X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fmswin%2Ffg_menu_mswin.c;h=9df001e92616db0eae63a942d63a154bd7230c85;hb=8f5779d2f8e49f4de9fd79689b2c7867450578ab;hp=a5afd46b128319fd3a8ae9e7060fedfa58373f3c;hpb=af4474129987c478bad43ff0b4f44c2470298a8d;p=freeglut

diff --git a/src/mswin/fg_menu_mswin.c b/src/mswin/fg_menu_mswin.c
index a5afd46..9df001e 100644
--- a/src/mswin/fg_menu_mswin.c
+++ b/src/mswin/fg_menu_mswin.c
@@ -29,7 +29,6 @@
 #include <GL/freeglut.h>
 #include "../fg_internal.h"
 
-extern void fghGetClientArea( RECT *clientRect, const SFG_Window *window );
 
 
 GLvoid fgPlatformGetGameModeVMaxExtent( SFG_Window* window, int* x, int* y )
@@ -40,10 +39,8 @@ GLvoid fgPlatformGetGameModeVMaxExtent( SFG_Window* window, int* x, int* y )
 
 void fgPlatformCheckMenuDeactivate()
 {
-    /* 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.
+    /* User/system switched application focus.
+     * If we have an open menu, close it.
      */
     SFG_Menu* menu = NULL;
 
@@ -52,34 +49,8 @@ void fgPlatformCheckMenuDeactivate()
 
     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)      /* Make sure we don't kill the menu when trying to enter a submenu */
-        {
-            if (wnd!=menu->ParentWindow)
-                /* User switched to another FreeGLUT window */
-                fgDeactivateMenu(menu->ParentWindow);
-            else
-            {
-                /* Check if focus lost because non-client area of
-                 * window was pressed (pressing on client area is
-                 * handled in fgCheckActiveMenu)
-                 */
-                POINT mouse_pos;
-                RECT clientArea;
-                fghGetClientArea(&clientArea,menu->ParentWindow);
-                GetCursorPos(&mouse_pos);
-                if ( !PtInRect( &clientArea, mouse_pos ) )
-                    fgDeactivateMenu(menu->ParentWindow);
-            }
-        }
+        printf("focus menu close\n");
+        fgDeactivateMenu(menu->ParentWindow);
     }
 };