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

GUI: Simplified away the notebook vector, bugfixes

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4112 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
John Peterson
2009-08-30 22:04:30 +00:00
parent 6b97c0b764
commit 63786d5438
5 changed files with 124 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/DolphinWX/Src/Frame.h
View File

@ -100,7 +100,6 @@ class CFrame : public wxFrame
// AUI
wxAuiManager *m_Mgr;
wxAuiToolBar *m_ToolBar, *m_ToolBarDebug, *m_ToolBarAui;
std::vector<wxAuiNotebook*> m_NB;
int DefaultNBStyle;
int iLeftWidth[2], iMidWidth[2];
// Perspectives
@ -109,12 +108,14 @@ class CFrame : public wxFrame
wxWindow * GetWxWindowHwnd(HWND);
#endif
wxWindow * GetNootebookPage(wxString);
wxAuiNotebook * GetNotebook(int);
void AddRemoveBlankPage();
void OnNotebookPageClose(wxAuiNotebookEvent& event);
void OnAllowNotebookDnD(wxAuiNotebookEvent& event);
void OnNotebookPageChanged(wxAuiNotebookEvent& event);
int GetNootebookAffiliation(wxString Name);
void DoToggleWindow(int,bool);
int GetNotebookCount();
void DoAddPage(wxWindow *, int, std::string);
void DoRemovePage(wxWindow *, bool Hide = true);
void DoRemovePageString(wxString, bool Hide = true);
@ -202,6 +203,7 @@ class CFrame : public wxFrame
void RecreateToolbar();
void CreateMenu();
wxPanel *CreateEmptyPanel();
wxAuiNotebook *CreateEmptyNotebook();
#ifdef _WIN32
// Override window proc for tricks like screensaver disabling