Integrated Boux's fixes for Win32 + ATI graphics configurations:

- Fixed invisible context menu in fullscreen mode
- Fixed menu bar overlapping top of 3D view
ver1_6_1
Chris Laurel 2009-12-06 21:52:49 +00:00
parent ec6a025165
commit 447e1eebe5
1 changed files with 8 additions and 7 deletions

View File

@ -1973,7 +1973,7 @@ HWND CreateOpenGLWindow(int x, int y, int width, int height,
DWORD dwStyle;
if (newMode != 0)
{
dwStyle = WS_POPUP;
dwStyle = WS_POPUPWINDOW | WS_MAXIMIZE;
}
else
{
@ -2004,22 +2004,23 @@ HWND CreateOpenGLWindow(int x, int y, int width, int height,
MessageBox(NULL,
"Could not get appropriate pixel format for OpenGL rendering.", "Fatal Error",
MB_OK | MB_ICONERROR);
return NULL;
return NULL;
}
if (glContext == NULL)
glContext = wglCreateContext(deviceContext);
wglMakeCurrent(deviceContext, glContext);
if (newMode == 0)
SetMenu(hwnd, menuBar);
else
hideMenuBar = true;
if (glContext == NULL)
{
glContext = wglCreateContext(deviceContext);
}
wglMakeCurrent(deviceContext, glContext);
return hwnd;
}
void DestroyOpenGLWindow()
{
#if 0