From a08bfc134469c5919ec3d448201b9ba130b8b6bd Mon Sep 17 00:00:00 2001 From: "j4ck.fr0st" Date: Thu, 21 Jan 2010 20:58:26 +0000 Subject: [PATCH] thats more like it i guess... does the Software Plug in not check for RenderToMainframe on purpose? git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4920 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp | 4 ++-- Source/Plugins/Plugin_VideoSoftware/Src/GLUtil.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp index 3aca6fc2f0..e16bc49599 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp @@ -164,10 +164,10 @@ bool OpenGL_Create(SVideoInitialize &_VideoInitialize, int _iwidth, int _iheight wxSize size(_iwidth, _iheight); if (!g_Config.RenderToMainframe || g_VideoInitialize.pWindowHandle == NULL) { - GLWin.frame = new wxFrame((wxWindow *)g_VideoInitialize.pWindowHandle, + GLWin.frame = new wxFrame((wxWindow *)NULL, -1, _("Dolphin"), wxPoint(50,50), size); } else { - GLWin.frame = new wxFrame((wxWindow *)NULL, + GLWin.frame = new wxFrame((wxWindow *)g_VideoInitialize.pWindowHandle, -1, _("Dolphin"), wxPoint(50,50), size); } diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/GLUtil.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/GLUtil.cpp index 2407bd8324..5aea32ca15 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/GLUtil.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/GLUtil.cpp @@ -148,10 +148,10 @@ bool OpenGL_Create(SVideoInitialize &_VideoInitialize, int _twidth, int _theight wxSize size(_twidth, _theight); if ( g_VideoInitialize.pWindowHandle == NULL) { - GLWin.frame = new wxFrame((wxWindow *)g_VideoInitialize.pWindowHandle, + GLWin.frame = new wxFrame((wxWindow *)NULL, -1, _("Dolphin"), wxPoint(50,50), size); } else { - GLWin.frame = new wxFrame((wxWindow *)NULL, + GLWin.frame = new wxFrame((wxWindow *)g_VideoInitialize.pWindowHandle, -1, _("Dolphin"), wxPoint(50,50), size); }