diff options
| author | Soren Jorvang <soren.jorvang@gmail.com> | 2011-01-29 05:31:27 +0000 |
|---|---|---|
| committer | Soren Jorvang <soren.jorvang@gmail.com> | 2011-01-29 05:31:27 +0000 |
| commit | 779d434843d2fe31b60d933fad3cbd06b77fd920 (patch) | |
| tree | 576eb9375ac9870509dc5562f006d1c63f8918c0 /Source/Plugins/Plugin_VideoSoftware | |
| parent | d002a97575bee2daf4f64f1eb250c6bc25c50fab (diff) | |
r6958 removes the need for the hackery in r6946.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6960 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Plugins/Plugin_VideoSoftware')
| -rw-r--r-- | Source/Plugins/Plugin_VideoSoftware/Src/GLUtil.cpp | 7 | ||||
| -rw-r--r-- | Source/Plugins/Plugin_VideoSoftware/Src/Win32.cpp | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/GLUtil.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/GLUtil.cpp index 4a910e92fb..48e18f12f0 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/GLUtil.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/GLUtil.cpp @@ -122,8 +122,7 @@ bool OpenGL_Create(SVideoInitialize &_VideoInitialize, int _twidth, int _theight GLWin.glCanvas = new wxGLCanvas(GLWin.panel, wxID_ANY, NULL, wxPoint(0, 0), wxSize(_twidth, _theight)); GLWin.glCanvas->Show(true); - if (GLWin.glCtxt == NULL) // XXX dirty hack - GLWin.glCtxt = new wxGLContext(GLWin.glCanvas); + GLWin.glCtxt = new wxGLContext(GLWin.glCanvas); #elif defined(_WIN32) // Create rendering window in Windows @@ -385,8 +384,8 @@ void OpenGL_Shutdown() { #if defined(USE_WX) && USE_WX GLWin.glCanvas->Hide(); - // XXX GLWin.glCanvas->Destroy(); - // XXX delete GLWin.glCtxt; + GLWin.glCanvas->Destroy(); + delete GLWin.glCtxt; #elif defined(_WIN32) if (hRC) // Do We Have A Rendering Context? { diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/Win32.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/Win32.cpp index f66d84e7be..5cd343e50e 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/Win32.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/Win32.cpp @@ -195,7 +195,7 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT iMsg, WPARAM wParam, LPARAM lParam ) if (m_hParent == NULL) { // Take it out of fullscreen and stop the game - if( g_SWVidoConfig.bFullscreen ) + if( g_SWVideoConfig.bFullscreen ) ToggleFullscreen(m_hParent); PostMessage(m_hParent, WM_USER, WM_USER_STOP, 0); } |