From ae84837320e056a5c8e0028a0bac342dfa5a056e Mon Sep 17 00:00:00 2001 From: nakeee Date: Sat, 31 Jan 2009 20:31:19 +0000 Subject: [PATCH] compile fix git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2045 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Plugins/Plugin_VideoOGL/Src/Win32Window.h | 2 +- Source/Plugins/Plugin_VideoOGL/Src/nmain.cpp | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Win32Window.h b/Source/Plugins/Plugin_VideoOGL/Src/Win32Window.h index 4e1ae5f4ce..423ffe34a7 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Win32Window.h +++ b/Source/Plugins/Plugin_VideoOGL/Src/Win32Window.h @@ -63,7 +63,7 @@ private: class Win32Window : public GLWindow { public: - Win32Window {} + Win32Window() {} }; #endif //_WIN32 diff --git a/Source/Plugins/Plugin_VideoOGL/Src/nmain.cpp b/Source/Plugins/Plugin_VideoOGL/Src/nmain.cpp index cef6119df4..b6f8cb9e0c 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/nmain.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/nmain.cpp @@ -150,8 +150,10 @@ void SetDllGlobals(PLUGIN_GLOBALS* _pPluginGlobals) { void DllConfig(HWND _hParent) { wxWindow * win = new wxWindow(); +#ifdef _WIN32 win->SetHWND((WXHWND)_hParent); win->AdoptAttributesFromHWND(); +#endif //win->Reparent(wxGetApp().GetTopWindow()); ConfigDialog *frame = new ConfigDialog(win); g_Config.Load();