diff options
| author | John Peterson <jpeterson57@gmail.com> | 2009-08-27 10:10:07 +0000 |
|---|---|---|
| committer | John Peterson <jpeterson57@gmail.com> | 2009-08-27 10:10:07 +0000 |
| commit | da6a200540de80afaad9b28290739969ba42a965 (patch) | |
| tree | 907abdd6a4776075181e74b7f69fecef589f9228 /Source/Core/DebuggerWX/Src/CodeWindow.h | |
| parent | cb0eafcfc80e301a49c621b7ed17ed18bdf00e87 (diff) | |
GUI: Dock logwindow
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4075 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/DebuggerWX/Src/CodeWindow.h')
| -rw-r--r-- | Source/Core/DebuggerWX/Src/CodeWindow.h | 39 |
1 files changed, 17 insertions, 22 deletions
diff --git a/Source/Core/DebuggerWX/Src/CodeWindow.h b/Source/Core/DebuggerWX/Src/CodeWindow.h index a41abdbbaa..a97ec6d6ce 100644 --- a/Source/Core/DebuggerWX/Src/CodeWindow.h +++ b/Source/Core/DebuggerWX/Src/CodeWindow.h @@ -30,7 +30,9 @@ // GUI global #include "../../DolphinWX/Src/Globals.h" +#include "../../DolphinWX/Src/Frame.h" +class CFrame; class CRegisterWindow; class CBreakPointWindow; class CMemoryWindow; @@ -42,7 +44,7 @@ class CCodeWindow { public: - CCodeWindow(const SCoreStartupParameter& _LocalCoreStartupParameter, wxWindow* parent, + CCodeWindow(const SCoreStartupParameter& _LocalCoreStartupParameter, CFrame *, wxWindow* parent, wxWindowID id = wxID_ANY); /* CCodeWindow(const SCoreStartupParameter& _LocalCoreStartupParameter, wxWindow* parent, @@ -57,20 +59,14 @@ class CCodeWindow void Load(); void Save(); - // Function redirection and parent interaction - wxFrame *GetParentFrame(); + // Parent interaction + CFrame *Parent; wxMenuBar * GetMenuBar(); - wxAuiToolBar * GetToolBar(), * m_ToolBarDebug; - wxAuiNotebook *m_NB0, *m_NB1; - bool IsActive(); - void UpdateToolbar(wxAuiToolBar *); - void UpdateNotebook(int, wxAuiNotebook *); - wxBitmap aNormalFile; + wxAuiToolBar * GetToolBar(); #ifdef _WIN32 wxWindow * GetWxWindow(wxString); #endif - wxWindow * GetNootebookPage(wxString); - void DoToggleWindow(int,bool); + wxWindow * GetNootebookPage(wxString); wxBitmap m_Bitmaps[ToolbarDebugBitmapMax]; bool UseInterpreter(); @@ -89,6 +85,15 @@ class CCodeWindow void UpdateButtonStates(); void OpenPages(); void UpdateManager(); + + 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); // Sub dialogs wxMenuBar* pMenuBar; @@ -127,17 +132,7 @@ class CCodeWindow void OnCodeViewChange(wxCommandEvent &event); void SingleCPUStep(); - void OnAddrBoxChange(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 OnAddrBoxChange(wxCommandEvent& event); void OnHostMessage(wxCommandEvent& event); void OnSymbolsMenu(wxCommandEvent& event); void OnJitMenu(wxCommandEvent& event); |