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

woops missed a file :) 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5130 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
luisr142004 2010-02-25 06:38:09 +00:00
parent 816febd3b0
commit 5d81b93189
1 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,11 +28,6 @@ Core::GetWindowHandle().
*/ */
// Why doesn't it work on windows?
#ifndef _WIN32
#include "Common.h"
#endif
#include "Setup.h" // Common #include "Setup.h" // Common
#include "NetWindow.h" #include "NetWindow.h"
@ -747,11 +742,9 @@ void CFrame::OnReset(wxCommandEvent& WXUNUSED (event))
void CFrame::OnConfigMain(wxCommandEvent& WXUNUSED (event)) void CFrame::OnConfigMain(wxCommandEvent& WXUNUSED (event))
{ {
m_bModalDialogOpen = true;
CConfigMain ConfigMain(this); CConfigMain ConfigMain(this);
if (ConfigMain.ShowModal() == wxID_OK) if (ConfigMain.ShowModal() == wxID_OK)
m_GameListCtrl->Update(); m_GameListCtrl->Update();
m_bModalDialogOpen = false;
} }
void CFrame::OnPluginGFX(wxCommandEvent& WXUNUSED (event)) void CFrame::OnPluginGFX(wxCommandEvent& WXUNUSED (event))
@ -763,7 +756,6 @@ void CFrame::OnPluginGFX(wxCommandEvent& WXUNUSED (event))
); );
} }
void CFrame::OnPluginDSP(wxCommandEvent& WXUNUSED (event)) void CFrame::OnPluginDSP(wxCommandEvent& WXUNUSED (event))
{ {
CPluginManager::GetInstance().OpenConfig( CPluginManager::GetInstance().OpenConfig(
@ -796,12 +788,10 @@ void CFrame::OnHelp(wxCommandEvent& event)
{ {
case IDM_HELPABOUT: case IDM_HELPABOUT:
{ {
m_bModalDialogOpen = true;
AboutDolphin frame(this); AboutDolphin frame(this);
frame.ShowModal(); frame.ShowModal();
m_bModalDialogOpen = false;
break;
} }
break;
case IDM_HELPWEBSITE: case IDM_HELPWEBSITE:
WxUtils::Launch("http://www.dolphin-emu.com/"); WxUtils::Launch("http://www.dolphin-emu.com/");
break; break;
@ -842,10 +832,8 @@ void CFrame::OnNetPlay(wxCommandEvent& WXUNUSED (event))
void CFrame::OnMemcard(wxCommandEvent& WXUNUSED (event)) void CFrame::OnMemcard(wxCommandEvent& WXUNUSED (event))
{ {
m_bModalDialogOpen = true;
CMemcardManager MemcardManager(this); CMemcardManager MemcardManager(this);
MemcardManager.ShowModal(); MemcardManager.ShowModal();
m_bModalDialogOpen = false;
} }
void CFrame::OnImportSave(wxCommandEvent& WXUNUSED (event)) void CFrame::OnImportSave(wxCommandEvent& WXUNUSED (event))