Changeset 3662 for trunk/src/user32/win32wbasenonclient.cpp

Timestamp:

Jun 7, 2000, 4:51:33 PM (25 years ago)

Author:

sandervl

Message:

Major rewrite: frame/client -> frame

File:

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

trunk/src/user32/win32wbasenonclient.cpp

@@ -1 @@
-/* $Id: win32wbasenonclient.cpp,v 1.23 2000-05-28 16:43:47 sandervl Exp $ */
+/* $Id: win32wbasenonclient.cpp,v 1.24 2000-06-07 14:51:32 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2 (non-client methods)
@@ -211 +211 @@
   }
 
-  pt.x -= rectWindow.left;
-  pt.y -= rectWindow.top;
-  SCROLL_HandleScrollEvent(Win32Hwnd,0,MAKELONG(pt.x,pt.y),scrollbar,WM_LBUTTONDOWN);
+  ScreenToClient(getWindowHandle(), &pt);
+  pt.x += rectClient.left;
+  pt.y += rectClient.top;
+
+  SCROLL_HandleScrollEvent(getWindowHandle(),0,MAKELONG(pt.x,pt.y),scrollbar,WM_LBUTTONDOWN);
   if (GetCapture() != Win32Hwnd) return;
   do
@@ -224 +226 @@
         case WM_LBUTTONUP:
         case WM_MOUSEMOVE:
-            pt.x = msg.pt.x-rectWindow.left;
-            pt.y = msg.pt.y-rectWindow.top;
+            pt.x = msg.pt.x;
+            pt.y = msg.pt.y;
+            ScreenToClient(getWindowHandle(), &pt);
+            pt.x += rectClient.left;
+            pt.y += rectClient.top;
             msg.lParam = MAKELONG(pt.x,pt.y);
 
@@ -262 +267 @@
         {
             //SvL: Calling topparent->SetActiveWindow() causes focus problems
-            OSLibWinSetFocus(topparent->getOS2FrameWindowHandle());
+//          topparent->SetActiveWindow();
+            OSLibWinSetFocus(topparent->getOS2WindowHandle());
         }
 
         if (GetActiveWindow() == topparent->getWindowHandle())
             SendInternalMessageA(WM_SYSCOMMAND,SC_MOVE+HTCAPTION,lParam);
+        else dprintf(("ACtive window (%x) != toplevel wnd %x", OSLibWinQueryActiveWindow(), topparent->getWindowHandle()));
         break;
     }
@@ -425 +432 @@
 LONG Win32BaseWindow::HandleNCHitTest(POINT pt)
 {
-  RECT rect = rectWindow;
+  RECT rect;
 
   if (dwStyle & WS_MINIMIZE) return HTCAPTION;
+
+  GetWindowRect(getWindowHandle(), &rect);
 
   if (!PtInRect(&rect,pt)) return HTNOWHERE;
@@ -1007 +1016 @@
     //only redraw caption
     GetRgnBox(clip,&rectClip);
+#if 1
     //SvL: I'm getting paint problems when clipping a dc created in GetDCEx
     //     with a region that covers the entire window (RealPlayer 7 Update 1)
@@ -1016 +1026 @@
         rectClip = rect;
     }
+#endif
   }
   else
@@ -1122 +1133 @@
   }
 
-  ReleaseDC(Win32Hwnd,hdc);
+  ReleaseDC(getWindowHandle(),hdc);
   IncreaseLogCount();
   dprintf(("**DoNCPaint %x DONE", getWindowHandle()));
@@ -1305 +1316 @@
 
     case SC_TASKLIST:
-        OSLibWinShowTaskList(getOS2FrameWindowHandle());
+        OSLibWinShowTaskList(getOS2WindowHandle());
         break;