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

Timestamp:

Feb 3, 2000, 6:13:03 PM (26 years ago)

Author:

cbratschi

Message:

merged controls with wine 20000130

File:

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

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.149 2000-01-29 20:46:52 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.150 2000-02-03 17:13:01 cbratschi Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -651 +651 @@
             if(!(flags & WIN_NEED_SIZE))
             {
-             LPARAM lParam;
-
                 SendInternalMessageA(WM_SIZE, SIZE_RESTORED,
                                 MAKELONG(rectClient.right-rectClient.left,
                                          rectClient.bottom-rectClient.top));
 
-                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);
+                SendInternalMessageA(WM_MOVE,0,MAKELONG(rectClient.left,rectClient.top));
             }
 
@@ -684 +669 @@
             }
 
+            //CB: timew32.exe, blockcad.exe -> children not shown!!!
             if (cs->style & WS_VISIBLE) ShowWindow(sw);
 
@@ -1280 +1266 @@
     {
         LPCSTR lpsz = (LPCSTR)lParam;
-        CHAR* oldNameA = windowNameA;
-        WCHAR* oldNameW = windowNameW;
-
+
+        if(windowNameA) free(windowNameA);
+        if(windowNameW) free(windowNameW);
         if (lParam)
         {
@@ -1298 +1284 @@
         }
         dprintf(("WM_SETTEXT of %x to %s\n", Win32Hwnd, lParam));
-        if ((dwStyle & WS_CAPTION) && (lstrcmpA(oldNameA,windowNameA) != 0))
-        {
-          UpdateCaptionText();
+        if ((dwStyle & WS_CAPTION) == WS_CAPTION)
+        {
+          HandleNCPaint((HRGN)1);
           OSLibWinSetWindowText(OS2HwndFrame,(LPSTR)windowNameA);
         }
-
-        if(oldNameA) free(oldNameA);
-        if(oldNameW) free(oldNameW);
 
         return TRUE;
@@ -1428 +1411 @@
         if (!(wpos->flags & SWP_NOMOVE) && !(wpos->flags & SWP_NOCLIENTMOVE))
         {
-            SendInternalMessageA(WM_MOVE, 0, MAKELONG(wpos->x + rectClient.left, wpos->y + rectClient.top));
+            SendInternalMessageA(WM_MOVE, 0, MAKELONG(rectClient.left,rectClient.top));
         }
         if (!(wpos->flags & SWP_NOSIZE) && !(wpos->flags & SWP_NOCLIENTSIZE))
@@ -1696 +1679 @@
         LPWSTR lpsz = (LPWSTR)lParam;
 
-        CHAR* oldNameA = windowNameA;
-        WCHAR* oldNameW = windowNameW;
-
+        if(windowNameA) free(windowNameA);
+        if(windowNameW) free(windowNameW);
         if (lParam)
         {
@@ -1714 +1696 @@
         }
         dprintf(("WM_SETTEXT of %x\n",Win32Hwnd));
-        if ((dwStyle & WS_CAPTION) && (lstrcmpW(oldNameW,windowNameW) != 0))
-        {
-          UpdateCaptionText();
+        if ((dwStyle & WS_CAPTION) == WS_CAPTION)
+        {
+          HandleNCPaint((HRGN)1);
           OSLibWinSetWindowText(OS2HwndFrame,(LPSTR)windowNameA);
         }
-
-        if(oldNameA) free(oldNameA);
-        if(oldNameW) free(oldNameW);
 
         return TRUE;
@@ -1978 +1957 @@
                      MAKELONG(rectClient.right-rectClient.left,
                               rectClient.bottom-rectClient.top));
-        DWORD 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);
+        SendInternalMessageA(WM_MOVE,0,MAKELONG(rectClient.left,rectClient.top));
     }
     switch(nCmdShow)