Changeset 10017 for trunk/src

Timestamp:

Apr 11, 2003, 7:26:11 PM (22 years ago)

Author:

sandervl

Message:

MENU_TrackKbdMenuBar: check for WS_EX_TOOLWINDOW before using the system menu

Location:

trunk/src/user32

Files:

• menu.c (modified) (1 diff)
• oslibmsgtranslate.cpp (modified) (2 diffs)

trunk/src/user32/menu.c

@@ -3174 +3174 @@
     {
         if (!(GetWindowLongA( hwnd, GWL_STYLE ) & WS_SYSMENU)) return;
+#ifdef __WIN32OS2__
+        if ((GetWindowLongA( hwnd, GWL_EXSTYLE ) & WS_EX_TOOLWINDOW)) return;
+#endif
         hTrackMenu = get_win_sys_menu( hwnd );
         uItem = 0;

trunk/src/user32/oslibmsgtranslate.cpp

@@ -1 @@
-/* $Id: oslibmsgtranslate.cpp,v 1.108 2003-04-11 14:22:06 sandervl Exp $ */
+/* $Id: oslibmsgtranslate.cpp,v 1.109 2003-04-11 17:26:11 sandervl Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -658 +658 @@
             win32sc = SC_TASKLIST_W;
             break;
+        case SC_SYSMENU:
+            win32sc = SC_KEYMENU_W; //??
+            break;
         default:
             dprintf(("Unknown/unsupported SC command %d", SHORT1FROMMP(os2Msg->mp1)));