library should call window status func at all times, translation to

[freeglut] / src / mswin / fg_main_mswin.c

diff --git a/src/mswin/fg_main_mswin.c b/src/mswin/fg_main_mswin.c
index baf4b3b..f00728e 100644 (file)
--- a/src/mswin/fg_main_mswin.c
+++ b/src/mswin/fg_main_mswin.c
@@ -143,11 +143,11 @@ void fgPlatformMainLoopPreliminaryWork ( void )
      */
     while( window )
     {
-        if ( FETCH_WCB( *window, Visibility ) )
+        if ( FETCH_WCB( *window, WindowStatus ) )
         {
             SFG_Window *current_window = fgStructure.CurrentWindow ;
 
-            INVOKE_WCB( *window, Visibility, ( window->State.Visible ) );
+            INVOKE_WCB( *window, WindowStatus, ( window->State.Visible?GLUT_FULLY_RETAINED:GLUT_HIDDEN ) );
             fgSetWindow( current_window );
         }
 
@@ -624,17 +624,6 @@ LRESULT CALLBACK fgPlatformWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPAR
          */
         return 0;
 
-    case WM_CANCELMODE:
-        /*
-         * The window manager sends this message when it detects a change
-         * that requires that an application cancel any modal state it has
-         * entered. If we've called SetCapture in the mouse button handler,
-         * call ReleaseCapture.
-         */
-        if (setCaptureActive)
-            ReleaseCapture();
-        break;
-
     case WM_MOUSEMOVE:
     {
 #if defined(_WIN32_WCE)
@@ -883,8 +872,9 @@ LRESULT CALLBACK fgPlatformWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPAR
         if (!lParam || !fgWindowByHandle((HWND)lParam))
             /* Capture released or capture taken by non-FreeGLUT window */
             setCaptureActive = 0;
-        /* User has finished resizing the window, force a redraw */
-        INVOKE_WCB( *window, Display, ( ) );
+        /* Docs advise a redraw */
+        InvalidateRect( hWnd, NULL, GL_FALSE );
+        UpdateWindow(hWnd);
         lRet = 0;   /* Per docs, should return zero */
         break;