Applied initial patches for wx2.8 compatibility

[ctsim.git] / src / backgroundsupr.cpp

diff --git a/src/backgroundsupr.cpp b/src/backgroundsupr.cpp
index d7d8c0a9a14cedfd203f2df8a39878bf66f1478a..c4720770bdc310051a4cd6da8fa4e212881d5d2a 100644 (file)
--- a/src/backgroundsupr.cpp
+++ b/src/backgroundsupr.cpp
@@ -57,7 +57,7 @@ END_EVENT_TABLE()
 
 
 
-BackgroundSupervisor::BackgroundSupervisor (SupervisorThread* pMyThread, wxWindow* pParentFrame, BackgroundProcessingDocument* pDocument, const char* const pszProcessTitle, int iTotalUnits)
+BackgroundSupervisor::BackgroundSupervisor (SupervisorThread* pMyThread, wxWindow* pParentFrame, BackgroundProcessingDocument* pDocument, wxChar const* pszProcessTitle, int iTotalUnits)
     : wxEvtHandler(), m_pMyThread(pMyThread), m_pParentFrame(pParentFrame), m_pDocument(pDocument), m_strProcessTitle(pszProcessTitle),
     m_iTotalUnits(iTotalUnits), m_iNumThreads(0), m_bDone(false), m_bFail(false), m_bCancelled(false), m_iRunning(0),
     m_pTimer(NULL), m_bWorkersDeleted(false), m_bBackgroundManagerAdded(false)
@@ -120,12 +120,12 @@ BackgroundSupervisor::start()
     m_vecpThreads[iThread] = createWorker (iThread, iStartUnit, iNumUnits);
     if (! m_vecpThreads[iThread]) {
       m_bFail = true;
-      m_strFailMessage = "createWorker returned NULL [BackgroundSupervisor]";
+      m_strFailMessage = _T("createWorker returned NULL [BackgroundSupervisor]");
       break;
     }
     if (m_vecpThreads[iThread]->Create () != wxTHREAD_NO_ERROR) {
       m_bFail = true;
-      m_strFailMessage = "Thread creation failed [BackgroundSupervisor]";
+      m_strFailMessage = _T("Thread creation failed [BackgroundSupervisor]");
       break;
     }
    m_vecpThreads[iThread]->SetPriority (40);
@@ -136,13 +136,13 @@ BackgroundSupervisor::start()
 
   m_pTimer = new Timer;
 
-  std::string strLabel (m_strProcessTitle);
-  strLabel += " ";
-  strLabel += m_pParentFrame->GetTitle();
+  wxString strLabel (m_strProcessTitle);
+  strLabel += _T(" ");
+  strLabel += dynamic_cast<wxFrame*>(m_pParentFrame)->GetTitle();
 
 #ifdef USE_BKGMGR
   wxCommandEvent addTaskEvent (wxEVT_COMMAND_MENU_SELECTED, MSG_BACKGROUND_SUPERVISOR_ADD);
-  addTaskEvent.SetString (strLabel.c_str());
+  addTaskEvent.SetString (strLabel);
   addTaskEvent.SetInt (m_iTotalUnits);
   addTaskEvent.SetClientData (this);
   wxPostEvent (theApp->getBackgroundManager(), addTaskEvent);
@@ -192,7 +192,7 @@ BackgroundSupervisor::onWorkerDone (int iThread)
 #ifdef DEBUG
   if (theApp->getVerboseLogging()) {
     wxString msg;
-    msg.Printf("Background Supervisor: Thread finished. Remaining threads: %d\n", m_iRunning);
+    msg.Printf(_T("Background Supervisor: Thread finished. Remaining threads: %d\n"), m_iRunning);
     wxCommandEvent eventLog (wxEVT_COMMAND_MENU_SELECTED, MAINMENU_LOG_EVENT );
     eventLog.SetString( msg );
     wxPostEvent( theApp->getMainFrame(), eventLog ); // send log event
@@ -203,11 +203,11 @@ BackgroundSupervisor::onWorkerDone (int iThread)
 }
 
 void
-BackgroundSupervisor::onWorkerFail (int iThread, std::string strFailMessage)
+BackgroundSupervisor::onWorkerFail (int iThread, const wxString& strFailMessage)
 {
   m_iRunning--;
   wxCommandEvent eventLog( wxEVT_COMMAND_MENU_SELECTED, MAINMENU_LOG_EVENT );
-  eventLog.SetString( strFailMessage.c_str() );
+  eventLog.SetString( strFailMessage );
   wxPostEvent( theApp->getMainFrame(), eventLog ); // send log event
 
   onCancel();