pulling in cleanup from r1442

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1443 7f0cb862-5218-0410-a997-914c9d46530a

diff --git a/src/mswin/fg_main_mswin.c b/src/mswin/fg_main_mswin.c
index 3013f80..f8879c6 100644 (file)
--- a/src/mswin/fg_main_mswin.c
+++ b/src/mswin/fg_main_mswin.c
@@ -566,7 +566,7 @@ LRESULT CALLBACK fgPlatformWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam,
     case WM_PAINT:
         /* Turn on the visibility in case it was turned off somehow */
         window->State.Visible = GL_TRUE;
-        InvalidateRect( hWnd, NULL, GL_FALSE ); /* Make sure whole window is repainted. Bit of a hack, but a safe on from what google turns up... */
+        InvalidateRect( hWnd, NULL, GL_FALSE ); /* Make sure whole window is repainted. Bit of a hack, but a safe one from what google turns up... */
         BeginPaint( hWnd, &ps );
         fghRedrawWindow( window );
         EndPaint( hWnd, &ps );

diff --git a/src/mswin/fg_state_mswin.c b/src/mswin/fg_state_mswin.c
index 9ce47fa..9df5211 100644 (file)
--- a/src/mswin/fg_state_mswin.c
+++ b/src/mswin/fg_state_mswin.c
@@ -210,7 +210,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 +249,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;
             }
         }