ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

added close event so application got shutdown correctly 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1083 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
fires.gc 2008-11-05 22:58:26 +00:00
parent 46c284f7a9
commit 135b6e1eb8
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -80,6 +80,7 @@ static const long TOOLBAR_STYLE = wxTB_FLAT | wxTB_DOCKABLE | wxTB_TEXT;
const wxEventType wxEVT_HOST_COMMAND = wxNewEventType(); const wxEventType wxEVT_HOST_COMMAND = wxNewEventType();
BEGIN_EVENT_TABLE(CFrame, wxFrame) BEGIN_EVENT_TABLE(CFrame, wxFrame)
EVT_CLOSE(CFrame::OnClose)
EVT_MENU(wxID_OPEN, CFrame::OnOpen) EVT_MENU(wxID_OPEN, CFrame::OnOpen)
EVT_MENU(wxID_EXIT, CFrame::OnQuit) EVT_MENU(wxID_EXIT, CFrame::OnQuit)
EVT_MENU(IDM_HELPWEBSITE, CFrame::OnHelp) EVT_MENU(IDM_HELPWEBSITE, CFrame::OnHelp)
@ -367,16 +368,22 @@ void CFrame::OnOpen(wxCommandEvent& WXUNUSED (event))
void CFrame::OnQuit(wxCommandEvent& WXUNUSED (event)) void CFrame::OnQuit(wxCommandEvent& WXUNUSED (event))
{ {
Close(true);
}
void CFrame::OnClose(wxCloseEvent& event)
{
// Don't forget the skip of the window won't be destroyed
event.Skip();
if (Core::GetState() != Core::CORE_UNINITIALIZED) if (Core::GetState() != Core::CORE_UNINITIALIZED)
{ {
Core::Stop(); Core::Stop();
UpdateGUI(); UpdateGUI();
} }
Close(true);
} }
void CFrame::OnHelp(wxCommandEvent& event) void CFrame::OnHelp(wxCommandEvent& event)
{ {
switch (event.GetId()) switch (event.GetId())

1
Source/Core/DolphinWX/Src/Frame.h
View File

@ -80,6 +80,7 @@ class CFrame : public wxFrame
void OnHostMessage(wxCommandEvent& event); void OnHostMessage(wxCommandEvent& event);
void OnLoadState(wxCommandEvent& event); void OnLoadState(wxCommandEvent& event);
void OnSaveState(wxCommandEvent& event); void OnSaveState(wxCommandEvent& event);
void OnClose(wxCloseEvent &event);
wxStatusBar* m_pStatusBar; wxStatusBar* m_pStatusBar;