ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Soren Jorvang 2011-01-29 05:31:27 +00:00
parent d002a97575
commit 779d434843
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp
View File

@ -325,7 +325,6 @@ bool OpenGL_Create(SVideoInitialize &_VideoInitialize, int _iwidth, int _iheight
GLWin.glCanvas = new wxGLCanvas(GLWin.panel, wxID_ANY, NULL, GLWin.glCanvas = new wxGLCanvas(GLWin.panel, wxID_ANY, NULL,
wxPoint(0, 0), wxSize(_twidth, _theight)); wxPoint(0, 0), wxSize(_twidth, _theight));
GLWin.glCanvas->Show(true); 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(__APPLE__) #elif defined(__APPLE__)
@ -571,8 +570,8 @@ void OpenGL_Shutdown()
{ {
#if defined(USE_WX) && USE_WX #if defined(USE_WX) && USE_WX
GLWin.glCanvas->Hide(); GLWin.glCanvas->Hide();
// XXX GLWin.glCanvas->Destroy(); GLWin.glCanvas->Destroy();
// XXX delete GLWin.glCtxt; delete GLWin.glCtxt;
#elif defined(__APPLE__) #elif defined(__APPLE__)
[GLWin.cocoaWin close]; [GLWin.cocoaWin close];
[GLWin.cocoaCtx clearDrawable]; [GLWin.cocoaCtx clearDrawable];

5
Source/Plugins/Plugin_VideoSoftware/Src/GLUtil.cpp
View File

@ -122,7 +122,6 @@ bool OpenGL_Create(SVideoInitialize &_VideoInitialize, int _twidth, int _theight
GLWin.glCanvas = new wxGLCanvas(GLWin.panel, wxID_ANY, NULL, GLWin.glCanvas = new wxGLCanvas(GLWin.panel, wxID_ANY, NULL,
wxPoint(0, 0), wxSize(_twidth, _theight)); wxPoint(0, 0), wxSize(_twidth, _theight));
GLWin.glCanvas->Show(true); 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) #elif defined(_WIN32)
@ -385,8 +384,8 @@ void OpenGL_Shutdown()
{ {
#if defined(USE_WX) && USE_WX #if defined(USE_WX) && USE_WX
GLWin.glCanvas->Hide(); GLWin.glCanvas->Hide();
// XXX GLWin.glCanvas->Destroy(); GLWin.glCanvas->Destroy();
// XXX delete GLWin.glCtxt; delete GLWin.glCtxt;
#elif defined(_WIN32) #elif defined(_WIN32)
if (hRC) // Do We Have A Rendering Context? if (hRC) // Do We Have A Rendering Context?
{ {

2
Source/Plugins/Plugin_VideoSoftware/Src/Win32.cpp
View File

@ -195,7 +195,7 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT iMsg, WPARAM wParam, LPARAM lParam )
if (m_hParent == NULL) if (m_hParent == NULL)
{ {
// Take it out of fullscreen and stop the game // Take it out of fullscreen and stop the game
if( g_SWVidoConfig.bFullscreen ) if( g_SWVideoConfig.bFullscreen )
ToggleFullscreen(m_hParent); ToggleFullscreen(m_hParent);
PostMessage(m_hParent, WM_USER, WM_USER_STOP, 0); PostMessage(m_hParent, WM_USER, WM_USER_STOP, 0);
} }