mirrors/Bochs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- unicode fixes in the wx debugger

Browse Source
This commit is contained in:
Volker Ruppert 2006-05-22 16:35:03 +00:00
parent 8b55085c76
commit 837d104770
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
bochs/gui/wxdialog.cc
View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////
// $Id: wxdialog.cc,v 1.97 2006-04-16 10:12:31 vruppert Exp $ // $Id: wxdialog.cc,v 1.98 2006-05-22 16:35:03 vruppert Exp $
///////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////
// Define BX_PLUGGABLE in files that can be compiled into plugins. For // Define BX_PLUGGABLE in files that can be compiled into plugins. For
@ -746,7 +746,7 @@ void DebugLogDialog::CheckLogLength ()
void DebugLogDialog::AppendCommand (const char *cmd) void DebugLogDialog::AppendCommand (const char *cmd)
{ {
log->AppendText(wxT(">>> ")); log->AppendText(wxT(">>> "));
log->AppendText(wxString (cmd)); log->AppendText(wxString(cmd, wxConvUTF8));
log->AppendText(wxT("\n")); log->AppendText(wxT("\n"));
int n = log->GetLastPosition(); int n = log->GetLastPosition();
if (n>0) n--; if (n>0) n--;
@ -1708,27 +1708,27 @@ CpuRegistersDialog::OnEvent(wxCommandEvent& event)
int id = event.GetId (); int id = event.GetId ();
switch (id) { switch (id) {
case ID_Close: case ID_Close:
Show (FALSE); Show(FALSE);
break; break;
#if BX_DEBUGGER #if BX_DEBUGGER
case ID_Debug_Stop: case ID_Debug_Stop:
wxLogDebug ("wxWidgets triggered a break"); wxLogDebug(wxT("wxWidgets triggered a break"));
theFrame->DebugBreak (); theFrame->DebugBreak();
break; break;
case ID_Debug_Continue: case ID_Debug_Continue:
wxLogDebug ("before calling DebugCommand"); wxLogDebug(wxT("before calling DebugCommand"));
theFrame->DebugCommand ("continue"); theFrame->DebugCommand("continue");
wxLogDebug ("after calling DebugCommand"); wxLogDebug(wxT("after calling DebugCommand"));
break; break;
case ID_Debug_Step: case ID_Debug_Step:
theFrame->DebugCommand ("step 1"); theFrame->DebugCommand("step 1");
break; break;
case ID_Debug_Commit: case ID_Debug_Commit:
CopyGuiToParam (); CopyGuiToParam();
break; break;
#endif #endif
default: default:
ParamDialog::OnEvent (event); ParamDialog::OnEvent(event);
} }
} }

4
bochs/gui/wxmain.cc
View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////
// $Id: wxmain.cc,v 1.136 2006-04-16 10:12:31 vruppert Exp $ // $Id: wxmain.cc,v 1.137 2006-05-22 16:35:03 vruppert Exp $
///////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////
// //
// wxmain.cc implements the wxWidgets frame, toolbar, menus, and dialogs. // wxmain.cc implements the wxWidgets frame, toolbar, menus, and dialogs.
@ -1204,7 +1204,7 @@ MyFrame::OnSim2CIEvent(wxCommandEvent& event)
break; break;
#if BX_DEBUGGER #if BX_DEBUGGER
case BX_ASYNC_EVT_DBG_MSG: case BX_ASYNC_EVT_DBG_MSG:
showDebugLog->AppendText(be->u.logmsg.msg); showDebugLog->AppendText(wxString(be->u.logmsg.msg, wxConvUTF8));
// free the char* which was allocated in dbg_printf // free the char* which was allocated in dbg_printf
delete [] ((char*) be->u.logmsg.msg); delete [] ((char*) be->u.logmsg.msg);
break; break;