diff options
| author | Glenn Rice <glennricster@gmail.com> | 2010-07-24 02:36:22 +0000 |
|---|---|---|
| committer | Glenn Rice <glennricster@gmail.com> | 2010-07-24 02:36:22 +0000 |
| commit | 43cbff64b5c5041815ada20e384a0e601c32dbf5 (patch) | |
| tree | b973de829ee8967f69710270448dc9b148ac8b62 /Source/Core/DolphinWX/Src/FrameTools.cpp | |
| parent | 949b873dc8164a9cbfdb48d687263da95b4bfc66 (diff) | |
More FrameAui work. Some more segmentation faults resolved. And a little more code clean up.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5959 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/DolphinWX/Src/FrameTools.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/Src/FrameTools.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp index e4c304623b..80571ba71e 100644 --- a/Source/Core/DolphinWX/Src/FrameTools.cpp +++ b/Source/Core/DolphinWX/Src/FrameTools.cpp @@ -100,7 +100,7 @@ void CFrame::CreateMenu() { if (GetMenuBar()) GetMenuBar()->Destroy(); - m_MenuBar = new wxMenuBar(wxMB_DOCKABLE); + wxMenuBar *m_MenuBar = new wxMenuBar(); // file menu wxMenu* fileMenu = new wxMenu; @@ -367,6 +367,7 @@ void CFrame::RecreateToolbar() m_ToolBar->Destroy(); } + long TOOLBAR_STYLE = wxAUI_TB_DEFAULT_STYLE | wxAUI_TB_TEXT /*wxAUI_TB_OVERFLOW overflow visible*/; m_ToolBar = new wxAuiToolBar(this, ID_TOOLBAR, wxDefaultPosition, wxDefaultSize, TOOLBAR_STYLE); PopulateToolbar(m_ToolBar); @@ -495,8 +496,6 @@ void CFrame::InitBitmaps() // Update in case the bitmap has been updated if (m_ToolBar != NULL) RecreateToolbar(); - - aNormalFile = wxArtProvider::GetBitmap(wxART_NORMAL_FILE, wxART_OTHER, wxSize(16,16)); } // Menu items @@ -1325,10 +1324,8 @@ void CFrame::UpdateGUI() // Game has not started, show game list if (!m_GameListCtrl->IsShown()) { - m_GameListCtrl->Reparent(m_Panel); m_GameListCtrl->Enable(); m_GameListCtrl->Show(); - sizerPanel->FitInside(m_Panel); } // Game has been selected but not started, enable play button if (m_GameListCtrl->GetSelectedISO() != NULL && m_GameListCtrl->IsEnabled() && !m_bGameLoading) |