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

Removed AuiTB, moved functions to menubar (Debug->Perspectives)

Browse Source
This commit is contained in:
archshift
2014-08-09 00:42:32 -07:00
parent 6cd0ebab93
commit b8b72861b5
5 changed files with 55 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Source/Core/DolphinWX/Frame.h
View File

@ -44,8 +44,6 @@ class wxAuiManager;
class wxAuiManagerEvent;
class wxAuiNotebook;
class wxAuiNotebookEvent;
class wxAuiToolBar;
class wxAuiToolBarEvent;
class wxListEvent;
class wxMenuItem;
class wxWindow;
@ -124,6 +122,7 @@ public:
void DoFullscreen(bool bF);
void ToggleDisplayMode (bool bFullscreen);
void UpdateWiiMenuChoice(wxMenuItem *WiiMenuItem=nullptr);
void PopulateSavedPerspectives();
static void ConnectWiimote(int wm_idx, bool connect);
const CGameListCtrl *GetGameListCtrl() const;
@ -138,10 +137,11 @@ public:
X11Utils::XRRConfiguration *m_XRRConfig;
#endif
wxMenu* m_SavedPerspectives;
wxToolBar *m_ToolBar, *m_ToolBarDebug;
// AUI
wxAuiManager *m_Mgr;
wxAuiToolBar *m_ToolBarAui;
bool bFloatWindow[IDM_CODEWINDOW - IDM_LOGWINDOW + 1];
// Perspectives (Should find a way to make all of this private)
@ -197,7 +197,6 @@ private:
wxBitmap m_BitmapsMenu[EToolbar_Max];
void PopulateToolbar(wxToolBar* toolBar);
void PopulateToolbarAui(wxAuiToolBar* toolBar);
void RecreateToolbar();
void CreateMenu();
@ -222,7 +221,6 @@ private:
void ShowResizePane();
void TogglePane();
void SetPaneSize();
void ResetToolbarStyle();
void TogglePaneStyle(bool On, int EventId);
void ToggleNotebookStyle(bool On, long Style);
// Float window
@ -241,9 +239,7 @@ private:
void OnPaneClose(wxAuiManagerEvent& evt);
void ReloadPanes();
void DoLoadPerspective();
void OnDropDownToolbarSelect(wxCommandEvent& event);
void OnDropDownSettingsToolbar(wxAuiToolBarEvent& event);
void OnDropDownToolbarItem(wxAuiToolBarEvent& event);
void OnPerspectiveMenu(wxCommandEvent& event);
void OnSelectPerspective(wxCommandEvent& event);
#ifdef _WIN32
@ -253,8 +249,6 @@ private:
// Event functions
void OnQuit(wxCommandEvent& event);
void OnHelp(wxCommandEvent& event);
void OnToolBar(wxCommandEvent& event);
void OnAuiToolBar(wxAuiToolBarEvent& event);
void OnOpen(wxCommandEvent& event); // File menu
void DoOpen(bool Boot);