Changeset 218 for trunk/src

Timestamp:

Jun 26, 1999, 4:09:58 PM (26 years ago)

Author:

sandervl

Message:

More message changes

Location:

trunk/src/user32

Files:

• wndclass.cpp (modified) (4 diffs)
• wndproc.cpp (modified) (4 diffs)

trunk/src/user32/wndclass.cpp

@@ -1 @@
-/* $Id: wndclass.cpp,v 1.10 1999-06-26 13:45:20 sandervl Exp $ */
+/* $Id: wndclass.cpp,v 1.11 1999-06-26 14:09:58 sandervl Exp $ */
 
 /*
@@ -73 +73 @@
   switch(Msg)
   {
-        case WM_MOUSEACTIVATE:
-                //Open32 sends an OS/2 window message for a button click
-                if(HIWORD(lParam) == 0x71)  //WM_BUTTONCLICKFIRST
-                {
-                        lParam = (WM_LBUTTONDOWN << 16) | LOWORD(lParam);
-                }
-                dwStyle   = GetWindowLongA(hwnd, GWL_STYLE);
-                dwExStyle = GetWindowLongA(hwnd, GWL_EXSTYLE);
-
-                if(dwStyle & WS_CHILD && !(dwExStyle & WS_EX_NOPARENTNOTIFY) )
-                {
-                        HWND hwndParent = GetParent(hwnd);
-
-                        Win32WindowProc *parentwnd = Win32WindowProc::FindProc(hwndParent);
-                        if(parentwnd) {
-                                LRESULT rc = parentwnd->SendMessageA(hwndParent, Msg, wParam, lParam);
-                                if(rc) return TRUE;
-                        }
-                }
-                break;
         case WM_LBUTTONDOWN:
                 rc = ButtonHandler(hwnd, Msg, wParam, lParam);
@@ -842 +822 @@
  Win32WindowProc      *window;
 
+  if(Msg == WM_MOUSEACTIVATE) 
+  {
+        //Open32 sends an OS/2 window message for a button click
+        if(HIWORD(lParam) == 0x71)  //WM_BUTTONCLICKFIRST
+        {
+                lParam = (WM_LBUTTONDOWN << 16) | LOWORD(lParam);
+        }
+  }
   if(PostSpyMessage(hwnd, Msg, wParam, lParam) == FALSE)
         dprintf(("OS2ToWinCallback %s for %x %x %x", GetMsgText(Msg), hwnd, wParam, lParam));
@@ -885 +873 @@
                         break;
 
-                case WM_MOUSEACTIVATE:
-                        //Open32 sends an OS/2 window message for a button click
-                        if(HIWORD(lParam) == 0x71)  //WM_BUTTONCLICKFIRST
-                        {
-                                lParam = (WM_LBUTTONDOWN << 16) | LOWORD(lParam);
-                        }
-                        break;
-
                 case WM_ACTIVATE:
                         if(LOWORD(wParam) != WA_INACTIVE)

trunk/src/user32/wndproc.cpp

@@ -1 @@
-/* $Id: wndproc.cpp,v 1.9 1999-06-26 13:21:11 sandervl Exp $ */
+/* $Id: wndproc.cpp,v 1.10 1999-06-26 14:09:45 sandervl Exp $ */
 
 /*
@@ -289 +289 @@
  LRESULT rc;
 
+  if(Msg == WM_MOUSEACTIVATE) 
+  {
+        //Open32 sends an OS/2 window message for a button click
+        if(HIWORD(lParam) == 0x71)  //WM_BUTTONCLICKFIRST
+        {
+                lParam = (WM_LBUTTONDOWN << 16) | LOWORD(lParam);
+        }
+  }
+
+  if(PostSpyMessage(hwnd, Msg, wParam, lParam) == FALSE)
+        dprintf(("Message %s for %X %x %x\n", GetMsgText(Msg), hwnd, wParam, lParam));
+
   if(HkCBT::OS2HkCBTProc(hwnd, Msg, wParam, lParam) == TRUE) {//hook swallowed msg
         return(0);
   }
-  
+ 
   curwnd = Win32WindowProc::FindProc(hwnd);
   if(!curwnd) {
@@ -299 +311 @@
   }
   if(curwnd != NULL) {
-        if(PostSpyMessage(hwnd, Msg, wParam, lParam) == FALSE)
-                dprintf(("Message %s for %X %x %x\n", GetMsgText(Msg), hwnd, wParam, lParam));
-        
         switch(Msg) 
         {
@@ -341 +350 @@
                 }
                 break;
-        case WM_MOUSEACTIVATE:
-                //Open32 sends an OS/2 window message for a button click
-                if(HIWORD(lParam) == 0x71)  //WM_BUTTONCLICKFIRST
-                {
-                        lParam = (WM_LBUTTONDOWN << 16) | LOWORD(lParam);
-                }
-                break;
         }
+
         rc = curwnd->pCallback(hwnd, Msg, wParam, lParam);
         if(Msg == WM_NCDESTROY) {