mirror/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-26 12:35:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

wxgl build fix for osx (not working)

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3106 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
tmator 2009-04-30 07:19:23 +00:00
parent 28e3abbe6f
commit 44516dc226
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -201,20 +201,29 @@ bool OpenGL_Create(SVideoInitialize &_VideoInitialize, int _iwidth, int _iheight
if (!g_Config.renderToMainframe || if (!g_Config.renderToMainframe ||
g_VideoInitialize.pWindowHandle == NULL) { g_VideoInitialize.pWindowHandle == NULL) {
GLWin.frame = new wxFrame((wxWindow *)g_VideoInitialize.pWindowHandle, GLWin.frame = new wxFrame((wxWindow *)g_VideoInitialize.pWindowHandle,
-1, _("Dolphin"), wxPoint(0,0), size); -1, _("Dolphin"), wxPoint(50,50), size);
} else { } else {
GLWin.frame = new wxFrame((wxWindow *)NULL, GLWin.frame = new wxFrame((wxWindow *)NULL,
-1, _("Dolphin"), wxPoint(0,0), size); -1, _("Dolphin"), wxPoint(50,50), size);
} }
#if defined(__APPLE__)
GLWin.glCanvas = new wxGLCanvas(GLWin.frame, wxID_ANY, wxPoint(0,0), size, 0, wxT("Dolphin"), args, wxNullPalette);
#else
GLWin.glCanvas = new wxGLCanvas(GLWin.frame, wxID_ANY, args, GLWin.glCanvas = new wxGLCanvas(GLWin.frame, wxID_ANY, args,
wxPoint(0,0), size, wxSUNKEN_BORDER); wxPoint(0,0), size, wxSUNKEN_BORDER);
GLWin.glCtxt = new wxGLContext(GLWin.glCanvas); GLWin.glCtxt = new wxGLContext(GLWin.glCanvas);
#endif
GLWin.frame->Show(TRUE); GLWin.frame->Show(TRUE);
GLWin.glCanvas->Show(TRUE); GLWin.glCanvas->Show(TRUE);
#if defined(__APPLE__)
GLWin.glCanvas->SetCurrent();
#else
GLWin.glCanvas->SetCurrent(*GLWin.glCtxt); GLWin.glCanvas->SetCurrent(*GLWin.glCtxt);
// GLWin.glCtxt->SetCurrent(*GLWin.glCanvas); // GLWin.glCtxt->SetCurrent(*GLWin.glCanvas);
#endif
#elif defined(_WIN32) #elif defined(_WIN32)
@ -515,7 +524,11 @@ bool OpenGL_MakeCurrent()
return false; return false;
} }
#elif defined(USE_WX) && USE_WX #elif defined(USE_WX) && USE_WX
#if defined(__APPLE__)
GLWin.glCanvas->SetCurrent();
#else
GLWin.glCanvas->SetCurrent(*GLWin.glCtxt); GLWin.glCanvas->SetCurrent(*GLWin.glCtxt);
#endif
return true; return true;
#elif defined(HAVE_X11) && HAVE_X11 #elif defined(HAVE_X11) && HAVE_X11
Window winDummy; Window winDummy;