From d4ff195cadd3e7510eca7226bf43591d7f558671 Mon Sep 17 00:00:00 2001 From: Scott Moreau Date: Thu, 23 Jan 2014 19:20:22 -0700 Subject: [PATCH] EGL: Properly set parent window. In X with EGL and WX frontend enabled, running the emulator created two windows. This was because the parent window was set incorrectly. --- Source/Core/DolphinWX/GLInterface/EGL.cpp | 1 + Source/Core/DolphinWX/GLInterface/X11_Util.cpp | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/DolphinWX/GLInterface/EGL.cpp b/Source/Core/DolphinWX/GLInterface/EGL.cpp index 627d2a8402..9a97384ddc 100644 --- a/Source/Core/DolphinWX/GLInterface/EGL.cpp +++ b/Source/Core/DolphinWX/GLInterface/EGL.cpp @@ -173,6 +173,7 @@ bool cInterfaceEGL::Create(void *&window_handle) else eglBindAPI(EGL_OPENGL_ES_API); + GLWin.parent = (Window) window_handle; if (!Platform.Init(config)) return false; diff --git a/Source/Core/DolphinWX/GLInterface/X11_Util.cpp b/Source/Core/DolphinWX/GLInterface/X11_Util.cpp index e17fd05eaf..5e42809daa 100644 --- a/Source/Core/DolphinWX/GLInterface/X11_Util.cpp +++ b/Source/Core/DolphinWX/GLInterface/X11_Util.cpp @@ -63,7 +63,6 @@ bool cXInterface::Initialize(void *config) GLWin.height = _theight; GLWin.evdpy = XOpenDisplay(NULL); - GLWin.parent = GLWin.win; GLWin.screen = DefaultScreen(GLWin.dpy); if (GLWin.parent == 0)