mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-09-03 16:16:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Changed toolbar to be static, increasing UI integration

Browse source
This commit is contained in:
archshift 2014-08-08 03:43:13 -07:00
commit 019d5aee49
5 changed files with 34 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Source/Core/DolphinWX/Frame.h
View file

@ -138,9 +138,10 @@ public:
X11Utils::XRRConfiguration *m_XRRConfig;
#endif
wxToolBar *m_ToolBar, *m_ToolBarDebug;
// AUI
wxAuiManager *m_Mgr;
wxAuiToolBar *m_ToolBar, *m_ToolBarDebug, *m_ToolBarAui;
wxAuiToolBar *m_ToolBarAui;
bool bFloatWindow[IDM_CODEWINDOW - IDM_LOGWINDOW + 1];
// Perspectives (Should find a way to make all of this private)
@ -195,7 +196,7 @@ private:
wxBitmap m_Bitmaps[EToolbar_Max];
wxBitmap m_BitmapsMenu[EToolbar_Max];
void PopulateToolbar(wxAuiToolBar* toolBar);
void PopulateToolbar(wxToolBar* toolBar);
void PopulateToolbarAui(wxAuiToolBar* toolBar);
void RecreateToolbar();
void CreateMenu();