X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmswin%2Ffg_state_mswin.c;h=bea609e8e2ae741bf0164b0f5290bfd1ee4db925;hb=2272bd5a70b8bac63e1535fee6257cc4595f36e7;hp=9ce47fa5b527a4aae4582dd5b2be851580d4a37c;hpb=9ed8564f6fe4382f9e16118f8ea8e2054f4be71c;p=freeglut diff --git a/src/mswin/fg_state_mswin.c b/src/mswin/fg_state_mswin.c index 9ce47fa..bea609e 100644 --- a/src/mswin/fg_state_mswin.c +++ b/src/mswin/fg_state_mswin.c @@ -187,11 +187,9 @@ int fgPlatformGlutGet ( GLenum eWhat ) if (fgStructure.CurrentWindow->Parent && (eWhat==GLUT_WINDOW_X || eWhat==GLUT_WINDOW_Y)) { /* For child window, we should return relative to upper-left - * of parent's client area. + * of parent's client area. */ - POINT topleft; - topleft.x = winRect.left; - topleft.y = winRect.top; + POINT topleft = {winRect.left,winRect.top}; ScreenToClient(fgStructure.CurrentWindow->Parent->Window.Handle,&topleft); winRect.left = topleft.x; @@ -210,7 +208,7 @@ int fgPlatformGlutGet ( GLenum eWhat ) break; case GLUT_WINDOW_BORDER_WIDTH : - case GLUT_WINDOW_HEADER_HEIGHT : + case GLUT_WINDOW_BORDER_HEIGHT : #if defined(_WIN32_WCE) return 0; #else @@ -249,8 +247,7 @@ int fgPlatformGlutGet ( GLenum eWhat ) { case GLUT_WINDOW_BORDER_WIDTH: return borderWidth; - case GLUT_WINDOW_HEADER_HEIGHT: - /* Need to query for WS_MAXIMIZEBOX to see if we have a title bar, the WS_CAPTION query is also true for a WS_DLGFRAME only... */ + case GLUT_WINDOW_BORDER_HEIGHT: return captionHeight; } }