can someone test it on win?
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1507 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
parent
45201abb9e
commit
bd1aa13182
|
@ -208,14 +208,16 @@ bool OpenGL_Create(SVideoInitialize &_VideoInitialize, int _iwidth, int _iheight
|
||||||
GLWin.cocoaWin = cocoaGLCreateWindow(GLWin.width, GLWin.height);
|
GLWin.cocoaWin = cocoaGLCreateWindow(GLWin.width, GLWin.height);
|
||||||
GLWin.cocoaCtx = cocoaGLInit(g_Config.iMultisampleMode);
|
GLWin.cocoaCtx = cocoaGLInit(g_Config.iMultisampleMode);
|
||||||
#elif defined(USE_WX) && USE_WX
|
#elif defined(USE_WX) && USE_WX
|
||||||
int attrib[2];
|
|
||||||
attrib[0] = 16; //WX_GL_DEPTH_SIZE;
|
|
||||||
attrib[1] = 32;
|
|
||||||
|
|
||||||
wxSize size(_iwidth, _iheight);
|
wxSize size(_iwidth, _iheight);
|
||||||
GLWin.frame = new wxFrame((wxFrame *)NULL, -1,_ ("Dolphin"),
|
if (!g_Config.renderToMainframe ||
|
||||||
wxPoint(50,50), size);
|
g_VideoInitialize.pWindowHandle == NULL) {
|
||||||
GLWin.glCanvas = new wxGLCanvas(GLWin.frame, wxID_ANY, attrib,
|
GLWin.frame = new wxFrame((wxFrame *)g_VideoInitialize.pWindowHandle,
|
||||||
|
-1, _("Dolphin"), wxPoint(0,0), size);
|
||||||
|
} else {
|
||||||
|
GLWin.frame = (wxFrame *)g_VideoInitialize.pWindowHandle;
|
||||||
|
}
|
||||||
|
GLWin.glCanvas = new wxGLCanvas(GLWin.frame, wxID_ANY, NULL,
|
||||||
wxPoint(0,0), size, wxSUNKEN_BORDER);
|
wxPoint(0,0), size, wxSUNKEN_BORDER);
|
||||||
GLWin.glCtxt = new wxGLContext(GLWin.glCanvas);
|
GLWin.glCtxt = new wxGLContext(GLWin.glCanvas);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue