Changeset 2208 for trunk/src/user32/win32wbase.cpp

Timestamp:

Dec 27, 1999, 3:41:43 PM (26 years ago)

Author:

sandervl

Message:

Lots of message fixes

File:

• trunk/src/user32/win32wbase.cpp (modified) (3 diffs)

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.119 1999-12-26 17:30:18 cbratschi Exp $ */
+/* $Id: win32wbase.cpp,v 1.120 1999-12-27 14:41:42 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -1018 +1018 @@
         else    hwndTop = (GetTopParent()) ? GetTopParent()->getWindowHandle() : 0;
 
-        if (hwndTop && getWindowHandle() != GetActiveWindow())
+        HWND hwndActive = GetActiveWindow();
+        if (hwndTop && getWindowHandle() != hwndActive)
         {
                 LONG ret = SendInternalMessageA(WM_MOUSEACTIVATE, hwndTop,
-                                                MAKELONG( HTCLIENT, msg->message) );
+                                                MAKELONG( lastHitTestVal, msg->message) );
 
 #if 0
@@ -2970 +2971 @@
   hwndActive = OSLibWinQueryActiveWindow();
 
-  win32wnd = (Win32BaseWindow *)OSLibWinGetWindowULong(hwndActive, OFFSET_WIN32WNDPTR);
-  magic    = OSLibWinGetWindowULong(hwndActive, OFFSET_WIN32PM_MAGIC);
-  if(CheckMagicDword(magic) && win32wnd)
-  {
-        return win32wnd->getWindowHandle();
-  }
-  return 0;
-//  return hwndActive;
+  return OS2ToWin32Handle(hwndActive);
 }
 //******************************************************************************