Changeset 2452 for trunk/src

Timestamp:

Jan 15, 2000, 6:27:20 PM (26 years ago)

Author:

sandervl

Message:

child window system menu + titlebar tracking bugfixes

File:

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

trunk/src/user32/new/win32wbasenonclient.cpp

@@ -1 @@
-/* $Id: win32wbasenonclient.cpp,v 1.11 2000-01-15 16:37:12 sandervl Exp $ */
+/* $Id: win32wbasenonclient.cpp,v 1.12 2000-01-15 17:27:20 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2 (non-client methods)
@@ -245 +245 @@
   {
     case HTCAPTION:
-      if (GetActiveWindow() != Win32Hwnd)
-        SetActiveWindow();
-
-      if (GetActiveWindow() == Win32Hwnd)
+    {
+      Win32BaseWindow *topparent = GetTopParent();
+
+      if (GetActiveWindow() != topparent->getWindowHandle())
+        topparent->SetActiveWindow();
+
+      if (GetActiveWindow() == topparent->getWindowHandle())
         SendInternalMessageA(WM_SYSCOMMAND,SC_MOVE+HTCAPTION,lParam);
       break;
+    }
 
     case HTSYSMENU:
@@ -650 +654 @@
           GetInsideRect(rect );
           OffsetRect( rect, rectWindow.left, rectWindow.top);
-          if ((dwStyle & WS_CHILD) && getParent())
-              ClientToScreen(getParent()->getWindowHandle(), (POINT *)rect );
           rect->right = rect->left + GetSystemMetrics(SM_CYCAPTION) - 1;
           rect->bottom = rect->top + GetSystemMetrics(SM_CYCAPTION) - 1;