mirror of https://github.com/PCSX2/pcsx2.git
zzogl-pg: part two of fixing CreateWindow conflict; should compile in Windows without error now.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2793 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
parent
dc95fc1d6c
commit
03ea6e04d6
|
@ -69,7 +69,7 @@ LRESULT WINAPI MsgProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam )
|
||||||
return DefWindowProc( hWnd, msg, wParam, lParam );
|
return DefWindowProc( hWnd, msg, wParam, lParam );
|
||||||
}
|
}
|
||||||
|
|
||||||
bool GLWindow::CreateGLWindow(void *pDisplay)
|
bool GLWindow::CreateWindow(void *pDisplay)
|
||||||
{
|
{
|
||||||
RECT rc, rcdesktop;
|
RECT rc, rcdesktop;
|
||||||
rc.left = 0; rc.top = 0;
|
rc.left = 0; rc.top = 0;
|
||||||
|
|
|
@ -547,7 +547,7 @@ s32 CALLBACK GSopen(void *pDsp, char *Title, int multithread)
|
||||||
LoadConfig();
|
LoadConfig();
|
||||||
|
|
||||||
strcpy(GStitle, Title);
|
strcpy(GStitle, Title);
|
||||||
err = GLWin.CreateGLWindow(pDsp);
|
err = GLWin.CreateWindow(pDsp);
|
||||||
|
|
||||||
if (!err)
|
if (!err)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue