diff options
| author | John Peterson <jpeterson57@gmail.com> | 2009-08-26 09:19:15 +0000 |
|---|---|---|
| committer | John Peterson <jpeterson57@gmail.com> | 2009-08-26 09:19:15 +0000 |
| commit | b185fedb858cd261906abf0edb556d13af033ad1 (patch) | |
| tree | b14990e958922d3c07854ff324593b4561c0d108 /Source/Core/DebuggerWX/Src/CodeWindow.h | |
| parent | 2e24e7db06ce685f8132d8b0d9c8bd97d2a74f56 (diff) | |
GUI debugger: Added more windows to aui
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4065 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/DebuggerWX/Src/CodeWindow.h')
| -rw-r--r-- | Source/Core/DebuggerWX/Src/CodeWindow.h | 36 |
1 files changed, 20 insertions, 16 deletions
diff --git a/Source/Core/DebuggerWX/Src/CodeWindow.h b/Source/Core/DebuggerWX/Src/CodeWindow.h index a145fa7863..ec984e4573 100644 --- a/Source/Core/DebuggerWX/Src/CodeWindow.h +++ b/Source/Core/DebuggerWX/Src/CodeWindow.h @@ -22,6 +22,7 @@ #include <wx/dialog.h> #include <wx/textctrl.h> #include <wx/listbox.h> +#include <wx/artprov.h> #include <wx/aui/aui.h> #include "Thread.h" @@ -54,10 +55,12 @@ class CCodeWindow // Function redirection wxFrame *GetParentFrame(); wxMenuBar * GetMenuBar(); - wxAuiToolBar * GetToolBar(); - wxAuiToolBar * m_ToolBar2; + wxAuiToolBar * GetToolBar(), * m_ToolBar2; + wxAuiNotebook *m_NB0, *m_NB1; bool IsActive(); void UpdateToolbar(wxAuiToolBar *); + void UpdateNotebook(int, wxAuiNotebook *); + wxBitmap page_bmp; void Load_(IniFile &file); void Load(IniFile &file); @@ -79,6 +82,13 @@ class CCodeWindow void CreateSymbolsMenu(); void UpdateButtonStates(); + // Sub dialogs + wxMenuBar* pMenuBar; + CRegisterWindow* m_RegisterWindow; + CBreakPointWindow* m_BreakpointWindow; + CMemoryWindow* m_MemoryWindow; + CJitWindow* m_JitWindow; + private: enum @@ -122,13 +132,14 @@ class CCodeWindow void SingleCPUStep(); void OnAddrBoxChange(wxCommandEvent& event); - - void OnToggleRegisterWindow(wxCommandEvent& event); - void OnToggleBreakPointWindow(wxCommandEvent& event); - void OnToggleMemoryWindow(wxCommandEvent& event); - void OnToggleJitWindow(wxCommandEvent& event); - void OnToggleSoundWindow(wxCommandEvent& event); - void OnToggleVideoWindow(wxCommandEvent& event); + + void OnToggleWindow(wxCommandEvent& event); + void OnToggleRegisterWindow(bool,wxAuiNotebook*); + void OnToggleBreakPointWindow(bool,wxAuiNotebook*); + void OnToggleMemoryWindow(bool,wxAuiNotebook*); + void OnToggleJitWindow(bool,wxAuiNotebook*); + void OnToggleSoundWindow(bool,wxAuiNotebook*); + void OnToggleVideoWindow(bool,wxAuiNotebook*); void OnChangeFont(wxCommandEvent& event); void OnHostMessage(wxCommandEvent& event); @@ -145,13 +156,6 @@ class CCodeWindow void DoTip(wxString text); void OnKeyDown(wxKeyEvent& event); - // Sub dialogs - wxMenuBar* pMenuBar; - CRegisterWindow* m_RegisterWindow; - CBreakPointWindow* m_BreakpointWindow; - CMemoryWindow* m_MemoryWindow; - CJitWindow* m_JitWindow; - wxMenuItem* jitblocklinking, *jitunlimited, *jitoff; wxMenuItem* jitlsoff, *jitlslxzoff, *jitlslwzoff, *jitlslbzxoff; wxMenuItem* jitlspoff; |