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

Timestamp:

Apr 15, 2000, 5:11:14 PM (25 years ago)

Author:

sandervl

Message:

EnableWindow fixes & don't send mouse messages to disabled windows

File:

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

trunk/src/user32/oslibmsgtranslate.cpp

@@ -1 @@
-/* $Id: oslibmsgtranslate.cpp,v 1.27 2000-04-02 15:11:50 cbratschi Exp $ */
+/* $Id: oslibmsgtranslate.cpp,v 1.28 2000-04-15 15:11:13 sandervl Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -138 +138 @@
   POSTMSG_PACKET  *packet;
   THDB            *thdb = (THDB *)pThdb;
+  BOOL             fWasDisabled = FALSE;
   int i;
 
@@ -169 +170 @@
         winMsg->lParam  = MAKELONG(winMsg->pt.x,winMsg->pt.y);
 
+        if(!win32wnd->IsWindowEnabled()) {
+                if(win32wnd->getParent()) {
+                        winMsg->hwnd = win32wnd->getParent()->getWindowHandle();
+                }
+                else    goto dummymessage; //don't send mouse messages to disabled windows
+        }
         return TRUE;
 
@@ -182 +189 @@
         //WM_NC*BUTTON* is posted when the cursor is in a non-client area of the window
 
+        //if a window is disabled, it's parent receives the mouse messages
+        if(!win32wnd->IsWindowEnabled()) {
+                if(win32wnd->getParent()) {
+                        win32wnd = win32wnd->getParent();
+                }
+                fWasDisabled = TRUE;
+        }
+
         if (IsNCMouseMsg(win32wnd)) {
             winMsg->message = WINWM_NCLBUTTONDOWN + (os2Msg->msg - WM_BUTTON1DOWN);
@@ -203 +218 @@
             }
         }
-
+        if(fWasDisabled) {
+                if(win32wnd) {
+                        winMsg->hwnd = win32wnd->getWindowHandle();
+                }
+                else    goto dummymessage; //don't send mouse messages to disabled windows
+        }
         return TRUE;
 
@@ -221 +241 @@
         //WM_NCMOUSEMOVE is posted when the cursor moves into a non-client area of the window
 
+        //if a window is disabled, it's parent receives the mouse messages
+        if(!win32wnd->IsWindowEnabled()) {
+                if(win32wnd->getParent()) {
+                        win32wnd = win32wnd->getParent();
+                }
+                fWasDisabled = TRUE;
+        }
         if (IsNCMouseMsg(win32wnd))
         {
@@ -239 +266 @@
             }
         }
+        if(fWasDisabled) {
+                if(win32wnd) {
+                        winMsg->hwnd = win32wnd->getWindowHandle();
+                }
+                else    goto dummymessage; //don't send mouse messages to disabled windows
+        }
         //OS/2 Window coordinates -> Win32 Window coordinates
         return TRUE;
@@ -429 +462 @@
       winMsg->wParam  = 0;
       winMsg->lParam  = MAKELONG(winMsg->pt.x,winMsg->pt.y);
+      if(!win32wnd->IsWindowEnabled()) {
+                if(win32wnd->getParent()) {
+                        winMsg->hwnd = win32wnd->getParent()->getWindowHandle();
+                }
+                else    goto dummymessage; //don't send mouse messages to disabled windows
+      }
       break;
 
@@ -442 +481 @@
         //WM_NC*BUTTON* is posted when the cursor is in a non-client area of the window
 
+        //if a window is disabled, it's parent receives the mouse messages
+        if(!win32wnd->IsWindowEnabled()) {
+                if(win32wnd->getParent()) {
+                        win32wnd = win32wnd->getParent();
+                }
+                fWasDisabled = TRUE;
+        }
+
         if(IsNCMouseMsg(win32wnd)) {
             winMsg->message = WINWM_NCLBUTTONDOWN + (os2Msg->msg - WM_BUTTON1DOWN);
@@ -464 +511 @@
         }
 
+        if(fWasDisabled) {
+                if(win32wnd) {
+                        winMsg->hwnd = win32wnd->getWindowHandle();
+                }
+                else    goto dummymessage; //don't send mouse messages to disabled windows
+        }
         break;
 
@@ -481 +534 @@
         //WM_NCMOUSEMOVE is posted when the cursor moves into a non-client area of the window
 
+        //if a window is disabled, it's parent receives the mouse messages
+        if(!win32wnd->IsWindowEnabled()) {
+                if(win32wnd->getParent()) {
+                        win32wnd = win32wnd->getParent();
+                }
+                fWasDisabled = TRUE;
+        }
         if(IsNCMouseMsg(win32wnd))
         {
@@ -499 +559 @@
             }
         }
+        if(fWasDisabled) {
+                if(win32wnd) {
+                        winMsg->hwnd = win32wnd->getWindowHandle();
+                }
+                else    goto dummymessage; //don't send mouse messages to disabled windows
+        }
         //OS/2 Window coordinates -> Win32 Window coordinates
         break;