X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=src%2Fbackgroundmgr.cpp;h=f40cc916340d55b9975ffbcc86fad45171da38af;hp=7c6ef63fdd87343ebde024af4129c1c655435bc5;hb=f13a8c004b8f182b42d9e4df2bcd7c7f030bf1ad;hpb=1a050c98763fbbc0662731b0b76953acede6f5d7 diff --git a/src/backgroundmgr.cpp b/src/backgroundmgr.cpp index 7c6ef63..f40cc91 100644 --- a/src/backgroundmgr.cpp +++ b/src/backgroundmgr.cpp @@ -7,9 +7,7 @@ ** 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 @@ -108,7 +106,7 @@ void BackgroundManager::OnAddTask (wxCommandEvent& event) { int iNumUnits = event.GetInt(); - const char* const pszTaskName = event.GetString().c_str(); + const char* const pszTaskName = event.GetString().mb_str(wxConvUTF8); BackgroundSupervisor* pSupervisor = reinterpret_cast(event.GetClientData()); if (pSupervisor == NULL) { sys_error (ERR_SEVERE, "Received NULL supervisor [BackgroundManager::OnAddTask]"); @@ -139,7 +137,7 @@ BackgroundManager::OnAddTask (wxCommandEvent& event) wxPoint posLabel (m_sizeBorder.x + m_sizeGauge.x, m_sizeBorder.y + iFirstUnusedPos * m_sizeCell.y); wxPoint posButton (m_sizeBorder.x + m_sizeGauge.x + m_sizeLabel.x, m_sizeBorder.y + iFirstUnusedPos * m_sizeCell.y); wxGauge* pGauge = new wxGauge (m_pCanvas, -1, iNumUnits, posGauge, m_sizeGauge); - wxStaticText* pLabel = new wxStaticText (m_pCanvas, -1, pszTaskName, posLabel, m_sizeLabel); + wxStaticText* pLabel = new wxStaticText (m_pCanvas, -1, wxConvUTF8.cMB2WX(pszTaskName), posLabel, m_sizeLabel); wxButton* pButton = new wxButton (m_pCanvas, s_iNextButtonID, _T("Cancel"), posButton, m_sizeButton, wxBU_LEFT); BackgroundManagerTask* pTask = new BackgroundManagerTask (pSupervisor, pszTaskName,