- clean up

pollution
This commit is contained in:
Bryce Denney 2002-09-18 20:59:05 +00:00
parent 8dde63da04
commit 4694ac5c04

View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////
// $Id: wxmain.cc,v 1.48 2002-09-16 15:28:19 bdenney Exp $
// $Id: wxmain.cc,v 1.49 2002-09-18 20:59:05 bdenney Exp $
/////////////////////////////////////////////////////////////////
//
// wxmain.cc implements the wxWindows frame, toolbar, menus, and dialogs.
@ -177,8 +177,8 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
EVT_MENU(ID_Log_Prefs, MyFrame::OnLogPrefs)
EVT_MENU(ID_Debug_ShowCpu, MyFrame::OnShowCpu)
EVT_MENU(ID_Debug_ShowKeyboard, MyFrame::OnShowKeyboard)
#if BX_DEBUGGER
EVT_MENU(ID_Debug_Log, MyFrame::OnDebugLog)
#if BX_DEBUGGER
EVT_MENU(ID_Debug_Log, MyFrame::OnDebugLog)
#endif
// toolbar events
EVT_TOOL(ID_Edit_FD_0, MyFrame::OnToolbarClick)
@ -681,11 +681,11 @@ void MyFrame::OnShowCpu(wxCommandEvent& WXUNUSED(event))
return;
}
if (showCpu == NULL) {
showCpu = new CpuRegistersDialog (this, -1);
showCpu = new CpuRegistersDialog (this, -1);
#if BX_DEBUGGER
showCpu->SetTitle ("Bochs Debugger");
#else
showCpu->SetTitle ("CPU Registers");
showCpu->SetTitle ("Bochs Debugger");
#else
showCpu->SetTitle ("CPU Registers");
#endif
showCpu->Init ();
} else {
@ -707,12 +707,12 @@ void MyFrame::OnShowKeyboard(wxCommandEvent& WXUNUSED(event))
showKbd->Show (TRUE);
}
#if BX_DEBUGGER
#if BX_DEBUGGER
void MyFrame::OnDebugLog(wxCommandEvent& WXUNUSED(event))
{
wxASSERT (showDebugLog != NULL);
showDebugLog->Refresh ();
showDebugLog->Show (TRUE);
showDebugLog->Show (TRUE);
}
void
@ -726,7 +726,7 @@ MyFrame::DebugBreak ()
showDebugLog->AppendCommand ("*** break ***");
SIM->debug_break ();
}
void
MyFrame::DebugCommand (wxString cmd)
{
@ -764,7 +764,7 @@ MyFrame::DebugCommand (const char *cmd)
wxLogDebug ("storing debugger command '%s'", tmp);
debugCommand = tmp;
}
}
}
#endif
void MyFrame::OnQuit(wxCommandEvent& event)
@ -1048,14 +1048,14 @@ MyFrame::OnSim2CIEvent (wxCommandEvent& event)
sim_thread->SendSyncResponse(be);
wxLogDebug ("after SendSyncResponse");
return;
#if BX_DEBUGGER
#if BX_DEBUGGER
case BX_ASYNC_EVT_DBG_MSG:
showDebugLog->AppendText (be->u.logmsg.msg);
// free the char* which was allocated in dbg_printf
delete [] ((char*) be->u.logmsg.msg);
// free the whole event
delete be;
return;
return;
#endif
case BX_SYNC_EVT_LOG_ASK:
case BX_ASYNC_EVT_LOG_MSG: