Applied initial patches for wx2.8 compatibility

[ctsim.git] / libctsupport / syserror.cpp

diff --git a/libctsupport/syserror.cpp b/libctsupport/syserror.cpp
index aca4b8c0a735feed36e0bef541c77befb48513ab..1427f87b85f05a7a299c3e0c50146c1d59e67ecc 100644 (file)
--- a/libctsupport/syserror.cpp
+++ b/libctsupport/syserror.cpp
@@ -57,15 +57,15 @@ void sys_error (int severity, const char *msg, ...)
   if (g_bRunningWXWindows) {
     if (theApp) {
       wxCommandEvent eventLog (wxEVT_COMMAND_MENU_SELECTED, MAINMENU_LOG_EVENT );
-      wxString msg (strOutput.c_str());
+      wxString msg (wxConvCurrent->cMB2WX(strOutput.c_str()));
       if (msg.length() > 0) {
-        msg += "\n";
+        msg += wxChar('\n');
         eventLog.SetString( msg );
         wxPostEvent( theApp->getMainFrame(), eventLog ); // send log event, thread safe
       }
     } else {
       wxMutexGuiEnter();
-      wxLog::OnLog (wxLOG_Message, strOutput.c_str(), time(NULL));
+      wxLog::OnLog (wxLOG_Message, wxConvCurrent->cMB2WX(strOutput.c_str()), time(NULL));
       wxMutexGuiLeave();
     }
   }