** Date Started: February 2001
**
** This is part of the CTSim program
-** Copyright (C) 1983-2001 Kevin Rosenberg
-**
-** $Id$
+** Copyright (C) 1983-2009 Kevin Rosenberg
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License (version 2) as
-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)
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);
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);
#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
}
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();