X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fmswin%2Ffg_main_mswin.c;h=a7ca9d86753e3902caf566bbc9f013349195d032;hb=39e6bd8f1a64627db129f36ed8f98630b2de2729;hp=a992b2ba5d8c8189f6472f4688cc3fa325d02c3d;hpb=49e61d9b74ae8520b5b7fddbcfc727081ac54391;p=freeglut

diff --git a/src/mswin/fg_main_mswin.c b/src/mswin/fg_main_mswin.c
index a992b2b..a7ca9d8 100644
--- a/src/mswin/fg_main_mswin.c
+++ b/src/mswin/fg_main_mswin.c
@@ -495,7 +495,7 @@ LRESULT CALLBACK fgPlatformWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam,
     case WM_KILLFOCUS:
         {
             SFG_Menu* menu = NULL;
-/*            printf("WM_KILLFOCUS (ismenu: %i): %p\n", window->IsMenu, window ); */
+/*            printf("WM_KILLFOCUS: %p\n", window ); */
             lRet = DefWindowProc( hWnd, uMsg, wParam, lParam );
             INVOKE_WCB( *window, Entry, ( GLUT_LEFT ) );
 
@@ -504,24 +504,21 @@ LRESULT CALLBACK fgPlatformWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam,
                application or FreeGLUT window (if one is running multiple
                windows). If so, close menu the active menu.
              */
-            if ( fgStructure.CurrentMenu )
+            if ( fgStructure.Menus.First )
                 menu = fgGetActiveMenu();
             
             if ( menu )
             {
                 SFG_Window* wnd = NULL;
-                HWND hwnd = GetForegroundWindow();  /* Get window with current focus */
+                HWND hwnd = GetFocus();  /* Get window with current focus - NULL for non freeglut windows */
                 if (hwnd)
-                    /* See if its one of our windows */
+                    /* 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->ActiveMenu && wnd->ActiveMenu->ParentWindow!=menu->ParentWindow) ||    /* Make sure we don't kill the menu when trying to enter a submenu */
-                    (!wnd->IsMenu && wnd!=menu->ParentWindow)
-                    )
+                else if (!wnd->IsMenu && wnd!=menu->ParentWindow)   /* Make sure we don't kill the menu when trying to enter a submenu */
                     /* User switched to another FreeGLUT window */
                     fgDeactivateMenu(menu->ParentWindow);
             }