Changeset 7195 for trunk/src/user32/menu.cpp

Timestamp:

Oct 24, 2001, 5:41:54 PM (24 years ago)

Author:

sandervl

Message:

double click fix + double click on system menu now works

File:

• trunk/src/user32/menu.cpp (modified) (7 diffs)

trunk/src/user32/menu.cpp

@@ -1 @@
-/* $Id: menu.cpp,v 1.38 2001-10-16 14:49:45 sandervl Exp $*/
+/* $Id: menu.cpp,v 1.39 2001-10-24 15:41:53 sandervl Exp $*/
 /*
  * Menu functions
@@ -35 +35 @@
 #include "pmwindow.h"
 #include "win32wmisc.h"
+#include "oslibmsg.h"
 
 #define DBG_LOCALLOG    DBG_menu
@@ -2827 +2828 @@
     }
 
-    //EVENT_Capture( mt.hOwnerWnd, HTMENU ); //CB: todo
+#ifdef __WIN32OS2__
     //SvL: Set keyboard & mouse event capture
     SetCapture(mt.hOwnerWnd);
+    //SetCapture breaks system menu (double click), must generate double
+    //clicks manually
+    SetMenuDoubleClick(TRUE);
+#else
+    EVENT_Capture( mt.hOwnerWnd, HTMENU );
+#endif
 
     while (!fEndMenu)
@@ -2838 +2845 @@
         /* we have to keep the message in the queue until it's
          * clear that menu loop is not over yet. */
-//        if (!GetMessageA(&msg,msg.hwnd,0,0)) break;
+#ifdef __WIN32OS2__
         //SvL: Getting messages for only the menu delays background paints (i.e. VPBuddy logo)
         if (!GetMessageA(&msg,0,0,0)) break;
+#else
+        if (!GetMessageA(&msg,msg.hwnd,0,0)) break;
+#endif
         TranslateMessage( &msg );
         mt.pt = msg.pt;
@@ -2868 +2878 @@
                     if (bSysMenu && (hmenu == mt.hTopMenu))
                     {
+#ifdef __WIN32OS2__
+                        //double click on system menu -> close application
+                        PostMessageA(hwnd, WM_SYSCOMMAND,SC_CLOSE, msg.lParam);
+#endif
                         fEndMenu = TRUE;
                         break;
@@ -3062 +3076 @@
         else if (msg.message == WM_SYSCOMMAND)
         {
-                /* The user clicked on the system menu/button */
-        fEndMenu = TRUE;
-        break;
+            /* The user clicked on the system menu/button */
+            fEndMenu = TRUE;
+            break;
         }
         else
@@ -3079 +3093 @@
         else mt.trackFlags &= ~TF_SKIPREMOVE;
     }
-
+#ifdef __WIN32OS2__
+    SetMenuDoubleClick(FALSE);
     ReleaseCapture();
+#endif
 
     menu = MENU_GetMenu(mt.hTopMenu);