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

Modal windows must be closed with EndModal(), not just Destroy()'ed. 

wxFD_FILE_MUST_EXIST cannot be used with wxFD_SAVE.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6003 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang 2010-07-30 13:14:53 +00:00
parent 2d108f8d57
commit 1fb47e6393
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/DolphinWX/Src/AboutDolphin.cpp
View File

@ -105,7 +105,7 @@ void AboutDolphin::CreateGUIControls()
void AboutDolphin::OnClose(wxCloseEvent& WXUNUSED (event)) void AboutDolphin::OnClose(wxCloseEvent& WXUNUSED (event))
{ {
Destroy(); EndModal(wxID_OK);
} }
void AboutDolphin::CloseClick(wxCommandEvent& WXUNUSED (event)) void AboutDolphin::CloseClick(wxCommandEvent& WXUNUSED (event))

3
Source/Core/DolphinWX/Src/FrameTools.cpp
View File

@ -145,6 +145,7 @@ void CFrame::CreateMenu()
emulationMenu->AppendSeparator(); emulationMenu->AppendSeparator();
emulationMenu->Append(IDM_SCREENSHOT, _T("Take S&creenshot\tF9")); emulationMenu->Append(IDM_SCREENSHOT, _T("Take S&creenshot\tF9"));
emulationMenu->AppendSeparator(); emulationMenu->AppendSeparator();
wxMenu *saveMenu = new wxMenu; wxMenu *saveMenu = new wxMenu;
wxMenu *loadMenu = new wxMenu; wxMenu *loadMenu = new wxMenu;
@ -626,7 +627,7 @@ void CFrame::OnRecord(wxCommandEvent& WXUNUSED (event))
wxFileSelectorDefaultWildcardStr, wxFileSelectorDefaultWildcardStr,
wxFileSelectorDefaultWildcardStr wxFileSelectorDefaultWildcardStr
), ),
wxFD_SAVE | wxFD_PREVIEW | wxFD_FILE_MUST_EXIST, wxFD_SAVE | wxFD_PREVIEW,
this); this);
if(path.IsEmpty()) if(path.IsEmpty())