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: Fix to last commit

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4077 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
John Peterson
2009-08-27 10:46:43 +00:00
parent 843a07d22e
commit 273f8ed4e9
1 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
Source/Core/DolphinWX/Src/Frame.cpp
View File

@ -429,12 +429,20 @@ CFrame::CFrame(bool showLogWindow,
m_Mgr->AddPane(m_NB0, wxAuiPaneInfo().Name(wxT("Pane1")).Caption(wxT("Pane1")).Hide()); m_Mgr->AddPane(m_NB0, wxAuiPaneInfo().Name(wxT("Pane1")).Caption(wxT("Pane1")).Hide());
} }
// Setup perspectives
if (UseDebugger) if (UseDebugger)
{ {
// Setup perspectives
m_Mgr->GetPane(wxT("Pane0")).CenterPane().PaneBorder(false); m_Mgr->GetPane(wxT("Pane0")).CenterPane().PaneBorder(false);
AuiFullscreen = m_Mgr->SavePerspective(); AuiFullscreen = m_Mgr->SavePerspective();
}
// Create toolbar
RecreateToolbar();
if (!SConfig::GetInstance().m_InterfaceToolbar) DoToggleToolbar(false);
// Setup perspectives
if (UseDebugger)
{
m_Mgr->GetPane(wxT("Pane0")).Show().PaneBorder(true).CaptionVisible(false).Layer(0).Center().Position(0); m_Mgr->GetPane(wxT("Pane0")).Show().PaneBorder(true).CaptionVisible(false).Layer(0).Center().Position(0);
m_Mgr->GetPane(wxT("Pane1")).Show().PaneBorder(true).CaptionVisible(false).Layer(0).Center().Position(1); m_Mgr->GetPane(wxT("Pane1")).Show().PaneBorder(true).CaptionVisible(false).Layer(0).Center().Position(1);
m_Mgr->GetPane(wxT("Pane2")).Show().PaneBorder(true).CaptionVisible(false).Layer(0).Right(); m_Mgr->GetPane(wxT("Pane2")).Show().PaneBorder(true).CaptionVisible(false).Layer(0).Right();
@ -462,10 +470,6 @@ CFrame::CFrame(bool showLogWindow,
AuiFullscreen = m_Mgr->SavePerspective(); AuiFullscreen = m_Mgr->SavePerspective();
m_Mgr->GetPane(wxT("Pane1")).Hide().PaneBorder(false).CaptionVisible(false).Layer(0).Right(); m_Mgr->GetPane(wxT("Pane1")).Hide().PaneBorder(false).CaptionVisible(false).Layer(0).Right();
} }
// Create toolbar
RecreateToolbar();
if (!SConfig::GetInstance().m_InterfaceToolbar) DoToggleToolbar(false);
// Show titles to position the panes // Show titles to position the panes
/* /*
@ -515,7 +519,7 @@ CFrame::CFrame(bool showLogWindow,
(wxObject*)0, this); (wxObject*)0, this);
#ifdef _WIN32 // The functions are only tested in Windows so far #ifdef _WIN32 // The functions are only tested in Windows so far
wxTheApp->Connect(wxID_ANY, wxEVT_LEFT_DOWN, // Mouse wxTheApp->Connect(wxID_ANY, wxEVT_LEFT_DOWN,
wxMouseEventHandler(CFrame::OnDoubleClick), wxMouseEventHandler(CFrame::OnDoubleClick),
(wxObject*)0, this); (wxObject*)0, this);
wxTheApp->Connect(wxID_ANY, wxEVT_MOTION, wxTheApp->Connect(wxID_ANY, wxEVT_MOTION,
@ -534,16 +538,15 @@ CFrame::CFrame(bool showLogWindow,
//Core::WriteStatus(); //Core::WriteStatus();
#endif #endif
} }
// Destructor // Destructor
CFrame::~CFrame() CFrame::~CFrame()
{ {
cdio_free_device_list(drives); cdio_free_device_list(drives);
/* The statbar sample has this so I add this to, but I guess timer will be deleted after /* The statbar sample has this so I add this to, but I guess timer will be deleted after
this anyway */ this anyway */
#if wxUSE_TIMER #if wxUSE_TIMER
if (m_timer.IsRunning()) m_timer.Stop(); if (m_timer.IsRunning()) m_timer.Stop();
#endif #endif
} }
void CFrame::OnQuit(wxCommandEvent& WXUNUSED (event)) void CFrame::OnQuit(wxCommandEvent& WXUNUSED (event))