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

Timestamp:

Jan 26, 2000, 7:04:30 PM (26 years ago)

Author:

cbratschi

Message:

added API logging, removed progress frame

File:

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

trunk/src/comctl32/toolbar.c

@@ -1 @@
-/* $Id: toolbar.c,v 1.24 1999-12-26 17:32:13 cbratschi Exp $ */
+/* $Id: toolbar.c,v 1.25 2000-01-26 18:04:30 cbratschi Exp $ */
 /*
  * Toolbar control
@@ -3332 +3332 @@
 }
 
-/* << TOOLBAR_SetButtonInfo32W >> */
-
-
 static LRESULT
 TOOLBAR_SetButtonSize (HWND hwnd, WPARAM wParam, LPARAM lParam)
@@ -4165 +4162 @@
     RECT parent_rect;
     HWND parent;
-    /* INT32  x, y; */
-    INT  cx, cy;
+    INT  x,y,cx,cy;
     INT  flags;
     UINT uPosFlags = 0;
@@ -4182 +4178 @@
      */
 
-//    TRACE (toolbar, "sizing toolbar!\n");
+    //TRACE (toolbar, "sizing toolbar!\n");
 
     if (flags == SIZE_RESTORED) {
@@ -4188 +4184 @@
         parent = GetParent (hwnd);
         GetClientRect(parent, &parent_rect);
+        x = parent_rect.left;
+        y = parent_rect.top;
 
         if (dwStyle & CCS_NORESIZE) {
             uPosFlags |= (SWP_NOSIZE | SWP_NOMOVE);
-
             /* FIXME */
 /*          infoPtr->nWidth = parent_rect.right - parent_rect.left; */
@@ -4216 +4213 @@
             cy += GetSystemMetrics(SM_CYEDGE);
 
-        SetWindowPos (hwnd, 0, parent_rect.left, parent_rect.top,
+        SetWindowPos (hwnd, 0, x, y,
                         cx, cy, uPosFlags | SWP_NOZORDER);
     }