diff options
| author | Scott Moreau <oreaus@gmail.com> | 2014-01-23 19:20:22 -0700 |
|---|---|---|
| committer | Scott Moreau <oreaus@gmail.com> | 2014-01-23 19:20:22 -0700 |
| commit | d4ff195cadd3e7510eca7226bf43591d7f558671 (patch) | |
| tree | 5df3ec44267fdb05c00abe7c801645e890cc5cd9 /Source/Core | |
| parent | 1898524c9620eb1669aea0df1904fe459abc916d (diff) | |
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.
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/DolphinWX/GLInterface/EGL.cpp | 1 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/GLInterface/X11_Util.cpp | 1 |
2 files changed, 1 insertions, 1 deletions
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) |