Changeset 9008 for trunk/src

Timestamp:

Aug 15, 2002, 5:45:46 PM (23 years ago)

Author:

sandervl

Message:

SPI_GETNONCLIENTMETRICS size check extended & Fixed RMB on icon of minimized mdi window

Location:

trunk/src/user32

Files:

• oslibmsg.h (modified) (2 diffs)
• pmwindow.cpp (modified) (2 diffs)
• user32.cpp (modified) (2 diffs)
• win32wbasenonclient.cpp (modified) (3 diffs)

trunk/src/user32/oslibmsg.h

@@ -1 @@
-/* $Id: oslibmsg.h,v 1.17 2002-08-01 16:04:19 sandervl Exp $ */
+/* $Id: oslibmsg.h,v 1.18 2002-08-15 15:45:45 sandervl Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -373 +373 @@
 ************/
 
+#define OSWM_SYSCOMMAND              0x0021
+#define OSSC_SYSMENU                 0x8007
+
 #endif //__OSLIBMSG_H__

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.186 2002-08-14 10:37:43 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.187 2002-08-15 15:45:45 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -1862 +1862 @@
     case WM_SYSCOMMAND:
         dprintf(("PMFRAME: WM_SYSCOMMAND %x %x %x", win32wnd->getWindowHandle(), mp1, mp2));
+        if (fOS2Look == OS2_APPEARANCE_SYSMENU && mp1 == (MPARAM)OSSC_SYSMENU)
+            goto RunDefFrameWndProc;
+
         if(win32wnd->getWindowHandle() != pWinMsg->hwnd) {
             RELEASE_WNDOBJ(win32wnd);

trunk/src/user32/user32.cpp

@@ -1 @@
-/* $Id: user32.cpp,v 1.123 2002-08-09 11:19:56 sandervl Exp $ */
+/* $Id: user32.cpp,v 1.124 2002-08-15 15:45:46 sandervl Exp $ */
 
 /*
@@ -737 +737 @@
         LPNONCLIENTMETRICSA lpnm = (LPNONCLIENTMETRICSA)pvParam;
                 
-        if (lpnm->cbSize == sizeof(NONCLIENTMETRICSA))
+        if (lpnm->cbSize == sizeof(NONCLIENTMETRICSA) || uiParam == sizeof(NONCLIENTMETRICSA))
         {
             memset(lpnm, 0, sizeof(NONCLIENTMETRICSA));

trunk/src/user32/win32wbasenonclient.cpp

@@ -1 @@
-/* $Id: win32wbasenonclient.cpp,v 1.42 2002-08-14 10:37:45 sandervl Exp $ */
+/* $Id: win32wbasenonclient.cpp,v 1.43 2002-08-15 15:45:46 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2 (non-client methods)
@@ -1262 +1262 @@
   {
     case HTCAPTION:
+      //we receive a HTCAPTION rbuttonup for RMB clicks on icon of minimized mdi windows
+      if (fOS2Look && ((dwStyle & (WS_SYSMENU | WS_MINIMIZE)) == (WS_SYSMENU | WS_MINIMIZE)) )
+      {
+          return HandleNCRButtonUp(HTSYSMENU, lParam);
+      }
+
       if (GetActiveWindow() != Win32Hwnd)
         SetActiveWindow();
@@ -1274 +1280 @@
       if (fOS2Look && (dwStyle & WS_SYSMENU))
       {
-        SendMessageA( getWindowHandle(), WM_SYSCOMMAND,SC_MOUSEMENU+HTSYSMENU,lParam);
+        if (fOS2Look == OS2_APPEARANCE)
+          SendMessageA( getWindowHandle(), WM_SYSCOMMAND,SC_MOUSEMENU+HTSYSMENU,lParam);
+        else
+        if (fOS2Look == OS2_APPEARANCE_SYSMENU)
+          OSLibPostMessageDirect( getOS2FrameWindowHandle(), OSWM_SYSCOMMAND, OSSC_SYSMENU,0);
       }
       break;