Changeset 2415 for trunk/src/user32/new/menu.cpp

Timestamp:

Jan 12, 2000, 1:41:20 PM (26 years ago)

Author:

sandervl

Message:

menu, resize/move fixes + ported Wine messagebox code

File:

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

trunk/src/user32/new/menu.cpp

@@ -1 @@
-/* $Id: menu.cpp,v 1.7 2000-01-11 17:34:42 cbratschi Exp $*/
+/* $Id: menu.cpp,v 1.8 2000-01-12 12:40:43 sandervl Exp $*/
 /*
  * Menu functions
@@ -2402 +2402 @@
         if( hNewWnd != pmt->hOwnerWnd )
         {
-            ReleaseCapture();
+            ReleaseCapture(); 
             pmt->hOwnerWnd = hNewWnd;
+            SetCapture(pmt->hOwnerWnd); //SvL: Don't know if this is good enough
             //EVENT_Capture( pmt->hOwnerWnd, HTMENU ); //CB: todo
         }
@@ -2594 +2595 @@
 
     //EVENT_Capture( mt.hOwnerWnd, HTMENU ); //CB: todo
+    //SvL: Set keyboard & mouse event capture
+    SetCapture(mt.hOwnerWnd);
 
     while (!fEndMenu)
@@ -2602 +2605 @@
         /* 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;
+//        if (!GetMessageA(&msg,msg.hwnd,0,0)) break;
+        //SvL: Getting messages for only the menu delays background paints (i.e. VPBuddy logo)
+        if (!GetMessageA(&msg,0,0,0)) break;
         TranslateMessage( &msg );
         mt.pt = msg.pt;
@@ -2610 +2615 @@
 
         fRemove = FALSE;
-        if ((msg.message >= WM_MOUSEFIRST) && (msg.message <= WM_MOUSELAST))
+        if((msg.message >= WM_MOUSEFIRST) && (msg.message <= WM_MOUSELAST))
         {
             /* Find a menu for this mouse event */