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

Logical reorderring of the GUI boot sequence. Also a little clean up in the OpenGL plugin.

Browse source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5379 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Glenn Rice 2010-04-17 03:17:36 +00:00
commit 0a12b9d9f5
7 changed files with 83 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Source/Core/DolphinWX/Src/Frame.cpp
View file

@ -357,7 +357,7 @@ CFrame::CFrame(wxFrame* parent,
, m_RenderFrame(NULL), m_RenderParent(NULL)
, m_LogWindow(NULL)
, UseDebugger(_UseDebugger), m_bEdit(false), m_bTabSplit(false), m_bNoDocking(false)
, m_bControlsCreated(false), m_StopDlg(NULL)
, m_bControlsCreated(false), m_bGameLoading(false), m_StopDlg(NULL)
#if wxUSE_TIMER
, m_timer(this)
#endif
@ -488,13 +488,6 @@ CFrame::CFrame(wxFrame* parent,
// -------------------------
// Connect event handlers
wxTheApp->Connect(wxID_ANY, wxEVT_KEY_DOWN, // Keyboard
wxKeyEventHandler(CFrame::OnKeyDown),
(wxObject*)0, this);
wxTheApp->Connect(wxID_ANY, wxEVT_KEY_UP,
wxKeyEventHandler(CFrame::OnKeyUp),
(wxObject*)0, this);
m_Mgr->Connect(wxID_ANY, wxEVT_AUI_RENDER, // Resize
wxAuiManagerEventHandler(CFrame::OnManagerResize),
(wxObject*)0, this);
@ -846,7 +839,7 @@ void CFrame::OnGameListCtrl_ItemActivated(wxListEvent& WXUNUSED (event))
}
else
// Game started by double click
StartGame(std::string(""));
BootGame(std::string(""));
}
bool IsHotkey(wxKeyEvent &event, int Id)