Changeset 2611 for trunk/src

Timestamp:

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

Author:

cbratschi

Message:

merged controls with wine 20000130

Location:

trunk/src/user32

Files:

• button.cpp (modified) (2 diffs)
• menu.cpp (modified) (56 diffs)
• scroll.cpp (modified) (3 diffs)
• win32wbase.cpp (modified) (9 diffs)
• win32wbase.h (modified) (3 diffs)
• win32wbasenonclient.cpp (modified) (10 diffs)
• win32wbasepos.cpp (modified) (2 diffs)

trunk/src/user32/button.cpp

@@ -1 @@
-/* $Id: button.cpp,v 1.30 2000-01-18 20:10:31 sandervl Exp $ */
+/* $Id: button.cpp,v 1.31 2000-02-03 17:13:00 cbratschi Exp $ */
 /* File: button.cpp -- Button type widgets
  *
@@ -7 +7 @@
  * Copyright (c) 1999 Christoph Bratschi
  *
- * WINE version: 991212
+ * WINE version: 20000130
  *
  * Status: complete

trunk/src/user32/menu.cpp

@@ -1 @@
-/* $Id: menu.cpp,v 1.14 2000-01-31 22:30:52 sandervl Exp $*/
+/* $Id: menu.cpp,v 1.15 2000-02-03 17:13:00 cbratschi Exp $*/
 /*
  * Menu functions
@@ -9 +9 @@
  * Copyright 1999 Christoph Bratschi
  *
- * WINE version: 991212
+ * WINE version: 20000130
  *
  * Status:  ???
@@ -301 +301 @@
 
 /***********************************************************************
+ *           MENU_GetMenu
+ *
+ * Validate the given menu handle and returns the menu structure pointer.
+ */
+POPUPMENU *MENU_GetMenu(HMENU hMenu)
+{
+    POPUPMENU *menu;
+    menu = (POPUPMENU*)hMenu;
+    if (!IS_A_MENU(menu))
+    {
+        //ERR("invalid menu handle=%x, ptr=%p, magic=%x\n", hMenu, menu, menu? menu->wMagic:0);
+        menu = NULL;
+    }
+    return menu;
+}
+
+/***********************************************************************
  *           MENU_CopySysPopup
  *
@@ -578 +595 @@
     UINT i;
 
-    if (((*hmenu)==0xffff) || (!(menu = (POPUPMENU*)*hmenu))) return NULL;
+    if (((*hmenu)==0xffff) || (!(menu = MENU_GetMenu(*hmenu)))) return NULL;
     if (wFlags & MF_BYPOSITION)
     {
@@ -623 +640 @@
     MENUITEM *item;
     if (((*hmenu)==0xffff) ||
-            (!(menu = (POPUPMENU*)*hmenu)))
+            (!(menu = MENU_GetMenu(*hmenu))))
         return NO_SELECTED_ITEM;
     item = menu->items;
@@ -701 +718 @@
     if (hmenu)
     {
-        POPUPMENU *menu = (POPUPMENU*)hmenu;
+        POPUPMENU *menu = MENU_GetMenu(hmenu);
         MENUITEM *item = menu->items;
         LONG menuchar;
@@ -1320 +1337 @@
             /* draw menu items */
 
-            menu = (POPUPMENU*)hmenu;
+            menu = MENU_GetMenu(hmenu);
             if (menu && menu->nItems)
             {
@@ -1351 +1368 @@
     HFONT hfontOld = 0;
 
-    lppop = (LPPOPUPMENU)getMenu(hwnd);
+    lppop = MENU_GetMenu(getMenu(hwnd));
     if (lppop == NULL || lprect == NULL)
     {
@@ -1493 +1510 @@
     //hwndOwner, hmenu, id, x, y, xanchor, yanchor);
 
-    if (!(menu = (POPUPMENU*)hmenu)) return FALSE;
+    if (!(menu = MENU_GetMenu(hmenu))) return FALSE;
     if (menu->FocusedItem != NO_SELECTED_ITEM)
     {
@@ -1601 +1618 @@
     //TRACE("owner=0x%04x menu=0x%04x index=0x%04x select=0x%04x\n", hwndOwner, hmenu, wIndex, sendMenuSelect);
 
-    lppop = (POPUPMENU*)hmenu;
-    if (!lppop->nItems) return;
+    lppop = MENU_GetMenu(hmenu);
+    if ((!lppop) || (!lppop->nItems)) return;
 
     if (lppop->FocusedItem == wIndex) return;
@@ -1668 +1685 @@
     //TRACE("hwnd=0x%04x hmenu=0x%04x off=0x%04x\n", hwndOwner, hmenu, offset);
 
-    menu = (POPUPMENU*)hmenu;
-    if (!menu->items) return;
+    menu = MENU_GetMenu(hmenu);
+    if ((!menu) || (!menu->items)) return;
 
     if ( menu->FocusedItem != NO_SELECTED_ITEM )
@@ -1741 +1758 @@
     if (flags & MF_POPUP)
     {
-        POPUPMENU *menu = (POPUPMENU*)(UINT)id;
-        if (IS_A_MENU(menu)) menu->wFlags |= MF_POPUP;
+        POPUPMENU *menu = MENU_GetMenu((UINT)id);
+        if (menu) menu->wFlags |= MF_POPUP;
         else
         {
@@ -1785 +1802 @@
     POPUPMENU *menu;
 
-    if (!(menu = (POPUPMENU*)hMenu))
-    {
-        //WARN("%04x not a menu handle\n",
-        //              hMenu );
+    if (!(menu = MENU_GetMenu(hMenu)))
         return NULL;
-    }
 
     /* Find where to insert new item */
@@ -1799 +1812 @@
         /* Some programs specify the menu length to do that */
         pos = menu->nItems;
-    }
-    else
+    } else
     {
         if (!MENU_FindItem( &hMenu, &pos, flags ))
         {
-            //WARN("item %x not found\n",
-            //              pos );
+            //FIXME("item %x not found\n", pos );
             return NULL;
         }
-        if (!(menu = (LPPOPUPMENU)hMenu))
-        {
-            //WARN("%04x not a menu handle\n",
-            //             hMenu);
+        if (!(menu = MENU_GetMenu(hMenu)))
             return NULL;
-        }
     }
 
@@ -1952 +1959 @@
     MENUITEM *item;
 
-    menu = (POPUPMENU*)hmenu;
-
-    if (menu->FocusedItem == NO_SELECTED_ITEM) return 0;
+    menu = MENU_GetMenu(hmenu);
+
+    if ((!menu) || (menu->FocusedItem == NO_SELECTED_ITEM)) return 0;
 
     item = &menu->items[menu->FocusedItem];
@@ -1971 +1978 @@
                                 BOOL sendMenuSelect )
 {
-    POPUPMENU *menu = (POPUPMENU*)hmenu;
+    POPUPMENU *menu = MENU_GetMenu(hmenu);
 
     //TRACE("owner=0x%04x hmenu=0x%04x 0x%04x\n", hwndOwner, hmenu, sendMenuSelect);
@@ -1990 +1997 @@
         } else return;
 
-        submenu = (POPUPMENU*)hsubmenu;
+        submenu = MENU_GetMenu(hsubmenu);
         MENU_HideSubPopups( hwndOwner, hsubmenu, FALSE );
         MENU_SelectItem( hwndOwner, hsubmenu, NO_SELECTED_ITEM, sendMenuSelect, 0 );
@@ -2025 +2032 @@
     //TRACE("owner=0x%04x hmenu=0x%04x 0x%04x\n", hwndOwner, hmenu, selectFirst);
 
-    if (!(menu = (POPUPMENU*)hmenu)) return hmenu;
+    if (!(menu = MENU_GetMenu(hmenu))) return hmenu;
 
     if (menu->FocusedItem == NO_SELECTED_ITEM)
@@ -2124 +2131 @@
 static HMENU MENU_PtMenu(HMENU hMenu,POINT pt,BOOL inMenuBar)
 {
-   POPUPMENU *menu = (POPUPMENU*)hMenu;
+   POPUPMENU *menu = MENU_GetMenu(hMenu);
    register UINT ht = menu->FocusedItem;
 
@@ -2165 +2172 @@
 {
     MENUITEM *item;
-    POPUPMENU *menu = (POPUPMENU*)hMenu;
+    POPUPMENU *menu = MENU_GetMenu(hMenu);
 
     //TRACE("%p hmenu=0x%04x\n", pmt, hMenu);
@@ -2207 +2214 @@
 static void MENU_SwitchTracking( MTRACKER* pmt, HMENU hPtMenu, UINT id )
 {
-    POPUPMENU *ptmenu = (POPUPMENU*)hPtMenu;
-    POPUPMENU *topmenu = (POPUPMENU*)pmt->hTopMenu;
+    POPUPMENU *ptmenu = MENU_GetMenu(hPtMenu);
+    POPUPMENU *topmenu = MENU_GetMenu(pmt->hTopMenu);
 
     //TRACE("%p hmenu=0x%04x 0x%04x\n", pmt, hPtMenu, id);
@@ -2237 +2244 @@
     {
         UINT id = 0;
-        POPUPMENU *ptmenu = (POPUPMENU*)hPtMenu;
+        POPUPMENU *ptmenu = MENU_GetMenu(hPtMenu);
         MENUITEM *item;
 
@@ -2278 +2285 @@
     {
         UINT id = 0;
-        POPUPMENU *ptmenu = (POPUPMENU*)hPtMenu;
+        POPUPMENU *ptmenu = MENU_GetMenu(hPtMenu);
         MENUITEM *item;
 
@@ -2315 +2322 @@
     if( hPtMenu )
     {
-        ptmenu = (POPUPMENU*)hPtMenu;
+        ptmenu = MENU_GetMenu(hPtMenu);
         if( IS_SYSTEM_MENU(ptmenu) )
             id = 0;
@@ -2344 +2351 @@
 static LRESULT MENU_DoNextMenu( MTRACKER* pmt, UINT vk )
 {
-    POPUPMENU *menu = (POPUPMENU*)pmt->hTopMenu;
+    POPUPMENU *menu = MENU_GetMenu(pmt->hTopMenu);
 
     if( (vk == VK_LEFT &&  menu->FocusedItem == 0 ) ||
@@ -2373 +2380 @@
                 if( vk == VK_LEFT )
                 {
-                    menu = (POPUPMENU*)hNewMenu;
+                    menu = MENU_GetMenu(hNewMenu);
                     id = menu->nItems - 1;
                 }
@@ -2485 +2492 @@
 
     hmenuprev = hmenutmp = pmt->hTopMenu;
-    menu = (POPUPMENU*)hmenutmp;
+    menu = MENU_GetMenu(hmenutmp);
 
     /* Try to move 1 column left (if possible) */
@@ -2534 +2541 @@
 {
     HMENU hmenutmp;
-    POPUPMENU *menu = (POPUPMENU*)pmt->hTopMenu;
+    POPUPMENU *menu = MENU_GetMenu(pmt->hTopMenu);
     UINT  nextcol;
 
@@ -2619 +2626 @@
 
     fEndMenu = FALSE;
-    if (!(menu = (POPUPMENU*)hmenu)) return FALSE;
-
-    if (wFlags & TPM_BUTTONDOWN) MENU_ButtonDown( &mt, hmenu, wFlags );
+    if (!(menu = MENU_GetMenu(hmenu))) return FALSE;
+
+    if (wFlags & TPM_BUTTONDOWN)
+    {
+        /* Get the result in order to start the tracking or not */
+        fRemove = MENU_ButtonDown( &mt, hmenu, wFlags );
+        fEndMenu = !fRemove;
+    }
 
     //EVENT_Capture( mt.hOwnerWnd, HTMENU ); //CB: todo
@@ -2629 +2641 @@
     while (!fEndMenu)
     {
-        menu = (POPUPMENU*)mt.hCurrentMenu;
+        menu = MENU_GetMenu(mt.hCurrentMenu);
         msg.hwnd = (wFlags & TPM_ENTERIDLEEX && menu->wFlags & MF_POPUP) ? menu->hWnd : 0;
 
@@ -2720 +2732 @@
                 case VK_DOWN: /* If on menu bar, pull-down the menu */
 
-                    menu = (POPUPMENU*)mt.hCurrentMenu;
+                    menu = MENU_GetMenu(mt.hCurrentMenu);
                     if (!(menu->wFlags & MF_POPUP))
                         mt.hCurrentMenu = MENU_ShowSubPopup(mt.hOwnerWnd, mt.hTopMenu, TRUE, wFlags,&mt.pt);
@@ -2801 +2813 @@
     ReleaseCapture();
 
-    menu = (POPUPMENU*)mt.hTopMenu;
+    menu = MENU_GetMenu(mt.hTopMenu);
 
     if( IsWindow( mt.hOwnerWnd ) )
@@ -3089 +3101 @@
     //             hwnd, menubarWidth, orgX, orgY );
 
-    if (!(lppop = (LPPOPUPMENU)getMenu(hwnd)))
+    if (!(lppop = MENU_GetMenu(getMenu(hwnd))))
     {
         return 0;
@@ -3184 +3196 @@
 
     /* Get the Popupmenu to access the owner menu */
-    if (!(menu = (POPUPMENU*)hMenu))
+    if (!(menu = MENU_GetMenu(hMenu)))
         return (UINT)-1;
 
@@ -3201 +3213 @@
 
             /* Get the parent menu to access*/
-            if (!(parentMenu = (POPUPMENU*)menu->hSysMenuOwner))
+            if (!(parentMenu = MENU_GetMenu(menu->hSysMenuOwner)))
                 return (UINT)-1;
 
@@ -3217 +3229 @@
  *         GetMenuString32A    (USER32.268)
  */
-INT WINAPI GetMenuStringA(HMENU hMenu, UINT wItemID,
-                          LPSTR str, INT nMaxSiz, UINT wFlags )
-{
+INT WINAPI GetMenuStringA(
+        HMENU hMenu,    /* [in] menuhandle */
+        UINT wItemID,   /* [in] menu item (dep. on wFlags) */
+        LPSTR str,      /* [out] outbuffer. If NULL, func returns entry length*/
+        INT nMaxSiz,    /* [in] length of buffer. if 0, func returns entry len*/
+        UINT wFlags     /* [in] MF_ flags */
+) {
     MENUITEM *item;
 
@@ -3270 +3286 @@
     //             hWnd, hMenu, wItemID, wHilite);
     if (!MENU_FindItem( &hMenu, &wItemID, wHilite )) return FALSE;
-    if (!(menu = (LPPOPUPMENU)hMenu)) return FALSE;
+    if (!(menu = MENU_GetMenu(hMenu))) return FALSE;
     if (menu->FocusedItem == wItemID) return TRUE;
     MENU_HideSubPopups( hWnd, hMenu, FALSE );
@@ -3295 +3311 @@
     if (item->fType & MF_POPUP)
     {
-        POPUPMENU *menu = (POPUPMENU*)item->hSubMenu;
+        POPUPMENU *menu = MENU_GetMenu(item->hSubMenu);
         if (!menu) return -1;
         else return (menu->nItems << 8) | ((item->fState|item->fType) & 0xff);
@@ -3314 +3330 @@
 INT WINAPI GetMenuItemCount( HMENU hMenu )
 {
-    LPPOPUPMENU menu = (LPPOPUPMENU)hMenu;
+    LPPOPUPMENU menu = MENU_GetMenu(hMenu);
 
     dprintf(("USER32: GetMenuItemCount"));
 
-    if (!IS_A_MENU(menu)) return -1;
+    if (!menu) return -1;
     //TRACE("(%04x) returning %d\n",
     //              hMenu, menu->nItems );
@@ -3366 +3382 @@
 
     if (flags & MF_POPUP)  /* Set the MF_POPUP flag on the popup-menu */
-        ((POPUPMENU *)(HMENU)id)->wFlags |= MF_POPUP;
+        (MENU_GetMenu((HMENU)id))->wFlags |= MF_POPUP;
 
     item->hCheckBit = item->hUnCheckBit = 0;
@@ -3428 +3444 @@
     //TRACE("(menu=%04x pos=%04x flags=%04x)\n",hMenu, nPos, wFlags);
     if (!(item = MENU_FindItem( &hMenu, &nPos, wFlags ))) return FALSE;
-    if (!(menu = (LPPOPUPMENU)hMenu)) return FALSE;
+    if (!(menu = MENU_GetMenu(hMenu))) return FALSE;
 
       /* Remove item */
@@ -3612 +3628 @@
     if (hMenu && hMenu != MENU_DefSysPopup)
     {
-        LPPOPUPMENU lppop = (LPPOPUPMENU)hMenu;
+        LPPOPUPMENU lppop = MENU_GetMenu(hMenu);
         HWND pTPWnd = MENU_GetTopPopupWnd();
 
@@ -3618 +3634 @@
           SetWindowLongA(pTPWnd,0,0);
 
-        if (IS_A_MENU( lppop ))
+        if (!IS_A_MENU(lppop)) lppop = NULL;
+        if (lppop)
         {
             lppop->wMagic = 0;  /* Mark it as destroyed */
@@ -3672 +3689 @@
             else
             {
-                POPUPMENU *menu = (POPUPMENU*)hSysMenu;
-                if( IS_A_MENU(menu) )
+                POPUPMENU *menu = MENU_GetMenu(hSysMenu);
+                if(menu)
                 {
                    if( menu->nItems > 0 && menu->items[0].hSubMenu == MENU_DefSysPopup )
@@ -3701 +3718 @@
             /* Store the dummy sysmenu handle to facilitate the refresh */
             /* of the close button if the SC_CLOSE item change */
-            menu = (POPUPMENU*)retvalue;
-            if ( IS_A_MENU(menu) )
+            menu = MENU_GetMenu(retvalue);
+            if (menu)
                menu->hSysMenuOwner = hSysMenu;
         }
@@ -3766 +3783 @@
             LPPOPUPMENU lpmenu;
 
-            if (!(lpmenu = (LPPOPUPMENU)hMenu))
+            if (!(lpmenu = MENU_GetMenu(hMenu)))
             {
                 return FALSE;
@@ -3811 +3828 @@
     if (!(GetWindowLongA(hWnd,GWL_STYLE) & WS_CHILD) && getMenu(hWnd))
     {
-        lppop = (LPPOPUPMENU)getMenu(hWnd);
+        lppop = MENU_GetMenu(getMenu(hWnd));
         if (lppop == NULL)
         {
@@ -4095 +4112 @@
         menu->hSubMenu = lpmii->hSubMenu;
         if (menu->hSubMenu) {
-            POPUPMENU *subMenu = (POPUPMENU*)(UINT)menu->hSubMenu;
-            if (IS_A_MENU(subMenu)) {
+            POPUPMENU *subMenu = MENU_GetMenu((UINT)menu->hSubMenu);
+            if (subMenu) {
                 subMenu->wFlags |= MF_POPUP;
                 menu->fType |= MF_POPUP;
@@ -4158 +4175 @@
         //TRACE("(0x%x,%d,%d)\n", hmenu, uItem, bypos);
 
-        if (!(menu = (POPUPMENU*)hmenu)) return FALSE;
+        if (!(menu = MENU_GetMenu(hmenu))) return FALSE;
 
         /* reset all default-item flags */
@@ -4207 +4224 @@
         //TRACE("(0x%x,%d,%d)\n", hmenu, bypos, flags);
 
-        if (!(menu = (POPUPMENU*)hmenu)) return -1;
+        if (!(menu = MENU_GetMenu(hmenu))) return -1;
 
         /* find default item */
@@ -4326 +4343 @@
      if(!hwnd)
      {
-         itemMenu = (POPUPMENU*)hMenu;
+         itemMenu = MENU_GetMenu(hMenu);
          if (itemMenu == NULL) {
-                SetLastError(ERROR_INVALID_PARAMETER);
-                return FALSE;
-         }
+                SetLastError(ERROR_INVALID_PARAMETER);
+                return FALSE;
+         }
 
          if(itemMenu->hWnd == 0)
@@ -4338 +4355 @@
 
      if ((rect == NULL) || (item == NULL)) {
-        SetLastError(ERROR_INVALID_PARAMETER);
+        SetLastError(ERROR_INVALID_PARAMETER);
         return FALSE;
      }
@@ -4363 +4380 @@
     //TRACE("(0x%04x %p)\n", hMenu, lpmi);
 
-    if (lpmi && (lpmi->cbSize==sizeof(MENUINFO)) && (menu=(POPUPMENU*)hMenu))
+    if (lpmi && (lpmi->cbSize==sizeof(MENUINFO)) && (menu=MENU_GetMenu(hMenu)))
     {
 
@@ -4399 +4416 @@
     //TRACE("(0x%04x %p)\n", hMenu, lpmi);
 
-    if (lpmi && (menu = (POPUPMENU*)hMenu))
+    if (lpmi && (menu = MENU_GetMenu(hMenu)))
     {
 
@@ -4432 +4449 @@
     //TRACE("(0x%04x 0x%08lx)\n", hMenu, dwContextHelpID);
 
-    menu = (POPUPMENU*)hMenu;
+    menu = MENU_GetMenu(hMenu);
     if (menu)
     {
@@ -4451 +4468 @@
     //TRACE("(0x%04x)\n", hMenu);
 
-    menu = (POPUPMENU*)hMenu;
+    menu = MENU_GetMenu(hMenu);
     if (menu)
     {

trunk/src/user32/scroll.cpp

@@ -1 @@
-/* $Id: scroll.cpp,v 1.32 2000-01-18 20:10:44 sandervl Exp $ */
+/* $Id: scroll.cpp,v 1.33 2000-02-03 17:13:01 cbratschi Exp $ */
 /*
  * Scrollbar control
@@ -8 +8 @@
  * Copyright 1994, 1996 Alexandre Julliard
  *
- * WINE version: 991031
+ * WINE version: 20000130
  *
  * Status:  complete
@@ -1260 +1260 @@
     //             infoPtr->MinVal, infoPtr->MaxVal );
 
+    /* don't change the scrollbar state if SetScrollInfo
+     * is just called with SIF_DISABLENOSCROLL
+     */
+    if(!(info->fMask & SIF_ALL)) goto done;
+
     /* Check if the scrollbar should be hidden or disabled */
     if (info->fMask & (SIF_RANGE | SIF_PAGE | SIF_DISABLENOSCROLL))

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)

trunk/src/user32/win32wbase.h

@@ -1 @@
-/* $Id: win32wbase.h,v 1.77 2000-01-28 22:26:00 sandervl Exp $ */
+/* $Id: win32wbase.h,v 1.78 2000-02-03 17:13:02 cbratschi Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -106 +106 @@
          ULONG  MsgPosChanging(LPARAM lp);
          ULONG  MsgPosChanged(LPARAM lp);
-         ULONG  MsgActivate(BOOL fActivate, BOOL fMinimized, HWND hwnd, HWND hwndOS2Win);
+         ULONG  MsgActivate(BOOL fActivate, BOOL fMinimized, HWND hwnd, HWND hwndOS2Win);
          ULONG  MsgSetFocus(HWND hwnd);
          ULONG  MsgKillFocus(HWND hwnd);
@@ -401 +401 @@
         VOID  DrawMinButton(HDC hdc,RECT *rect,BOOL down,BOOL bGrayed);
         VOID  DrawCaption(HDC hdc,RECT *rect,BOOL active,BOOL redrawText);
-        VOID  UpdateCaptionText();
         VOID  DoNCPaint(HRGN clip,BOOL suppress_menupaint);
         LONG  HandleNCPaint(HRGN clip);

trunk/src/user32/win32wbasenonclient.cpp

@@ -1 @@
-/* $Id: win32wbasenonclient.cpp,v 1.7 2000-01-30 18:48:29 sandervl Exp $ */
+/* $Id: win32wbasenonclient.cpp,v 1.8 2000-02-03 17:13:03 cbratschi Exp $ */
 /*
  * Win32 Window Base Class for OS/2 (non-client methods)
@@ -415 +415 @@
   if (!PtInRect(&rect,pt)) return HTNOWHERE;
 
-  if (!(flags & WIN_MANAGED))
-  {
-    /* Check borders */
-    if (HAS_THICKFRAME(dwStyle,dwExStyle))
-    {
-      InflateRect(&rect,-GetSystemMetrics(SM_CXFRAME),-GetSystemMetrics(SM_CYFRAME));
-      if (!PtInRect(&rect,pt))
+  /* Check borders */
+  if (HAS_THICKFRAME(dwStyle,dwExStyle))
+  {
+    InflateRect(&rect,-GetSystemMetrics(SM_CXFRAME),-GetSystemMetrics(SM_CYFRAME));
+    if (!PtInRect(&rect,pt))
+    {
+      /* Check top sizing border */
+      if (pt.y < rect.top)
       {
-        /* Check top sizing border */
-        if (pt.y < rect.top)
-        {
-          if (pt.x < rect.left+GetSystemMetrics(SM_CXSIZE)) return HTTOPLEFT;
-          if (pt.x >= rect.right-GetSystemMetrics(SM_CXSIZE)) return HTTOPRIGHT;
-          return HTTOP;
-        }
-        /* Check bottom sizing border */
-        if (pt.y >= rect.bottom)
-        {
-          if (pt.x < rect.left+GetSystemMetrics(SM_CXSIZE)) return HTBOTTOMLEFT;
-          if (pt.x >= rect.right-GetSystemMetrics(SM_CXSIZE)) return HTBOTTOMRIGHT;
-          return HTBOTTOM;
-        }
-        /* Check left sizing border */
-        if (pt.x < rect.left)
-        {
-          if (pt.y < rect.top+GetSystemMetrics(SM_CYSIZE)) return HTTOPLEFT;
-          if (pt.y >= rect.bottom-GetSystemMetrics(SM_CYSIZE)) return HTBOTTOMLEFT;
-          return HTLEFT;
-        }
-        /* Check right sizing border */
-        if (pt.x >= rect.right)
-        {
-          if (pt.y < rect.top+GetSystemMetrics(SM_CYSIZE)) return HTTOPRIGHT;
-          if (pt.y >= rect.bottom-GetSystemMetrics(SM_CYSIZE)) return HTBOTTOMRIGHT;
-          return HTRIGHT;
-        }
+        if (pt.x < rect.left+GetSystemMetrics(SM_CXSIZE)) return HTTOPLEFT;
+        if (pt.x >= rect.right-GetSystemMetrics(SM_CXSIZE)) return HTTOPRIGHT;
+        return HTTOP;
       }
-    } else  /* No thick frame */
-    {
-      if (HAS_DLGFRAME(dwStyle,dwExStyle))
-        InflateRect(&rect, -GetSystemMetrics(SM_CXDLGFRAME), -GetSystemMetrics(SM_CYDLGFRAME));
-      else if (HAS_THINFRAME(dwStyle ))
-        InflateRect(&rect, -GetSystemMetrics(SM_CXBORDER), -GetSystemMetrics(SM_CYBORDER));
-      if (!PtInRect( &rect, pt )) return HTBORDER;
-    }
-
-    /* Check caption */
-
-    if ((dwStyle & WS_CAPTION) == WS_CAPTION)
-    {
-      if (dwExStyle & WS_EX_TOOLWINDOW)
-        rect.top += GetSystemMetrics(SM_CYSMCAPTION)-1;
-      else
-        rect.top += GetSystemMetrics(SM_CYCAPTION)-1;
-      if (!PtInRect(&rect,pt))
+      /* Check bottom sizing border */
+      if (pt.y >= rect.bottom)
       {
-        /* Check system menu */
-        if(dwStyle & WS_SYSMENU)
-        {
-          /* Check if there is an user icon */
-          HICON hIcon = (HICON) GetClassLongA(Win32Hwnd, GCL_HICONSM);
-          if(!hIcon) hIcon = (HICON) GetClassLongA(Win32Hwnd, GCL_HICON);
-
-          /* If there is an icon associated with the window OR              */
-          /* If there is no hIcon specified and this is not a modal dialog, */
-          /* there is a system menu icon.                                   */
-          if((hIcon != 0) || (!(dwStyle & DS_MODALFRAME)))
-          rect.left += GetSystemMetrics(SM_CYCAPTION) - 1;
-        }
-        if (pt.x < rect.left) return HTSYSMENU;
-
-        /* Check close button */
-        if (dwStyle & WS_SYSMENU)
-        rect.right -= GetSystemMetrics(SM_CYCAPTION) - 1;
-        if (pt.x > rect.right) return HTCLOSE;
-
-        /* Check maximize box */
-        /* In win95 there is automatically a Maximize button when there is a minimize one*/
-        if ((dwStyle & WS_MAXIMIZEBOX)|| (dwStyle & WS_MINIMIZEBOX))
-        rect.right -= GetSystemMetrics(SM_CXSIZE) + 1;
-        if (pt.x > rect.right) return HTMAXBUTTON;
-
-        /* Check minimize box */
-        /* In win95 there is automatically a Maximize button when there is a Maximize one*/
-        if ((dwStyle & WS_MINIMIZEBOX)||(dwStyle & WS_MAXIMIZEBOX))
-        rect.right -= GetSystemMetrics(SM_CXSIZE) + 1;
-
-        if (pt.x > rect.right) return HTMINBUTTON;
-        return HTCAPTION;
+        if (pt.x < rect.left+GetSystemMetrics(SM_CXSIZE)) return HTBOTTOMLEFT;
+        if (pt.x >= rect.right-GetSystemMetrics(SM_CXSIZE)) return HTBOTTOMRIGHT;
+        return HTBOTTOM;
       }
+      /* Check left sizing border */
+      if (pt.x < rect.left)
+      {
+        if (pt.y < rect.top+GetSystemMetrics(SM_CYSIZE)) return HTTOPLEFT;
+        if (pt.y >= rect.bottom-GetSystemMetrics(SM_CYSIZE)) return HTBOTTOMLEFT;
+        return HTLEFT;
+      }
+      /* Check right sizing border */
+      if (pt.x >= rect.right)
+      {
+        if (pt.y < rect.top+GetSystemMetrics(SM_CYSIZE)) return HTTOPRIGHT;
+        if (pt.y >= rect.bottom-GetSystemMetrics(SM_CYSIZE)) return HTBOTTOMRIGHT;
+        return HTRIGHT;
+      }
+    }
+  } else  /* No thick frame */
+  {
+    if (HAS_DLGFRAME(dwStyle,dwExStyle))
+      InflateRect(&rect, -GetSystemMetrics(SM_CXDLGFRAME), -GetSystemMetrics(SM_CYDLGFRAME));
+    else if (HAS_THINFRAME(dwStyle ))
+      InflateRect(&rect, -GetSystemMetrics(SM_CXBORDER), -GetSystemMetrics(SM_CYBORDER));
+    if (!PtInRect( &rect, pt )) return HTBORDER;
+  }
+
+  /* Check caption */
+
+  if ((dwStyle & WS_CAPTION) == WS_CAPTION)
+  {
+    if (dwExStyle & WS_EX_TOOLWINDOW)
+      rect.top += GetSystemMetrics(SM_CYSMCAPTION)-1;
+    else
+      rect.top += GetSystemMetrics(SM_CYCAPTION)-1;
+    if (!PtInRect(&rect,pt))
+    {
+      /* Check system menu */
+      if(dwStyle & WS_SYSMENU)
+      {
+        /* Check if there is an user icon */
+        HICON hIcon = (HICON) GetClassLongA(Win32Hwnd, GCL_HICONSM);
+        if(!hIcon) hIcon = (HICON) GetClassLongA(Win32Hwnd, GCL_HICON);
+
+        /* If there is an icon associated with the window OR              */
+        /* If there is no hIcon specified and this is not a modal dialog, */
+        /* there is a system menu icon.                                   */
+        if((hIcon != 0) || (!(dwStyle & DS_MODALFRAME)))
+        rect.left += GetSystemMetrics(SM_CYCAPTION) - 1;
+      }
+      if (pt.x < rect.left) return HTSYSMENU;
+
+      /* Check close button */
+      if (dwStyle & WS_SYSMENU)
+      rect.right -= GetSystemMetrics(SM_CYCAPTION) - 1;
+      if (pt.x > rect.right) return HTCLOSE;
+
+      /* Check maximize box */
+      /* In win95 there is automatically a Maximize button when there is a minimize one*/
+      if ((dwStyle & WS_MAXIMIZEBOX)|| (dwStyle & WS_MINIMIZEBOX))
+      rect.right -= GetSystemMetrics(SM_CXSIZE) + 1;
+      if (pt.x > rect.right) return HTMAXBUTTON;
+
+      /* Check minimize box */
+      /* In win95 there is automatically a Maximize button when there is a Maximize one*/
+      if ((dwStyle & WS_MINIMIZEBOX)||(dwStyle & WS_MAXIMIZEBOX))
+      rect.right -= GetSystemMetrics(SM_CXSIZE) + 1;
+
+      if (pt.x > rect.right) return HTMINBUTTON;
+      return HTCAPTION;
     }
   }
@@ -557 +554 @@
   rect->bottom = rectWindow.bottom - rectWindow.top;
 
-  if ((dwStyle & WS_ICONIC) || (flags & WIN_MANAGED)) return;
+  if (dwStyle & WS_ICONIC) return;
 
   /* Remove frame from rectangle */
@@ -618 +615 @@
 BOOL Win32BaseWindow::DrawSysButton(HDC hdc,RECT *rect)
 {
-  if(!(flags & WIN_MANAGED))
-  {
-    HICON  hIcon;
-    RECT r;
-
-    if (!rect) GetInsideRect(&r);
-    else r = *rect;
-
-    hIcon = (HICON) GetClassLongA(Win32Hwnd, GCL_HICONSM);
-    if(!hIcon) hIcon = (HICON) GetClassLongA(Win32Hwnd, GCL_HICON);
-
-    /* If there is no hIcon specified or this is not a modal dialog, */
-    /* get the default one.                                          */
-    if(hIcon == 0)
-      if (!(dwStyle & DS_MODALFRAME))
-        hIcon = LoadImageA(0, MAKEINTRESOURCEA(OIC_ODINICON), IMAGE_ICON, 0, 0, LR_DEFAULTCOLOR);
-
-    if (hIcon)
-      DrawIconEx(hdc,r.left+2,r.top+2,hIcon,
-                 GetSystemMetrics(SM_CXSMICON),
-                 GetSystemMetrics(SM_CYSMICON),
-                 0, 0, DI_NORMAL);
-
-    return (hIcon != 0);
-  }
-  return FALSE;
+  HICON  hIcon;
+  RECT r;
+
+  if (!rect) GetInsideRect(&r);
+  else r = *rect;
+
+  hIcon = (HICON) GetClassLongA(Win32Hwnd, GCL_HICONSM);
+  if(!hIcon) hIcon = (HICON) GetClassLongA(Win32Hwnd, GCL_HICON);
+
+  /* If there is no hIcon specified or this is not a modal dialog, */
+  /* get the default one.                                          */
+  if(hIcon == 0)
+    if (!(dwStyle & DS_MODALFRAME))
+      hIcon = LoadImageA(0, MAKEINTRESOURCEA(OIC_ODINICON), IMAGE_ICON, 0, 0, LR_DEFAULTCOLOR);
+
+  if (hIcon)
+    DrawIconEx(hdc,r.left+2,r.top+2,hIcon,
+               GetSystemMetrics(SM_CXSMICON),
+               GetSystemMetrics(SM_CYSMICON),
+               0, 0, DI_NORMAL);
+
+  return (hIcon != 0);
 }
 //******************************************************************************
@@ -696 +689 @@
   RECT r;
   HDC hdcMem;
-
-  if( !(flags & WIN_MANAGED) )
-  {
-    BITMAP bmp;
-    HBITMAP hBmp, hOldBmp;
-
-    if (!rect) GetInsideRect(&r);
-    else r = *rect;
-
-    hdcMem = CreateCompatibleDC( hdc );
-    hBmp = down ? hbitmapCloseD : hbitmapClose;
-    hOldBmp = SelectObject (hdcMem, hBmp);
-    GetObjectA (hBmp, sizeof(BITMAP), &bmp);
-
-    BitBlt (hdc, r.right - (GetSystemMetrics(SM_CYCAPTION) + 1 + bmp.bmWidth) / 2,
-            r.top + (GetSystemMetrics(SM_CYCAPTION) - 1 - bmp.bmHeight) / 2,
-            bmp.bmWidth, bmp.bmHeight, hdcMem, 0, 0, SRCCOPY);
-
-    if(bGrayed)
-      DrawGrayButton(hdc,r.right - (GetSystemMetrics(SM_CYCAPTION) + 1 + bmp.bmWidth) / 2 + 2,
-                     r.top + (GetSystemMetrics(SM_CYCAPTION) - 1 - bmp.bmHeight) / 2 + 2);
-
-    SelectObject (hdcMem, hOldBmp);
-    DeleteDC (hdcMem);
-  }
+  BITMAP bmp;
+  HBITMAP hBmp, hOldBmp;
+
+  if (!rect) GetInsideRect(&r);
+  else r = *rect;
+
+  hdcMem = CreateCompatibleDC( hdc );
+  hBmp = down ? hbitmapCloseD : hbitmapClose;
+  hOldBmp = SelectObject (hdcMem, hBmp);
+  GetObjectA (hBmp, sizeof(BITMAP), &bmp);
+
+  BitBlt (hdc, r.right - (GetSystemMetrics(SM_CYCAPTION) + 1 + bmp.bmWidth) / 2,
+          r.top + (GetSystemMetrics(SM_CYCAPTION) - 1 - bmp.bmHeight) / 2,
+          bmp.bmWidth, bmp.bmHeight, hdcMem, 0, 0, SRCCOPY);
+
+  if(bGrayed)
+    DrawGrayButton(hdc,r.right - (GetSystemMetrics(SM_CYCAPTION) + 1 + bmp.bmWidth) / 2 + 2,
+                   r.top + (GetSystemMetrics(SM_CYCAPTION) - 1 - bmp.bmHeight) / 2 + 2);
+
+  SelectObject (hdcMem, hOldBmp);
+  DeleteDC (hdcMem);
 }
 //******************************************************************************
@@ -728 +717 @@
   RECT r;
   HDC hdcMem;
-
-  if( !(flags & WIN_MANAGED))
-  {
-    BITMAP  bmp;
-    HBITMAP  hBmp,hOldBmp;
-
-    if (!rect) GetInsideRect(&r);
-    else r = *rect;
-    hdcMem = CreateCompatibleDC( hdc );
-    hBmp = IsZoomed(Win32Hwnd) ?
-            (down ? hbitmapRestoreD : hbitmapRestore ) :
-            (down ? hbitmapMaximizeD: hbitmapMaximize);
-    hOldBmp=SelectObject( hdcMem, hBmp );
-    GetObjectA (hBmp, sizeof(BITMAP), &bmp);
-
-    if (dwStyle & WS_SYSMENU)
-      r.right -= GetSystemMetrics(SM_CYCAPTION) + 1;
-
-    BitBlt( hdc, r.right - (GetSystemMetrics(SM_CXSIZE) + bmp.bmWidth) / 2,
+  BITMAP  bmp;
+  HBITMAP  hBmp,hOldBmp;
+
+  if (!rect) GetInsideRect(&r);
+  else r = *rect;
+  hdcMem = CreateCompatibleDC( hdc );
+  hBmp = IsZoomed(Win32Hwnd) ?
+          (down ? hbitmapRestoreD : hbitmapRestore ) :
+          (down ? hbitmapMaximizeD: hbitmapMaximize);
+  hOldBmp=SelectObject( hdcMem, hBmp );
+  GetObjectA (hBmp, sizeof(BITMAP), &bmp);
+
+  if (dwStyle & WS_SYSMENU)
+    r.right -= GetSystemMetrics(SM_CYCAPTION) + 1;
+
+  BitBlt( hdc, r.right - (GetSystemMetrics(SM_CXSIZE) + bmp.bmWidth) / 2,
+        r.top + (GetSystemMetrics(SM_CYCAPTION) - 1 - bmp.bmHeight) / 2,
+        bmp.bmWidth, bmp.bmHeight, hdcMem, 0, 0, SRCCOPY );
+
+  if(bGrayed)
+    DrawGrayButton(hdc, r.right - (GetSystemMetrics(SM_CXSIZE) + bmp.bmWidth) / 2 + 2,
+                   r.top + (GetSystemMetrics(SM_CYCAPTION) - 1 - bmp.bmHeight) / 2 + 2);
+
+  SelectObject (hdcMem, hOldBmp);
+  DeleteDC( hdcMem );
+}
+//******************************************************************************
+//******************************************************************************
+VOID Win32BaseWindow::DrawMinButton(HDC hdc,RECT *rect,BOOL down,BOOL bGrayed)
+{
+  RECT r;
+  HDC hdcMem;
+  BITMAP  bmp;
+  HBITMAP  hBmp,hOldBmp;
+
+  if (!rect) GetInsideRect(&r);
+  else r = *rect;
+
+  hdcMem = CreateCompatibleDC( hdc );
+  hBmp = down ? hbitmapMinimizeD : hbitmapMinimize;
+  hOldBmp= SelectObject( hdcMem, hBmp );
+  GetObjectA (hBmp, sizeof(BITMAP), &bmp);
+
+  if (dwStyle & WS_SYSMENU)
+    r.right -= GetSystemMetrics(SM_CYCAPTION) + 1;
+
+  /* In win 95 there is always a Maximize box when there is a Minimize one */
+  if ((dwStyle & WS_MAXIMIZEBOX) || (dwStyle & WS_MINIMIZEBOX))
+    r.right -= bmp.bmWidth;
+
+  BitBlt( hdc, r.right - (GetSystemMetrics(SM_CXSIZE) + bmp.bmWidth) / 2,
           r.top + (GetSystemMetrics(SM_CYCAPTION) - 1 - bmp.bmHeight) / 2,
           bmp.bmWidth, bmp.bmHeight, hdcMem, 0, 0, SRCCOPY );
 
-    if(bGrayed)
-      DrawGrayButton(hdc, r.right - (GetSystemMetrics(SM_CXSIZE) + bmp.bmWidth) / 2 + 2,
-                      r.top + (GetSystemMetrics(SM_CYCAPTION) - 1 - bmp.bmHeight) / 2 + 2);
-
-
-    SelectObject (hdcMem, hOldBmp);
-    DeleteDC( hdcMem );
-  }
-}
-//******************************************************************************
-//******************************************************************************
-VOID Win32BaseWindow::DrawMinButton(HDC hdc,RECT *rect,BOOL down,BOOL bGrayed)
-{
-  RECT r;
-  HDC hdcMem;
-
-  if( !(flags & WIN_MANAGED))
-
-  {
-    BITMAP  bmp;
-    HBITMAP  hBmp,hOldBmp;
-
-    if (!rect) GetInsideRect(&r);
-    else r = *rect;
-
-    hdcMem = CreateCompatibleDC( hdc );
-    hBmp = down ? hbitmapMinimizeD : hbitmapMinimize;
-    hOldBmp= SelectObject( hdcMem, hBmp );
-    GetObjectA (hBmp, sizeof(BITMAP), &bmp);
-
-    if (dwStyle & WS_SYSMENU)
-      r.right -= GetSystemMetrics(SM_CYCAPTION) + 1;
-
-    /* In win 95 there is always a Maximize box when there is a Minimize one */
-    if ((dwStyle & WS_MAXIMIZEBOX) || (dwStyle & WS_MINIMIZEBOX))
-      r.right -= bmp.bmWidth;
-
-    BitBlt( hdc, r.right - (GetSystemMetrics(SM_CXSIZE) + bmp.bmWidth) / 2,
-          r.top + (GetSystemMetrics(SM_CYCAPTION) - 1 - bmp.bmHeight) / 2,
-          bmp.bmWidth, bmp.bmHeight, hdcMem, 0, 0, SRCCOPY );
-
-    if(bGrayed)
-      DrawGrayButton(hdc, r.right - (GetSystemMetrics(SM_CXSIZE) + bmp.bmWidth) / 2 + 2,
-                      r.top + (GetSystemMetrics(SM_CYCAPTION) - 1 - bmp.bmHeight) / 2 + 2);
-
-
-    SelectObject (hdcMem, hOldBmp);
-    DeleteDC( hdcMem );
-  }
+  if(bGrayed)
+    DrawGrayButton(hdc, r.right - (GetSystemMetrics(SM_CXSIZE) + bmp.bmWidth) / 2 + 2,
+                   r.top + (GetSystemMetrics(SM_CYCAPTION) - 1 - bmp.bmHeight) / 2 + 2);
+
+
+  SelectObject (hdcMem, hOldBmp);
+  DeleteDC( hdcMem );
 }
 //******************************************************************************
@@ -810 +789 @@
   HDC memDC;
   HBITMAP memBmp,oldBmp;
-
-  if (flags & WIN_MANAGED) return;
 
   memDC = CreateCompatibleDC(hdc);
@@ -934 +911 @@
 //******************************************************************************
 //******************************************************************************
-VOID Win32BaseWindow::UpdateCaptionText()
-{
-  BOOL active = flags & WIN_NCACTIVATED;
-  HDC hdc;
-  RECT rect,r;
-  HRGN hrgn;
-
-  if (!((dwStyle & WS_CAPTION) == WS_CAPTION)) return;
-
-  rect.top = rect.left = 0;
-  rect.right  = rectWindow.right - rectWindow.left;
-  rect.bottom = rectWindow.bottom - rectWindow.top;
-  if(!(flags & WIN_MANAGED))
-  {
-    if (HAS_BIGFRAME( dwStyle, dwExStyle))
-    {
-      InflateRect(&rect,-2,-2);
-    }
-
-    if (HAS_THICKFRAME(dwStyle,dwExStyle))
-    {
-      INT width = GetSystemMetrics(SM_CXFRAME) - GetSystemMetrics(SM_CXEDGE);
-      INT height = GetSystemMetrics(SM_CYFRAME) - GetSystemMetrics(SM_CYEDGE);
-
-      InflateRect(&rect,-width,-height);
-    }
-    else if (HAS_DLGFRAME(dwStyle,dwExStyle))
-    {
-      INT width = GetSystemMetrics(SM_CXDLGFRAME) - GetSystemMetrics(SM_CXEDGE);
-      INT height = GetSystemMetrics(SM_CYDLGFRAME) - GetSystemMetrics(SM_CYEDGE);
-
-      InflateRect(&rect,-width,-height);
-    }
-    else if (HAS_THINFRAME(dwStyle))
-    {
-    }
-
-    r = rect;
-    if (dwExStyle & WS_EX_TOOLWINDOW)
-    {
-      r.bottom = rect.top + GetSystemMetrics(SM_CYSMCAPTION);
-    }
-    else
-    {
-      r.bottom = rect.top + GetSystemMetrics(SM_CYCAPTION);
-    }
-
-    //clip the buttons
-    if ((dwStyle & WS_SYSMENU) && !(dwExStyle & WS_EX_TOOLWINDOW))
-    {
-      HICON hIcon;
-
-      hIcon = (HICON) GetClassLongA(Win32Hwnd, GCL_HICONSM);
-      if(!hIcon) hIcon = (HICON) GetClassLongA(Win32Hwnd, GCL_HICON);
-      if (hIcon)
-        rect.left += GetSystemMetrics(SM_CYCAPTION) - 1;
-    }
-    if (dwStyle & WS_SYSMENU)
-    {
-      rect.right -= GetSystemMetrics(SM_CYCAPTION) - 1;
-
-      if ((dwStyle & WS_MAXIMIZEBOX) || (dwStyle & WS_MINIMIZEBOX))
-      {
-        rect.right -= GetSystemMetrics(SM_CXSIZE) + 1;
-        rect.right -= GetSystemMetrics(SM_CXSIZE) + 1;
-      }
-    }
-
-    hrgn = CreateRectRgnIndirect(&rect);
-    hdc = GetDCEx(Win32Hwnd,hrgn,DCX_USESTYLE | DCX_WINDOW | DCX_INTERSECTRGN);
-    SelectObject(hdc,GetSysColorPen(COLOR_WINDOWFRAME));
-    DrawCaption(hdc,&r,active,TRUE);
-    DeleteObject(hrgn);
-    ReleaseDC(Win32Hwnd,hdc);
-  }
-}
-//******************************************************************************
-//******************************************************************************
 VOID Win32BaseWindow::DoNCPaint(HRGN clip,BOOL suppress_menupaint)
 {
@@ -1034 +933 @@
   rect.bottom = rectWindow.bottom - rectWindow.top;
 
-  if( clip > 1 )
-  {
-    //CB: unknown WINE handling (clip == 1), clip client?
-    GetRgnBox( clip, &rectClip );
-  } 
+  if (clip > 1)
+  {
+    //only redraw caption
+    GetRgnBox(clip,&rectClip);
+  }
   else
   {
@@ -1047 +946 @@
   SelectObject( hdc, GetSysColorPen(COLOR_WINDOWFRAME) );
 
-  if(!(flags & WIN_MANAGED))
-  {
-    if (HAS_BIGFRAME( dwStyle, dwExStyle))
-    {
-      DrawEdge (hdc, &rect, EDGE_RAISED, BF_RECT | BF_ADJUST);
-    }
-    if (HAS_THICKFRAME( dwStyle, dwExStyle ))
-      DrawFrame(hdc, &rect, FALSE, active );
-    else if (HAS_DLGFRAME( dwStyle, dwExStyle ))
-      DrawFrame( hdc, &rect, TRUE, active );
-    else if (HAS_THINFRAME( dwStyle ))
-    {
-      SelectObject( hdc, GetStockObject(NULL_BRUSH) );
-      Rectangle( hdc, 0, 0, rect.right, rect.bottom );
-    }
-
-    if ((dwStyle & WS_CAPTION) == WS_CAPTION)
-    {
-      RECT  r = rect;
-      if (dwExStyle & WS_EX_TOOLWINDOW)
-      {
-        r.bottom = rect.top + GetSystemMetrics(SM_CYSMCAPTION);
-        rect.top += GetSystemMetrics(SM_CYSMCAPTION);
-      }
-      else
-      {
-        r.bottom = rect.top + GetSystemMetrics(SM_CYCAPTION);
-        rect.top += GetSystemMetrics(SM_CYCAPTION);
-      }
-      if( !clip || IntersectRect( &rfuzz, &r, &rectClip ) )
-        DrawCaption(hdc,&r,active,FALSE);
-    }
-  }
+  if (HAS_BIGFRAME( dwStyle, dwExStyle))
+  {
+    DrawEdge (hdc, &rect, EDGE_RAISED, BF_RECT | BF_ADJUST);
+  }
+  if (HAS_THICKFRAME( dwStyle, dwExStyle ))
+    DrawFrame(hdc, &rect, FALSE, active );
+  else if (HAS_DLGFRAME( dwStyle, dwExStyle ))
+    DrawFrame( hdc, &rect, TRUE, active );
+  else if (HAS_THINFRAME( dwStyle ))
+  {
+    SelectObject( hdc, GetStockObject(NULL_BRUSH) );
+    Rectangle( hdc, 0, 0, rect.right, rect.bottom );
+  }
+
+  if ((dwStyle & WS_CAPTION) == WS_CAPTION)
+  {
+    RECT  r = rect;
+    if (dwExStyle & WS_EX_TOOLWINDOW)
+    {
+      r.bottom = rect.top + GetSystemMetrics(SM_CYSMCAPTION);
+      rect.top += GetSystemMetrics(SM_CYSMCAPTION);
+    }
+    else
+    {
+      r.bottom = rect.top + GetSystemMetrics(SM_CYCAPTION);
+      rect.top += GetSystemMetrics(SM_CYCAPTION);
+    }
+    if( !clip || IntersectRect( &rfuzz, &r, &rectClip ) )
+      DrawCaption(hdc,&r,active,FALSE);
+  }
+
   if (HAS_MENU())
   {

trunk/src/user32/win32wbasepos.cpp

@@ -1 @@
-/* $Id: win32wbasepos.cpp,v 1.11 2000-01-26 18:02:38 cbratschi Exp $ */
+/* $Id: win32wbasepos.cpp,v 1.12 2000-02-03 17:13:03 cbratschi Exp $ */
 /*
  * Win32 Window Base Class for OS/2 (nonclient/position methods)
@@ -59 +59 @@
     MinMax.ptMaxTrackSize.y = GetSystemMetrics(SM_CYSCREEN);
 
-    if (flags & WIN_MANAGED) xinc = yinc = 0;
-    else if (HAS_DLGFRAME( dwStyle, dwExStyle ))
+    if (HAS_DLGFRAME( dwStyle, dwExStyle ))
     {
         xinc = GetSystemMetrics(SM_CXDLGFRAME);