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

Timestamp:

Jan 21, 2000, 2:30:35 PM (26 years ago)

Author:

sandervl

Message:

Many bugfixes

File:

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

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.143 2000-01-20 16:48:56 cbratschi Exp $ */
+/* $Id: win32wbase.cpp,v 1.144 2000-01-21 13:30:35 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -105 +105 @@
   OS2Hwnd          = 0;
   OS2HwndFrame     = 0;
-  hMenu            = 0;
   hSysMenu         = 0;
   Win32Hwnd        = 0;
@@ -122 +121 @@
   win32wndproc     = 0;
   hInstance        = 0;
-  windowId         = 0xFFFFFFFF;        //default = -1
+  dwIDMenu         = 0; //0xFFFFFFFF; //default -1
   userData         = 0;
   contextHelpId    = 0;
@@ -1055 +1054 @@
     //set new window rectangle
     setWindowRect(lpWndPos->x, lpWndPos->y, lpWndPos->x + lpWndPos->cx, lpWndPos->y + lpWndPos->cy);
-    if (getParent()) mapWin32Rect(getParent()->getOS2WindowHandle(),OSLIB_HWND_DESKTOP,&rectWindow);
     newWindowRect= rectWindow;
   }
@@ -1414 +1412 @@
             DWORD lParam;
 
-            if (dwStyle & WS_CHILD)
-            {
-              lParam = MAKELONG(rectClient.left,rectClient.top);
-            } else
-            {
-              POINT point;
-
-              point.x = rectClient.left;
-              point.y = rectClient.top;
-              if (getParent()) ClientToScreen(getParent()->getWindowHandle(),&point);
-
-              lParam = MAKELONG(point.x, point.y);
-            }
-            SendInternalMessageA(WM_MOVE, 0, lParam);
+                if(getParent()) {//in parent coordinates
+                    POINT point;
+
+                    point.x = rectClient.left;
+                    point.y = rectClient.top;
+                    MapWindowPoints(getWindowHandle(), getParent()->getWindowHandle(), &point, 1);
+
+                    lParam = MAKELONG(point.x, point.y);
+                }
+                else {//in screen coordinates
+                    lParam = MAKELONG(rectWindow.left+rectClient.left, rectWindow.top+rectClient.top);
+                }
+                SendInternalMessageA(WM_MOVE, 0, lParam);
         }
         if (!(wpos->flags & SWP_NOSIZE) && !(wpos->flags & SWP_NOCLIENTSIZE))
@@ -2722 +2719 @@
 //******************************************************************************
 //******************************************************************************
-VOID Win32BaseWindow::updateWindowStyle(DWORD oldExStyle,DWORD oldStyle)
-{
-  if(IsWindowDestroyed()) return;
-
-  if ((dwStyle & 0xFFFF0000) != (oldStyle & 0xFFFF0000))
-  {
-        FrameUpdateClient(this);
-  }
-}
-//******************************************************************************
-//******************************************************************************
 LONG Win32BaseWindow::SetWindowLongA(int index, ULONG value, BOOL fUnicode)
 {
@@ -2751 +2737 @@
                 SendInternalMessageA(WM_STYLECHANGING,GWL_EXSTYLE,(LPARAM)&ss);
                 setExStyle(ss.styleNew);
-                updateWindowStyle(ss.styleOld,getStyle());
                 SendInternalMessageA(WM_STYLECHANGED,GWL_EXSTYLE,(LPARAM)&ss);
                 return ss.styleOld;
@@ -2768 +2753 @@
                 SendInternalMessageA(WM_STYLECHANGING,GWL_STYLE,(LPARAM)&ss);
                 setStyle(ss.styleNew);
-                updateWindowStyle(dwExStyle,ss.styleOld);
                 SendInternalMessageA(WM_STYLECHANGED,GWL_STYLE,(LPARAM)&ss);
 #ifdef DEBUG
@@ -2878 +2862 @@
 void Win32BaseWindow::setWindowId(DWORD id)
 {
-    windowId = id;
-    dprintf(("Set window ID to %x", id));
-    OSLibSetWindowID(OS2HwndFrame, id);
+    dwIDMenu = id;
 }
 //******************************************************************************