X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fmswin%2Ffg_main_mswin.c;h=25330e81fb601a889a6355ea254e605e5235626d;hb=f8a0d455b4ec10096337cee040166bd006e63eef;hp=c72e467c9bb84f4699af2e7dbe945e796c74384f;hpb=50a39165aaf08b38ab5fe252b0a56e49e8dadd1c;p=freeglut

diff --git a/src/mswin/fg_main_mswin.c b/src/mswin/fg_main_mswin.c
index c72e467..25330e8 100644
--- a/src/mswin/fg_main_mswin.c
+++ b/src/mswin/fg_main_mswin.c
@@ -493,34 +493,36 @@ LRESULT CALLBACK fgPlatformWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam,
         break;
 
     case WM_KILLFOCUS:
-/*        printf("WM_KILLFOCUS (ismenu: %i): %p\n", window->IsMenu, window ); */
-        lRet = DefWindowProc( hWnd, uMsg, wParam, lParam );
-        INVOKE_WCB( *window, Entry, ( GLUT_LEFT ) );
-
-        /* If this is a menu that lost focus, see if user either switched
-           application or FreeGLUT window (if one is running multiple
-           windows). If so, close menu that lost focus.
-         */
-        if( window->IsMenu &&
-            window->ActiveMenu && window->ActiveMenu->IsActive )
         {
-            SFG_Window* wnd = NULL;
-            HWND hwnd = GetForegroundWindow();  /* Get window with current focus */
-            if (hwnd)
-                /* See if its one of our windows */
-                wnd = fgWindowByHandle(hwnd);
-
-            if (!hwnd || !wnd)
-                /* User switched to another application*/
-                fgDeactivateMenu(window->ActiveMenu->ParentWindow);
-            else if (
-                ( wnd->IsMenu && wnd->ActiveMenu->ParentWindow!=window->ActiveMenu->ParentWindow) ||    /* Make sure we don't kill the menu when trying to enter a submenu */
-                (!wnd->IsMenu && wnd!=window->ActiveMenu->ParentWindow)
-                )
-                /* User switched to another FreeGLUT window */
-                fgDeactivateMenu(window->ActiveMenu->ParentWindow);
-        }
+            SFG_Menu* menu = NULL;
+/*            printf("WM_KILLFOCUS: %p\n", window ); */
+            lRet = DefWindowProc( hWnd, uMsg, wParam, lParam );
+            INVOKE_WCB( *window, Entry, ( GLUT_LEFT ) );
 
+            /* If we have an open menu, see if the open menu should be closed
+               when focus was lost because user either switched
+               application or FreeGLUT window (if one is running multiple
+               windows). If so, close menu the active menu.
+             */
+            if ( fgStructure.Menus.First )
+                menu = fgGetActiveMenu();
+            
+            if ( menu )
+            {
+                SFG_Window* wnd = NULL;
+                HWND hwnd = GetFocus();  /* Get window with current focus - NULL for non freeglut windows */
+                if (hwnd)
+                    /* See which of our windows it is */
+                    wnd = fgWindowByHandle(hwnd);
+
+                if (!hwnd || !wnd)
+                    /* User switched to another application*/
+                    fgDeactivateMenu(menu->ParentWindow);
+                else if (!wnd->IsMenu && wnd!=menu->ParentWindow)
+                    /* User switched to another FreeGLUT window */
+                    fgDeactivateMenu(menu->ParentWindow);
+            }
+        }
         break;
 
 #if 0