Changeset 6243 for trunk/src

Timestamp:

Jul 8, 2001, 10:06:15 AM (24 years ago)

Author:

sandervl

Message:

changed menu & scrollbar behaviour in os/2 mode

Location:

trunk/src/user32

Files:

• menu.cpp (modified) (4 diffs)
• scroll.cpp (modified) (3 diffs)

trunk/src/user32/menu.cpp

@@ -1 @@
-/* $Id: menu.cpp,v 1.34 2001-07-06 13:46:59 sandervl Exp $*/
+/* $Id: menu.cpp,v 1.35 2001-07-08 08:06:14 sandervl Exp $*/
 /*
  * Menu functions
@@ -33 +33 @@
 #ifdef __WIN32OS2__
 #include <objhandle.h>
+#include "pmwindow.h"
 
 #define DBG_LOCALLOG    DBG_menu
@@ -2372 +2373 @@
             {
                 pmt->hCurrentMenu = MENU_ShowSubPopup(pmt->hOwnerWnd,hPtMenu,FALSE,wFlags,&pmt->pt);
+
+#ifdef __WIN32OS2__
+                if(fOS2Look)
+                    ptmenu->bTimeToHide = FALSE;                    
+#else
+                /* In win31, a newly popped menu always remains opened for the next buttonup */
+                if(TWEAK_WineLook == WIN31_LOOK)
+                    ptmenu->bTimeToHide = FALSE;                    
+#endif
             }
 
@@ -2893 +2903 @@
                     /* In win95 winelook, the selected menu item must be changed every time the
                        mouse moves. In Win31 winelook, the mouse button has to be held down */
-
-                    fEndMenu |= !MENU_MouseMove( &mt, hmenu, wFlags );
+#ifdef __WIN32OS2__
+                    if ( !fOS2Look ||
+                         ( (msg.wParam & MK_LBUTTON) ||
+                           ((wFlags & TPM_RIGHTBUTTON) && (msg.wParam & MK_RBUTTON))) )
+                       fEndMenu |= !MENU_MouseMove( &mt, hmenu, wFlags );
+#else
+                    if ( (TWEAK_WineLook > WIN31_LOOK) ||
+                         ( (msg.wParam & MK_LBUTTON) ||
+                           ((wFlags & TPM_RIGHTBUTTON) && (msg.wParam & MK_RBUTTON))) )
+                       fEndMenu |= !MENU_MouseMove( &mt, hmenu, wFlags );
+#endif
+
             } /* switch(msg.message) - mouse */
         }

trunk/src/user32/scroll.cpp

@@ -1 @@
-/* $Id: scroll.cpp,v 1.41 2001-06-18 09:00:50 sandervl Exp $ */
+/* $Id: scroll.cpp,v 1.42 2001-07-08 08:06:15 sandervl Exp $ */
 /*
  * Scrollbar control
@@ -21 +21 @@
 #include "oslibwin.h"
 #include "initterm.h"
+#include "pmwindow.h"
 
 #define DBG_LOCALLOG    DBG_scroll
@@ -994 +995 @@
             UINT pos;
 
+#ifdef __WIN32OS2__
+            if (!SCROLL_PtInRectEx( &rect, pt, vertical ) && !fOS2Look) pos = lastClickPos;
+#else
             if (!SCROLL_PtInRectEx( &rect, pt, vertical )) pos = lastClickPos;
+#endif
             else
             {