diff options
| author | John Peterson <jpeterson57@gmail.com> | 2009-08-27 07:33:07 +0000 |
|---|---|---|
| committer | John Peterson <jpeterson57@gmail.com> | 2009-08-27 07:33:07 +0000 |
| commit | cb0eafcfc80e301a49c621b7ed17ed18bdf00e87 (patch) | |
| tree | 637ddf38b1c11aba0c59dc181ccd35b94e772042 /Source/Core/DebuggerWX/Src/CodeWindow.h | |
| parent | 217e0da0e6f949b68cc7073c66c820a5ced2bf54 (diff) | |
GUI: Views toolbar, save view on exit
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4074 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/DebuggerWX/Src/CodeWindow.h')
| -rw-r--r-- | Source/Core/DebuggerWX/Src/CodeWindow.h | 31 |
1 files changed, 10 insertions, 21 deletions
diff --git a/Source/Core/DebuggerWX/Src/CodeWindow.h b/Source/Core/DebuggerWX/Src/CodeWindow.h index bc0f69858a..a41abdbbaa 100644 --- a/Source/Core/DebuggerWX/Src/CodeWindow.h +++ b/Source/Core/DebuggerWX/Src/CodeWindow.h @@ -28,6 +28,9 @@ #include "Thread.h" #include "CoreParameter.h" +// GUI global +#include "../../DolphinWX/Src/Globals.h" + class CRegisterWindow; class CBreakPointWindow; class CMemoryWindow; @@ -54,10 +57,10 @@ class CCodeWindow void Load(); void Save(); - // Function redirection + // Function redirection and parent interaction wxFrame *GetParentFrame(); wxMenuBar * GetMenuBar(); - wxAuiToolBar * GetToolBar(), * m_ToolBar2; + wxAuiToolBar * GetToolBar(), * m_ToolBarDebug; wxAuiNotebook *m_NB0, *m_NB1; bool IsActive(); void UpdateToolbar(wxAuiToolBar *); @@ -68,13 +71,13 @@ class CCodeWindow #endif wxWindow * GetNootebookPage(wxString); void DoToggleWindow(int,bool); + wxBitmap m_Bitmaps[ToolbarDebugBitmapMax]; bool UseInterpreter(); bool BootToPause(); bool AutomaticStart(); bool UnlimitedJITCache(); bool JITBlockLinking(); - //bool UseDualCore(); // not used void JumpToAddress(u32 _Address); void Update(); @@ -106,18 +109,6 @@ class CCodeWindow ID_SYMBOLLIST }; - enum - { - Toolbar_DebugGo, - Toolbar_Pause, - Toolbar_Step, - Toolbar_StepOver, - Toolbar_Skip, - Toolbar_GotoPC, - Toolbar_SetPC, - Bitmaps_max - }; - // Settings bool bAutomaticStart; bool bBootToPause; bool bRegisterWindow; @@ -161,6 +152,9 @@ class CCodeWindow void DoTip(wxString text); void OnKeyDown(wxKeyEvent& event); + void InitBitmaps(); + void CreateGUIControls(const SCoreStartupParameter& _LocalCoreStartupParameter); + wxMenuItem* jitblocklinking, *jitunlimited, *jitoff; wxMenuItem* jitlsoff, *jitlslxzoff, *jitlslwzoff, *jitlslbzxoff; wxMenuItem* jitlspoff; @@ -177,12 +171,7 @@ class CCodeWindow wxListBox* calls; Common::Event sync_event; - wxBitmap m_Bitmaps[Bitmaps_max]; - - DECLARE_EVENT_TABLE() - - void InitBitmaps(); - void CreateGUIControls(const SCoreStartupParameter& _LocalCoreStartupParameter); + DECLARE_EVENT_TABLE() }; #endif /*CODEWINDOW_*/ |