piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 22:29:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix a segmentation fault when changing perspectives.

Browse Source 
Some general code clean up.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5948 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Glenn Rice
2010-07-23 03:53:18 +00:00
parent ba67333053
commit 2e6c5b36ab
5 changed files with 188 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Source/Core/DebuggerWX/Src/CodeWindow.h
View File

@ -52,15 +52,13 @@ class CCodeWindow
const wxString& name = wxT("Code")
);
~CCodeWindow();
void Load();
void Save();
// Parent interaction
CFrame *Parent;
wxMenuBar * GetMenuBar();
wxAuiToolBar * GetToolBar();
int GetNootebookAffiliation(wxString);
wxAuiToolBar * GetToolBar();
wxBitmap m_Bitmaps[ToolbarDebugBitmapMax];
bool UseInterpreter();
@ -68,11 +66,12 @@ class CCodeWindow
bool AutomaticStart();
bool JITNoBlockCache();
bool JITBlockLinking();
void JumpToAddress(u32 _Address);
void JumpToAddress(u32 _Address);
void Update();
void NotifyMapLoaded();
void CreateMenu(const SCoreStartupParameter& _LocalCoreStartupParameter, wxMenuBar * pMenuBar);
void CreateMenu(const SCoreStartupParameter& _LocalCoreStartupParameter,
wxMenuBar * pMenuBar);
void CreateMenuView(wxMenuBar * pMenuBar, wxMenu*);
void CreateMenuOptions(wxMenuBar * pMenuBar, wxMenu*);
void CreateMenuSymbols();
@ -81,10 +80,10 @@ class CCodeWindow
void UpdateButtonStates();
void OpenPages();
void UpdateManager();
// Menu bar
// -------------------
void OnCPUMode(wxCommandEvent& event); // CPU Mode menu
void OnCPUMode(wxCommandEvent& event); // CPU Mode menu
void OnJITOff(wxCommandEvent& event);
void OnToggleWindow(wxCommandEvent& event);
@ -125,7 +124,7 @@ class CCodeWindow
private:
enum
{
{
// Debugger GUI Objects
ID_CODEVIEW,
ID_CALLSTACKLIST,
@ -140,17 +139,15 @@ class CCodeWindow
void OnCallersListChange(wxCommandEvent& event);
void OnCallsListChange(wxCommandEvent& event);
void OnCodeViewChange(wxCommandEvent &event);
void SingleCPUStep();
void SingleCPUStep();
void OnHostMessage(wxCommandEvent& event);
void UpdateLists();
void UpdateCallstack();
void OnStatusBar(wxMenuEvent& event); void OnStatusBar_(wxUpdateUIEvent& event);
void DoTip(wxString text);
void OnKeyDown(wxKeyEvent& event);
void InitBitmaps();
void CreateGUIControls(const SCoreStartupParameter& _LocalCoreStartupParameter);
void CreateGUIControls(const SCoreStartupParameter& _LocalCoreStartupParameter);
wxMenuItem* jitblocklinking, *jitnoblockcache, *jitoff;
wxMenuItem* jitlsoff, *jitlslxzoff, *jitlslwzoff, *jitlslbzxoff;
@ -170,7 +167,7 @@ class CCodeWindow
wxListBox* calls;
Common::Event sync_event;
DECLARE_EVENT_TABLE()
DECLARE_EVENT_TABLE()
};
#endif /*CODEWINDOW_*/
#endif // CODEWINDOW_H_