mirror/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-11 00:40:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix issue 2364 + another issue introduced in r5129 causing the main window to lose the focus on windows

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5133 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
sl1nk3.s 2010-02-25 17:50:08 +00:00
parent f1ed7e5656
commit 6da7695843
6 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Plugins/Plugin_DSP_HLE/Src/main.cpp
View File

@ -186,11 +186,13 @@ void DllConfig(HWND _hParent)
m_ConfigFrame->ShowModal(); m_ConfigFrame->ShowModal();
frame->Enable(); frame->Enable();
m_ConfigFrame->Destroy();
m_ConfigFrame = NULL;
#ifdef _WIN32 #ifdef _WIN32
frame->SetFocus();
frame->SetHWND(NULL); frame->SetHWND(NULL);
#endif #endif
m_ConfigFrame->Destroy();
m_ConfigFrame = NULL;
frame->Destroy(); frame->Destroy();
#endif #endif
} }

6
Source/Plugins/Plugin_DSP_LLE/Src/main.cpp
View File

@ -151,11 +151,13 @@ void DllConfig(HWND _hParent)
m_ConfigFrame->ShowModal(); m_ConfigFrame->ShowModal();
frame->Enable(); frame->Enable();
m_ConfigFrame->Destroy();
m_ConfigFrame = NULL;
#ifdef _WIN32 #ifdef _WIN32
frame->SetFocus();
frame->SetHWND(NULL); frame->SetHWND(NULL);
#endif #endif
m_ConfigFrame->Destroy();
m_ConfigFrame = NULL;
frame->Destroy(); frame->Destroy();
#endif #endif
} }

6
Source/Plugins/Plugin_GCPad/Src/GCPad.cpp
View File

@ -168,11 +168,13 @@ void DllConfig(HWND _hParent)
m_ConfigFrame->ShowModal(); m_ConfigFrame->ShowModal();
frame->Enable(); frame->Enable();
m_ConfigFrame->Destroy();
m_ConfigFrame = NULL;
#ifdef _WIN32 #ifdef _WIN32
frame->SetFocus();
frame->SetHWND(NULL); frame->SetHWND(NULL);
#endif #endif
m_ConfigFrame->Destroy();
m_ConfigFrame = NULL;
frame->Destroy(); frame->Destroy();
#endif #endif
} }

1
Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.cpp
View File

@ -86,7 +86,6 @@ END_EVENT_TABLE()
GFXConfigDialogOGL::GFXConfigDialogOGL(wxWindow *parent, wxWindowID id, const wxString &title, const wxPoint &position, const wxSize& size, long style) GFXConfigDialogOGL::GFXConfigDialogOGL(wxWindow *parent, wxWindowID id, const wxString &title, const wxPoint &position, const wxSize& size, long style)
: wxDialog(parent, id, title, position, size, style) : wxDialog(parent, id, title, position, size, style)
{ {
CreateGUIControls();
} }

7
Source/Plugins/Plugin_VideoOGL/Src/main.cpp
View File

@ -292,14 +292,17 @@ void DllConfig(HWND _hParent)
// Prevent user to show more than 1 config window at same time // Prevent user to show more than 1 config window at same time
frame->Disable(); frame->Disable();
m_ConfigFrame->CreateGUIControls();
m_ConfigFrame->ShowModal(); m_ConfigFrame->ShowModal();
frame->Enable(); frame->Enable();
m_ConfigFrame->Destroy();
m_ConfigFrame = NULL;
#ifdef _WIN32 #ifdef _WIN32
frame->SetFocus();
frame->SetHWND(NULL); frame->SetHWND(NULL);
#endif #endif
m_ConfigFrame->Destroy();
m_ConfigFrame = NULL;
frame->Destroy(); frame->Destroy();
#endif #endif
} }

6
Source/Plugins/Plugin_Wiimote/Src/main.cpp
View File

@ -173,11 +173,13 @@ void DllConfig(HWND _hParent)
m_BasicConfigFrame->ShowModal(); m_BasicConfigFrame->ShowModal();
frame->Enable(); frame->Enable();
m_BasicConfigFrame->Destroy();
m_BasicConfigFrame = NULL;
#ifdef _WIN32 #ifdef _WIN32
frame->SetFocus();
frame->SetHWND(NULL); frame->SetHWND(NULL);
#endif #endif
m_BasicConfigFrame->Destroy();
m_BasicConfigFrame = NULL;
frame->Destroy(); frame->Destroy();
#endif #endif
} }