Changeset 3603 for trunk/src/user32/oslibmsgtranslate.cpp

Timestamp:

May 24, 2000, 9:30:08 PM (25 years ago)

Author:

sandervl

Message:

experimental WM_NCHITTEST generation (disabled) + MDI fixes

File:

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

trunk/src/user32/oslibmsgtranslate.cpp

@@ -1 @@
-/* $Id: oslibmsgtranslate.cpp,v 1.30 2000-05-12 18:09:40 sandervl Exp $ */
+/* $Id: oslibmsgtranslate.cpp,v 1.31 2000-05-24 19:30:05 sandervl Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -189 +189 @@
         //WM_NC*BUTTON* is posted when the cursor is in a non-client area of the window
 
+#ifdef ODIN_HITTEST
+        //Send WM_HITTEST message
+        win32wnd->sendHitTest(MAKELONG(winMsg->pt.x,winMsg->pt.y));
+#endif
+
         //if a window is disabled, it's parent receives the mouse messages
         if(!win32wnd->IsWindowEnabled()) {
@@ -242 +247 @@
         //WM_NCMOUSEMOVE is posted when the cursor moves into a non-client area of the window
 
+#ifdef ODIN_HITTEST
+        //Send WM_HITTEST message
+        win32wnd->sendHitTest(MAKELONG(winMsg->pt.x,winMsg->pt.y));
+#endif
         //if a window is disabled, it's parent receives the mouse messages
         if(!win32wnd->IsWindowEnabled()) {
@@ -288 +297 @@
         winMsg->message = WINWM_NCACTIVATE;
         winMsg->wParam  = SHORT1FROMMP(os2Msg->mp1);
+
         return TRUE;
       }
@@ -417 +427 @@
       BOOL fMinimized = FALSE;
 
-        if(WinQueryWindowULong(hwndActivate, OFFSET_WIN32PM_MAGIC) != WIN32PM_MAGIC) {
+        hwndActivate = Win32BaseWindow::OS2ToWin32Handle(hwndActivate);
+        if(hwndActivate == 0) {
                 //another (non-win32) application's window
                 //set to desktop window handle
-                hwndActivate = windowDesktop->getWindowHandle();
-        }
-        else    hwndActivate = Win32BaseWindow::OS2ToWin32Handle(hwndActivate);
+                hwndActivate = windowDesktop->getWindowHandle();
+        }
 
         if(WinQueryWindowULong(os2Msg->hwnd, QWL_STYLE) & WS_MINIMIZED)
@@ -483 +493 @@
         //WM_NC*BUTTON* is posted when the cursor is in a non-client area of the window
 
+#ifdef ODIN_HITTEST
+        //Send WM_HITTEST message
+        win32wnd->sendHitTest(MAKELONG(winMsg->pt.x,winMsg->pt.y));
+#endif
+
         //if a window is disabled, it's parent receives the mouse messages
         if(!win32wnd->IsWindowEnabled()) {
@@ -535 +550 @@
     {
         //WM_NCMOUSEMOVE is posted when the cursor moves into a non-client area of the window
+
+#ifdef ODIN_HITTEST
+        //Send WM_HITTEST message
+        win32wnd->sendHitTest(MAKELONG(winMsg->pt.x,winMsg->pt.y));
+#endif
 
         //if a window is disabled, it's parent receives the mouse messages