Changeset 2858 for trunk/src/comctl32/toolbar.c

Timestamp:

Feb 22, 2000, 6:11:41 PM (26 years ago)

Author:

cbratschi

Message:

Corel 20000212, TREEVIEW_Sort fix, CCBase

File:

• trunk/src/comctl32/toolbar.c (modified) (19 diffs)

trunk/src/comctl32/toolbar.c

@@ -1 @@
-/* $Id: toolbar.c,v 1.25 2000-01-26 18:04:30 cbratschi Exp $ */
+/* $Id: toolbar.c,v 1.26 2000-02-22 17:11:40 cbratschi Exp $ */
 /*
  * Toolbar control
@@ -28 +28 @@
  */
 
-/* WINE 991212 level */
+/*
+ - Corel 20000212 level
+ - WINE 991212 level
+*/
 
 /* CB: Odin32/WINE bugs
@@ -616 +619 @@
     /* the last row.                                                    */
     infoPtr->nHeight = TOP_BORDER + (nRows + 1) * infoPtr->nButtonHeight +
-                        nSepRows * SEPARATOR_WIDTH * 2 / 3 +
+                        nSepRows * (SEPARATOR_WIDTH * 2 / 3) +
                         nSepRows * (infoPtr->nBitmapHeight + 1) +
                         BOTTOM_BORDER;
@@ -2197 +2200 @@
     RECT parent_rect;
     HWND parent;
-    /* INT32  x, y; */
+    INT  x, y;
     INT  cx, cy;
     UINT uPosFlags = 0;
 
-//    TRACE (toolbar, "resize forced!\n");
-
+    //TRACE (toolbar, "resize forced!\n");
+
+    x = y = 0;
     parent = GetParent (hwnd);
     GetClientRect(parent, &parent_rect);
@@ -2225 +2229 @@
         cy += GetSystemMetrics(SM_CYEDGE);
 
+    if (dwStyle & WS_BORDER)
+    {
+        x = y = 1;
+        cy += GetSystemMetrics(SM_CYEDGE);
+        cx += GetSystemMetrics(SM_CYEDGE);
+    }
+
     infoPtr->bAutoSize = TRUE;
-    SetWindowPos (hwnd, HWND_TOP, parent_rect.left, parent_rect.top,
+    SetWindowPos (hwnd, HWND_TOP, parent_rect.left - x, parent_rect.top - y,
                     cx, cy, uPosFlags);
 
@@ -2290 +2301 @@
     INT nIndex;
     INT nOldIndex = -1;
+    BOOL bChecked = FALSE;
 
     nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam);
@@ -2299 +2311 @@
     if (!(btnPtr->fsStyle & TBSTYLE_CHECK))
         return FALSE;
+
+    bChecked = (btnPtr->fsState & TBSTATE_CHECKED) ? TRUE : FALSE;
 
     if (LOWORD(lParam) == FALSE)
@@ -2314 +2328 @@
     }
 
-    hdc = GetDC (hwnd);
-    if (nOldIndex != -1)
-        TOOLBAR_DrawButton (hwnd, &infoPtr->buttons[nOldIndex], hdc);
-    TOOLBAR_DrawButton (hwnd, btnPtr, hdc);
-    ReleaseDC (hwnd, hdc);
+    if( bChecked != LOWORD(lParam) )
+    {
+      hdc = GetDC (hwnd);
+      if (nOldIndex != -1)
+          TOOLBAR_DrawButton (hwnd, &infoPtr->buttons[nOldIndex], hdc);
+     TOOLBAR_DrawButton (hwnd, btnPtr, hdc);
+      ReleaseDC (hwnd, hdc);
+    }
 
     /* FIXME: Send a WM_NOTIFY?? */
@@ -2439 +2456 @@
     HDC hdc;
     INT nIndex;
+    BOOL bEnabled = FALSE;
 
     nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam);
@@ -2445 +2463 @@
 
     btnPtr = &infoPtr->buttons[nIndex];
+    bEnabled = (btnPtr->fsState & TBSTATE_ENABLED )? TRUE : FALSE ;
+
     if (LOWORD(lParam) == FALSE)
         btnPtr->fsState &= ~(TBSTATE_ENABLED | TBSTATE_PRESSED);
@@ -2450 +2470 @@
         btnPtr->fsState |= TBSTATE_ENABLED;
 
-    hdc = GetDC (hwnd);
-    TOOLBAR_DrawButton (hwnd, btnPtr, hdc);
-    ReleaseDC (hwnd, hdc);
+    if( bEnabled !=  LOWORD(lParam) )
+    {
+      hdc = GetDC (hwnd);
+      TOOLBAR_DrawButton (hwnd, btnPtr, hdc);
+      ReleaseDC (hwnd, hdc);
+    }
 
     return TRUE;
@@ -3230 +3253 @@
     if (((INT)LOWORD(lParam) <= 0) || ((INT)HIWORD(lParam) <= 0)) return FALSE;
 
+    /* Bitmap size can only be set before adding any button to the toolbar
+       according to the documentation.  */
+    if( infoPtr->nNumButtons != 0 )
+        return FALSE;
+
     infoPtr->nBitmapWidth = (INT)LOWORD(lParam);
     infoPtr->nBitmapHeight = (INT)HIWORD(lParam);
@@ -3339 +3367 @@
     if (((INT)LOWORD(lParam) <= 0) || ((INT)HIWORD(lParam) <= 0)) return FALSE;
 
+    /* Button size can only be set before adding any button to the toolbar
+       according to the documentation.  */
+    if( infoPtr->nNumButtons != 0 )
+        return FALSE;
+
     infoPtr->nButtonWidth = (INT)LOWORD(lParam);
     infoPtr->nButtonHeight = (INT)HIWORD(lParam);
@@ -3670 +3703 @@
     /* initialize info structure */
     infoPtr->nButtonHeight = 22;
-    infoPtr->nButtonWidth = 23;
+    infoPtr->nButtonWidth = 24;
     infoPtr->nBitmapHeight = 15;
     infoPtr->nBitmapWidth = 16;
@@ -4101 +4134 @@
         GetWindowRect (hwnd, &rcWindow);
         OffsetRect (&rcWindow, -rcWindow.left, -rcWindow.top);
+        if( dwStyle & WS_BORDER )
+            OffsetRect (&rcWindow, 1, 1);
         DrawEdge (hdc, &rcWindow, EDGE_ETCHED, BF_TOP);
     }
@@ -4162 +4197 @@
     RECT parent_rect;
     HWND parent;
-    INT  x,y,cx,cy;
+    INT  x = 0,y = 0,cx,cy;
     INT  flags;
     UINT uPosFlags = 0;
@@ -4213 +4248 @@
             cy += GetSystemMetrics(SM_CYEDGE);
 
-        SetWindowPos (hwnd, 0, x, y,
+        if (dwStyle & WS_BORDER)
+        {
+            x = y = 1;
+            cy += GetSystemMetrics(SM_CYEDGE);
+            cx += GetSystemMetrics(SM_CYEDGE);
+        }
+
+        SetWindowPos (hwnd, 0, parent_rect.left - x, parent_rect.top - y,
                         cx, cy, uPosFlags | SWP_NOZORDER);
     }
@@ -4587 +4629 @@
 {
     WNDCLASSA wndClass;
-
-//SvL: Don't check this now
-//    if (GlobalFindAtomA (TOOLBARCLASSNAMEA)) return;
 
     ZeroMemory (&wndClass, sizeof(WNDCLASSA));
@@ -4607 +4646 @@
 TOOLBAR_Unregister (VOID)
 {
-    if (GlobalFindAtomA (TOOLBARCLASSNAMEA))
-        UnregisterClassA (TOOLBARCLASSNAMEA, (HINSTANCE)NULL);
-}
-
+    UnregisterClassA (TOOLBARCLASSNAMEA, (HINSTANCE)NULL);
+}
+