Changeset 6705 for trunk/src/comctl32

Timestamp:

Sep 15, 2001, 11:13:31 AM (24 years ago)

Author:

sandervl

Message:

update

Location:

trunk/src/comctl32

Files:

• animate.c (modified) (1 diff)
• comboex.c (modified) (1 diff)
• comctl32.c (modified) (1 diff)
• comctl32undoc.c (modified) (1 diff)
• datetime.c (modified) (1 diff)
• flatsb.c (modified) (1 diff)
• imagelist.c (modified) (1 diff)
• listview.c (modified) (1 diff)
• monthcal.c (modified) (1 diff)
• pager.c (modified) (51 diffs)
• rebar.c (modified) (131 diffs)
• status.c (modified) (1 diff)
• tab.c (modified) (1 diff)
• toolbar.c (modified) (157 diffs)
• treeview.cpp (modified) (2 diffs)

trunk/src/comctl32/animate.c

@@ -1 +1 @@
 /* -*- tab-width: 8; c-basic-offset: 4 -*- */
-/* $Id: animate.c,v 1.14 2001-09-05 12:04:56 bird Exp $ */
 /*
  * Animation control

trunk/src/comctl32/comboex.c

@@ -1 @@
-/* $Id: comboex.c,v 1.12 2001-09-05 12:04:56 bird Exp $ */
 /*
  * TODO   <-------------

trunk/src/comctl32/comctl32.c

@@ -1 @@
-/* $Id: comctl32.c,v 1.18 2001-09-05 12:04:56 bird Exp $ */
 /*
  * Common controls functions

trunk/src/comctl32/comctl32undoc.c

@@ -1 @@
-/* $Id: comctl32undoc.c,v 1.22 2001-09-05 12:04:57 bird Exp $ */
 /*
  * Undocumented functions from COMCTL32.DLL

trunk/src/comctl32/datetime.c

@@ -1 @@
-/* $Id: datetime.c,v 1.18 2001-09-05 12:04:57 bird Exp $ */
 /*
  * Date and time picker control

trunk/src/comctl32/flatsb.c

@@ -1 @@
-/* $Id: flatsb.c,v 1.10 2001-09-05 12:04:58 bird Exp $ */
 /*
  * Flat Scrollbar control

trunk/src/comctl32/imagelist.c

@@ -1 @@
-/* $Id: imagelist.c,v 1.15 2001-09-05 12:04:58 bird Exp $ */
 /*
  *  ImageList implementation

trunk/src/comctl32/listview.c

@@ -1 @@
-/* $Id: listview.c,v 1.33 2001-09-05 12:04:59 bird Exp $ */
 /*
  * Listview control

trunk/src/comctl32/monthcal.c

@@ -1 @@
-/* $Id: monthcal.c,v 1.12 2001-09-05 12:05:00 bird Exp $ */
 /* Month calendar control
  *

trunk/src/comctl32/pager.c

@@ -1 @@
-/* $Id: pager.c,v 1.9 2001-09-05 12:05:01 bird Exp $ */
 /*
  * Pager control
@@ -21 +20 @@
 #include "debugtools.h"
 
+DEFAULT_DEBUG_CHANNEL(pager);
+
 #ifdef __WIN32OS2__
 #include "ccbase.h"
+#undef inline
 #define inline
 #endif
-
-DEFAULT_DEBUG_CHANNEL(pager);
 
 typedef struct
@@ -40 +40 @@
     INT    nPos;       /* scroll position */
     INT    nWidth;     /* from child wnd's response to PGN_CALCSIZE */
-    INT    nHeight;    /* from child wnd's response to PGN_CALCSIZE */
+    INT    nHeight;    /* from child wnd's response to PGN_CALCSIZE */ 
     BOOL   bForward;   /* forward WM_MOUSEMOVE msgs to the contained wnd */
     INT    TLbtnState; /* state of top or left btn */
@@ -58 +58 @@
 #define REPEAT_DELAY     50
 
-/* the horizontal arrows are:
+/* the horizontal arrows are: 
  *
  * 01234    01234
@@ -67 +67 @@
  * 5 **      **
  * 6  *      *
- * 7
+ * 7  
  *
  */
@@ -75 +75 @@
     INT x, y, w, h;
     HPEN hOldPen;
-
+    
     w = r.right - r.left + 1;
     h = r.bottom - r.top + 1;
@@ -108 +108 @@
 }
 
-/* the vertical arrows are:
+/* the vertical arrows are: 
  *
  * 01234567    01234567
- * 1******        **
+ * 1******        **  
  * 2 ****        ****
  * 3  **        ******
@@ -122 +122 @@
     INT x, y, w, h;
     HPEN hOldPen;
-
+    
     w = r.right - r.left + 1;
     h = r.bottom - r.top + 1;
@@ -166 +166 @@
 
     if ((rc.right - rc.left <= 0) || (rc.bottom - rc.top <= 0))
-        return;
+        return;  
 
     hBrush = CreateSolidBrush(clrBk);
@@ -173 +173 @@
     FillRect(hdc, &rc, hBrush);
 
-    if (btnState == PGF_HOT)
+    if (btnState == PGF_HOT) 
     {
        DrawEdge( hdc, &rc, BDR_RAISEDINNER, BF_RECT);
@@ -181 +181 @@
            PAGER_DrawVertArrow(hdc, rc, COLOR_WINDOWFRAME, topLeft);
     }
-    else if (btnState == PGF_NORMAL)
+    else if (btnState == PGF_NORMAL) 
     {
        DrawEdge (hdc, &rc, BDR_OUTER, BF_FLAT);
@@ -189 +189 @@
            PAGER_DrawVertArrow(hdc, rc, COLOR_WINDOWFRAME, topLeft);
     }
-    else if (btnState == PGF_DEPRESSED)
+    else if (btnState == PGF_DEPRESSED) 
     {
        DrawEdge( hdc, &rc, BDR_SUNKENOUTER, BF_RECT);
@@ -197 +197 @@
            PAGER_DrawVertArrow(hdc, rc, COLOR_WINDOWFRAME, topLeft);
     }
-    else if (btnState == PGF_GRAYED)
+    else if (btnState == PGF_GRAYED) 
     {
        DrawEdge (hdc, &rc, BDR_OUTER, BF_FLAT);
@@ -234 +234 @@
 PAGER_GetButtonState (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
-    PAGER_INFO *infoPtr = PAGER_GetInfoPtr (hwnd);
+    PAGER_INFO *infoPtr = PAGER_GetInfoPtr (hwnd); 
     LRESULT btnState = PGF_INVISIBLE;
     INT btn = (INT)lParam;
@@ -251 +251 @@
 PAGER_GetPos(HWND hwnd)
 {
-    PAGER_INFO *infoPtr = PAGER_GetInfoPtr (hwnd);
+    PAGER_INFO *infoPtr = PAGER_GetInfoPtr (hwnd); 
     TRACE("[%04x] returns %d\n", hwnd, infoPtr->nPos);
     return (LRESULT)infoPtr->nPos;
@@ -259 +259 @@
 PAGER_GetButtonSize(HWND hwnd)
 {
-    PAGER_INFO *infoPtr = PAGER_GetInfoPtr (hwnd);
+    PAGER_INFO *infoPtr = PAGER_GetInfoPtr (hwnd); 
     TRACE("[%04x] returns %d\n", hwnd, infoPtr->nButtonSize);
     return (LRESULT)infoPtr->nButtonSize;
@@ -267 +267 @@
 PAGER_GetBorder(HWND hwnd)
 {
-    PAGER_INFO *infoPtr = PAGER_GetInfoPtr (hwnd);
+    PAGER_INFO *infoPtr = PAGER_GetInfoPtr (hwnd); 
     TRACE("[%04x] returns %d\n", hwnd, infoPtr->nBorder);
     return (LRESULT)infoPtr->nBorder;
@@ -275 +275 @@
 PAGER_GetBkColor(HWND hwnd)
 {
-    PAGER_INFO *infoPtr = PAGER_GetInfoPtr (hwnd);
+    PAGER_INFO *infoPtr = PAGER_GetInfoPtr (hwnd); 
     TRACE("[%04x] returns %06lx\n", hwnd, infoPtr->clrBk);
     return (LRESULT)infoPtr->clrBk;
 }
 
-static void
-PAGER_CalcSize (HWND hwnd, INT* size, BOOL getWidth)
+static void 
+PAGER_CalcSize (HWND hwnd, INT* size, BOOL getWidth) 
 {
     NMPGCALCSIZE nmpgcs;
@@ -291 +291 @@
     nmpgcs.iWidth = getWidth ? *size : 0;
     nmpgcs.iHeight = getWidth ? 0 : *size;
-    SendMessageA (hwnd, WM_NOTIFY,
+    SendMessageA (GetParent (hwnd), WM_NOTIFY,
                   (WPARAM)nmpgcs.hdr.idFrom, (LPARAM)&nmpgcs);
 
@@ -334 +334 @@
                 infoPtr->nHeight = wndSize;
 
-            TRACE("[%04x] SWP %dx%d at (%d,%d)\n", hwnd,
+            TRACE("[%04x] SWP %dx%d at (%d,%d)\n", hwnd, 
                          infoPtr->nWidth, infoPtr->nHeight,
                          0, -nPos);
@@ -380 +380 @@
 }
 
-static void
+static void 
 PAGER_GrayAndRestoreBtns(PAGER_INFO* infoPtr, INT scrollRange,
                          BOOL* needsResize, BOOL* needsRepaint)
@@ -417 +417 @@
 
 
-static void
+static void 
 PAGER_NormalizeBtns(PAGER_INFO* infoPtr, BOOL* needsRepaint)
 {
@@ -433 +433 @@
 }
 
-static void
+static void 
 PAGER_HideGrayBtns(PAGER_INFO* infoPtr, BOOL* needsResize)
 {
@@ -464 +464 @@
         PAGER_HideGrayBtns(infoPtr, &resizeClient);
 
-    if (resizeClient) /* initiate NCCalcSize to resize client wnd */
-        SetWindowPos(hwnd, 0,0,0,0,0,
+    if (resizeClient) /* initiate NCCalcSize to resize client wnd */ {
+        SetWindowPos(hwnd, 0,0,0,0,0, 
                      SWP_FRAMECHANGED | SWP_NOSIZE | SWP_NOMOVE |
                      SWP_NOZORDER | SWP_NOACTIVATE);
+    }
 
     if (repaintBtns)
-        SendMessageA(hwnd, WM_NCPAINT, 0, 0);
-}
-
-static LRESULT
+        SendMessageA(hwnd, WM_NCPAINT, 0, 0); 
+}
+
+static LRESULT  
 PAGER_SetPos(HWND hwnd, INT newPos, BOOL fromBtnPress)
 {
@@ -500 +501 @@
 
 static LRESULT
-PAGER_HandleWindowPosChanging(HWND hwnd, WINDOWPOS *winpos)
+PAGER_HandleWindowPosChanging(HWND hwnd, WPARAM wParam, WINDOWPOS *winpos)
 {
     PAGER_INFO *infoPtr = PAGER_GetInfoPtr (hwnd);
@@ -510 +511 @@
          * (i.e. height for a horizontal pager, or width for a vertical one) */
 
+        /* except if the current dimension is 0 and app is setting for
+         * first time, then save amount as dimension. - GA 8/01 */
+
         if (PAGER_IsHorizontal(hwnd))
-            winpos->cy = infoPtr->nHeight;
+            if (!infoPtr->nHeight && winpos->cy)
+                infoPtr->nHeight = winpos->cy;
+            else
+                winpos->cy = infoPtr->nHeight;
         else
-            winpos->cx = infoPtr->nWidth;
-    }
-
-    return 0;
-}
-
-static void
+            if (!infoPtr->nWidth && winpos->cx)
+                infoPtr->nWidth = winpos->cx;
+            else
+                winpos->cx = infoPtr->nWidth;
+        return 0;
+    }
+
+    DefWindowProcA (hwnd, WM_WINDOWPOSCHANGING, wParam, (LPARAM)winpos);
+
+    return 1;
+}
+
+static INT 
 PAGER_SetFixedWidth(HWND hwnd, PAGER_INFO* infoPtr)
 {
@@ -544 +557 @@
     h = wndRect.bottom - wndRect.top + infoPtr->nButtonSize;
 
-    /* adjust non-scrollable dimension to fit the child */
-    SetWindowPos(hwnd, 0, 0,0, infoPtr->nWidth, h,
-                 SWP_FRAMECHANGED | SWP_NOMOVE | SWP_NOZORDER);
-
-
     TRACE("[%04x] infoPtr->nWidth set to %d\n",
-           hwnd, infoPtr->nWidth);
-}
-
-static void
+               hwnd, infoPtr->nWidth);
+
+    return h;
+}
+
+static INT 
 PAGER_SetFixedHeight(HWND hwnd, PAGER_INFO* infoPtr)
 {
@@ -578 +588 @@
     w = wndRect.right - wndRect.left + infoPtr->nButtonSize;
 
-    /* adjust non-scrollable dimension to fit the child */
-    SetWindowPos(hwnd, 0, 0,0, w, infoPtr->nHeight,
-                 SWP_FRAMECHANGED | SWP_NOMOVE | SWP_NOZORDER);
-
     TRACE("[%04x] infoPtr->nHeight set to %d\n",
-           hwnd, infoPtr->nHeight);
+               hwnd, infoPtr->nHeight);
+
+    return w;
 }
 
@@ -602 +610 @@
             PAGER_SetPos(hwnd, 0, FALSE);
         }
-        else
+        else 
         {
             PAGER_UpdateBtns(hwnd, infoPtr, scrollRange, TRUE);
@@ -663 +671 @@
 {
     PAGER_INFO *infoPtr = PAGER_GetInfoPtr (hwnd);
+    INT hw;
 
     infoPtr->hwndChild = IsWindow ((HWND)lParam) ? (HWND)lParam : 0;
@@ -670 +679 @@
         TRACE("[%04x] hwndChild=%04x\n", hwnd, infoPtr->hwndChild);
 
-        if (PAGER_IsHorizontal(hwnd))
-            PAGER_SetFixedHeight(hwnd, infoPtr);
-        else
-            PAGER_SetFixedWidth(hwnd, infoPtr);
+        if (PAGER_IsHorizontal(hwnd)) {
+            hw = PAGER_SetFixedHeight(hwnd, infoPtr);
+            /* adjust non-scrollable dimension to fit the child */
+            SetWindowPos(hwnd, 0, 0,0, hw, infoPtr->nHeight, 
+                         SWP_FRAMECHANGED | SWP_NOMOVE | SWP_NOZORDER |
+                         SWP_NOSIZE | SWP_NOACTIVATE);
+        }
+        else {
+            hw = PAGER_SetFixedWidth(hwnd, infoPtr);
+            /* adjust non-scrollable dimension to fit the child */
+            SetWindowPos(hwnd, 0, 0,0, infoPtr->nWidth, hw, 
+                         SWP_FRAMECHANGED | SWP_NOMOVE | SWP_NOZORDER |
+                         SWP_NOSIZE | SWP_NOACTIVATE);
+        }
 
         /* position child within the page scroller */
         SetWindowPos(infoPtr->hwndChild, HWND_TOP,
                      0,0,0,0,
-                     SWP_SHOWWINDOW | SWP_NOSIZE);
+                     SWP_SHOWWINDOW | SWP_NOSIZE);  /* native is 0 */
 
         infoPtr->nPos = -1;
@@ -701 +720 @@
         nmpgScroll.hdr.code = PGN_SCROLL;
 
-        GetWindowRect(hwnd, &rcWnd);
-        GetClientRect(hwnd, &nmpgScroll.rcParent);
+        GetWindowRect(hwnd, &rcWnd);  
+        GetClientRect(hwnd, &nmpgScroll.rcParent);  
         nmpgScroll.iXpos = nmpgScroll.iYpos = 0;
         nmpgScroll.iDir = dir;
@@ -717 +736 @@
         }
         nmpgScroll.iScroll -= 2*infoPtr->nButtonSize;
-
+  
         SendMessageA (hwnd, WM_NOTIFY,
                     (WPARAM)nmpgScroll.hdr.idFrom, (LPARAM)&nmpgScroll);
-
+  
         TRACE("[%04x] PGN_SCROLL returns iScroll=%d\n", hwnd, nmpgScroll.iScroll);
 
@@ -770 +789 @@
         FIXME("[%04x] Drag and Drop style is not implemented yet.\n", hwnd);
     /*
-     * If neither horizontal nor vertical style specified, default to vertical.
-     * This is probably not necessary, since the style may be set later on as
-     * the control is initialized, but just in case it isn't, set it here.
-     */
+         * If neither horizontal nor vertical style specified, default to vertical.
+         * This is probably not necessary, since the style may be set later on as
+         * the control is initialized, but just in case it isn't, set it here.
+         */
     if (!(dwStyle & PGS_HORZ) && !(dwStyle & PGS_VERT))
     {
@@ -799 +818 @@
     PAGER_INFO *infoPtr = PAGER_GetInfoPtr (hwnd);
     LPRECT lpRect = (LPRECT)lParam;
+    RECT rcChildw, rcmyw, wnrc, lbrc, rbrc;
+    POINT cursor;
+
     /*
      * lParam points to a RECT struct.  On entry, the struct
-     * contains the proposed wnd rectangle for the window.
+     * contains the proposed wnd rectangle for the window. 
      * On exit, the struct should contain the screen
      * coordinates of the corresponding window's client area.
      */
+        
+    DefWindowProcA (hwnd, WM_NCCALCSIZE, wParam, lParam);
 
     if (PAGER_IsHorizontal(hwnd))
     {
-        if (infoPtr->TLbtnState) /* != PGF_INVISIBLE */
-            lpRect->left += infoPtr->nButtonSize;
-        if (infoPtr->BRbtnState)
-            lpRect->right -= infoPtr->nButtonSize;
+        infoPtr->nWidth = lpRect->right - lpRect->left;
+        PAGER_CalcSize (hwnd, &infoPtr->nWidth, TRUE);
+        GetWindowRect (infoPtr->hwndChild, &rcChildw);
+        MapWindowPoints (0, hwnd, (LPPOINT)&rcChildw, 2);
+        GetCursorPos (&cursor);
+        GetWindowRect (hwnd, &rcmyw);
+        if (PtInRect (&rcmyw, cursor)) {
+            GetWindowRect (hwnd, &wnrc);
+            lbrc = wnrc;
+            lbrc.right = lbrc.left + infoPtr->nButtonSize;
+            rbrc = wnrc;
+            rbrc.left = rbrc.right - infoPtr->nButtonSize;
+            TRACE("horz lb rect=(%d,%d)-(%d,%d), rb rect=(%d,%d)-(%d,%d)\n",
+                  lbrc.left, lbrc.top, lbrc.right, lbrc.bottom,
+                  rbrc.left, rbrc.top, rbrc.right, rbrc.bottom);
+            if (PtInRect (&lbrc, cursor) && infoPtr->TLbtnState)
+                RedrawWindow (hwnd, 0, 0, RDW_INVALIDATE | RDW_ERASE);
+            if (PtInRect (&rbrc, cursor) && infoPtr->BRbtnState)
+                RedrawWindow (hwnd, 0, 0, RDW_INVALIDATE | RDW_ERASE);
+        }
+        if (infoPtr->TLbtnState) /* != PGF_INVISIBLE */
+            lpRect->left += infoPtr->nButtonSize;
+        if (infoPtr->BRbtnState) 
+            lpRect->right -= infoPtr->nButtonSize;
     }
     else
     {
-        if (infoPtr->TLbtnState)
-            lpRect->top += infoPtr->nButtonSize;
-        if (infoPtr->BRbtnState)
-            lpRect->bottom -= infoPtr->nButtonSize;
+        /* native does: (from trace of IE4 opening "Favorites" frame) 
+         *        DefWindowProc
+         *        WM_NOITFY  PGN_CALCSIZE w/ dwFlag=2
+         *        GetWindowRect (child, &rc)
+         *        MapWindowPoints (0, syspager, &rc, 2)
+         *        GetCursorPos( &cur )
+         *        GetWindowRect (syspager, &rc2)
+         *        PtInRect (&rc2, cur.x, cur.y) rtns 0
+         *        returns with rect empty
+         */
+        infoPtr->nHeight = lpRect->bottom - lpRect->top;
+        PAGER_CalcSize (hwnd, &infoPtr->nHeight, FALSE);
+        GetWindowRect (infoPtr->hwndChild, &rcChildw);
+        MapWindowPoints (0, hwnd, (LPPOINT)&rcChildw, 2);
+        GetCursorPos (&cursor);
+        GetWindowRect (hwnd, &rcmyw);
+        if (PtInRect (&rcmyw, cursor)) {
+
+            /* native does:
+             *    GetWindowRect(pager, &rc)
+             *    PtInRect(btn-left????, cur.x, cur.y)
+             *    if true -> ???
+             *    PtInRect(btn-right????, cur.x, cur.y)
+             *    if true
+             *      RedrawWindow(pager, 0, 0, 5)
+             *      return TRUE
+             */
+
+            GetWindowRect (hwnd, &wnrc);
+            lbrc = wnrc;
+            lbrc.right = lbrc.left + infoPtr->nButtonSize;
+            rbrc = wnrc;
+            rbrc.left = rbrc.right - infoPtr->nButtonSize;
+            TRACE("vert lb rect=(%d,%d)-(%d,%d), rb rect=(%d,%d)-(%d,%d)\n",
+                  lbrc.left, lbrc.top, lbrc.right, lbrc.bottom,
+                  rbrc.left, rbrc.top, rbrc.right, rbrc.bottom);
+            if (PtInRect (&lbrc, cursor) && infoPtr->TLbtnState)
+                RedrawWindow (hwnd, 0, 0, RDW_INVALIDATE | RDW_ERASE);
+            if (PtInRect (&rbrc, cursor) && infoPtr->BRbtnState)
+                RedrawWindow (hwnd, 0, 0, RDW_INVALIDATE | RDW_ERASE);
+        }
+        if (infoPtr->TLbtnState)
+            lpRect->top += infoPtr->nButtonSize;
+        if (infoPtr->BRbtnState)
+            lpRect->bottom -= infoPtr->nButtonSize;
+        /* ???? */
+        if ((lpRect->bottom < 0) || (lpRect->bottom > infoPtr->nHeight))
+            lpRect->bottom = infoPtr->nHeight;
     }
 
@@ -864 +952 @@
                      bHorizontal, TRUE, infoPtr->TLbtnState);
     PAGER_DrawButton(hdc, infoPtr->clrBk, rcBottomRight,
-                     bHorizontal, FALSE, infoPtr->BRbtnState);
+                     bHorizontal, FALSE, infoPtr->BRbtnState); 
 
     ReleaseDC( hwnd, hdc );
@@ -870 +958 @@
 }
 
-static INT
+static INT 
 PAGER_HitTest (HWND hwnd, LPPOINT pt)
 {
@@ -977 +1065 @@
         if(!(trackinfo.dwFlags & TME_LEAVE)) {
             trackinfo.dwFlags = TME_LEAVE; /* notify upon leaving */
-
+ 
            /* call TRACKMOUSEEVENT so we receive a WM_MOUSELEAVE message */
            /* and can properly deactivate the hot button */
@@ -983 +1071 @@
         }
 
-        SendMessageA(hwnd, WM_NCPAINT, 0, 0);
+        SendMessageA(hwnd, WM_NCPAINT, 0, 0); 
     }
 
@@ -1026 +1114 @@
 
     TRACE("[%04x]\n", hwnd);
-
+        
     hit = PAGER_HitTest(hwnd, &pt);
 
@@ -1034 +1122 @@
         repaintBtns = infoPtr->TLbtnState != PGF_DEPRESSED;
         infoPtr->TLbtnState = PGF_DEPRESSED;
-        SetTimer(hwnd, TIMERID1, INITIAL_DELAY, 0);
+        SetTimer(hwnd, TIMERID1, INITIAL_DELAY, 0); 
     }
     else if (hit == HTRIGHT || hit == HTBOTTOM)
@@ -1040 +1128 @@
         repaintBtns = infoPtr->BRbtnState != PGF_DEPRESSED;
         infoPtr->BRbtnState = PGF_DEPRESSED;
-        SetTimer(hwnd, TIMERID1, INITIAL_DELAY, 0);
+        SetTimer(hwnd, TIMERID1, INITIAL_DELAY, 0); 
     }
 
     if (repaintBtns)
-        SendMessageA(hwnd, WM_NCPAINT, 0, 0);
+        SendMessageA(hwnd, WM_NCPAINT, 0, 0); 
 
     switch(hit)
@@ -1089 +1177 @@
 PAGER_EraseBackground (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
+    POINT pt, ptorig;
+    HDC hdc = (HDC)wParam;
+    HWND parent;
+
+    /* native does:
+     *   parent = GetParent(pager)
+     *   pt.x=0; pt.y=0; ?????
+     *   MapWindowPoints(pager, parent, &pt, 1)
+     *   OffsetWindowOrgEx(hdc, pt.x, pt.y, &ptorg)
+     *   SendMessageA(parent, WM_ERASEBKGND, hdc, 0)
+     *   SetWindowOrgEx(hdc, 0, 0, 0)
+     */
+
+    pt.x = 0;
+    pt.y = 0;
+    parent = GetParent(hwnd);
+    MapWindowPoints(hwnd, parent, &pt, 1);
+    OffsetWindowOrgEx (hdc, pt.x, pt.y, &ptorig);
+    SendMessageA (parent, WM_ERASEBKGND, wParam, lParam);
+    SetWindowOrgEx (hdc, ptorig.x, ptorig.y, 0);
+
+
+#if 0
     PAGER_INFO *infoPtr = PAGER_GetInfoPtr (hwnd);
     HBRUSH hBrush = CreateSolidBrush(infoPtr->clrBk);
@@ -1104 +1215 @@
 
     DeleteObject (hBrush);
+#endif
+
     return TRUE;
 }
@@ -1131 +1244 @@
 
     if (!infoPtr && (uMsg != WM_CREATE))
-    return DefWindowProcA (hwnd, uMsg, wParam, lParam);
+        return DefWindowProcA (hwnd, uMsg, wParam, lParam);
 
     switch (uMsg)
@@ -1157 +1270 @@
         case PGM_RECALCSIZE:
             return PAGER_RecalcSize(hwnd);
-
+    
         case PGM_SETBKCOLOR:
             return PAGER_SetBkColor (hwnd, wParam, lParam);
@@ -1186 +1299 @@
 
         case WM_WINDOWPOSCHANGING:
-            return PAGER_HandleWindowPosChanging (hwnd, (WINDOWPOS*)lParam);
+            return PAGER_HandleWindowPosChanging (hwnd, wParam, (WINDOWPOS*)lParam);
 
         case WM_NCCALCSIZE:
@@ -1205 +1318 @@
             if (infoPtr->bForward && infoPtr->hwndChild)
                 PostMessageA(infoPtr->hwndChild, WM_MOUSEMOVE, wParam, lParam);
-            return TRUE;
+            return TRUE;                        
 
         case WM_MOUSELEAVE:
-            return PAGER_MouseLeave (hwnd, wParam, lParam);
+            return PAGER_MouseLeave (hwnd, wParam, lParam);     
 
         case WM_LBUTTONDOWN:
@@ -1220 +1333 @@
 /*
         case WM_PAINT:
-            return PAGER_Paint (hwnd, wParam);
+            return PAGER_Paint (hwnd, wParam); 
 */
         case WM_TIMER:
@@ -1234 +1347 @@
             {
                 PAGER_Scroll(hwnd, infoPtr->direction);
-                SetTimer(hwnd, TIMERID2, REPEAT_DELAY, 0);
+                SetTimer(hwnd, TIMERID2, REPEAT_DELAY, 0);          
             }
             break;
@@ -1267 +1380 @@
     wndClass.hbrBackground = 0;
     wndClass.lpszClassName = WC_PAGESCROLLERA;
-
+ 
     RegisterClassA (&wndClass);
 }

trunk/src/comctl32/rebar.c

@@ -1 @@
-/* $Id: rebar.c,v 1.16 2001-09-05 12:05:01 bird Exp $ */
+/*
+ * Testing: set to 1 to make background brush *always* green
+ */
+#define GLATESTING 0
+
 /*
  *
@@ -10 +14 @@
 
 /*
- * Rebar control    rev 7f
+ * 3. REBAR_MoveChildWindows should have a loop because more than
+ *    one pass is made (together with the RBN_CHILDSIZEs) is made on
+ *    at least RB_INSERTBAND
+ */
+
+
+/*
+ * Rebar control    rev 8a
  *
  * Copyright 1998, 1999 Eric Kohl
@@ -22 +33 @@
  *   - vertical placement
  *   - ComboBox and ComboBoxEx placement
- *   - center image
+ *   - center image 
  *   - Layout code.
  *   - Display code.
@@ -31 +42 @@
  *  rev 2,3,4
  *   - Implement initial version of row grouping, row separators,
- *     text and background colors. Support additional messages.
+ *     text and background colors. Support additional messages. 
  *     Support RBBS_BREAK. Implement ERASEBKGND and improve painting.
  *  rev 5
  *   - implement support for dragging Gripper left or right in a row. Supports
- *     WM_LBUTTONDOWN, WM_LBUTTONUP, and WM_MOUSEMOVE. Also support
+ *     WM_LBUTTONDOWN, WM_LBUTTONUP, and WM_MOUSEMOVE. Also support 
  *     RBS_BANDBORDERS.
  *  rev 6
@@ -43 +54 @@
  *
  * rev 7
- *  1. Redesign _Layout to better emulate native.
- *     a. Flag rebar when a band needs to be (and all bands) need to
- *        go through rest of _Layout
- *  2. Fix RBN_ENDDRAG contents.
- *  3. REBAR_ForceResize changed to handle shrink of client.
- * rev 7b
- *  4. Support RBBS_HIDDEN in _Layout (phase 2 & 3), _InternalEraseBkgnd,
- *     and _InternalHitTest
- *  5. Support RBS_VARHEIGHT.
- *  6. Rewrite _AdjustBands with new algorithm.
- * rev 7c
- *  7. Format mask and style with labels.
- *  8. Move calls to _ForceResize and _MoveChildWindows into _Layout to
- *     centralize processing.
- *  9. Pass "infoPtr" to all routines instead of "hwnd" to eliminate extra
- *     calls to GetWindowLongA.
- * 10. Use _MoveChildWindows in _HandleLRDrag.
- * 11. Another rewrite of _AdjustBands with new algorithm.
- * 12. Correct drawing of rebar borders and handling of RBS_BORDERS.
- * rev 7d
- * 13. Support WM_NOTIFYFORMAT (both incoming and outgoing) and do
- *     WM_NOTIFY correctly based on results.
- * 14. Implement WM_SETREDRAW.
- * 15. Native WM_ERASEBKGND draws horz and vert separators between bands and
- *     rows, and fills in the background color for each band. The gripper,
- *     image, and text for each band is drawn by the WM_PAINT process. Change
- *     this code to match.
- * rev 7e
- * 16. RBBS_FIXEDSIZE should not affect _AdjustBands. (Found by Mike McCormack
- *     in WinZip - Thanks!)
- * 17. Implement WM_NCCREATE to set necessary additional styles and move most
- *     of creation stuff to it like native control.
- * 18. WM_SETFONT should redraw only if LOWORD is TRUE.
- * 19. Implement WM_NCHITTEST to send notify to parent of NM_NCHITTEST.
- * 20. Cleaned up dead and/or testing code.
- * 21. Support RB_MOVEBAND.
- * 22. Support WM_STYLECHANGED and remove all (or most) of the GetWindowLong
- *     for GWL_STYLE.
- * 23. Support RB_MINIMIZEBAND.
- * 24. RBBS_HIDDEN (and the CCS_VERT+RBBS_NOVERT case) should be supported
- *     by all routines now.
- * rev 7f
- * 25. Fix handling of text color.
- * 26. Correct implementation of WM_SETREDRAW to be closer to native.
- *     See REBAR_SetRedraw for doc changes of actual vs. MSDN
- * 27. Do more implementation of RBS_AUTOSIZE in the WM_SIZE processor.
- * 28. Implement RBBS_VARIABLEHEIGHT. Used by IE4.
- * 29. Do more testing in WM_SIZE to handle strange cases like native.
+ *   - Fix algorithm for _Layout and _AdjustBand.
+ *   - Fix or implement RBN_ENDDRAG, RB_MOVEBAND, WM_SETREDRAW, 
+ *     WM_STYLECHANGED, RB_MINIMIZEBAND, RBBS_VARIABLEHEIGHT, RBS_VARHEIGHT,
+ *     RBBS_HIDDEN, WM_NOTIFYFORMAT, NM_NCHITTEST, WM_SETREDRAW, RBS_AUTOSIZE,
+ *     WM_SETFONT, RBS_BORDERS
+ *   - Create structures in WM_NCCREATE
+ *   - Additional performance enhancements.
+ *
+ * rev 8
+ *  1. Create array of start and end band indexes by row and use.
+ *  2. Fix problem with REBAR_Layout Phase 2b to process only if only
+ *     band in row.
+ *  3. Set the Caption Font (Regular) as default font for text.
+ *  4. Delete font handle on control distruction.
+ *  5. Add UpdateWindow call in _MoveChildWindows to match repainting done
+ *     by native control
+ *  6. Improve some traces.
+ *  7. Invalidate window rectangles after SetBandInfo, InsertBand, ShowBand
+ *     so that repainting is correct.
+ *  8. Implement RB_MAXIMIZEBAND for the "ideal=TRUE" case.
+ *  9. Implement item custom draw notifications partially. Only done for 
+ *     ITEMPREPAINT and ITEMPOSTPAINT. (Used by IE4 for "Favorites" frame
+ *     to draw the word "Favorites").
+ * rev 8a
+ * 10. Handle CCS_NODIVIDER and fix WS_BORDER code.
+ * 11. Fix logic error in _AdjustBands where flag was set to valid band
+ *     number (0) to indicate *no* band.
+ * 12. Fix CCS_VERT errors in _ForceResize, _NCCalcSize, and _NCPaint.
+ * 13. Support some special cases of CCS_TOP (and therefore CCS_LEFT),
+ *     CCS_BOTTOM (and therefore CCS_RIGHT) and CCS_NOPARENTALIGN. Not 
+ *     at all sure whether this is all cases.
+ * 14. Handle returned value for the RBN_CHILDSIZE notify.
+ * 15. Implement RBBS_CHILDEDGE, and set each bands "offChild" at _Layout
+ *     time.
+ * 16. Fix REBARSPACE. It should depend on CCS_NODIVIDER.
  *
  *
  *    Still to do:
- *  2. Following still not handled: RBBS_FIXEDBMP, RBBS_CHILDEDGE,
- *            RBBS_USECHEVRON
- *  3. Following are only partially handled:
+ *  2. Following still not handled: RBBS_FIXEDBMP,
+ *            RBBS_USECHEVRON, CCS_NORESIZE,
+ *            CCS_NOMOVEX, CCS_NOMOVEY
+ *  3. Following are only partially handled: 
  *            RBS_AUTOSIZE, RBBS_VARIABLEHEIGHT
  *  5. Native uses (on each draw!!) SM_CYBORDER (or SM_CXBORDER for CCS_VERT)
- *     to set the size of the separator width (the value SEP_WIDTH_SIZE
+ *     to set the size of the separator width (the value SEP_WIDTH_SIZE 
  *     in here). Should be fixed!!
  *  6. The following messages are not implemented:
@@ -117 +116 @@
 #include <string.h>
 
-#include "win.h"
 #include "winbase.h"
 #include "wingdi.h"
@@ -134 +132 @@
 typedef struct
 {
-#ifdef __WIN32OS2__
-    COMCTL32_HEADER header;
-#endif
     UINT    fStyle;
     UINT    fMask;
@@ -167 +162 @@
     UINT    fStatus;        /* status flags, reset only by _Validate */
     UINT    fDraw;          /* drawing flags, reset only by _Layout */
+    UINT    uCDret;         /* last return from NM_CUSTOMDRAW */
     RECT    rcoldBand;      /* previous calculated band rectangle */
     RECT    rcBand;         /* calculated band rectangle */
@@ -191 +187 @@
 #define NTF_INVALIDATE  0x01000000
 
-
 typedef struct
 {
+    INT      istartband;  /* index of first band in row */
+    INT      iendband;    /* index of last band in row */
+} REBAR_ROW;
+
+
+typedef struct
+{
+#ifdef __WIN32OS2__
+    COMCTL32_HEADER header;
+#endif
     COLORREF   clrBk;       /* background color */
     COLORREF   clrText;     /* text color */
@@ -199 +204 @@
     COLORREF   clrBtnFace;  /* system color for BTNFACE */
     HIMAGELIST himl;        /* handle to imagelist */
-    UINT     uNumBands;   /* # of bands in rebar (first=0, last=uNumRows-1 */
+    UINT     uNumBands;   /* # of bands in rebar (first=0, last=uNumBands-1 */
     UINT     uNumRows;    /* # of rows of bands (first=1, last=uNumRows */
     HWND     hwndSelf;    /* handle of REBAR window itself */
@@ -212 +217 @@
     BOOL     NtfUnicode;  /* TRUE if parent wants notify in W format */
     BOOL     DoRedraw;    /* TRUE to acutally draw bands */
-    UINT     fStatus;     /* Status flags (see below)  */
+    UINT     fStatus;     /* Status flags (see below)  */ 
     HCURSOR  hcurArrow;   /* handle to the arrow cursor */
     HCURSOR  hcurHorz;    /* handle to the EW cursor */
@@ -223 +228 @@
     INT      ihitoffset;  /* offset of hotspot from gripper.left */
 
+    REBAR_ROW  *rows;       /* pointer to row indexes              */
     REBAR_BAND *bands;      /* pointer to the array of rebar bands */
 } REBAR_INFO;
@@ -263 +269 @@
 #define GRIPPER_WIDTH  3
 
-/* This is the increment that is used over the band height */
-/* Determined by experiment.                               */
-#define REBARSPACE      4
+/* Height of divider for Rebar if not disabled (CCS_NODIVIDER)     */
+/* either top or bottom                                            */
+#define REBAR_DIVIDER  2
+
+/* This is the increment that is used over the band height         */
+#define REBARSPACE(a)     ((a->fStyle & RBBS_CHILDEDGE) ? 2*REBAR_DIVIDER : 0)
 
 /* ----   End of REBAR layout constants.                      ---- */
@@ -275 +284 @@
 #define rcBrb(b) ((infoPtr->dwStyle & CCS_VERT) ? b->rcBand.bottom : b->rcBand.right)
 #define rcBw(b)  ((infoPtr->dwStyle & CCS_VERT) ? (b->rcBand.bottom - b->rcBand.top) : \
-          (b->rcBand.right - b->rcBand.left))
+                  (b->rcBand.right - b->rcBand.left))
 #define ircBlt(b) ((infoPtr->dwStyle & CCS_VERT) ? b->rcBand.left : b->rcBand.top)
 #define ircBrb(b) ((infoPtr->dwStyle & CCS_VERT) ? b->rcBand.right : b->rcBand.bottom)
 #define ircBw(b)  ((infoPtr->dwStyle & CCS_VERT) ? (b->rcBand.right - b->rcBand.left) : \
-          (b->rcBand.bottom - b->rcBand.top))
+                  (b->rcBand.bottom - b->rcBand.top))
 
 /*  The following define determines if a given band is hidden      */
@@ -339 +348 @@
     *line = 0;
     while (band_stylename[i]) {
-    if (style & (1<<i)) {
-        if (*line != 0) strcat(line, " | ");
-        strcat(line, band_stylename[i]);
-    }
-    i++;
+        if (style & (1<<i)) {
+            if (*line != 0) strcat(line, " | ");
+            strcat(line, band_stylename[i]);
+        }
+        i++;
     }
     return line;
@@ -356 +365 @@
     *line = 0;
     while (band_maskname[i]) {
-    if (mask & (1<<i)) {
-        if (*line != 0) strcat(line, " | ");
-        strcat(line, band_maskname[i]);
-    }
-    i++;
+        if (mask & (1<<i)) {
+            if (*line != 0) strcat(line, " | ");
+            strcat(line, band_maskname[i]);
+        }
+        i++;
     }
     return line;
@@ -371 +380 @@
     if( !TRACE_ON(rebar) ) return;
     TRACE("band info: ID=%u, size=%u, child=%04x, clrF=0x%06lx, clrB=0x%06lx\n",
-      pB->wID, pB->cbSize, pB->hwndChild, pB->clrFore, pB->clrBack);
+          pB->wID, pB->cbSize, pB->hwndChild, pB->clrFore, pB->clrBack); 
     TRACE("band info: mask=0x%08x (%s)\n", pB->fMask, REBAR_FmtMask(pB->fMask));
     if (pB->fMask & RBBIM_STYLE)
-    TRACE("band info: style=0x%08x (%s)\n", pB->fStyle, REBAR_FmtStyle(pB->fStyle));
+        TRACE("band info: style=0x%08x (%s)\n", pB->fStyle, REBAR_FmtStyle(pB->fStyle));
     if (pB->fMask & (RBBIM_SIZE | RBBIM_IDEALSIZE | RBBIM_HEADERSIZE | RBBIM_LPARAM )) {
-    TRACE("band info:");
-    if (pB->fMask & RBBIM_SIZE)
-        DPRINTF(" cx=%u", pB->cx);
-    if (pB->fMask & RBBIM_IDEALSIZE)
-        DPRINTF(" xIdeal=%u", pB->cxIdeal);
-    if (pB->fMask & RBBIM_HEADERSIZE)
-        DPRINTF(" xHeader=%u", pB->cxHeader);
-    if (pB->fMask & RBBIM_LPARAM)
-        DPRINTF(" lParam=0x%08lx", pB->lParam);
-    DPRINTF("\n");
+        TRACE("band info:");
+        if (pB->fMask & RBBIM_SIZE)
+            DPRINTF(" cx=%u", pB->cx);
+        if (pB->fMask & RBBIM_IDEALSIZE)
+            DPRINTF(" xIdeal=%u", pB->cxIdeal);
+        if (pB->fMask & RBBIM_HEADERSIZE)
+            DPRINTF(" xHeader=%u", pB->cxHeader);
+        if (pB->fMask & RBBIM_LPARAM)
+            DPRINTF(" lParam=0x%08lx", pB->lParam);
+        DPRINTF("\n");
     }
     if (pB->fMask & RBBIM_CHILDSIZE)
-    TRACE("band info: xMin=%u, yMin=%u, yChild=%u, yMax=%u, yIntgl=%u\n",
-          pB->cxMinChild,
-          pB->cyMinChild, pB->cyChild, pB->cyMaxChild, pB->cyIntegral);
+        TRACE("band info: xMin=%u, yMin=%u, yChild=%u, yMax=%u, yIntgl=%u\n",
+              pB->cxMinChild, 
+              pB->cyMinChild, pB->cyChild, pB->cyMaxChild, pB->cyIntegral);
 }
 
@@ -401 +410 @@
     if(! TRACE_ON(rebar) ) return;
 
-    TRACE("hwnd=%04x: color=%08lx/%08lx, bands=%u, rows=%u, cSize=%ld,%ld\n",
-      iP->hwndSelf, iP->clrText, iP->clrBk, iP->uNumBands, iP->uNumRows,
-      iP->calcSize.cx, iP->calcSize.cy);
+    TRACE("hwnd=%04x: color=%08lx/%08lx, bands=%u, rows=%u, cSize=%ld,%ld\n", 
+          iP->hwndSelf, iP->clrText, iP->clrBk, iP->uNumBands, iP->uNumRows,
+          iP->calcSize.cx, iP->calcSize.cy);
     TRACE("hwnd=%04x: flags=%08x, dragStart=%d,%d, dragNow=%d,%d, ihitBand=%d\n",
-      iP->hwndSelf, iP->fStatus, iP->dragStart.x, iP->dragStart.y,
-      iP->dragNow.x, iP->dragNow.y,
-      iP->ihitBand);
+          iP->hwndSelf, iP->fStatus, iP->dragStart.x, iP->dragStart.y,
+          iP->dragNow.x, iP->dragNow.y,
+          iP->ihitBand);
     TRACE("hwnd=%04x: style=%08lx, I'm Unicode=%s, notify in Unicode=%s, redraw=%s\n",
-      iP->hwndSelf, iP->dwStyle, (iP->bUnicode)?"TRUE":"FALSE",
-      (iP->NtfUnicode)?"TRUE":"FALSE", (iP->DoRedraw)?"TRUE":"FALSE");
+          iP->hwndSelf, iP->dwStyle, (iP->bUnicode)?"TRUE":"FALSE",
+          (iP->NtfUnicode)?"TRUE":"FALSE", (iP->DoRedraw)?"TRUE":"FALSE");
     for (i = 0; i < iP->uNumBands; i++) {
-    pB = &iP->bands[i];
-    TRACE("band # %u: ID=%u, child=%04x, row=%u, clrF=0x%06lx, clrB=0x%06lx\n",
-          i, pB->wID, pB->hwndChild, pB->iRow, pB->clrFore, pB->clrBack);
-    TRACE("band # %u: mask=0x%08x (%s)\n", i, pB->fMask, REBAR_FmtMask(pB->fMask));
-    if (pB->fMask & RBBIM_STYLE)
-        TRACE("band # %u: style=0x%08x (%s)\n",
-          i, pB->fStyle, REBAR_FmtStyle(pB->fStyle));
-    TRACE("band # %u: uMinH=%u xHeader=%u",
-          i, pB->uMinHeight, pB->cxHeader);
-    if (pB->fMask & (RBBIM_SIZE | RBBIM_IDEALSIZE | RBBIM_LPARAM )) {
-        if (pB->fMask & RBBIM_SIZE)
-        DPRINTF(" cx=%u", pB->cx);
-        if (pB->fMask & RBBIM_IDEALSIZE)
-        DPRINTF(" xIdeal=%u", pB->cxIdeal);
-        if (pB->fMask & RBBIM_LPARAM)
-        DPRINTF(" lParam=0x%08lx", pB->lParam);
-    }
-    DPRINTF("\n");
-    if (RBBIM_CHILDSIZE)
-        TRACE("band # %u: xMin=%u, yMin=%u, yChild=%u, yMax=%u, yIntgl=%u\n",
-          i, pB->cxMinChild, pB->cyMinChild, pB->cyChild, pB->cyMaxChild, pB->cyIntegral);
-    TRACE("band # %u: lcx=%u, ccx=%u, hcx=%u, lcy=%u, ccy=%u, hcy=%u, offChild=%ld,%ld\n",
-          i, pB->lcx, pB->ccx, pB->hcx, pB->lcy, pB->ccy, pB->hcy, pB->offChild.cx, pB->offChild.cy);
-    TRACE("band # %u: fStatus=%08x, fDraw=%08x, Band=(%d,%d)-(%d,%d), Grip=(%d,%d)-(%d,%d)\n",
-          i, pB->fStatus, pB->fDraw,
-          pB->rcBand.left, pB->rcBand.top, pB->rcBand.right, pB->rcBand.bottom,
-          pB->rcGripper.left, pB->rcGripper.top, pB->rcGripper.right, pB->rcGripper.bottom);
-    TRACE("band # %u: Img=(%d,%d)-(%d,%d), Txt=(%d,%d)-(%d,%d), Child=(%d,%d)-(%d,%d)\n",
-          i,
-          pB->rcCapImage.left, pB->rcCapImage.top, pB->rcCapImage.right, pB->rcCapImage.bottom,
-          pB->rcCapText.left, pB->rcCapText.top, pB->rcCapText.right, pB->rcCapText.bottom,
-          pB->rcChild.left, pB->rcChild.top, pB->rcChild.right, pB->rcChild.bottom);
+        pB = &iP->bands[i];
+        TRACE("band # %u: ID=%u, child=%04x, row=%u, clrF=0x%06lx, clrB=0x%06lx\n",
+              i, pB->wID, pB->hwndChild, pB->iRow, pB->clrFore, pB->clrBack);
+        TRACE("band # %u: mask=0x%08x (%s)\n", i, pB->fMask, REBAR_FmtMask(pB->fMask));
+        if (pB->fMask & RBBIM_STYLE)
+            TRACE("band # %u: style=0x%08x (%s)\n", 
+                  i, pB->fStyle, REBAR_FmtStyle(pB->fStyle));
+        TRACE("band # %u: uMinH=%u xHeader=%u", 
+              i, pB->uMinHeight, pB->cxHeader);
+        if (pB->fMask & (RBBIM_SIZE | RBBIM_IDEALSIZE | RBBIM_LPARAM )) {
+            if (pB->fMask & RBBIM_SIZE)
+                DPRINTF(" cx=%u", pB->cx);
+            if (pB->fMask & RBBIM_IDEALSIZE)
+                DPRINTF(" xIdeal=%u", pB->cxIdeal);
+            if (pB->fMask & RBBIM_LPARAM)
+                DPRINTF(" lParam=0x%08lx", pB->lParam);
+        }
+        DPRINTF("\n");
+        if (RBBIM_CHILDSIZE)
+            TRACE("band # %u: xMin=%u, yMin=%u, yChild=%u, yMax=%u, yIntgl=%u\n",
+                  i, pB->cxMinChild, pB->cyMinChild, pB->cyChild, pB->cyMaxChild, pB->cyIntegral);
+        if (pB->fMask & RBBIM_TEXT)
+            TRACE("band # %u: text=%s\n",
+                  i, (pB->lpText) ? debugstr_w(pB->lpText) : "(null)");
+        TRACE("band # %u: lcx=%u, ccx=%u, hcx=%u, lcy=%u, ccy=%u, hcy=%u, offChild=%ld,%ld\n",
+              i, pB->lcx, pB->ccx, pB->hcx, pB->lcy, pB->ccy, pB->hcy, pB->offChild.cx, pB->offChild.cy);
+        TRACE("band # %u: fStatus=%08x, fDraw=%08x, Band=(%d,%d)-(%d,%d), Grip=(%d,%d)-(%d,%d)\n",
+              i, pB->fStatus, pB->fDraw,
+              pB->rcBand.left, pB->rcBand.top, pB->rcBand.right, pB->rcBand.bottom,
+              pB->rcGripper.left, pB->rcGripper.top, pB->rcGripper.right, pB->rcGripper.bottom);
+        TRACE("band # %u: Img=(%d,%d)-(%d,%d), Txt=(%d,%d)-(%d,%d), Child=(%d,%d)-(%d,%d)\n",
+              i,
+              pB->rcCapImage.left, pB->rcCapImage.top, pB->rcCapImage.right, pB->rcCapImage.bottom,
+              pB->rcCapText.left, pB->rcCapText.top, pB->rcCapText.right, pB->rcCapText.bottom,
+              pB->rcChild.left, pB->rcChild.top, pB->rcChild.right, pB->rcChild.bottom);
     }
 
@@ -457 +469 @@
     if (!parent) {
         parent = GetParent (infoPtr->hwndSelf);
-    owner = GetWindow (infoPtr->hwndSelf, GW_OWNER);
-    if (owner) parent = owner;
+        owner = GetWindow (infoPtr->hwndSelf, GW_OWNER);
+        if (owner) parent = owner;
     }
     return parent;
@@ -475 +487 @@
 
     TRACE("window %04x, code=%08x, %s\n", parent, code,
-      (infoPtr->NtfUnicode) ? "via Unicode" : "via ANSI");
+          (infoPtr->NtfUnicode) ? "via Unicode" : "via ANSI");
 
     if (infoPtr->NtfUnicode)
-    return SendMessageW (parent, WM_NOTIFY, (WPARAM) nmhdr->idFrom,
-                 (LPARAM)nmhdr);
+        return SendMessageW (parent, WM_NOTIFY, (WPARAM) nmhdr->idFrom,
+                             (LPARAM)nmhdr);
     else
-    return SendMessageA (parent, WM_NOTIFY, (WPARAM) nmhdr->idFrom,
-                 (LPARAM)nmhdr);
+        return SendMessageA (parent, WM_NOTIFY, (WPARAM) nmhdr->idFrom,
+                             (LPARAM)nmhdr);
 }
 
@@ -493 +505 @@
     notify_rebar.dwMask = 0;
     if (uBand!=-1) {
-    lpBand = &infoPtr->bands[uBand];
-    if (lpBand->fMask & RBBIM_ID) {
-        notify_rebar.dwMask |= RBNM_ID;
-        notify_rebar.wID = lpBand->wID;
-    }
-    if (lpBand->fMask & RBBIM_LPARAM) {
-        notify_rebar.dwMask |= RBNM_LPARAM;
-        notify_rebar.lParam = lpBand->lParam;
-    }
-    if (lpBand->fMask & RBBIM_STYLE) {
-        notify_rebar.dwMask |= RBNM_STYLE;
-        notify_rebar.fStyle = lpBand->fStyle;
-    }
+        lpBand = &infoPtr->bands[uBand];
+        if (lpBand->fMask & RBBIM_ID) {
+            notify_rebar.dwMask |= RBNM_ID;
+            notify_rebar.wID = lpBand->wID;
+        }
+        if (lpBand->fMask & RBBIM_LPARAM) {
+            notify_rebar.dwMask |= RBNM_LPARAM;
+            notify_rebar.lParam = lpBand->lParam;
+        }
+        if (lpBand->fMask & RBBIM_STYLE) {
+            notify_rebar.dwMask |= RBNM_STYLE;
+            notify_rebar.fStyle = lpBand->fStyle;
+        }
     }
     notify_rebar.uBand = uBand;
@@ -514 +526 @@
 REBAR_DrawBand (HDC hdc, REBAR_INFO *infoPtr, REBAR_BAND *lpBand)
 {
-
+    HFONT hOldFont = 0;
+    INT oldBkMode = 0;
+    NMCUSTOMDRAW nmcd;
+
+    if (lpBand->fDraw & DRAW_TEXT) {
+        hOldFont = SelectObject (hdc, infoPtr->hFont);
+        oldBkMode = SetBkMode (hdc, TRANSPARENT);
+    }
+
+    /* should test for CDRF_NOTIFYITEMDRAW here */
+    nmcd.dwDrawStage = CDDS_ITEMPREPAINT;
+    nmcd.hdc = hdc;
+    nmcd.rc = lpBand->rcBand;
+    nmcd.rc.right = lpBand->rcCapText.right;
+    nmcd.rc.bottom = lpBand->rcCapText.bottom;
+    nmcd.dwItemSpec = lpBand->wID;
+    nmcd.uItemState = 0;
+    nmcd.lItemlParam = lpBand->lParam;
+    lpBand->uCDret = REBAR_Notify ((NMHDR *)&nmcd, infoPtr, NM_CUSTOMDRAW);
+    if (lpBand->uCDret == CDRF_SKIPDEFAULT) {
+        if (oldBkMode != TRANSPARENT)
+            SetBkMode (hdc, oldBkMode);
+        SelectObject (hdc, hOldFont);
+        return;
+    }
 
     /* draw gripper */
@@ -522 +558 @@
     /* draw caption image */
     if (lpBand->fDraw & DRAW_IMAGE) {
-    POINT pt;
-
-    /* center image */
-    pt.y = (lpBand->rcCapImage.bottom + lpBand->rcCapImage.top - infoPtr->imageSize.cy)/2;
-    pt.x = (lpBand->rcCapImage.right + lpBand->rcCapImage.left - infoPtr->imageSize.cx)/2;
-
-    ImageList_Draw (infoPtr->himl, lpBand->iImage, hdc,
-            pt.x, pt.y,
-            ILD_TRANSPARENT);
+        POINT pt;
+
+        /* center image */
+        pt.y = (lpBand->rcCapImage.bottom + lpBand->rcCapImage.top - infoPtr->imageSize.cy)/2;
+        pt.x = (lpBand->rcCapImage.right + lpBand->rcCapImage.left - infoPtr->imageSize.cx)/2;
+
+        ImageList_Draw (infoPtr->himl, lpBand->iImage, hdc,
+                        pt.x, pt.y,
+                        ILD_TRANSPARENT);
     }
 
     /* draw caption text */
     if (lpBand->fDraw & DRAW_TEXT) {
-    HFONT hOldFont = SelectObject (hdc, infoPtr->hFont);
-    INT oldBkMode = SetBkMode (hdc, TRANSPARENT);
-    COLORREF oldcolor = CLR_NONE;
-    oldcolor = SetTextColor (hdc, (lpBand->clrFore != CLR_NONE) ?
-                 lpBand->clrFore : infoPtr->clrBtnText);
-    DrawTextW (hdc, lpBand->lpText, -1, &lpBand->rcCapText,
-           DT_CENTER | DT_VCENTER | DT_SINGLELINE);
-    if (oldBkMode != TRANSPARENT)
-        SetBkMode (hdc, oldBkMode);
-    SetTextColor (hdc, oldcolor);
-    SelectObject (hdc, hOldFont);
+        /* need to handle CDRF_NEWFONT here */
+        INT oldBkMode = SetBkMode (hdc, TRANSPARENT);
+        COLORREF oldcolor = CLR_NONE;
+        oldcolor = SetTextColor (hdc, (lpBand->clrFore != CLR_NONE) ?
+                                 lpBand->clrFore : infoPtr->clrBtnText);
+        DrawTextW (hdc, lpBand->lpText, -1, &lpBand->rcCapText,
+                   DT_CENTER | DT_VCENTER | DT_SINGLELINE);
+        if (oldBkMode != TRANSPARENT)
+            SetBkMode (hdc, oldBkMode);
+        SetTextColor (hdc, oldcolor);
+        SelectObject (hdc, hOldFont);
+    }
+
+    if (lpBand->uCDret == (CDRF_NOTIFYPOSTPAINT | CDRF_NOTIFYITEMDRAW)) {
+        nmcd.dwDrawStage = CDDS_ITEMPOSTPAINT;
+        nmcd.hdc = hdc;
+        nmcd.rc = lpBand->rcBand;
+        nmcd.rc.right = lpBand->rcCapText.right;
+        nmcd.rc.bottom = lpBand->rcCapText.bottom;
+        nmcd.dwItemSpec = lpBand->wID;
+        nmcd.uItemState = 0;
+        nmcd.lItemlParam = lpBand->lParam;
+        lpBand->uCDret = REBAR_Notify ((NMHDR *)&nmcd, infoPtr, NM_CUSTOMDRAW);
     }
 }
@@ -560 +608 @@
     oldrow = infoPtr->bands[0].iRow;
     for (i = 0; i < infoPtr->uNumBands; i++) {
-    lpBand = &infoPtr->bands[i];
-
-    if (HIDDENBAND(lpBand)) continue;
-
-    /* now draw the band */
-    REBAR_DrawBand (hdc, infoPtr, lpBand);
+        lpBand = &infoPtr->bands[i];
+
+        if (HIDDENBAND(lpBand)) continue; 
+
+        /* now draw the band */
+        TRACE("[%04x] drawing band %i, flags=%08x\n", 
+              infoPtr->hwndSelf, i, lpBand->fDraw);
+        REBAR_DrawBand (hdc, infoPtr, lpBand);
 
     }
@@ -573 +623 @@
 static void
 REBAR_FixVert (REBAR_INFO *infoPtr, UINT rowstart, UINT rowend,
-           INT mcy)
-     /* Function:                                                    */
+                   INT mcy)
+     /* Function:                                                    */ 
      /*   Cycle through bands in row and fix height of each band.    */
      /*   Also determine whether each band has changed.              */
@@ -586 +636 @@
     for (i = (INT)rowstart; i<=(INT)rowend; i++) {
         lpBand = &infoPtr->bands[i];
-    if (HIDDENBAND(lpBand)) continue;
-
-    /* adjust height of bands in row to "mcy" value */
-    if (infoPtr->dwStyle & CCS_VERT) {
-        if (lpBand->rcBand.right != lpBand->rcBand.left + mcy)
-            lpBand->rcBand.right = lpBand->rcBand.left + mcy;
-    }
-    else {
-        if (lpBand->rcBand.bottom != lpBand->rcBand.top + mcy)
-            lpBand->rcBand.bottom = lpBand->rcBand.top + mcy;
-
-    }
-
-    /* mark whether we need to invalidate this band and trace */
-    if ((lpBand->rcoldBand.left !=lpBand->rcBand.left) ||
-        (lpBand->rcoldBand.top !=lpBand->rcBand.top) ||
-        (lpBand->rcoldBand.right !=lpBand->rcBand.right) ||
-        (lpBand->rcoldBand.bottom !=lpBand->rcBand.bottom)) {
-        lpBand->fDraw |= NTF_INVALIDATE;
-        TRACE("band %d row=%d: changed to (%d,%d)-(%d,%d) from (%d,%d)-(%d,%d)\n",
-          i, lpBand->iRow,
-          lpBand->rcBand.left, lpBand->rcBand.top,
-          lpBand->rcBand.right, lpBand->rcBand.bottom,
-          lpBand->rcoldBand.left, lpBand->rcoldBand.top,
-          lpBand->rcoldBand.right, lpBand->rcoldBand.bottom);
-    }
-    else
-        TRACE("band %d row=%d: unchanged (%d,%d)-(%d,%d)\n",
-          i, lpBand->iRow,
-          lpBand->rcBand.left, lpBand->rcBand.top,
-          lpBand->rcBand.right, lpBand->rcBand.bottom);
+        if (HIDDENBAND(lpBand)) continue;
+
+        /* adjust height of bands in row to "mcy" value */
+        if (infoPtr->dwStyle & CCS_VERT) {
+            if (lpBand->rcBand.right != lpBand->rcBand.left + mcy)
+                lpBand->rcBand.right = lpBand->rcBand.left + mcy;
+        }
+        else {
+            if (lpBand->rcBand.bottom != lpBand->rcBand.top + mcy)
+                lpBand->rcBand.bottom = lpBand->rcBand.top + mcy;
+
+        }
+
+        /* mark whether we need to invalidate this band and trace */
+        if ((lpBand->rcoldBand.left !=lpBand->rcBand.left) ||
+            (lpBand->rcoldBand.top !=lpBand->rcBand.top) ||
+            (lpBand->rcoldBand.right !=lpBand->rcBand.right) ||
+            (lpBand->rcoldBand.bottom !=lpBand->rcBand.bottom)) {
+            lpBand->fDraw |= NTF_INVALIDATE;
+            TRACE("band %d row=%d: changed to (%d,%d)-(%d,%d) from (%d,%d)-(%d,%d)\n",
+                  i, lpBand->iRow,
+                  lpBand->rcBand.left, lpBand->rcBand.top,
+                  lpBand->rcBand.right, lpBand->rcBand.bottom,
+                  lpBand->rcoldBand.left, lpBand->rcoldBand.top,
+                  lpBand->rcoldBand.right, lpBand->rcoldBand.bottom);
+        }
+        else
+            TRACE("band %d row=%d: unchanged (%d,%d)-(%d,%d)\n",
+                  i, lpBand->iRow,
+                  lpBand->rcBand.left, lpBand->rcBand.top,
+                  lpBand->rcBand.right, lpBand->rcBand.bottom);
     }
 }
@@ -623 +673 @@
 static void
 REBAR_AdjustBands (REBAR_INFO *infoPtr, UINT rowstart, UINT rowend,
-           INT maxx, INT mcy)
+                   INT maxx, INT mcy)
      /* Function: This routine distributes the extra space in a row. */
      /*  See algorithm below.                                        */
@@ -635 +685 @@
 
     TRACE("start=%u, end=%u, max x=%d, max y=%d\n",
-      rowstart, rowend, maxx, mcy);
+          rowstart, rowend, maxx, mcy);
 
     /* *******************  Phase 1  ************************ */
@@ -643 +693 @@
     /*         or band's ->ccx reached.                       */
     /*  If any band modified, add any space left to last band */
-    /*  adjusted.                                             */
+    /*  adjusted.                                             */ 
     /*                                                        */
     /* ****************************************************** */
@@ -649 +699 @@
     extra = maxx - rcBrb(lpBand);
     x = 0;
-    last_adjusted = 0;
+    last_adjusted = -1;
     for (i=(INT)rowstart; i<=(INT)rowend; i++) {
-    lpBand = &infoPtr->bands[i];
-    if (HIDDENBAND(lpBand)) continue;
-    xsep = (x == 0) ? 0 : SEP_WIDTH;
-    curwidth = rcBw(lpBand);
-
-    /* set new left/top point */
-    if (infoPtr->dwStyle & CCS_VERT)
-        lpBand->rcBand.top = x + xsep;
-    else
-        lpBand->rcBand.left = x + xsep;
-
-    /* compute new width */
-    if (lpBand->hwndChild && extra) {
-        /* set to the "current" band size less the header */
-        fudge = lpBand->ccx;
-        last_adjusted = i;
-        if ((lpBand->fMask & RBBIM_SIZE) && (lpBand->cx > 0) &&
-        (fudge > curwidth)) {
-        TRACE("adjusting band %d by %d, fudge=%d, curwidth=%d, extra=%d\n",
-              i, fudge-curwidth, fudge, curwidth, extra);
-        if ((fudge - curwidth) > extra)
-            fudge = curwidth + extra;
-        extra -= (fudge - curwidth);
-        curwidth = fudge;
-        }
-        else {
-        TRACE("adjusting band %d by %d, fudge=%d, curwidth=%d\n",
-              i, extra, fudge, curwidth);
-        curwidth += extra;
-        extra = 0;
-        }
-    }
-
-    /* set new right/bottom point */
-    if (infoPtr->dwStyle & CCS_VERT)
-        lpBand->rcBand.bottom = lpBand->rcBand.top + curwidth;
-    else
-        lpBand->rcBand.right = lpBand->rcBand.left + curwidth;
-    TRACE("Phase 1 band %d, (%d,%d)-(%d,%d), orig x=%d, xsep=%d\n",
-          i, lpBand->rcBand.left, lpBand->rcBand.top,
-          lpBand->rcBand.right, lpBand->rcBand.bottom, x, xsep);
-    x = rcBrb(lpBand);
-    }
-    if ((x >= maxx) || last_adjusted) {
-    if (x > maxx) {
-        ERR("Phase 1 failed, x=%d, maxx=%d, start=%u, end=%u\n",
-        x, maxx,  rowstart, rowend);
-    }
-    /* done, so spread extra space */
-    if (x < maxx) {
-        fudge = maxx - x;
-        TRACE("Need to spread %d on last adjusted band %d\n",
-        fudge, last_adjusted);
-        for (i=(INT)last_adjusted; i<=(INT)rowend; i++) {
-        lpBand = &infoPtr->bands[i];
-        if (HIDDENBAND(lpBand)) continue;
-
-        /* set right/bottom point */
-        if (i != last_adjusted) {
-            if (infoPtr->dwStyle & CCS_VERT)
-            lpBand->rcBand.top += fudge;
-            else
-            lpBand->rcBand.left += fudge;
-        }
-
-        /* set left/bottom point */
-        if (infoPtr->dwStyle & CCS_VERT)
-            lpBand->rcBand.bottom += fudge;
-        else
-            lpBand->rcBand.right += fudge;
-        }
-    }
-    TRACE("Phase 1 succeeded, used x=%d\n", x);
-    REBAR_FixVert (infoPtr, rowstart, rowend, mcy);
-    return;
+        lpBand = &infoPtr->bands[i];
+        if (HIDDENBAND(lpBand)) continue;
+        xsep = (x == 0) ? 0 : SEP_WIDTH;
+        curwidth = rcBw(lpBand);
+
+        /* set new left/top point */
+        if (infoPtr->dwStyle & CCS_VERT)
+            lpBand->rcBand.top = x + xsep;
+        else
+            lpBand->rcBand.left = x + xsep;
+
+        /* compute new width */
+        if (lpBand->hwndChild && extra) {
+            /* set to the "current" band size less the header */
+            fudge = lpBand->ccx;
+            last_adjusted = i;
+            if ((lpBand->fMask & RBBIM_SIZE) && (lpBand->cx > 0) &&
+                (fudge > curwidth)) {
+                TRACE("adjusting band %d by %d, fudge=%d, curwidth=%d, extra=%d\n",
+                      i, fudge-curwidth, fudge, curwidth, extra);
+                if ((fudge - curwidth) > extra)
+                    fudge = curwidth + extra;
+                extra -= (fudge - curwidth);
+                curwidth = fudge;
+            }
+            else {
+                TRACE("adjusting band %d by %d, fudge=%d, curwidth=%d\n",
+                      i, extra, fudge, curwidth);
+                curwidth += extra;
+                extra = 0;
+            }
+        }
+
+        /* set new right/bottom point */
+        if (infoPtr->dwStyle & CCS_VERT)
+            lpBand->rcBand.bottom = lpBand->rcBand.top + curwidth;
+        else
+            lpBand->rcBand.right = lpBand->rcBand.left + curwidth;
+        TRACE("Phase 1 band %d, (%d,%d)-(%d,%d), orig x=%d, xsep=%d\n",
+              i, lpBand->rcBand.left, lpBand->rcBand.top,
+              lpBand->rcBand.right, lpBand->rcBand.bottom, x, xsep);
+        x = rcBrb(lpBand);
+    }
+    if ((x >= maxx) || (last_adjusted != -1)) {
+        if (x > maxx) {
+            ERR("Phase 1 failed, x=%d, maxx=%d, start=%u, end=%u\n", 
+                x, maxx,  rowstart, rowend);
+        }
+        /* done, so spread extra space */
+        if (x < maxx) {
+            fudge = maxx - x;
+            TRACE("Need to spread %d on last adjusted band %d\n",
+                fudge, last_adjusted);
+            for (i=(INT)last_adjusted; i<=(INT)rowend; i++) {
+                lpBand = &infoPtr->bands[i];
+                if (HIDDENBAND(lpBand)) continue;
+
+                /* set right/bottom point */
+                if (i != last_adjusted) {
+                    if (infoPtr->dwStyle & CCS_VERT)
+                        lpBand->rcBand.top += fudge;
+                    else
+                        lpBand->rcBand.left += fudge;
+                }
+
+                /* set left/bottom point */
+                if (infoPtr->dwStyle & CCS_VERT)
+                    lpBand->rcBand.bottom += fudge;
+                else
+                    lpBand->rcBand.right += fudge;
+            }
+        }
+        TRACE("Phase 1 succeeded, used x=%d\n", x);
+        REBAR_FixVert (infoPtr, rowstart, rowend, mcy);
+        return;
     }
 
@@ -737 +787 @@
     x = 0;
     for (i=(INT)rowstart; i<=(INT)rowend; i++) {
-    lpBand = &infoPtr->bands[i];
-    if (HIDDENBAND(lpBand)) continue;
-    xsep = (x == 0) ? 0 : SEP_WIDTH;
-    curwidth = rcBw(lpBand);
-
-    /* set new left/top point */
-    if (infoPtr->dwStyle & CCS_VERT)
-        lpBand->rcBand.top = x + xsep;
-    else
-        lpBand->rcBand.left = x + xsep;
-
-    /* compute new width */
-    if (extra) {
-        curwidth += extra;
-        extra = 0;
-    }
-
-    /* set new right/bottom point */
-    if (infoPtr->dwStyle & CCS_VERT)
-        lpBand->rcBand.bottom = lpBand->rcBand.top + curwidth;
-    else
-        lpBand->rcBand.right = lpBand->rcBand.left + curwidth;
-    TRACE("Phase 2 band %d, (%d,%d)-(%d,%d), orig x=%d, xsep=%d\n",
-          i, lpBand->rcBand.left, lpBand->rcBand.top,
-          lpBand->rcBand.right, lpBand->rcBand.bottom, x, xsep);
-    x = rcBrb(lpBand);
+        lpBand = &infoPtr->bands[i];
+        if (HIDDENBAND(lpBand)) continue;
+        xsep = (x == 0) ? 0 : SEP_WIDTH;
+        curwidth = rcBw(lpBand);
+
+        /* set new left/top point */
+        if (infoPtr->dwStyle & CCS_VERT)
+            lpBand->rcBand.top = x + xsep;
+        else
+            lpBand->rcBand.left = x + xsep;
+
+        /* compute new width */
+        if (extra) {
+            curwidth += extra;
+            extra = 0;
+        }
+
+        /* set new right/bottom point */
+        if (infoPtr->dwStyle & CCS_VERT)
+            lpBand->rcBand.bottom = lpBand->rcBand.top + curwidth;
+        else
+            lpBand->rcBand.right = lpBand->rcBand.left + curwidth;
+        TRACE("Phase 2 band %d, (%d,%d)-(%d,%d), orig x=%d, xsep=%d\n",
+              i, lpBand->rcBand.left, lpBand->rcBand.top,
+              lpBand->rcBand.right, lpBand->rcBand.bottom, x, xsep);
+        x = rcBrb(lpBand);
     }
     if (x >= maxx) {
-    if (x > maxx) {
-        ERR("Phase 2 failed, x=%d, maxx=%d, start=%u, end=%u\n",
-        x, maxx,  rowstart, rowend);
-    }
-    /* done, so spread extra space */
-    TRACE("Phase 2 succeeded, used x=%d\n", x);
-    REBAR_FixVert (infoPtr, rowstart, rowend, mcy);
-    return;
+        if (x > maxx) {
+            ERR("Phase 2 failed, x=%d, maxx=%d, start=%u, end=%u\n", 
+                x, maxx,  rowstart, rowend);
+        }
+        /* done, so spread extra space */
+        TRACE("Phase 2 succeeded, used x=%d\n", x);
+        REBAR_FixVert (infoPtr, rowstart, rowend, mcy);
+        return;
     }
 
@@ -782 +832 @@
     lpBand = &infoPtr->bands[rowstart];
     ERR("Serious problem adjusting row %d, start band %d, end band %d\n",
-    lpBand->iRow, rowstart, rowend);
+        lpBand->iRow, rowstart, rowend);
     REBAR_DumpBand (infoPtr);
     return;
@@ -806 +856 @@
       if (HIDDENBAND(lpBand)) {
           SetRect (&lpBand->rcChild,
-           lpBand->rcBand.right, lpBand->rcBand.top,
-           lpBand->rcBand.right, lpBand->rcBand.bottom);
-      continue;
+                   lpBand->rcBand.right, lpBand->rcBand.top,
+                   lpBand->rcBand.right, lpBand->rcBand.bottom);
+          continue;
       }
 
@@ -815 +865 @@
       /* set initial gripper rectangle */
       SetRect (&lpBand->rcGripper, lpBand->rcBand.left, lpBand->rcBand.top,
-           lpBand->rcBand.left, lpBand->rcBand.bottom);
+               lpBand->rcBand.left, lpBand->rcBand.bottom);
 
       /* calculate gripper rectangle */
       if ( lpBand->fStatus & HAS_GRIPPER) {
-      lpBand->fDraw |= DRAW_GRIPPER;
-      lpBand->rcGripper.left   += REBAR_PRE_GRIPPER;
-      lpBand->rcGripper.right  = lpBand->rcGripper.left + GRIPPER_WIDTH;
-      lpBand->rcGripper.top    += 2;
-      lpBand->rcGripper.bottom -= 2;
-
-      SetRect (&lpBand->rcCapImage,
-           lpBand->rcGripper.right+REBAR_ALWAYS_SPACE, lpBand->rcBand.top,
-           lpBand->rcGripper.right+REBAR_ALWAYS_SPACE, lpBand->rcBand.bottom);
+          lpBand->fDraw |= DRAW_GRIPPER;
+          lpBand->rcGripper.left   += REBAR_PRE_GRIPPER;
+          lpBand->rcGripper.right  = lpBand->rcGripper.left + GRIPPER_WIDTH;
+          lpBand->rcGripper.top    += 2;
+          lpBand->rcGripper.bottom -= 2;
+
+          SetRect (&lpBand->rcCapImage,
+                   lpBand->rcGripper.right+REBAR_ALWAYS_SPACE, lpBand->rcBand.top,
+                   lpBand->rcGripper.right+REBAR_ALWAYS_SPACE, lpBand->rcBand.bottom);
       }
       else {  /* no gripper will be drawn */
-      xoff = 0;
-      if (lpBand->fStatus & (HAS_IMAGE | HAS_TEXT))
-          /* if no gripper but either image or text, then leave space */
-          xoff = REBAR_ALWAYS_SPACE;
-      SetRect (&lpBand->rcCapImage,
-           lpBand->rcBand.left+xoff, lpBand->rcBand.top,
-           lpBand->rcBand.left+xoff, lpBand->rcBand.bottom);
+          xoff = 0;
+          if (lpBand->fStatus & (HAS_IMAGE | HAS_TEXT))
+              /* if no gripper but either image or text, then leave space */
+              xoff = REBAR_ALWAYS_SPACE;
+          SetRect (&lpBand->rcCapImage, 
+                   lpBand->rcBand.left+xoff, lpBand->rcBand.top,
+                   lpBand->rcBand.left+xoff, lpBand->rcBand.bottom);
       }
 
       /* image is visible */
       if (lpBand->fStatus & HAS_IMAGE) {
-      lpBand->fDraw |= DRAW_IMAGE;
-      lpBand->rcCapImage.right  += infoPtr->imageSize.cx;
-      lpBand->rcCapImage.bottom = lpBand->rcCapImage.top + infoPtr->imageSize.cy;
-
-      /* set initial caption text rectangle */
-      SetRect (&lpBand->rcCapText,
-           lpBand->rcCapImage.right+REBAR_POST_IMAGE, lpBand->rcBand.top+1,
-           lpBand->rcBand.left+lpBand->cxHeader, lpBand->rcBand.bottom-1);
-      /* update band height
-      if (lpBand->uMinHeight < infoPtr->imageSize.cy + 2) {
-          lpBand->uMinHeight = infoPtr->imageSize.cy + 2;
-          lpBand->rcBand.bottom = lpBand->rcBand.top + lpBand->uMinHeight;
-      }  */
+          lpBand->fDraw |= DRAW_IMAGE;
+          lpBand->rcCapImage.right  += infoPtr->imageSize.cx;
+          lpBand->rcCapImage.bottom = lpBand->rcCapImage.top + infoPtr->imageSize.cy;
+
+          /* set initial caption text rectangle */
+          SetRect (&lpBand->rcCapText,
+                   lpBand->rcCapImage.right+REBAR_POST_IMAGE, lpBand->rcBand.top+1,
+                   lpBand->rcBand.left+lpBand->cxHeader, lpBand->rcBand.bottom-1);
+          /* update band height 
+          if (lpBand->uMinHeight < infoPtr->imageSize.cy + 2) {
+              lpBand->uMinHeight = infoPtr->imageSize.cy + 2;
+              lpBand->rcBand.bottom = lpBand->rcBand.top + lpBand->uMinHeight;
+          }  */
       }
       else {
-      /* set initial caption text rectangle */
-      SetRect (&lpBand->rcCapText, lpBand->rcCapImage.right, lpBand->rcBand.top+1,
-           lpBand->rcBand.left+lpBand->cxHeader, lpBand->rcBand.bottom-1);
+          /* set initial caption text rectangle */
+          SetRect (&lpBand->rcCapText, lpBand->rcCapImage.right, lpBand->rcBand.top+1,
+                   lpBand->rcBand.left+lpBand->cxHeader, lpBand->rcBand.bottom-1);
       }
 
       /* text is visible */
       if (lpBand->fStatus & HAS_TEXT) {
-      lpBand->fDraw |= DRAW_TEXT;
-      lpBand->rcCapText.right = max(lpBand->rcCapText.left,
-                    lpBand->rcCapText.right-REBAR_POST_TEXT);
+          lpBand->fDraw |= DRAW_TEXT;
+          lpBand->rcCapText.right = max(lpBand->rcCapText.left, 
+                                        lpBand->rcCapText.right-REBAR_POST_TEXT);
       }
 
       /* set initial child window rectangle if there is a child */
       if (lpBand->fMask & RBBIM_CHILD) {
-      xoff = lpBand->offChild.cx;
-      yoff = lpBand->offChild.cy;
-      SetRect (&lpBand->rcChild,
-           lpBand->rcBand.left+lpBand->cxHeader, lpBand->rcBand.top+yoff,
-           lpBand->rcBand.right-xoff, lpBand->rcBand.bottom-yoff);
+          xoff = lpBand->offChild.cx;
+          yoff = lpBand->offChild.cy;
+          SetRect (&lpBand->rcChild,
+                   lpBand->rcBand.left+lpBand->cxHeader, lpBand->rcBand.top+yoff,
+                   lpBand->rcBand.right-xoff, lpBand->rcBand.bottom-yoff);
       }
       else {
           SetRect (&lpBand->rcChild,
-           lpBand->rcBand.left+lpBand->cxHeader, lpBand->rcBand.top,
-           lpBand->rcBand.right, lpBand->rcBand.bottom);
+                   lpBand->rcBand.left+lpBand->cxHeader, lpBand->rcBand.top,
+                   lpBand->rcBand.right, lpBand->rcBand.bottom);
       }
 
       /* flag if notify required and invalidate rectangle */
-      if (notify &&
-      ((oldChild.right-oldChild.left != lpBand->rcChild.right-lpBand->rcChild.left) ||
-       (oldChild.bottom-oldChild.top != lpBand->rcChild.bottom-lpBand->rcChild.top))) {
-      TRACE("Child rectangle changed for band %u\n", i);
-      TRACE("    from (%d,%d)-(%d,%d)  to (%d,%d)-(%d,%d)\n",
-        oldChild.left, oldChild.top,
-            oldChild.right, oldChild.bottom,
-        lpBand->rcChild.left, lpBand->rcChild.top,
-            lpBand->rcChild.right, lpBand->rcChild.bottom);
+      if (notify && 
+          ((oldChild.right-oldChild.left != lpBand->rcChild.right-lpBand->rcChild.left) ||
+           (oldChild.bottom-oldChild.top != lpBand->rcChild.bottom-lpBand->rcChild.top))) {
+          TRACE("Child rectangle changed for band %u\n", i);
+          TRACE("    from (%d,%d)-(%d,%d)  to (%d,%d)-(%d,%d)\n",
+                oldChild.left, oldChild.top,
+                oldChild.right, oldChild.bottom,
+                lpBand->rcChild.left, lpBand->rcChild.top,
+                lpBand->rcChild.right, lpBand->rcChild.bottom);
       }
       if (lpBand->fDraw & NTF_INVALIDATE) {
-      TRACE("invalidating (%d,%d)-(%d,%d)\n",
-        lpBand->rcBand.left,
-        lpBand->rcBand.top,
-        lpBand->rcBand.right + ((lpBand->fDraw & DRAW_RIGHTSEP) ? SEP_WIDTH_SIZE : 0),
-        lpBand->rcBand.bottom + ((lpBand->fDraw & DRAW_BOTTOMSEP) ? SEP_WIDTH_SIZE : 0));
-      lpBand->fDraw &= ~NTF_INVALIDATE;
-      work = lpBand->rcBand;
-      if (lpBand->fDraw & DRAW_RIGHTSEP) work.right += SEP_WIDTH_SIZE;
-      if (lpBand->fDraw & DRAW_BOTTOMSEP) work.bottom += SEP_WIDTH_SIZE;
-      InvalidateRect(infoPtr->hwndSelf, &work, TRUE);
+          TRACE("invalidating (%d,%d)-(%d,%d)\n",
+                lpBand->rcBand.left, 
+                lpBand->rcBand.top,
+                lpBand->rcBand.right + ((lpBand->fDraw & DRAW_RIGHTSEP) ? SEP_WIDTH_SIZE : 0), 
+                lpBand->rcBand.bottom + ((lpBand->fDraw & DRAW_BOTTOMSEP) ? SEP_WIDTH_SIZE : 0));
+          lpBand->fDraw &= ~NTF_INVALIDATE;
+          work = lpBand->rcBand;
+          if (lpBand->fDraw & DRAW_RIGHTSEP) work.right += SEP_WIDTH_SIZE;
+          if (lpBand->fDraw & DRAW_BOTTOMSEP) work.bottom += SEP_WIDTH_SIZE;
+          InvalidateRect(infoPtr->hwndSelf, &work, TRUE);
       }
 
@@ -926 +976 @@
 
     for(i=rstart; i<rend; i++){
-    lpBand = &infoPtr->bands[i];
-    if (HIDDENBAND(lpBand)) continue;
-    oldChild = lpBand->rcChild;
-
-    /* set initial gripper rectangle */
-    SetRect (&lpBand->rcGripper, lpBand->rcBand.left, lpBand->rcBand.top,
-         lpBand->rcBand.right, lpBand->rcBand.top);
-
-    /* calculate gripper rectangle */
-    if (lpBand->fStatus & HAS_GRIPPER) {
-        lpBand->fDraw |= DRAW_GRIPPER;
-
-        if (infoPtr->dwStyle & RBS_VERTICALGRIPPER) {
-        /*  vertical gripper  */
-        lpBand->rcGripper.left   += 3;
-        lpBand->rcGripper.right  = lpBand->rcGripper.left + GRIPPER_WIDTH;
-        lpBand->rcGripper.top    += REBAR_PRE_GRIPPER;
-        lpBand->rcGripper.bottom = lpBand->rcGripper.top + GRIPPER_HEIGHT;
-
-        /* initialize Caption image rectangle  */
-        SetRect (&lpBand->rcCapImage, lpBand->rcBand.left,
-             lpBand->rcGripper.bottom + REBAR_ALWAYS_SPACE,
-             lpBand->rcBand.right,
-             lpBand->rcGripper.bottom + REBAR_ALWAYS_SPACE);
-        }
-        else {
-        /*  horizontal gripper  */
-        lpBand->rcGripper.left   += 3;
-        lpBand->rcGripper.right  -= 3;
-        lpBand->rcGripper.top    += REBAR_PRE_GRIPPER;
-        lpBand->rcGripper.bottom  = lpBand->rcGripper.top + GRIPPER_WIDTH;
-
-        /* initialize Caption image rectangle  */
-        SetRect (&lpBand->rcCapImage, lpBand->rcBand.left,
-             lpBand->rcGripper.bottom + REBAR_ALWAYS_SPACE,
-             lpBand->rcBand.right,
-             lpBand->rcGripper.bottom + REBAR_ALWAYS_SPACE);
-        }
-    }
-    else {  /* no gripper will be drawn */
-        xoff = 0;
-        if (lpBand->fStatus & (HAS_IMAGE | HAS_TEXT))
-        /* if no gripper but either image or text, then leave space */
-        xoff = REBAR_ALWAYS_SPACE;
-        /* initialize Caption image rectangle  */
-        SetRect (&lpBand->rcCapImage,
-             lpBand->rcBand.left, lpBand->rcBand.top+xoff,
-             lpBand->rcBand.right, lpBand->rcBand.top+xoff);
-    }
-
-    /* image is visible */
-    if (lpBand->fStatus & HAS_IMAGE) {
-        lpBand->fDraw |= DRAW_IMAGE;
-
-        lpBand->rcCapImage.right  = lpBand->rcCapImage.left + infoPtr->imageSize.cx;
-        lpBand->rcCapImage.bottom += infoPtr->imageSize.cy;
-
-        /* set initial caption text rectangle */
-        SetRect (&lpBand->rcCapText,
-             lpBand->rcBand.left, lpBand->rcCapImage.bottom+REBAR_POST_IMAGE,
-             lpBand->rcBand.right, lpBand->rcBand.top+lpBand->cxHeader);
-        /* update band height *
-           if (lpBand->uMinHeight < infoPtr->imageSize.cx + 2) {
-           lpBand->uMinHeight = infoPtr->imageSize.cx + 2;
-           lpBand->rcBand.right = lpBand->rcBand.left + lpBand->uMinHeight;
-           } */
-    }
-    else {
-        /* set initial caption text rectangle */
-        SetRect (&lpBand->rcCapText,
-             lpBand->rcBand.left, lpBand->rcCapImage.bottom,
-             lpBand->rcBand.right, lpBand->rcBand.top+lpBand->cxHeader);
-    }
-
-    /* text is visible */
-    if (lpBand->fStatus & HAS_TEXT) {
-        lpBand->fDraw |= DRAW_TEXT;
-        lpBand->rcCapText.bottom = max(lpBand->rcCapText.top,
-                       lpBand->rcCapText.bottom-REBAR_POST_TEXT);
-    }
-
-    /* set initial child window rectangle if there is a child */
-    if (lpBand->fMask & RBBIM_CHILD) {
-        yoff = lpBand->offChild.cx;
-        xoff = lpBand->offChild.cy;
-        SetRect (&lpBand->rcChild,
-             lpBand->rcBand.left+xoff, lpBand->rcBand.top+lpBand->cxHeader,
-             lpBand->rcBand.right-xoff, lpBand->rcBand.bottom-yoff);
-    }
-    else {
-        SetRect (&lpBand->rcChild,
-             lpBand->rcBand.left, lpBand->rcBand.top+lpBand->cxHeader,
-             lpBand->rcBand.right, lpBand->rcBand.bottom);
-    }
-
-    /* flag if notify required and invalidate rectangle */
-    if (notify &&
-        ((oldChild.right-oldChild.left != lpBand->rcChild.right-lpBand->rcChild.left) ||
-         (oldChild.bottom-oldChild.top != lpBand->rcChild.bottom-lpBand->rcChild.top))) {
-        TRACE("Child rectangle changed for band %u\n", i);
-        TRACE("    from (%d,%d)-(%d,%d)  to (%d,%d)-(%d,%d)\n",
-          oldChild.left, oldChild.top,
-          oldChild.right, oldChild.bottom,
-          lpBand->rcChild.left, lpBand->rcChild.top,
-          lpBand->rcChild.right, lpBand->rcChild.bottom);
-    }
-    if (lpBand->fDraw & NTF_INVALIDATE) {
-        TRACE("invalidating (%d,%d)-(%d,%d)\n",
-          lpBand->rcBand.left,
-          lpBand->rcBand.top,
-          lpBand->rcBand.right + ((lpBand->fDraw & DRAW_BOTTOMSEP) ? SEP_WIDTH_SIZE : 0),
-          lpBand->rcBand.bottom + ((lpBand->fDraw & DRAW_RIGHTSEP) ? SEP_WIDTH_SIZE : 0));
-        lpBand->fDraw &= ~NTF_INVALIDATE;
-        work = lpBand->rcBand;
-        if (lpBand->fDraw & DRAW_RIGHTSEP) work.bottom += SEP_WIDTH_SIZE;
-        if (lpBand->fDraw & DRAW_BOTTOMSEP) work.right += SEP_WIDTH_SIZE;
-        InvalidateRect(infoPtr->hwndSelf, &work, TRUE);
-    }
+        lpBand = &infoPtr->bands[i];
+        if (HIDDENBAND(lpBand)) continue;
+        oldChild = lpBand->rcChild;
+
+        /* set initial gripper rectangle */
+        SetRect (&lpBand->rcGripper, lpBand->rcBand.left, lpBand->rcBand.top,
+                 lpBand->rcBand.right, lpBand->rcBand.top);
+
+        /* calculate gripper rectangle */
+        if (lpBand->fStatus & HAS_GRIPPER) {
+            lpBand->fDraw |= DRAW_GRIPPER;
+
+            if (infoPtr->dwStyle & RBS_VERTICALGRIPPER) {
+                /*  vertical gripper  */
+                lpBand->rcGripper.left   += 3;
+                lpBand->rcGripper.right  = lpBand->rcGripper.left + GRIPPER_WIDTH;
+                lpBand->rcGripper.top    += REBAR_PRE_GRIPPER;
+                lpBand->rcGripper.bottom = lpBand->rcGripper.top + GRIPPER_HEIGHT;
+
+                /* initialize Caption image rectangle  */
+                SetRect (&lpBand->rcCapImage, lpBand->rcBand.left,
+                         lpBand->rcGripper.bottom + REBAR_ALWAYS_SPACE,
+                         lpBand->rcBand.right,
+                         lpBand->rcGripper.bottom + REBAR_ALWAYS_SPACE);
+            }
+            else {
+                /*  horizontal gripper  */
+                lpBand->rcGripper.left   += 2;
+                lpBand->rcGripper.right  -= 2;
+                lpBand->rcGripper.top    += REBAR_PRE_GRIPPER;
+                lpBand->rcGripper.bottom  = lpBand->rcGripper.top + GRIPPER_WIDTH;
+
+                /* initialize Caption image rectangle  */
+                SetRect (&lpBand->rcCapImage, lpBand->rcBand.left,
+                         lpBand->rcGripper.bottom + REBAR_ALWAYS_SPACE,
+                         lpBand->rcBand.right,
+                         lpBand->rcGripper.bottom + REBAR_ALWAYS_SPACE);
+            }
+        }
+        else {  /* no gripper will be drawn */
+            xoff = 0;
+            if (lpBand->fStatus & (HAS_IMAGE | HAS_TEXT))
+                /* if no gripper but either image or text, then leave space */
+                xoff = REBAR_ALWAYS_SPACE;
+            /* initialize Caption image rectangle  */
+            SetRect (&lpBand->rcCapImage, 
+                     lpBand->rcBand.left, lpBand->rcBand.top+xoff,
+                     lpBand->rcBand.right, lpBand->rcBand.top+xoff);
+        }
+
+        /* image is visible */
+        if (lpBand->fStatus & HAS_IMAGE) {
+            lpBand->fDraw |= DRAW_IMAGE;
+
+            lpBand->rcCapImage.right  = lpBand->rcCapImage.left + infoPtr->imageSize.cx;
+            lpBand->rcCapImage.bottom += infoPtr->imageSize.cy;
+
+            /* set initial caption text rectangle */
+            SetRect (&lpBand->rcCapText, 
+                     lpBand->rcBand.left, lpBand->rcCapImage.bottom+REBAR_POST_IMAGE,
+                     lpBand->rcBand.right, lpBand->rcBand.top+lpBand->cxHeader);
+            /* update band height *
+               if (lpBand->uMinHeight < infoPtr->imageSize.cx + 2) {
+               lpBand->uMinHeight = infoPtr->imageSize.cx + 2;
+               lpBand->rcBand.right = lpBand->rcBand.left + lpBand->uMinHeight;
+               } */
+        }
+        else {
+            /* set initial caption text rectangle */
+            SetRect (&lpBand->rcCapText, 
+                     lpBand->rcBand.left, lpBand->rcCapImage.bottom,
+                     lpBand->rcBand.right, lpBand->rcBand.top+lpBand->cxHeader);
+        }
+
+        /* text is visible */
+        if (lpBand->fStatus & HAS_TEXT) {
+            lpBand->fDraw |= DRAW_TEXT;
+            lpBand->rcCapText.bottom = max(lpBand->rcCapText.top,
+                                           lpBand->rcCapText.bottom);
+        }
+
+        /* set initial child window rectangle if there is a child */
+        if (lpBand->fMask & RBBIM_CHILD) {
+            yoff = lpBand->offChild.cx;
+            xoff = lpBand->offChild.cy;
+            SetRect (&lpBand->rcChild,
+                     lpBand->rcBand.left+xoff, lpBand->rcBand.top+lpBand->cxHeader,
+                     lpBand->rcBand.right-xoff, lpBand->rcBand.bottom-yoff);
+        }
+        else {
+            SetRect (&lpBand->rcChild,
+                     lpBand->rcBand.left, lpBand->rcBand.top+lpBand->cxHeader,
+                     lpBand->rcBand.right, lpBand->rcBand.bottom);
+        }
+
+        /* flag if notify required and invalidate rectangle */
+        if (notify && 
+            ((oldChild.right-oldChild.left != lpBand->rcChild.right-lpBand->rcChild.left) ||
+             (oldChild.bottom-oldChild.top != lpBand->rcChild.bottom-lpBand->rcChild.top))) {
+            TRACE("Child rectangle changed for band %u\n", i);
+            TRACE("    from (%d,%d)-(%d,%d)  to (%d,%d)-(%d,%d)\n",
+                  oldChild.left, oldChild.top,
+                  oldChild.right, oldChild.bottom,
+                  lpBand->rcChild.left, lpBand->rcChild.top,
+                  lpBand->rcChild.right, lpBand->rcChild.bottom);
+        }
+        if (lpBand->fDraw & NTF_INVALIDATE) {
+            TRACE("invalidating (%d,%d)-(%d,%d)\n",
+                  lpBand->rcBand.left, 
+                  lpBand->rcBand.top,
+                  lpBand->rcBand.right + ((lpBand->fDraw & DRAW_BOTTOMSEP) ? SEP_WIDTH_SIZE : 0), 
+                  lpBand->rcBand.bottom + ((lpBand->fDraw & DRAW_RIGHTSEP) ? SEP_WIDTH_SIZE : 0));
+            lpBand->fDraw &= ~NTF_INVALIDATE;
+            work = lpBand->rcBand;
+            if (lpBand->fDraw & DRAW_RIGHTSEP) work.bottom += SEP_WIDTH_SIZE;
+            if (lpBand->fDraw & DRAW_BOTTOMSEP) work.right += SEP_WIDTH_SIZE;
+            InvalidateRect(infoPtr->hwndSelf, &work, TRUE);
+        }
 
     }
@@ -1055 +1105 @@
 {
     RECT rc;
+    INT x, y, width, height;
+    INT xedge = GetSystemMetrics(SM_CXEDGE);
+    INT yedge = GetSystemMetrics(SM_CYEDGE);
 
     /* TEST TEST TEST */
@@ -1064 +1117 @@
 
     TRACE( " old [%ld x %ld], new [%ld x %ld], client [%d x %d]\n",
-       infoPtr->oldSize.cx, infoPtr->oldSize.cy,
-       infoPtr->calcSize.cx, infoPtr->calcSize.cy,
-       rc.right, rc.bottom);
+           infoPtr->oldSize.cx, infoPtr->oldSize.cy,
+           infoPtr->calcSize.cx, infoPtr->calcSize.cy,
+           rc.right, rc.bottom);
 
     /* If we need to shrink client, then skip size test */
     if ((infoPtr->calcSize.cy >= rc.bottom) &&
-    (infoPtr->calcSize.cx >= rc.right)) {
-
-    /* if size did not change then skip process */
-    if ((infoPtr->oldSize.cx == infoPtr->calcSize.cx) &&
-        (infoPtr->oldSize.cy == infoPtr->calcSize.cy) &&
-        !(infoPtr->fStatus & RESIZE_ANYHOW))
-        {
-        TRACE("skipping reset\n");
-        return;
-        }
+        (infoPtr->calcSize.cx >= rc.right)) {
+
+        /* if size did not change then skip process */
+        if ((infoPtr->oldSize.cx == infoPtr->calcSize.cx) &&
+            (infoPtr->oldSize.cy == infoPtr->calcSize.cy) &&
+            !(infoPtr->fStatus & RESIZE_ANYHOW))
+            {
+                TRACE("skipping reset\n");
+                return;
+            }
     }
 
@@ -1086 +1139 @@
     infoPtr->fStatus |= AUTO_RESIZE;
 
-    rc.left = 0;
-    rc.top = 0;
-    rc.right  = infoPtr->calcSize.cx;
-    rc.bottom = infoPtr->calcSize.cy;
-
-    InflateRect (&rc, 0, GetSystemMetrics(SM_CYEDGE));
-    /* see comments in _NCCalcSize for reason below is not done */
-#if 0
-    if (GetWindowLongA (infoPtr->hwndSelf, GWL_STYLE) & WS_BORDER) {
-    InflateRect (&rc, GetSystemMetrics(SM_CXEDGE), GetSystemMetrics(SM_CYEDGE));
-    }
-#endif
-
-    TRACE("setting to (0,0)-(%d,%d)\n",
-      rc.right - rc.left, rc.bottom - rc.top);
-    SetWindowPos (infoPtr->hwndSelf, 0, 0, 0,
-            rc.right - rc.left, rc.bottom - rc.top,
-            SWP_NOMOVE | SWP_NOZORDER | SWP_SHOWWINDOW);
+    width = 0;
+    height = 0;
+    x = 0;
+    y = 0;
+
+    if (infoPtr->dwStyle & WS_BORDER) {
+        width = 2 * xedge;
+        height = 2 * yedge;
+    }
+
+    if (!(infoPtr->dwStyle & CCS_NOPARENTALIGN)) {
+        INT mode = infoPtr->dwStyle & (CCS_VERT | CCS_TOP | CCS_BOTTOM);
+        RECT rcPcl;
+
+        GetClientRect(GetParent(infoPtr->hwndSelf), &rcPcl);
+        switch (mode) {
+        case CCS_TOP:
+            /* _TOP sets width to parents width */
+            width += (rcPcl.right - rcPcl.left);
+            height += infoPtr->calcSize.cy;
+            x += ((infoPtr->dwStyle & WS_BORDER) ? -xedge : 0);
+            y += ((infoPtr->dwStyle & WS_BORDER) ? -yedge : 0);
+            y += ((infoPtr->dwStyle & CCS_NODIVIDER) ? 0 : REBAR_DIVIDER);
+            break;
+        case CCS_BOTTOM:
+            /* FIXME: wrong wrong wrong */
+            /* _BOTTOM sets width to parents width */
+            width += (rcPcl.right - rcPcl.left);
+            height += infoPtr->calcSize.cy;
+            x += -xedge;
+            y = rcPcl.bottom - height + 1;
+            break;
+        case CCS_LEFT:
+            /* _LEFT sets height to parents height */
+            width += infoPtr->calcSize.cx;
+            height += (rcPcl.bottom - rcPcl.top);
+            x += ((infoPtr->dwStyle & WS_BORDER) ? -xedge : 0);
+            x += ((infoPtr->dwStyle & CCS_NODIVIDER) ? 0 : REBAR_DIVIDER);
+            y += ((infoPtr->dwStyle & WS_BORDER) ? -yedge : 0);
+            break;
+        case CCS_RIGHT:
+            /* FIXME: wrong wrong wrong */
+            /* _RIGHT sets height to parents height */
+            width += infoPtr->calcSize.cx;
+            height += (rcPcl.bottom - rcPcl.top);
+            x = rcPcl.right - width + 1;
+            y = -yedge;
+            break;
+        default:
+            width += infoPtr->calcSize.cx;
+            height += infoPtr->calcSize.cy;
+        }
+    }
+    else {
+        width += infoPtr->calcSize.cx;
+        height += infoPtr->calcSize.cy;
+    }
+
+    TRACE("hwnd %04x, style=%08lx, setting at (%d,%d) for (%d,%d)\n",
+        infoPtr->hwndSelf, infoPtr->dwStyle,
+        x, y, width, height);
+    SetWindowPos (infoPtr->hwndSelf, 0, x, y, width, height,
+                    SWP_NOZORDER);
 }
 
@@ -1121 +1219 @@
 
     for (i = start; i < endplus; i++) {
-    lpBand = &infoPtr->bands[i];
-
-    if (HIDDENBAND(lpBand)) continue;
-    if (lpBand->hwndChild) {
-        TRACE("hwndChild = %x\n", lpBand->hwndChild);
-
-        /* Always geterate the RBN_CHILDSIZE even it child
-           did not change */
-        rbcz.uBand = i;
-        rbcz.wID = lpBand->wID;
-        rbcz.rcChild = lpBand->rcChild;
-        rbcz.rcBand = lpBand->rcBand;
-        rbcz.rcBand.left += lpBand->cxHeader;
-        REBAR_Notify ((NMHDR *)&rbcz, infoPtr, RBN_CHILDSIZE);
-        if (!EqualRect (&lpBand->rcChild, &rbcz.rcChild)) {
-        TRACE("Child rect changed by NOTIFY for band %u\n", i);
-        TRACE("    from (%d,%d)-(%d,%d)  to (%d,%d)-(%d,%d)\n",
-              lpBand->rcChild.left, lpBand->rcChild.top,
-              lpBand->rcChild.right, lpBand->rcChild.bottom,
-              rbcz.rcChild.left, rbcz.rcChild.top,
-              rbcz.rcChild.right, rbcz.rcChild.bottom);
-        }
-
-        GetClassNameA (lpBand->hwndChild, szClassName, 40);
-        if (!lstrcmpA (szClassName, "ComboBox") ||
-        !lstrcmpA (szClassName, WC_COMBOBOXEXA)) {
-        INT nEditHeight, yPos;
-        RECT rc;
-
-        /* special placement code for combo or comboex box */
-
-
-        /* get size of edit line */
-        GetWindowRect (lpBand->hwndChild, &rc);
-        nEditHeight = rc.bottom - rc.top;
-        yPos = (lpBand->rcChild.bottom + lpBand->rcChild.top - nEditHeight)/2;
-
-        /* center combo box inside child area */
-        TRACE("moving child (Combo(Ex)) %04x to (%d,%d) for (%d,%d)\n",
-              lpBand->hwndChild,
-              lpBand->rcChild.left, yPos,
-              lpBand->rcChild.right - lpBand->rcChild.left,
-              nEditHeight);
-        deferpos = DeferWindowPos (deferpos, lpBand->hwndChild, HWND_TOP,
-                       lpBand->rcChild.left,
-                       /*lpBand->rcChild.top*/ yPos,
-                       lpBand->rcChild.right - lpBand->rcChild.left,
-                       nEditHeight,
-                       SWP_NOZORDER);
-        if (!deferpos)
-            ERR("DeferWindowPos returned NULL\n");
-        }
-        else {
-        TRACE("moving child (Other) %04x to (%d,%d) for (%d,%d)\n",
-              lpBand->hwndChild,
-              lpBand->rcChild.left, lpBand->rcChild.top,
-              lpBand->rcChild.right - lpBand->rcChild.left,
-              lpBand->rcChild.bottom - lpBand->rcChild.top);
-        deferpos = DeferWindowPos (deferpos, lpBand->hwndChild, HWND_TOP,
-                       lpBand->rcChild.left,
-                       lpBand->rcChild.top,
-                       lpBand->rcChild.right - lpBand->rcChild.left,
-                       lpBand->rcChild.bottom - lpBand->rcChild.top,
-                       SWP_NOZORDER);
-        if (!deferpos)
-            ERR("DeferWindowPos returned NULL\n");
-        }
-    }
+        lpBand = &infoPtr->bands[i];
+
+        if (HIDDENBAND(lpBand)) continue;
+        if (lpBand->hwndChild) {
+            TRACE("hwndChild = %x\n", lpBand->hwndChild);
+
+            /* Always geterate the RBN_CHILDSIZE even it child
+                   did not change */
+            rbcz.uBand = i;
+            rbcz.wID = lpBand->wID;
+            rbcz.rcChild = lpBand->rcChild;
+            rbcz.rcBand = lpBand->rcBand;
+            rbcz.rcBand.left += lpBand->cxHeader;
+            REBAR_Notify ((NMHDR *)&rbcz, infoPtr, RBN_CHILDSIZE);
+            if (!EqualRect (&lpBand->rcChild, &rbcz.rcChild)) {
+                TRACE("Child rect changed by NOTIFY for band %u\n", i);
+                TRACE("    from (%d,%d)-(%d,%d)  to (%d,%d)-(%d,%d)\n",
+                      lpBand->rcChild.left, lpBand->rcChild.top,
+                      lpBand->rcChild.right, lpBand->rcChild.bottom,
+                      rbcz.rcChild.left, rbcz.rcChild.top,
+                      rbcz.rcChild.right, rbcz.rcChild.bottom);
+                lpBand->rcChild = rbcz.rcChild;  /* *** ??? */
+            }
+
+            /* native (IE4 in "Favorites" frame **1) does:
+             *   SetRect (&rc, -1, -1, -1, -1)
+             *   EqualRect (&rc,band->rc???)
+             *   if ret==0
+             *     CopyRect (band->rc????, &rc)
+             *     set flag outside of loop
+             */
+
+            GetClassNameA (lpBand->hwndChild, szClassName, 40);
+            if (!lstrcmpA (szClassName, "ComboBox") ||
+                !lstrcmpA (szClassName, WC_COMBOBOXEXA)) {
+                INT nEditHeight, yPos;
+                RECT rc;
+
+                /* special placement code for combo or comboex box */
+
+
+                /* get size of edit line */
+                GetWindowRect (lpBand->hwndChild, &rc);
+                nEditHeight = rc.bottom - rc.top;
+                yPos = (lpBand->rcChild.bottom + lpBand->rcChild.top - nEditHeight)/2;
+
+                /* center combo box inside child area */
+                TRACE("moving child (Combo(Ex)) %04x to (%d,%d) for (%d,%d)\n",
+                      lpBand->hwndChild,
+                      lpBand->rcChild.left, yPos,
+                      lpBand->rcChild.right - lpBand->rcChild.left,
+                      nEditHeight);
+                deferpos = DeferWindowPos (deferpos, lpBand->hwndChild, HWND_TOP,
+                                           lpBand->rcChild.left,
+                                           /*lpBand->rcChild.top*/ yPos,
+                                           lpBand->rcChild.right - lpBand->rcChild.left,
+                                           nEditHeight,
+                                           SWP_NOZORDER);
+                if (!deferpos)
+                    ERR("DeferWindowPos returned NULL\n");
+            }
+            else {
+                TRACE("moving child (Other) %04x to (%d,%d) for (%d,%d)\n",
+                      lpBand->hwndChild,
+                      lpBand->rcChild.left, lpBand->rcChild.top,
+                      lpBand->rcChild.right - lpBand->rcChild.left,
+                      lpBand->rcChild.bottom - lpBand->rcChild.top);
+                deferpos = DeferWindowPos (deferpos, lpBand->hwndChild, HWND_TOP,
+                                           lpBand->rcChild.left,
+                                           lpBand->rcChild.top,
+                                           lpBand->rcChild.right - lpBand->rcChild.left,
+                                           lpBand->rcChild.bottom - lpBand->rcChild.top,
+                                           SWP_NOZORDER);
+                if (!deferpos)
+                    ERR("DeferWindowPos returned NULL\n");
+            }
+        }
     }
     if (!EndDeferWindowPos(deferpos))
         ERR("EndDeferWindowPos returned NULL\n");
+
+    UpdateWindow (infoPtr->hwndSelf);
+
     if (infoPtr->fStatus & NTF_HGHTCHG) {
         infoPtr->fStatus &= ~NTF_HGHTCHG;
         REBAR_Notify (&heightchange, infoPtr, RBN_HEIGHTCHANGE);
     }
+
+    /* native (from **1 above) does:
+     *      UpdateWindow(rebar)
+     *      REBAR_ForceResize
+     *      RBN_HEIGHTCHANGE if necessary
+     *      if ret from any EqualRect was 0
+     *         Goto "BeginDeferWindowPos"
+     */
+
 }
 
@@ -1207 +1326 @@
     REBAR_BAND *lpBand, *prevBand;
     RECT rcClient, rcAdj;
-    INT x, y, cx, cxsep, mmcy, mcy, clientcx, clientcy;
+    INT initx, inity, x, y, cx, cxsep, mmcy, mcy, clientcx, clientcy;
     INT adjcx, adjcy, row, rightx, bottomy, origheight;
-    UINT i, j, rowstart;
+    UINT i, j, rowstart, origrows;
     BOOL dobreak;
 
     if (!(infoPtr->fStatus & BAND_NEEDS_LAYOUT)) {
-    TRACE("no layout done. No band changed.\n");
-    REBAR_DumpBand (infoPtr);
-    return;
+        TRACE("no layout done. No band changed.\n");
+        REBAR_DumpBand (infoPtr);
+        return;
     }
     infoPtr->fStatus &= ~BAND_NEEDS_LAYOUT;
@@ -1222 +1341 @@
     GetClientRect (infoPtr->hwndSelf, &rcClient);
     TRACE("Client is (%d,%d)-(%d,%d)\n",
-      rcClient.left, rcClient.top, rcClient.right, rcClient.bottom);
+          rcClient.left, rcClient.top, rcClient.right, rcClient.bottom);
 
     if (lpRect) {
-    rcAdj = *lpRect;
-    TRACE("adjustment rect is (%d,%d)-(%d,%d)\n",
-          rcAdj.left, rcAdj.top, rcAdj.right, rcAdj.bottom);
+        rcAdj = *lpRect;
+        TRACE("adjustment rect is (%d,%d)-(%d,%d)\n",
+              rcAdj.left, rcAdj.top, rcAdj.right, rcAdj.bottom);
     }
     else {
@@ -1244 +1363 @@
 
     if (!infoPtr->DoRedraw && (clientcx == 0) && (clientcy == 0)) {
-    ERR("no redraw and client is zero, skip layout\n");
-    infoPtr->fStatus |= BAND_NEEDS_LAYOUT;
-    return;
+        ERR("no redraw and client is zero, skip layout\n");
+        infoPtr->fStatus |= BAND_NEEDS_LAYOUT;
+        return;
     }
 
     /* save height of original control */
-    if (infoPtr->dwStyle & CCS_VERT)
+    if (infoPtr->dwStyle & CCS_VERT) 
         origheight = infoPtr->calcSize.cx;
     else
         origheight = infoPtr->calcSize.cy;
-
+    origrows = infoPtr->uNumRows;
+
+    initx = 0;
+    inity = 0;
 
     /* ******* Start Phase 1 - all bands on row at minimum size ******* */
 
-    TRACE("band loop constants, clientcx=%d, clientcy=%d\n",
-      clientcx, clientcy);
-    x = 0;
-    y = 0;
+    TRACE("band loop constants, clientcx=%d, clientcy=%d, adjcx=%d, adjcy=%d\n",
+          clientcx, clientcy, adjcx, adjcy);
+    x = initx;
+    y = inity;
     row = 1;
     cx = 0;
@@ -1269 +1391 @@
 
     for (i = 0; i < infoPtr->uNumBands; i++) {
-    lpBand = &infoPtr->bands[i];
-    lpBand->fDraw = 0;
-    lpBand->iRow = row;
-
-    if (HIDDENBAND(lpBand)) continue;
-
-    lpBand->rcoldBand = lpBand->rcBand;
-
-    /* separator from previous band */
-    cxsep = ( ((infoPtr->dwStyle & CCS_VERT) ? y : x)==0) ? 0 : SEP_WIDTH;
-
-    /* Header: includes gripper, text, image */
-    cx = lpBand->cxHeader;
-    if (lpBand->fStyle & RBBS_FIXEDSIZE) cx = lpBand->lcx;
-
-    if (infoPtr->dwStyle & CCS_VERT)
-        dobreak = (y + cx + cxsep > adjcy);
+        lpBand = &infoPtr->bands[i];
+        lpBand->fDraw = 0;
+        lpBand->iRow = row;
+
+        if (HIDDENBAND(lpBand)) continue;
+
+        lpBand->rcoldBand = lpBand->rcBand;
+
+        /* Set the offset of the child window */
+        if ((lpBand->fMask & RBBIM_CHILD) &&
+            !(lpBand->fStyle & RBBS_FIXEDSIZE)) {
+            lpBand->offChild.cx = 4;   /* ??? */
+        }
+        lpBand->offChild.cy = ((lpBand->fStyle & RBBS_CHILDEDGE) ? 2 : 0);
+
+        /* separator from previous band */
+        cxsep = ( ((infoPtr->dwStyle & CCS_VERT) ? y==inity : x==initx)) ? 
+            0 : SEP_WIDTH;  
+
+        /* Header: includes gripper, text, image */
+        cx = lpBand->cxHeader;   
+        if (lpBand->fStyle & RBBS_FIXEDSIZE) cx = lpBand->lcx;
+
+        if (infoPtr->dwStyle & CCS_VERT)
+            dobreak = (y + cx + cxsep > adjcy);
         else
-        dobreak = (x + cx + cxsep > adjcx);
-
-    /* This is the check for whether we need to start a new row */
-    if ( ( (lpBand->fStyle & RBBS_BREAK) && (i != 0) ) ||
-         ( ((infoPtr->dwStyle & CCS_VERT) ? (y != 0) : (x != 0)) && dobreak)) {
-
-        for (j = rowstart; j < i; j++) {
-        REBAR_BAND *lpB;
-        lpB = &infoPtr->bands[j];
-        if (infoPtr->dwStyle & CCS_VERT) {
-            lpB->rcBand.right  = lpB->rcBand.left + mcy;
-        }
-        else {
-            lpB->rcBand.bottom = lpB->rcBand.top + mcy;
-        }
-        }
-
-        TRACE("Spliting to new row %d on band %u\n", row+1, i);
-        if (infoPtr->dwStyle & CCS_VERT) {
-        y = 0;
-        x += (mcy + SEP_WIDTH);
-        }
-        else {
-        x = 0;
-        y += (mcy + SEP_WIDTH);
-        }
-
-        mcy = 0;
-        cxsep = 0;
-        row++;
-        lpBand->iRow = row;
-        prevBand = NULL;
-        rowstart = i;
-    }
-
-    if (mcy < lpBand->lcy + REBARSPACE) mcy = lpBand->lcy + REBARSPACE;
-
-    /* if boundary rect specified then limit mcy */
-    if (lpRect) {
-        if (infoPtr->dwStyle & CCS_VERT) {
-            if (x+mcy > adjcx) {
-            mcy = adjcx - x;
-            TRACE("row %u limiting mcy=%d, adjcx=%d, x=%d\n",
-              i, mcy, adjcx, x);
-        }
-        }
-        else {
-            if (y+mcy > adjcy) {
-            mcy = adjcy - y;
-            TRACE("row %u limiting mcy=%d, adjcy=%d, y=%d\n",
-              i, mcy, adjcy, y);
-        }
-        }
-    }
-
-    TRACE("band %u, row %d, x=%d, y=%d, cxsep=%d, cx=%d\n",
-          i, row,
-          x, y, cxsep, cx);
-    if (infoPtr->dwStyle & CCS_VERT) {
-        /* bound the bottom side if we have a bounding rectangle */
-        rightx = clientcx;
-        bottomy = (lpRect) ? min(clientcy, y+cxsep+cx) : y+cxsep+cx;
-        lpBand->rcBand.left   = x;
-        lpBand->rcBand.right  = x + min(mcy, lpBand->lcy+REBARSPACE);
-        lpBand->rcBand.top    = min(bottomy, y + cxsep);
-        lpBand->rcBand.bottom = bottomy;
-        lpBand->uMinHeight = lpBand->lcy;
-        y = bottomy;
-    }
-    else {
-        /* bound the right side if we have a bounding rectangle */
-        rightx = (lpRect) ? min(clientcx, x+cxsep+cx) : x+cxsep+cx;
-        bottomy = clientcy;
-        lpBand->rcBand.left   = min(rightx, x + cxsep);
-        lpBand->rcBand.right  = rightx;
-        lpBand->rcBand.top    = y;
-        lpBand->rcBand.bottom = y + min(mcy, lpBand->lcy+REBARSPACE);
-        lpBand->uMinHeight = lpBand->lcy;
-        x = rightx;
-    }
-    TRACE("band %u, row %d, (%d,%d)-(%d,%d)\n",
-          i, row,
-          lpBand->rcBand.left, lpBand->rcBand.top,
-          lpBand->rcBand.right, lpBand->rcBand.bottom);
-    prevBand = lpBand;
+            dobreak = (x + cx + cxsep > adjcx);
+
+        /* This is the check for whether we need to start a new row */
+        if ( ( (lpBand->fStyle & RBBS_BREAK) && (i != 0) ) ||
+             ( ((infoPtr->dwStyle & CCS_VERT) ? (y != 0) : (x != 0)) && dobreak)) {
+
+            for (j = rowstart; j < i; j++) {
+                REBAR_BAND *lpB;
+                lpB = &infoPtr->bands[j];
+                if (infoPtr->dwStyle & CCS_VERT) {
+                    lpB->rcBand.right  = lpB->rcBand.left + mcy;
+                }
+                else {
+                    lpB->rcBand.bottom = lpB->rcBand.top + mcy;
+                }
+            }
+
+            TRACE("P1 Spliting to new row %d on band %u\n", row+1, i);
+            if (infoPtr->dwStyle & CCS_VERT) {
+                y = inity;
+                x += (mcy + SEP_WIDTH);
+            }
+            else {
+                x = initx;
+                y += (mcy + SEP_WIDTH);
+            }
+
+            mcy = 0;
+            cxsep = 0;
+            row++;
+            lpBand->iRow = row;
+            prevBand = NULL;
+            rowstart = i;
+        }
+
+        if (mcy < lpBand->lcy + REBARSPACE(lpBand)) 
+            mcy = lpBand->lcy + REBARSPACE(lpBand);
+
+        /* if boundary rect specified then limit mcy */
+        if (lpRect) {
+            if (infoPtr->dwStyle & CCS_VERT) {
+                if (x+mcy > adjcx) {
+                    mcy = adjcx - x;
+                    TRACE("P1 row %u limiting mcy=%d, adjcx=%d, x=%d\n",
+                          i, mcy, adjcx, x);
+                }
+            }
+            else {
+                if (y+mcy > adjcy) {
+                    mcy = adjcy - y;
+                    TRACE("P1 row %u limiting mcy=%d, adjcy=%d, y=%d\n",
+                          i, mcy, adjcy, y);
+                }
+            }
+        }
+
+        TRACE("P1 band %u, row %d, x=%d, y=%d, cxsep=%d, cx=%d\n",
+              i, row,
+              x, y, cxsep, cx);
+        if (infoPtr->dwStyle & CCS_VERT) {
+            /* bound the bottom side if we have a bounding rectangle */
+            rightx = clientcx;
+            bottomy = (lpRect) ? min(clientcy, y+cxsep+cx) : y+cxsep+cx;
+            lpBand->rcBand.left   = x;
+            lpBand->rcBand.right  = x + min(mcy, 
+                                            lpBand->lcy+REBARSPACE(lpBand));
+            lpBand->rcBand.top    = min(bottomy, y + cxsep);
+            lpBand->rcBand.bottom = bottomy;
+            lpBand->uMinHeight = lpBand->lcy;
+            y = bottomy;
+        }
+        else {
+            /* bound the right side if we have a bounding rectangle */
+            rightx = (lpRect) ? min(clientcx, x+cxsep+cx) : x+cxsep+cx;
+            bottomy = clientcy;
+            lpBand->rcBand.left   = min(rightx, x + cxsep);
+            lpBand->rcBand.right  = rightx;
+            lpBand->rcBand.top    = y;
+            lpBand->rcBand.bottom = y + min(mcy, 
+                                            lpBand->lcy+REBARSPACE(lpBand));
+            lpBand->uMinHeight = lpBand->lcy;
+            x = rightx;
+        }
+        TRACE("P1 band %u, row %d, (%d,%d)-(%d,%d)\n",
+              i, row,
+              lpBand->rcBand.left, lpBand->rcBand.top,
+              lpBand->rcBand.right, lpBand->rcBand.bottom);
+        prevBand = lpBand;
 
     } /* for (i = 0; i < infoPtr->uNumBands... */
@@ -1381 +1514 @@
 
     for (j = rowstart; j < infoPtr->uNumBands; j++) {
-    lpBand = &infoPtr->bands[j];
-    if (infoPtr->dwStyle & CCS_VERT) {
-        lpBand->rcBand.right  = lpBand->rcBand.left + mcy;
-    }
-    else {
-        lpBand->rcBand.bottom = lpBand->rcBand.top + mcy;
-    }
+        lpBand = &infoPtr->bands[j];
+        if (infoPtr->dwStyle & CCS_VERT) {
+            lpBand->rcBand.right  = lpBand->rcBand.left + mcy;
+        }
+        else {
+            lpBand->rcBand.bottom = lpBand->rcBand.top + mcy;
+        }
     }
 
@@ -1400 +1533 @@
     mmcy = 0;
     if (!(infoPtr->dwStyle & RBS_VARHEIGHT)) {
-    INT xy;
-
-    /* get the max height of all bands */
-    for (i=0; i<infoPtr->uNumBands; i++) {
-        lpBand = &infoPtr->bands[i];
-        if (HIDDENBAND(lpBand)) continue;
-        if (infoPtr->dwStyle & CCS_VERT)
-        mmcy = max(mmcy, lpBand->rcBand.right - lpBand->rcBand.left);
-        else
-        mmcy = max(mmcy, lpBand->rcBand.bottom - lpBand->rcBand.top);
-    }
-
-    /* now adjust all rectangles by using the height found above */
-    xy = 0;
-    row = 1;
-    for (i=0; i<infoPtr->uNumBands; i++) {
-        lpBand = &infoPtr->bands[i];
-        if (HIDDENBAND(lpBand)) continue;
-        if (lpBand->iRow != row)
-        xy += (mmcy + SEP_WIDTH);
-        if (infoPtr->dwStyle & CCS_VERT) {
-        lpBand->rcBand.left = xy;
-        lpBand->rcBand.right = xy + mmcy;
-        }
-        else {
-        lpBand->rcBand.top = xy;
-        lpBand->rcBand.bottom = xy + mmcy;
-        }
-    }
-
-    /* set the x/y values to the correct maximum */
-    if (infoPtr->dwStyle & CCS_VERT)
-        x = xy + mmcy;
-    else
-        y = xy + mmcy;
+        INT xy;
+
+        /* get the max height of all bands */
+        for (i=0; i<infoPtr->uNumBands; i++) {
+            lpBand = &infoPtr->bands[i];
+            if (HIDDENBAND(lpBand)) continue;
+            if (infoPtr->dwStyle & CCS_VERT)
+                mmcy = max(mmcy, lpBand->rcBand.right - lpBand->rcBand.left);
+            else
+                mmcy = max(mmcy, lpBand->rcBand.bottom - lpBand->rcBand.top);
+        }
+
+        /* now adjust all rectangles by using the height found above */
+        xy = 0;
+        row = 1;
+        for (i=0; i<infoPtr->uNumBands; i++) {
+            lpBand = &infoPtr->bands[i];
+            if (HIDDENBAND(lpBand)) continue;
+            if (lpBand->iRow != row)
+                xy += (mmcy + SEP_WIDTH);
+            if (infoPtr->dwStyle & CCS_VERT) {
+                lpBand->rcBand.left = xy;
+                lpBand->rcBand.right = xy + mmcy;
+            }
+            else {
+                lpBand->rcBand.top = xy;
+                lpBand->rcBand.bottom = xy + mmcy;
+            }
+        }
+
+        /* set the x/y values to the correct maximum */
+        if (infoPtr->dwStyle & CCS_VERT)
+            x = xy + mmcy;
+        else
+            y = xy + mmcy;
     }
 
@@ -1446 +1579 @@
     if (lpRect) {
         INT i, j, prev_rh, new_rh, adj_rh, prev_idx, current_idx;
-    REBAR_BAND *prev, *current, *walk;
+        REBAR_BAND *prev, *current, *walk;
 
 /* FIXME:  problem # 2 */
-    if (((infoPtr->dwStyle & CCS_VERT) ?
+        if (((infoPtr->dwStyle & CCS_VERT) ? 
 #if PROBLEM2
-         (x < adjcx) : (y < adjcy)
+             (x < adjcx) : (y < adjcy)
 #else
-         (adjcx - x > 4) : (adjcy - y > 4)
+             (adjcx - x > 4) : (adjcy - y > 4)
 #endif
-         ) &&
-        (infoPtr->uNumBands > 1)) {
-        for (i=(INT)infoPtr->uNumBands-2; i>=0; i--) {
-        TRACE("adjcx=%d, adjcy=%d, x=%d, y=%d\n",
-              adjcx, adjcy, x, y);
-
-        /* find the current band (starts at i+1) */
-        current = &infoPtr->bands[i+1];
-        current_idx = i+1;
-        while (HIDDENBAND(current)) {
-            i--;
-            if (i < 0) break; /* out of bands */
-            current = &infoPtr->bands[i+1];
-            current_idx = i+1;
-        }
-        if (i < 0) break; /* out of bands */
-
-        /* now find the prev band (starts at i) */
-            prev = &infoPtr->bands[i];
-        prev_idx = i;
-        while (HIDDENBAND(prev)) {
-            i--;
-            if (i < 0) break; /* out of bands */
-            prev = &infoPtr->bands[i];
-            prev_idx = i;
-        }
-        if (i < 0) break; /* out of bands */
-
-        prev_rh = ircBw(prev);
-        if (prev->iRow == current->iRow) {
-            new_rh = (infoPtr->dwStyle & RBS_VARHEIGHT) ?
-            current->lcy + REBARSPACE :
-            mmcy;
-            adj_rh = new_rh + SEP_WIDTH;
-            infoPtr->uNumRows++;
-            current->fDraw |= NTF_INVALIDATE;
-            current->iRow++;
-            if (infoPtr->dwStyle & CCS_VERT) {
-                current->rcBand.top = 0;
-            current->rcBand.bottom = clientcy;
-            current->rcBand.left += (prev_rh + SEP_WIDTH);
-            current->rcBand.right = current->rcBand.left + new_rh;
-            x += adj_rh;
-            }
-            else {
-                current->rcBand.left = 0;
-            current->rcBand.right = clientcx;
-            current->rcBand.top += (prev_rh + SEP_WIDTH);
-            current->rcBand.bottom = current->rcBand.top + new_rh;
-            y += adj_rh;
-            }
-            TRACE("moving band %d to own row at (%d,%d)-(%d,%d)\n",
-              current_idx,
-              current->rcBand.left, current->rcBand.top,
-              current->rcBand.right, current->rcBand.bottom);
-            TRACE("prev band %d at (%d,%d)-(%d,%d)\n",
-              prev_idx,
-              prev->rcBand.left, prev->rcBand.top,
-              prev->rcBand.right, prev->rcBand.bottom);
-            TRACE("values: prev_rh=%d, new_rh=%d, adj_rh=%d\n",
-              prev_rh, new_rh, adj_rh);
-            /* for bands below current adjust row # and top/bottom */
-            for (j = current_idx+1; j<infoPtr->uNumBands; j++) {
-                walk = &infoPtr->bands[j];
-            if (HIDDENBAND(walk)) continue;
-            walk->fDraw |= NTF_INVALIDATE;
-            walk->iRow++;
-            if (infoPtr->dwStyle & CCS_VERT) {
-                walk->rcBand.left += adj_rh;
-                walk->rcBand.right += adj_rh;
-            }
-            else {
-                walk->rcBand.top += adj_rh;
-                walk->rcBand.bottom += adj_rh;
-            }
-            }
-            if ((infoPtr->dwStyle & CCS_VERT) ? (x >= adjcx) : (y >= adjcy))
-                break; /* all done */
-        }
-        }
-    }
+             ) &&
+            (infoPtr->uNumBands > 1)) {
+            for (i=(INT)infoPtr->uNumBands-2; i>=0; i--) {
+                TRACE("P2 adjcx=%d, adjcy=%d, x=%d, y=%d\n",
+                      adjcx, adjcy, x, y);
+
+                /* find the current band (starts at i+1) */
+                current = &infoPtr->bands[i+1];
+                current_idx = i+1;
+                while (HIDDENBAND(current)) {
+                    i--;
+                    if (i < 0) break; /* out of bands */
+                    current = &infoPtr->bands[i+1];
+                    current_idx = i+1;
+                }
+                if (i < 0) break; /* out of bands */
+
+                /* now find the prev band (starts at i) */
+                prev = &infoPtr->bands[i];
+                prev_idx = i;
+                while (HIDDENBAND(prev)) {
+                    i--;
+                    if (i < 0) break; /* out of bands */
+                    prev = &infoPtr->bands[i];
+                    prev_idx = i;
+                }
+                if (i < 0) break; /* out of bands */
+
+                prev_rh = ircBw(prev);
+                if (prev->iRow == current->iRow) {
+                    new_rh = (infoPtr->dwStyle & RBS_VARHEIGHT) ?
+                        current->lcy + REBARSPACE(current) :
+                        mmcy;
+                    adj_rh = new_rh + SEP_WIDTH;
+                    infoPtr->uNumRows++;
+                    current->fDraw |= NTF_INVALIDATE;
+                    current->iRow++;
+                    if (infoPtr->dwStyle & CCS_VERT) {
+                        current->rcBand.top = inity;
+                        current->rcBand.bottom = clientcy;
+                        current->rcBand.left += (prev_rh + SEP_WIDTH);
+                        current->rcBand.right = current->rcBand.left + new_rh;
+                        x += adj_rh;
+                    }
+                    else {
+                        current->rcBand.left = initx;
+                        current->rcBand.right = clientcx;
+                        current->rcBand.top += (prev_rh + SEP_WIDTH);
+                        current->rcBand.bottom = current->rcBand.top + new_rh;
+                        y += adj_rh;
+                    }
+                    TRACE("P2 moving band %d to own row at (%d,%d)-(%d,%d)\n",
+                          current_idx,
+                          current->rcBand.left, current->rcBand.top,
+                          current->rcBand.right, current->rcBand.bottom);
+                    TRACE("P2 prev band %d at (%d,%d)-(%d,%d)\n",
+                          prev_idx,
+                          prev->rcBand.left, prev->rcBand.top,
+                          prev->rcBand.right, prev->rcBand.bottom);
+                    TRACE("P2 values: prev_rh=%d, new_rh=%d, adj_rh=%d\n",
+                          prev_rh, new_rh, adj_rh);
+                    /* for bands below current adjust row # and top/bottom */
+                    for (j = current_idx+1; j<infoPtr->uNumBands; j++) {
+                        walk = &infoPtr->bands[j];
+                        if (HIDDENBAND(walk)) continue;
+                        walk->fDraw |= NTF_INVALIDATE;
+                        walk->iRow++;
+                        if (infoPtr->dwStyle & CCS_VERT) {
+                            walk->rcBand.left += adj_rh;
+                            walk->rcBand.right += adj_rh;
+                        }
+                        else {
+                            walk->rcBand.top += adj_rh;
+                            walk->rcBand.bottom += adj_rh;
+                        }
+                    }
+                    if ((infoPtr->dwStyle & CCS_VERT) ? (x >= adjcx) : (y >= adjcy)) 
+                        break; /* all done */
+                }
+            }
+        }
     }
 
@@ -1541 +1674 @@
 
 
-    /* ******* Start Phase 2a - adjust all bands for height full ******* */
+    /* ******* Start Phase 2a - create array of start and end  ******* */
+    /*                          indexes by row                         */
+
+    if (infoPtr->uNumRows != origrows) {
+        if (infoPtr->rows) COMCTL32_Free (infoPtr->rows);
+        infoPtr->rows = COMCTL32_Alloc (sizeof (REBAR_ROW) * infoPtr->uNumRows);
+    }
+
+    row = 0;
+    for (i = 0; i < infoPtr->uNumBands; i++) {
+        lpBand = &infoPtr->bands[i];
+        if (HIDDENBAND(lpBand)) continue;
+
+        if (lpBand->iRow > row) {
+            row++;
+            infoPtr->rows[row-1].istartband = i;
+        }
+        if (row == 0) {
+            ERR("P2a bug!!!!!!\n");
+        }
+        infoPtr->rows[row-1].iendband = i;
+    }
+
+    for (i = 0; i < infoPtr->uNumRows; i++) {
+        REBAR_ROW *p;
+
+        p = &infoPtr->rows[i];
+        TRACE("P2a row %d, starts %d, ends %d\n",
+              i+1, p->istartband, p->iendband);
+    }
+
+    /* ******* End Phase 2a - create array of start and end    ******* */
+    /*                          indexes by row                         */
+
+
+    /* ******* Start Phase 2b - adjust all bands for height full ******* */
     /* assumes that the following variables contain:                 */
     /*   y/x     current height/width of all rows                    */
     /*   clientcy/clientcx     height/width of client area           */
 
-    /* **** FIXME FIXME FIXME
-     *   this does not take into account that more than one band
-     *   is in a row!!!!!!!!!
-     */
-
     if (((infoPtr->dwStyle & CCS_VERT) ? clientcx > x : clientcy > y) &&
-    infoPtr->uNumBands) {
-    INT diff, i, j;
-
-    diff = (infoPtr->dwStyle & CCS_VERT) ? clientcx - x : clientcy - y;
-    for (i = infoPtr->uNumBands-1; i >= 0; i--) {
-        lpBand = &infoPtr->bands[i];
-        if(HIDDENBAND(lpBand)) continue;
-        if (!lpBand->fMask & RBBS_VARIABLEHEIGHT) continue;
-        if (((INT)lpBand->cyMaxChild < 1) ||
-        ((INT)lpBand->cyIntegral < 1)) {
-        if (lpBand->cyMaxChild + lpBand->cyIntegral == 0) continue;
-        ERR("band %u RBBS_VARIABLEHEIGHT set but cyMax=%d, cyInt=%d\n",
-            i, lpBand->cyMaxChild, lpBand->cyIntegral);
-        continue;
-        }
-        /* j is now the maximum height/width in the client area */
-        j = ((diff / lpBand->cyIntegral) * lpBand->cyIntegral) +
-        ircBw(lpBand);
-        if (j > lpBand->cyMaxChild + REBARSPACE)
-        j = lpBand->cyMaxChild + REBARSPACE;
-        diff -= (j - ircBw(lpBand));
-        if (infoPtr->dwStyle & CCS_VERT)
-        lpBand->rcBand.right = lpBand->rcBand.left + j;
-        else
-        lpBand->rcBand.bottom = lpBand->rcBand.top + j;
-        TRACE("P2a band %d, row %d changed to (%d,%d)-(%d,%d)\n",
-          i, lpBand->iRow,
-          lpBand->rcBand.left, lpBand->rcBand.top,
-          lpBand->rcBand.right, lpBand->rcBand.bottom);
-        if (diff <= 0) break;
-    }
-    if (diff < 0) {
-        ERR("allocated more than available, diff=%d\n", diff);
-        diff = 0;
-    }
-    if (infoPtr->dwStyle & CCS_VERT)
-        x = clientcx - diff;
-    else
-        y = clientcy - diff;
-    }
-
-    /* ******* End Phase 2a - adjust all bands for height full ******* */
+        infoPtr->uNumBands) {
+        INT diff, i, iband, j;
+
+        diff = (infoPtr->dwStyle & CCS_VERT) ? clientcx - x : clientcy - y;
+        for (i = infoPtr->uNumRows; i >= 1; i--) {
+            /* if row has more than 1 band, ignore row   */
+            if (infoPtr->rows[i-1].istartband != infoPtr->rows[i-1].iendband)
+                continue;
+            /* point to only band in row  */
+            iband = infoPtr->rows[i-1].istartband;
+            lpBand = &infoPtr->bands[iband];
+            if(HIDDENBAND(lpBand)) continue;
+            if (!lpBand->fMask & RBBS_VARIABLEHEIGHT) continue;
+            if (((INT)lpBand->cyMaxChild < 1) || 
+                ((INT)lpBand->cyIntegral < 1)) {
+                if (lpBand->cyMaxChild + lpBand->cyIntegral == 0) continue;
+                ERR("P2b band %u RBBS_VARIABLEHEIGHT set but cyMax=%d, cyInt=%d\n",
+                    iband, lpBand->cyMaxChild, lpBand->cyIntegral);
+                continue;
+            }
+            /* j is now the maximum height/width in the client area */
+            j = ((diff / lpBand->cyIntegral) * lpBand->cyIntegral) + 
+                ircBw(lpBand);
+            if (j > lpBand->cyMaxChild + REBARSPACE(lpBand)) 
+                j = lpBand->cyMaxChild + REBARSPACE(lpBand);
+            diff -= (j - ircBw(lpBand));
+            if (infoPtr->dwStyle & CCS_VERT)
+                lpBand->rcBand.right = lpBand->rcBand.left + j;
+            else
+                lpBand->rcBand.bottom = lpBand->rcBand.top + j;
+            TRACE("P2b band %d, row %d changed to (%d,%d)-(%d,%d)\n",
+                  iband, lpBand->iRow,
+                  lpBand->rcBand.left, lpBand->rcBand.top,
+                  lpBand->rcBand.right, lpBand->rcBand.bottom);
+            if (diff <= 0) break;
+        }
+        if (diff < 0) {
+            ERR("P2b allocated more than available, diff=%d\n", diff);
+            diff = 0;
+        }
+        if (infoPtr->dwStyle & CCS_VERT)
+            x = clientcx - diff;
+        else
+            y = clientcy - diff;
+    }
+
+    /* ******* End Phase 2b - adjust all bands for height full ******* */
 
 
@@ -1599 +1767 @@
 
     if (infoPtr->uNumBands) {
-    INT bandnum, bandnum_start, bandnum_end;
-
-    /* If RBS_BANDBORDERS set then indicate to draw bottom separator */
-    /* on all bands in all rows but last row.                        */
-    /* Also indicate to draw the right separator for each band in    */
-    /* each row but the rightmost band.                              */
-    if (infoPtr->dwStyle & RBS_BANDBORDERS) {
-        REBAR_BAND *prevband;
-        INT currow;
-
-        prevband = NULL;
-        currow = -1;
-        for (i = 0; i < infoPtr->uNumBands; i++) {
-            lpBand = &infoPtr->bands[i];
-        if (HIDDENBAND(lpBand)) continue;
-
-        if (lpBand->iRow < infoPtr->uNumRows)
-            lpBand->fDraw |= DRAW_BOTTOMSEP;
-
-        if (lpBand->iRow != currow) prevband = NULL;
-        currow = lpBand->iRow;
-        if (prevband) prevband->fDraw |= DRAW_RIGHTSEP;
-        prevband = lpBand;
-        }
-    }
-
-    /* Distribute the extra space on the horizontal and adjust  */
-    /* all bands in row to same height.                         */
-    bandnum = 0;
-    for (i=1; i<=infoPtr->uNumRows; i++) {
-        bandnum_start = -1;
-        bandnum_end = -1;
-        mcy = 0;
-        TRACE("processing row %d, starting band %d\n", i, bandnum);
-        while (TRUE) {
-        lpBand = &infoPtr->bands[bandnum];
-        if ((bandnum >= infoPtr->uNumBands) ||
-            ((lpBand->iRow != i) &&
-             !HIDDENBAND(lpBand))) {
-            if ((bandnum_start == -1) ||
-            (bandnum_end == -1)) {
-            ERR("logic error? bands=%d, rows=%d, start=%d, end=%d\n",
-                infoPtr->uNumBands, infoPtr->uNumRows,
-                (INT)bandnum_start, (INT)bandnum_end);
-            ERR("  current row=%d, band=%d\n",
-                i, bandnum);
-            break;
-            }
-            REBAR_AdjustBands (infoPtr, bandnum_start, bandnum_end,
-                       (infoPtr->dwStyle & CCS_VERT) ?
-                       clientcy : clientcx, mcy);
-            break;
-        }
-        if (!HIDDENBAND(lpBand)) {
-            if (bandnum_start == -1) bandnum_start = bandnum;
-            if (bandnum_end < bandnum) bandnum_end = bandnum;
-            if (mcy < ircBw(lpBand))
-            mcy = ircBw(lpBand);
-        }
-        bandnum++;
-        TRACE("point 1, bandnum=%d\n", bandnum);
-        }
-        TRACE("point 2, i=%d, numrows=%d, bandnum=%d\n",
-          i, infoPtr->uNumRows, bandnum);
-    }
-    TRACE("point 3\n");
-
-    /* Calculate the other rectangles in each band */
-    if (infoPtr->dwStyle & CCS_VERT) {
-        REBAR_CalcVertBand (infoPtr, 0, infoPtr->uNumBands,
-                notify);
-    }
-    else {
-        REBAR_CalcHorzBand (infoPtr, 0, infoPtr->uNumBands,
-                notify);
-    }
+        REBAR_ROW *p;
+
+        /* If RBS_BANDBORDERS set then indicate to draw bottom separator */
+        /* on all bands in all rows but last row.                        */
+        /* Also indicate to draw the right separator for each band in    */
+        /* each row but the rightmost band.                              */
+        if (infoPtr->dwStyle & RBS_BANDBORDERS) {
+
+            for(i = 0; i < infoPtr->uNumRows; i++) {
+                p = &infoPtr->rows[i];
+                for (j = p->istartband; j <= p->iendband; j++) {
+                    lpBand = &infoPtr->bands[j];
+                    if (HIDDENBAND(lpBand)) continue;
+                    if (j != p->iendband)
+                        lpBand->fDraw |= DRAW_RIGHTSEP;
+                    if (i != infoPtr->uNumRows-1)
+                        lpBand->fDraw |= DRAW_BOTTOMSEP;
+                }
+            }
+        }
+
+        /* Distribute the extra space on the horizontal and adjust  */
+        /* all bands in row to same height.                         */
+        for (i=1; i<=infoPtr->uNumRows; i++) {
+            p = &infoPtr->rows[i-1];
+            mcy = 0;
+
+            TRACE("P3 processing row %d, starting band %d, ending band %d\n", 
+                  i, p->istartband, p->iendband);
+
+            /* Find the largest height of the bands in the row */
+            for (j = p->istartband; j <= p->iendband; j++) {
+                lpBand = &infoPtr->bands[j];
+                if (HIDDENBAND(lpBand)) continue;
+                if (mcy < ircBw(lpBand))
+                    mcy = ircBw(lpBand);
+            }
+
+            REBAR_AdjustBands (infoPtr, p->istartband, p->iendband,
+                               (infoPtr->dwStyle & CCS_VERT) ? 
+                               clientcy : clientcx, mcy);
+        }
+
+        /* Calculate the other rectangles in each band */
+        if (infoPtr->dwStyle & CCS_VERT) {
+            REBAR_CalcVertBand (infoPtr, 0, infoPtr->uNumBands,
+                                notify);
+        }
+        else {
+            REBAR_CalcHorzBand (infoPtr, 0, infoPtr->uNumBands, 
+                                notify);
+        }
     }
 
@@ -1681 +1825 @@
     /* now compute size of Rebar itself */
     infoPtr->oldSize = infoPtr->calcSize;
+    if (infoPtr->uNumBands == 0) {
+        /* we have no bands, so make size the size of client */
+        x = clientcx;
+        y = clientcy;
+    }
     if (infoPtr->dwStyle & CCS_VERT) {
-    infoPtr->calcSize.cx = x;
-    infoPtr->calcSize.cy = clientcy;
-    TRACE("vert, notify=%d, x=%d, origheight=%d\n",
-          notify, x, origheight);
-    if (notify && (x != origheight)) infoPtr->fStatus |= NTF_HGHTCHG;
+        infoPtr->calcSize.cx = x;
+        infoPtr->calcSize.cy = clientcy;
+        TRACE("vert, notify=%d, x=%d, origheight=%d\n",
+              notify, x, origheight);
+        if (notify && (x != origheight)) infoPtr->fStatus |= NTF_HGHTCHG;
     }
     else {
-    infoPtr->calcSize.cx = clientcx;
-    infoPtr->calcSize.cy = y;
-    TRACE("horz, notify=%d, y=%d, origheight=%d\n",
-          notify, y, origheight);
-    if (notify && (y != origheight)) infoPtr->fStatus |= NTF_HGHTCHG;
+        infoPtr->calcSize.cx = clientcx;
+        infoPtr->calcSize.cy = y;
+        TRACE("horz, notify=%d, y=%d, origheight=%d\n",
+              notify, y, origheight);
+        if (notify && (y != origheight)) infoPtr->fStatus |= NTF_HGHTCHG; 
     }
 
@@ -1750 +1899 @@
     /* calculate gripper rectangle */
     if (  (!(lpBand->fStyle & RBBS_NOGRIPPER)) &&
-      ( (lpBand->fStyle & RBBS_GRIPPERALWAYS) ||
-        ( !(lpBand->fStyle & RBBS_FIXEDSIZE) && (infoPtr->uNumBands > 1)))
+          ( (lpBand->fStyle & RBBS_GRIPPERALWAYS) || 
+            ( !(lpBand->fStyle & RBBS_FIXEDSIZE) && (infoPtr->uNumBands > 1)))
        ) {
-    lpBand->fStatus |= HAS_GRIPPER;
+        lpBand->fStatus |= HAS_GRIPPER;
         if (infoPtr->dwStyle & CCS_VERT)
-        if (infoPtr->dwStyle & RBS_VERTICALGRIPPER)
+            if (infoPtr->dwStyle & RBS_VERTICALGRIPPER)
                 header += (GRIPPER_HEIGHT + REBAR_PRE_GRIPPER);
             else
-            header += (GRIPPER_WIDTH + REBAR_PRE_GRIPPER);
+                header += (GRIPPER_WIDTH + REBAR_PRE_GRIPPER);
         else
             header += (REBAR_PRE_GRIPPER + GRIPPER_WIDTH);
@@ -1767 +1916 @@
     /* image is visible */
     if ((lpBand->fMask & RBBIM_IMAGE) && (infoPtr->himl)) {
-    lpBand->fStatus |= HAS_IMAGE;
+        lpBand->fStatus |= HAS_IMAGE;
         if (infoPtr->dwStyle & CCS_VERT) {
-       header += (infoPtr->imageSize.cy + REBAR_POST_IMAGE);
-       lpBand->lcy = infoPtr->imageSize.cx + 2;
-    }
-    else {
-       header += (infoPtr->imageSize.cx + REBAR_POST_IMAGE);
-       lpBand->lcy = infoPtr->imageSize.cy + 2;
-    }
+           header += (infoPtr->imageSize.cy + REBAR_POST_IMAGE);
+           lpBand->lcy = infoPtr->imageSize.cx + 2;
+        }
+        else {
+           header += (infoPtr->imageSize.cx + REBAR_POST_IMAGE);
+           lpBand->lcy = infoPtr->imageSize.cy + 2;
+        }
     }
 
     /* text is visible */
     if ((lpBand->fMask & RBBIM_TEXT) && (lpBand->lpText)) {
-    HDC hdc = GetDC (0);
-    HFONT hOldFont = SelectObject (hdc, infoPtr->hFont);
-    SIZE size;
-
-    lpBand->fStatus |= HAS_TEXT;
-    GetTextExtentPoint32W (hdc, lpBand->lpText,
-                   lstrlenW (lpBand->lpText), &size);
-    header += ((infoPtr->dwStyle & CCS_VERT) ? (size.cy + REBAR_POST_TEXT) : (size.cx + REBAR_POST_TEXT));
-    textheight = (infoPtr->dwStyle & CCS_VERT) ? 0 : size.cy;
-
-    SelectObject (hdc, hOldFont);
-    ReleaseDC (0, hdc);
+        HDC hdc = GetDC (0);
+        HFONT hOldFont = SelectObject (hdc, infoPtr->hFont);
+        SIZE size;
+
+        lpBand->fStatus |= HAS_TEXT;
+        GetTextExtentPoint32W (hdc, lpBand->lpText,
+                               lstrlenW (lpBand->lpText), &size);
+        header += ((infoPtr->dwStyle & CCS_VERT) ? (size.cy + REBAR_POST_TEXT) : (size.cx + REBAR_POST_TEXT));
+        textheight = (infoPtr->dwStyle & CCS_VERT) ? 0 : size.cy;
+
+        SelectObject (hdc, hOldFont);
+        ReleaseDC (0, hdc);
     }
 
     /* if no gripper but either image or text, then leave space */
     if ((lpBand->fStatus & (HAS_IMAGE | HAS_TEXT)) &&
-    !(lpBand->fStatus & HAS_GRIPPER)) {
-    header += REBAR_ALWAYS_SPACE;
+        !(lpBand->fStatus & HAS_GRIPPER)) {
+        header += REBAR_ALWAYS_SPACE;
     }
 
@@ -1811 +1960 @@
     lpBand->ccy = lpBand->lcy;
     if (lpBand->fMask & RBBIM_CHILDSIZE) {
-    if (!(lpBand->fStyle & RBBS_FIXEDSIZE)) {
-        lpBand->offChild.cx = 4;
-        lpBand->offChild.cy = 2;
-        }
         lpBand->lcx = lpBand->cxMinChild;
 
-    /* Set the .cy values for CHILDSIZE case */
+        /* Set the .cy values for CHILDSIZE case */
         lpBand->lcy = max(lpBand->lcy, lpBand->cyMinChild);
-    lpBand->ccy = lpBand->lcy;
+        lpBand->ccy = lpBand->lcy;
         lpBand->hcy = lpBand->lcy;
         if (lpBand->cyMaxChild != 0xffffffff) {
-        lpBand->hcy = lpBand->cyMaxChild;
+            lpBand->hcy = lpBand->cyMaxChild;
         }
-    if (lpBand->cyChild != 0xffffffff)
-        lpBand->ccy = max (lpBand->cyChild, lpBand->lcy);
+        if (lpBand->cyChild != 0xffffffff)
+            lpBand->ccy = max (lpBand->cyChild, lpBand->lcy);
 
         TRACE("_CHILDSIZE\n");
@@ -1852 +1997 @@
 
     if (lprbbi->fMask & RBBIM_STYLE)
-    lpBand->fStyle = lprbbi->fStyle;
+        lpBand->fStyle = lprbbi->fStyle;
 
     if (lprbbi->fMask & RBBIM_COLORS) {
-    lpBand->clrFore = lprbbi->clrFore;
-    lpBand->clrBack = lprbbi->clrBack;
+        lpBand->clrFore = lprbbi->clrFore;
+        lpBand->clrBack = lprbbi->clrBack;
     }
 
     if (lprbbi->fMask & RBBIM_IMAGE)
-    lpBand->iImage = lprbbi->iImage;
+        lpBand->iImage = lprbbi->iImage;
 
     if (lprbbi->fMask & RBBIM_CHILD) {
-    if (lprbbi->hwndChild) {
-        lpBand->hwndChild = lprbbi->hwndChild;
-        lpBand->hwndPrevParent =
-        SetParent (lpBand->hwndChild, hwnd);
-        /* below in trace fro WinRAR */
-        ShowWindow(lpBand->hwndChild, SW_SHOWNOACTIVATE | SW_SHOWNORMAL);
-        /* above in trace fro WinRAR */
-    }
-    else {
-        TRACE("child: 0x%x  prev parent: 0x%x\n",
-           lpBand->hwndChild, lpBand->hwndPrevParent);
-        lpBand->hwndChild = 0;
-        lpBand->hwndPrevParent = 0;
-    }
+        if (lprbbi->hwndChild) {
+            lpBand->hwndChild = lprbbi->hwndChild;
+            lpBand->hwndPrevParent =
+                SetParent (lpBand->hwndChild, hwnd);
+            /* below in trace fro WinRAR */
+            ShowWindow(lpBand->hwndChild, SW_SHOWNOACTIVATE | SW_SHOWNORMAL);
+            /* above in trace fro WinRAR */
+        }
+        else {
+            TRACE("child: 0x%x  prev parent: 0x%x\n",
+                   lpBand->hwndChild, lpBand->hwndPrevParent);
+            lpBand->hwndChild = 0;
+            lpBand->hwndPrevParent = 0;
+        }
     }
 
     if (lprbbi->fMask & RBBIM_CHILDSIZE) {
-    lpBand->cxMinChild = lprbbi->cxMinChild;
-    lpBand->cyMinChild = lprbbi->cyMinChild;
-    if (lprbbi->cbSize >= sizeof (REBARBANDINFOA)) {
-        lpBand->cyChild    = lprbbi->cyChild;
-        lpBand->cyMaxChild = lprbbi->cyMaxChild;
-        lpBand->cyIntegral = lprbbi->cyIntegral;
-    }
-    else { /* special case - these should be zeroed out since   */
-           /* RBBIM_CHILDSIZE added these in WIN32_IE >= 0x0400 */
-        lpBand->cyChild    = 0;
-        lpBand->cyMaxChild = 0;
-        lpBand->cyIntegral = 0;
-    }
+        lpBand->cxMinChild = lprbbi->cxMinChild;
+        lpBand->cyMinChild = lprbbi->cyMinChild;
+        if (lprbbi->cbSize >= sizeof (REBARBANDINFOA)) {
+            lpBand->cyChild    = lprbbi->cyChild;
+            lpBand->cyMaxChild = lprbbi->cyMaxChild;
+            lpBand->cyIntegral = lprbbi->cyIntegral;
+        }
+        else { /* special case - these should be zeroed out since   */
+               /* RBBIM_CHILDSIZE added these in WIN32_IE >= 0x0400 */
+            lpBand->cyChild    = 0;
+            lpBand->cyMaxChild = 0;
+            lpBand->cyIntegral = 0;
+        }
     }
 
     if (lprbbi->fMask & RBBIM_SIZE)
-    lpBand->cx = lprbbi->cx;
+        lpBand->cx = lprbbi->cx;
 
     if (lprbbi->fMask & RBBIM_BACKGROUND)
-    lpBand->hbmBack = lprbbi->hbmBack;
+        lpBand->hbmBack = lprbbi->hbmBack;
 
     if (lprbbi->fMask & RBBIM_ID)
-    lpBand->wID = lprbbi->wID;
+        lpBand->wID = lprbbi->wID;
 
     /* check for additional data */
     if (lprbbi->cbSize >= sizeof (REBARBANDINFOA)) {
-    if (lprbbi->fMask & RBBIM_IDEALSIZE)
-        lpBand->cxIdeal = lprbbi->cxIdeal;
-
-    if (lprbbi->fMask & RBBIM_LPARAM)
-        lpBand->lParam = lprbbi->lParam;
-
-    if (lprbbi->fMask & RBBIM_HEADERSIZE)
-        lpBand->cxHeader = lprbbi->cxHeader;
+        if (lprbbi->fMask & RBBIM_IDEALSIZE)
+            lpBand->cxIdeal = lprbbi->cxIdeal;
+
+        if (lprbbi->fMask & RBBIM_LPARAM)
+            lpBand->lParam = lprbbi->lParam;
+
+        if (lprbbi->fMask & RBBIM_HEADERSIZE)
+            lpBand->cxHeader = lprbbi->cxHeader;
     }
 }
@@ -1933 +2078 @@
     for(i=0; i<infoPtr->uNumBands; i++) {
         lpBand = &infoPtr->bands[i];
-    if (HIDDENBAND(lpBand)) continue;
-
-    /* draw band separator between rows */
-    if (lpBand->iRow != oldrow) {
-        oldrow = lpBand->iRow;
-        if (lpBand->fDraw & DRAW_BOTTOMSEP) {
-        RECT rcRowSep;
-        rcRowSep = lpBand->rcBand;
-        if (infoPtr->dwStyle & CCS_VERT) {
-            rcRowSep.right += SEP_WIDTH_SIZE;
-            rcRowSep.bottom = infoPtr->calcSize.cy;
-            DrawEdge (hdc, &rcRowSep, EDGE_ETCHED, BF_RIGHT);
-        }
-        else {
-            rcRowSep.bottom += SEP_WIDTH_SIZE;
-            rcRowSep.right = infoPtr->calcSize.cx;
-            DrawEdge (hdc, &rcRowSep, EDGE_ETCHED, BF_BOTTOM);
-        }
-        TRACE ("drawing band separator bottom (%d,%d)-(%d,%d)\n",
-               rcRowSep.left, rcRowSep.top,
-               rcRowSep.right, rcRowSep.bottom);
-        }
-    }
-
-    /* draw band separator between bands in a row */
-    if (lpBand->fDraw & DRAW_RIGHTSEP) {
-        RECT rcSep;
-        rcSep = lpBand->rcBand;
-        if (infoPtr->dwStyle & CCS_VERT) {
-        rcSep.bottom += SEP_WIDTH_SIZE;
-        DrawEdge (hdc, &rcSep, EDGE_ETCHED, BF_BOTTOM);
-        }
-        else {
-        rcSep.right += SEP_WIDTH_SIZE;
-        DrawEdge (hdc, &rcSep, EDGE_ETCHED, BF_RIGHT);
-        }
-        TRACE("drawing band separator right (%d,%d)-(%d,%d)\n",
-          rcSep.left, rcSep.top, rcSep.right, rcSep.bottom);
-    }
-
-    /* draw the actual background */
-    if (lpBand->clrBack != CLR_NONE)
-        new = lpBand->clrBack;
-    else
-        new = infoPtr->clrBtnFace;
-    rect = lpBand->rcBand;
-    old = SetBkColor (hdc, new);
-    TRACE("%s backround color=0x%06lx, band (%d,%d)-(%d,%d), clip (%d,%d)-(%d,%d)\n",
-          (lpBand->clrBack == CLR_NONE) ? "std" : "",
-          new,
-          lpBand->rcBand.left,lpBand->rcBand.top,
-          lpBand->rcBand.right,lpBand->rcBand.bottom,
-          clip->left, clip->top,
-          clip->right, clip->bottom);
-    ExtTextOutA (hdc, 0, 0, ETO_OPAQUE, &rect, NULL, 0, 0);
-    SetBkColor (hdc, old);
+        if (HIDDENBAND(lpBand)) continue;
+
+        /* draw band separator between rows */
+        if (lpBand->iRow != oldrow) {
+            oldrow = lpBand->iRow;
+            if (lpBand->fDraw & DRAW_BOTTOMSEP) {
+                RECT rcRowSep;
+                rcRowSep = lpBand->rcBand;
+                if (infoPtr->dwStyle & CCS_VERT) {
+                    rcRowSep.right += SEP_WIDTH_SIZE;
+                    rcRowSep.bottom = infoPtr->calcSize.cy;
+                    DrawEdge (hdc, &rcRowSep, EDGE_ETCHED, BF_RIGHT);
+                }
+                else {
+                    rcRowSep.bottom += SEP_WIDTH_SIZE;
+                    rcRowSep.right = infoPtr->calcSize.cx;
+                    DrawEdge (hdc, &rcRowSep, EDGE_ETCHED, BF_BOTTOM);
+                }
+                TRACE ("drawing band separator bottom (%d,%d)-(%d,%d)\n",
+                       rcRowSep.left, rcRowSep.top,
+                       rcRowSep.right, rcRowSep.bottom);
+            }
+        }
+
+        /* draw band separator between bands in a row */
+        if (lpBand->fDraw & DRAW_RIGHTSEP) {
+            RECT rcSep;
+            rcSep = lpBand->rcBand;
+            if (infoPtr->dwStyle & CCS_VERT) {
+                rcSep.bottom += SEP_WIDTH_SIZE;
+                DrawEdge (hdc, &rcSep, EDGE_ETCHED, BF_BOTTOM);
+            }
+            else {
+                rcSep.right += SEP_WIDTH_SIZE;
+                DrawEdge (hdc, &rcSep, EDGE_ETCHED, BF_RIGHT);
+            }
+            TRACE("drawing band separator right (%d,%d)-(%d,%d)\n",
+                  rcSep.left, rcSep.top, rcSep.right, rcSep.bottom);
+        }
+
+        /* draw the actual background */
+        if (lpBand->clrBack != CLR_NONE)
+            new = lpBand->clrBack;
+        else
+            new = infoPtr->clrBtnFace;
+        rect = lpBand->rcBand;
+#if GLATESTING
+        /* testing only - make background green to see it */
+        new = RGB(0,128,0);
+#endif
+        old = SetBkColor (hdc, new);
+        TRACE("%s background color=0x%06lx, band (%d,%d)-(%d,%d), clip (%d,%d)-(%d,%d)\n",
+              (lpBand->clrBack == CLR_NONE) ? "std" : "",
+              new,
+              lpBand->rcBand.left,lpBand->rcBand.top,
+              lpBand->rcBand.right,lpBand->rcBand.bottom,
+              clip->left, clip->top,
+              clip->right, clip->bottom);
+        ExtTextOutA (hdc, 0, 0, ETO_OPAQUE, &rect, NULL, 0, 0);
+        SetBkColor (hdc, old);
     }
     return TRUE;
@@ -2005 +2154 @@
     if (PtInRect (&rect, *lpPt))
     {
-    if (infoPtr->uNumBands == 0) {
-        *pFlags = RBHT_NOWHERE;
-        if (pBand)
-        *pBand = -1;
-        TRACE("NOWHERE\n");
-        return;
+        if (infoPtr->uNumBands == 0) {
+            *pFlags = RBHT_NOWHERE;
+            if (pBand)
+                *pBand = -1;
+            TRACE("NOWHERE\n");
+            return;
+        }
+        else {
+            /* somewhere inside */
+            infoPtr->ihitBand = -1;
+            for (iCount = 0; iCount < infoPtr->uNumBands; iCount++) {
+                lpBand = &infoPtr->bands[iCount];
+                if (HIDDENBAND(lpBand)) continue;
+                if (PtInRect (&lpBand->rcBand, *lpPt)) {
+                    if (pBand)
+                        *pBand = iCount;
+                    if (PtInRect (&lpBand->rcGripper, *lpPt)) {
+                        *pFlags = RBHT_GRABBER;
+                        infoPtr->ihitBand = iCount;
+                        TRACE("ON GRABBER %d\n", iCount);
+                        return;
+                    }
+                    else if (PtInRect (&lpBand->rcCapImage, *lpPt)) {
+                        *pFlags = RBHT_CAPTION;
+                        TRACE("ON CAPTION %d\n", iCount);
+                        return;
+                    }
+                    else if (PtInRect (&lpBand->rcCapText, *lpPt)) {
+                        *pFlags = RBHT_CAPTION;
+                        TRACE("ON CAPTION %d\n", iCount);
+                        return;
+                    }
+                    else if (PtInRect (&lpBand->rcChild, *lpPt)) {
+                        *pFlags = RBHT_CLIENT;
+                        TRACE("ON CLIENT %d\n", iCount);
+                        return;
+                    }
+                    else {
+                        *pFlags = RBHT_NOWHERE;
+                        TRACE("NOWHERE %d\n", iCount);
+                        return;
+                    }
+                }
+            }
+
+            *pFlags = RBHT_NOWHERE;
+            if (pBand)
+                *pBand = -1;
+
+            TRACE("NOWHERE\n");
+            return;
+        }
     }
     else {
-        /* somewhere inside */
-        infoPtr->ihitBand = -1;
-        for (iCount = 0; iCount < infoPtr->uNumBands; iCount++) {
-        lpBand = &infoPtr->bands[iCount];
-        if (HIDDENBAND(lpBand)) continue;
-        if (PtInRect (&lpBand->rcBand, *lpPt)) {
-            if (pBand)
-            *pBand = iCount;
-            if (PtInRect (&lpBand->rcGripper, *lpPt)) {
-            *pFlags = RBHT_GRABBER;
-            infoPtr->ihitBand = iCount;
-            TRACE("ON GRABBER %d\n", iCount);
-            return;
-            }
-            else if (PtInRect (&lpBand->rcCapImage, *lpPt)) {
-            *pFlags = RBHT_CAPTION;
-            TRACE("ON CAPTION %d\n", iCount);
-            return;
-            }
-            else if (PtInRect (&lpBand->rcCapText, *lpPt)) {
-            *pFlags = RBHT_CAPTION;
-            TRACE("ON CAPTION %d\n", iCount);
-            return;
-            }
-            else if (PtInRect (&lpBand->rcChild, *lpPt)) {
-            *pFlags = RBHT_CLIENT;
-            TRACE("ON CLIENT %d\n", iCount);
-            return;
-            }
-            else {
-            *pFlags = RBHT_NOWHERE;
-            TRACE("NOWHERE %d\n", iCount);
-            return;
-            }
-        }
-        }
-
-        *pFlags = RBHT_NOWHERE;
-        if (pBand)
-        *pBand = -1;
-
-        TRACE("NOWHERE\n");
-        return;
-    }
-    }
-    else {
-    *pFlags = RBHT_NOWHERE;
-    if (pBand)
-        *pBand = -1;
-    TRACE("NOWHERE\n");
-    return;
+        *pFlags = RBHT_NOWHERE;
+        if (pBand)
+            *pBand = -1;
+        TRACE("NOWHERE\n");
+        return;
     }
 
@@ -2092 +2241 @@
         /* if this band is not shrinkable, then just move it */
         Leadjust = Readjust = movement;
-    ret = movement;
+        ret = movement;
     }
     else {
         if (movement < 0) {
-        /* Drag to left */
-        if (avail <= abs(movement)) {
-            Readjust = movement;
-        Leadjust = movement + avail;
-        ret = Leadjust;
-        }
-        else {
-            Readjust = movement;
-        Leadjust = 0;
-        ret = 0;
-        }
-    }
-    else {
-        /* Drag to right */
-        if (avail <= abs(movement)) {
-            Leadjust = movement;
-        Readjust = movement - avail;
-        ret = Readjust;
-        }
-        else {
-            Leadjust = movement;
-        Readjust = 0;
-        ret = 0;
-        }
-    }
+            /* Drag to left */
+            if (avail <= abs(movement)) {
+                Readjust = movement;
+                Leadjust = movement + avail;
+                ret = Leadjust;
+            }
+            else {
+                Readjust = movement;
+                Leadjust = 0;
+                ret = 0;
+            }
+        }
+        else {
+            /* Drag to right */
+            if (avail <= abs(movement)) {
+                Leadjust = movement;
+                Readjust = movement - avail;
+                ret = Readjust;
+            }
+            else {
+                Leadjust = movement;
+                Readjust = 0;
+                ret = 0;
+            }
+        }
     }
 
@@ -2126 +2275 @@
     if (rcBlt(band) + Leadjust < 0) {
         ERR("adjustment will fail, band %d: left=%d, right=%d, move=%d, rtn=%d\n",
-        i, Leadjust, Readjust, movement, ret);
+            i, Leadjust, Readjust, movement, ret);
     }
 
@@ -2133 +2282 @@
 
     TRACE("band %d:  left=%d, right=%d, move=%d, rtn=%d, rcBand=(%d,%d)-(%d,%d)\n",
-      i, Leadjust, Readjust, movement, ret,
-      band->rcBand.left, band->rcBand.top,
-      band->rcBand.right, band->rcBand.bottom);
+          i, Leadjust, Readjust, movement, ret,
+          band->rcBand.left, band->rcBand.top,
+          band->rcBand.right, band->rcBand.bottom);
     return ret;
 }
@@ -2158 +2307 @@
 
     if (!(infoPtr->fStatus & BEGIN_DRAG_ISSUED)) {
-    if (REBAR_Notify_NMREBAR (infoPtr, -1, RBN_BEGINDRAG)) {
-        /* Notify returned TRUE - abort drag */
-        infoPtr->dragStart.x = 0;
-        infoPtr->dragStart.y = 0;
-        infoPtr->dragNow = infoPtr->dragStart;
-        infoPtr->ihitBand = -1;
-        ReleaseCapture ();
-        return ;
-    }
-    infoPtr->fStatus |= BEGIN_DRAG_ISSUED;
+        if (REBAR_Notify_NMREBAR (infoPtr, -1, RBN_BEGINDRAG)) {
+            /* Notify returned TRUE - abort drag */
+            infoPtr->dragStart.x = 0;
+            infoPtr->dragStart.y = 0;
+            infoPtr->dragNow = infoPtr->dragStart;
+            infoPtr->ihitBand = -1;
+            ReleaseCapture ();
+            return ;
+        }
+        infoPtr->fStatus |= BEGIN_DRAG_ISSUED;
     }
 
@@ -2177 +2326 @@
     for (i=0; i<infoPtr->uNumBands; i++) {
         band = &infoPtr->bands[i];
-    if (HIDDENBAND(band)) continue;
-    if (band->iRow == hitBand->iRow) {
-        imaxdBand = i;
-        if (imindBand == -1) imindBand = i;
-        /* minimum size of each band is size of header plus            */
-        /* size of minimum child plus offset of child from header plus */
-        /* a one to separate each band.                                */
-        if (i < ihitBand)
-            LHeaderSum += (band->lcx + SEP_WIDTH);
-        else
-            RHeaderSum += (band->lcx + SEP_WIDTH);
-
-    }
+        if (HIDDENBAND(band)) continue;
+        if (band->iRow == hitBand->iRow) {
+            imaxdBand = i;
+            if (imindBand == -1) imindBand = i;
+            /* minimum size of each band is size of header plus            */
+            /* size of minimum child plus offset of child from header plus */
+            /* a one to separate each band.                                */
+            if (i < ihitBand)
+                LHeaderSum += (band->lcx + SEP_WIDTH);
+            else 
+                RHeaderSum += (band->lcx + SEP_WIDTH);
+
+        }
     }
     if (RHeaderSum) RHeaderSum -= SEP_WIDTH; /* no separator afterlast band */
@@ -2201 +2350 @@
     /* limit movement to inside adjustable bands - Left */
     if ( (ptsmove->x < mindBand->rcBand.left) ||
-     (ptsmove->x > maxdBand->rcBand.right) ||
-     (ptsmove->y < mindBand->rcBand.top) ||
-     (ptsmove->y > maxdBand->rcBand.bottom))
+         (ptsmove->x > maxdBand->rcBand.right) ||
+         (ptsmove->y < mindBand->rcBand.top) ||
+         (ptsmove->y > maxdBand->rcBand.bottom))
         return; /* should swap bands */
 
     if (infoPtr->dwStyle & CCS_VERT)
         movement = ptsmove->y - ((hitBand->rcBand.top+REBAR_PRE_GRIPPER) -
-                 infoPtr->ihitoffset);
+                             infoPtr->ihitoffset);
     else
         movement = ptsmove->x - ((hitBand->rcBand.left+REBAR_PRE_GRIPPER) -
-                 infoPtr->ihitoffset);
+                             infoPtr->ihitoffset);
     infoPtr->dragNow = *ptsmove;
 
     TRACE("before: movement=%d (%d,%d), imindBand=%d, ihitBand=%d, imaxdBand=%d, LSum=%d, RSum=%d\n",
-      movement, ptsmove->x, ptsmove->y, imindBand, ihitBand,
-      imaxdBand, LHeaderSum, RHeaderSum);
+          movement, ptsmove->x, ptsmove->y, imindBand, ihitBand,
+          imaxdBand, LHeaderSum, RHeaderSum);
     REBAR_DumpBand (infoPtr);
 
-    if (movement < 0) {
+    if (movement < 0) {  
 
         /* ***  Drag left/up *** */
         compress = rcBlt(hitBand) - rcBlt(mindBand) -
-               LHeaderSum;
-    if (compress < abs(movement)) {
-        TRACE("limiting left drag, was %d changed to %d\n",
-          movement, -compress);
-        movement = -compress;
-    }
+                   LHeaderSum;
+        if (compress < abs(movement)) {
+            TRACE("limiting left drag, was %d changed to %d\n",
+                  movement, -compress);
+            movement = -compress;
+        }
 
         for (i=ihitBand; i>=imindBand; i--) {
-        band = &infoPtr->bands[i];
-        if (HIDDENBAND(band)) continue;
-        if (i == ihitBand) {
-        LEADJ(band, movement)
-        }
-        else
-            movement = REBAR_Shrink (infoPtr, band, movement, i);
-        band->ccx = rcBw(band);
-    }
+            band = &infoPtr->bands[i];
+            if (HIDDENBAND(band)) continue;
+            if (i == ihitBand) {
+                LEADJ(band, movement)
+            }
+            else 
+                movement = REBAR_Shrink (infoPtr, band, movement, i);
+            band->ccx = rcBw(band);
+        }
     }
     else {
-    BOOL first = TRUE;
+        BOOL first = TRUE;
 
         /* ***  Drag right/down *** */
         compress = rcBrb(maxdBand) - rcBlt(hitBand) -
-               RHeaderSum;
-    if (compress < abs(movement)) {
-        TRACE("limiting right drag, was %d changed to %d\n",
-          movement, compress);
-        movement = compress;
-    }
+                   RHeaderSum;
+        if (compress < abs(movement)) {
+            TRACE("limiting right drag, was %d changed to %d\n",
+                  movement, compress);
+            movement = compress;
+        }
         for (i=ihitBand-1; i<=imaxdBand; i++) {
-        band = &infoPtr->bands[i];
-        if (HIDDENBAND(band)) continue;
-        if (first) {
-        first = FALSE;
-        READJ(band, movement)
-        }
-        else
-            movement = REBAR_Shrink (infoPtr, band, movement, i);
-        band->ccx = rcBw(band);
-    }
+            band = &infoPtr->bands[i];
+            if (HIDDENBAND(band)) continue;
+            if (first) {
+                first = FALSE;
+                READJ(band, movement)
+            }
+            else 
+                movement = REBAR_Shrink (infoPtr, band, movement, i);
+            band->ccx = rcBw(band);
+        }
     }
 
     /* recompute all rectangles */
     if (infoPtr->dwStyle & CCS_VERT) {
-    REBAR_CalcVertBand (infoPtr, imindBand, imaxdBand+1,
-                FALSE);
+        REBAR_CalcVertBand (infoPtr, imindBand, imaxdBand+1,
+                            FALSE);
     }
     else {
-    REBAR_CalcHorzBand (infoPtr, imindBand, imaxdBand+1,
-                FALSE);
+        REBAR_CalcHorzBand (infoPtr, imindBand, imaxdBand+1, 
+                            FALSE);
     }
 
     TRACE("bands after adjustment, see band # %d, %d\n",
-      imindBand, imaxdBand);
+          imindBand, imaxdBand);
     REBAR_DumpBand (infoPtr);
 
-    SetRect (&newrect,
-         mindBand->rcBand.left,
-         mindBand->rcBand.top,
-         maxdBand->rcBand.right,
-         maxdBand->rcBand.bottom);
+    SetRect (&newrect, 
+             mindBand->rcBand.left,
+             mindBand->rcBand.top,
+             maxdBand->rcBand.right,
+             maxdBand->rcBand.bottom);
 
     REBAR_MoveChildWindows (infoPtr, imindBand, imaxdBand+1);
@@ -2305 +2454 @@
 
     if (uBand >= infoPtr->uNumBands)
-    return FALSE;
+        return FALSE;
 
     TRACE("deleting band %u!\n", uBand);
@@ -2312 +2461 @@
 
     if (infoPtr->uNumBands == 1) {
-    TRACE(" simple delete!\n");
-    if ((lpBand->fMask & RBBIM_CHILD) && lpBand->hwndChild)
-        childhwnd = lpBand->hwndChild;
-    COMCTL32_Free (infoPtr->bands);
-    infoPtr->bands = NULL;
-    infoPtr->uNumBands = 0;
+        TRACE(" simple delete!\n");
+        if ((lpBand->fMask & RBBIM_CHILD) && lpBand->hwndChild)
+            childhwnd = lpBand->hwndChild;
+        COMCTL32_Free (infoPtr->bands);
+        infoPtr->bands = NULL;
+        infoPtr->uNumBands = 0;
     }
     else {
-    REBAR_BAND *oldBands = infoPtr->bands;
+        REBAR_BAND *oldBands = infoPtr->bands;
         TRACE("complex delete! [uBand=%u]\n", uBand);
 
-    if ((lpBand->fMask & RBBIM_CHILD) && lpBand->hwndChild)
-        childhwnd = lpBand->hwndChild;
-
-    infoPtr->uNumBands--;
-    infoPtr->bands = COMCTL32_Alloc (sizeof (REBAR_BAND) * infoPtr->uNumBands);
+        if ((lpBand->fMask & RBBIM_CHILD) && lpBand->hwndChild)
+            childhwnd = lpBand->hwndChild;
+
+        infoPtr->uNumBands--;
+        infoPtr->bands = COMCTL32_Alloc (sizeof (REBAR_BAND) * infoPtr->uNumBands);
         if (uBand > 0) {
             memcpy (&infoPtr->bands[0], &oldBands[0],
@@ -2338 +2487 @@
         }
 
-    COMCTL32_Free (oldBands);
+        COMCTL32_Free (oldBands);
     }
 
@@ -2370 +2519 @@
 
     if (!lParam)
-    return 0;
+        return 0;
     if ((UINT)wParam >= infoPtr->uNumBands)
-    return 0;
+        return 0;
 
     lpBand = &infoPtr->bands[(UINT)wParam];
@@ -2382 +2531 @@
     /* style.  -  GA                                                   */
     if (infoPtr->dwStyle & RBS_BANDBORDERS) {
-    if (infoPtr->dwStyle & CCS_VERT) {
-        lpRect->left = 1;
-        lpRect->top = lpBand->cxHeader + 4;
-        lpRect->right = 1;
-        lpRect->bottom = 0;
+        if (infoPtr->dwStyle & CCS_VERT) {
+            lpRect->left = 1;
+            lpRect->top = lpBand->cxHeader + 4;
+            lpRect->right = 1;
+            lpRect->bottom = 0;
+        }
+        else {
+            lpRect->left = lpBand->cxHeader + 4;
+            lpRect->top = 1;
+            lpRect->right = 0;
+            lpRect->bottom = 1;
+        }
     }
     else {
-        lpRect->left = lpBand->cxHeader + 4;
-        lpRect->top = 1;
-        lpRect->right = 0;
-        lpRect->bottom = 1;
-    }
-    }
-    else {
-    lpRect->left = lpBand->cxHeader;
+        lpRect->left = lpBand->cxHeader;
     }
     return 0;
@@ -2418 +2567 @@
 
     if (lprbbi == NULL)
-    return FALSE;
+        return FALSE;
     if (lprbbi->cbSize < REBARBANDINFO_V3_SIZEA)
-    return FALSE;
+        return FALSE;
     if ((UINT)wParam >= infoPtr->uNumBands)
-    return FALSE;
+        return FALSE;
 
     TRACE("index %u\n", (UINT)wParam);
@@ -2430 +2579 @@
 
     if (lprbbi->fMask & RBBIM_STYLE)
-    lprbbi->fStyle = lpBand->fStyle;
+        lprbbi->fStyle = lpBand->fStyle;
 
     if (lprbbi->fMask & RBBIM_COLORS) {
-    lprbbi->clrFore = lpBand->clrFore;
-    lprbbi->clrBack = lpBand->clrBack;
-    if (lprbbi->clrBack == CLR_NONE)
-        lprbbi->clrBack = infoPtr->clrBtnFace;
+        lprbbi->clrFore = lpBand->clrFore;
+        lprbbi->clrBack = lpBand->clrBack;
+        if (lprbbi->clrBack == CLR_NONE)
+            lprbbi->clrBack = infoPtr->clrBtnFace;
     }
 
@@ -2446 +2595 @@
               lprbbi->lpText[lprbbi->cch-1] = 0;
       }
-      else
-    *lprbbi->lpText = 0;
+      else 
+        *lprbbi->lpText = 0;
     }
 
     if (lprbbi->fMask & RBBIM_IMAGE) {
       if (lpBand->fMask & RBBIM_IMAGE)
-    lprbbi->iImage = lpBand->iImage;
+        lprbbi->iImage = lpBand->iImage;
       else
-    lprbbi->iImage = -1;
+        lprbbi->iImage = -1;
     }
 
     if (lprbbi->fMask & RBBIM_CHILD)
-    lprbbi->hwndChild = lpBand->hwndChild;
+        lprbbi->hwndChild = lpBand->hwndChild;
 
     if (lprbbi->fMask & RBBIM_CHILDSIZE) {
-    lprbbi->cxMinChild = lpBand->cxMinChild;
-    lprbbi->cyMinChild = lpBand->cyMinChild;
-    if (lprbbi->cbSize >= sizeof (REBARBANDINFOA)) {
-        lprbbi->cyChild    = lpBand->cyChild;
-        lprbbi->cyMaxChild = lpBand->cyMaxChild;
-        lprbbi->cyIntegral = lpBand->cyIntegral;
-    }
+        lprbbi->cxMinChild = lpBand->cxMinChild;
+        lprbbi->cyMinChild = lpBand->cyMinChild;
+        if (lprbbi->cbSize >= sizeof (REBARBANDINFOA)) {
+            lprbbi->cyChild    = lpBand->cyChild;
+            lprbbi->cyMaxChild = lpBand->cyMaxChild;
+            lprbbi->cyIntegral = lpBand->cyIntegral;
+        }
     }
 
     if (lprbbi->fMask & RBBIM_SIZE)
-    lprbbi->cx = lpBand->cx;
+        lprbbi->cx = lpBand->cx;
 
     if (lprbbi->fMask & RBBIM_BACKGROUND)
-    lprbbi->hbmBack = lpBand->hbmBack;
+        lprbbi->hbmBack = lpBand->hbmBack;
 
     if (lprbbi->fMask & RBBIM_ID)
-    lprbbi->wID = lpBand->wID;
+        lprbbi->wID = lpBand->wID;
 
     /* check for additional data */
     if (lprbbi->cbSize >= sizeof (REBARBANDINFOA)) {
-    if (lprbbi->fMask & RBBIM_IDEALSIZE)
-        lprbbi->cxIdeal = lpBand->cxIdeal;
-
-    if (lprbbi->fMask & RBBIM_LPARAM)
-        lprbbi->lParam = lpBand->lParam;
-
-    if (lprbbi->fMask & RBBIM_HEADERSIZE)
-        lprbbi->cxHeader = lpBand->cxHeader;
+        if (lprbbi->fMask & RBBIM_IDEALSIZE)
+            lprbbi->cxIdeal = lpBand->cxIdeal;
+
+        if (lprbbi->fMask & RBBIM_LPARAM)
+            lprbbi->lParam = lpBand->lParam;
+
+        if (lprbbi->fMask & RBBIM_HEADERSIZE)
+            lprbbi->cxHeader = lpBand->cxHeader;
     }
 
@@ -2504 +2653 @@
 
     if (lprbbi == NULL)
-    return FALSE;
+        return FALSE;
     if (lprbbi->cbSize < REBARBANDINFO_V3_SIZEW)
-    return FALSE;
+        return FALSE;
     if ((UINT)wParam >= infoPtr->uNumBands)
-    return FALSE;
+        return FALSE;
 
     TRACE("index %u\n", (UINT)wParam);
@@ -2516 +2665 @@
 
     if (lprbbi->fMask & RBBIM_STYLE)
-    lprbbi->fStyle = lpBand->fStyle;
+        lprbbi->fStyle = lpBand->fStyle;
 
     if (lprbbi->fMask & RBBIM_COLORS) {
-    lprbbi->clrFore = lpBand->clrFore;
-    lprbbi->clrBack = lpBand->clrBack;
-    if (lprbbi->clrBack == CLR_NONE)
-        lprbbi->clrBack = infoPtr->clrBtnFace;
+        lprbbi->clrFore = lpBand->clrFore;
+        lprbbi->clrBack = lpBand->clrBack;
+        if (lprbbi->clrBack == CLR_NONE)
+            lprbbi->clrBack = infoPtr->clrBtnFace;
     }
 
     if ((lprbbi->fMask & RBBIM_TEXT) && (lprbbi->lpText)) {
       if (lpBand->lpText && (lpBand->fMask & RBBIM_TEXT))
-    lstrcpynW (lprbbi->lpText, lpBand->lpText, lprbbi->cch);
-      else
-    *lprbbi->lpText = 0;
+        lstrcpynW (lprbbi->lpText, lpBand->lpText, lprbbi->cch);
+      else 
+        *lprbbi->lpText = 0;
     }
 
     if (lprbbi->fMask & RBBIM_IMAGE) {
       if (lpBand->fMask & RBBIM_IMAGE)
-    lprbbi->iImage = lpBand->iImage;
+        lprbbi->iImage = lpBand->iImage;
       else
-    lprbbi->iImage = -1;
+        lprbbi->iImage = -1;
     }
 
     if (lprbbi->fMask & RBBIM_CHILD)
-    lprbbi->hwndChild = lpBand->hwndChild;
+        lprbbi->hwndChild = lpBand->hwndChild;
 
     if (lprbbi->fMask & RBBIM_CHILDSIZE) {
-    lprbbi->cxMinChild = lpBand->cxMinChild;
-    lprbbi->cyMinChild = lpBand->cyMinChild;
-    if (lprbbi->cbSize >= sizeof (REBARBANDINFOW)) {
-        lprbbi->cyChild    = lpBand->cyChild;
-        lprbbi->cyMaxChild = lpBand->cyMaxChild;
-        lprbbi->cyIntegral = lpBand->cyIntegral;
-    }
+        lprbbi->cxMinChild = lpBand->cxMinChild;
+        lprbbi->cyMinChild = lpBand->cyMinChild;
+        if (lprbbi->cbSize >= sizeof (REBARBANDINFOW)) {
+            lprbbi->cyChild    = lpBand->cyChild;
+            lprbbi->cyMaxChild = lpBand->cyMaxChild;
+            lprbbi->cyIntegral = lpBand->cyIntegral;
+        }
     }
 
     if (lprbbi->fMask & RBBIM_SIZE)
-    lprbbi->cx = lpBand->cx;
+        lprbbi->cx = lpBand->cx;
 
     if (lprbbi->fMask & RBBIM_BACKGROUND)
-    lprbbi->hbmBack = lpBand->hbmBack;
+        lprbbi->hbmBack = lpBand->hbmBack;
 
     if (lprbbi->fMask & RBBIM_ID)
-    lprbbi->wID = lpBand->wID;
+        lprbbi->wID = lpBand->wID;
 
     /* check for additional data */
     if (lprbbi->cbSize >= sizeof (REBARBANDINFOW)) {
-    if (lprbbi->fMask & RBBIM_IDEALSIZE)
-        lprbbi->cxIdeal = lpBand->cxIdeal;
-
-    if (lprbbi->fMask & RBBIM_LPARAM)
-        lprbbi->lParam = lpBand->lParam;
-
-    if (lprbbi->fMask & RBBIM_HEADERSIZE)
-        lprbbi->cxHeader = lpBand->cxHeader;
+        if (lprbbi->fMask & RBBIM_IDEALSIZE)
+            lprbbi->cxIdeal = lpBand->cxIdeal;
+
+        if (lprbbi->fMask & RBBIM_LPARAM)
+            lprbbi->lParam = lpBand->lParam;
+
+        if (lprbbi->fMask & RBBIM_HEADERSIZE)
+            lprbbi->cxHeader = lpBand->cxHeader;
     }
 
@@ -2598 +2747 @@
 
     if (lpInfo == NULL)
-    return FALSE;
+        return FALSE;
 
     if (lpInfo->cbSize < sizeof (REBARINFO))
-    return FALSE;
+        return FALSE;
 
     TRACE("getting bar info!\n");
 
     if (infoPtr->himl) {
-    lpInfo->himl = infoPtr->himl;
-    lpInfo->fMask |= RBIM_IMAGELIST;
+        lpInfo->himl = infoPtr->himl;
+        lpInfo->fMask |= RBIM_IMAGELIST;
     }
 
@@ -2649 +2798 @@
 
     if ((iBand < 0) && ((UINT)iBand >= infoPtr->uNumBands))
-    return FALSE;
+        return FALSE;
     if (!lprc)
-    return FALSE;
+        return FALSE;
 
     lpBand = &infoPtr->bands[iBand];
@@ -2657 +2806 @@
 
     TRACE("band %d, (%d,%d)-(%d,%d)\n", iBand,
-      lprc->left, lprc->top, lprc->right, lprc->bottom);
+          lprc->left, lprc->top, lprc->right, lprc->bottom);
 
     return TRUE;
@@ -2681 +2830 @@
 
     for (i=0; i<infoPtr->uNumBands; i++) {
-    lpBand = &infoPtr->bands[i];
-    if (HIDDENBAND(lpBand)) continue;
-    if (lpBand->iRow != iRow) continue;
-    if (infoPtr->dwStyle & CCS_VERT)
-        j = lpBand->rcBand.right - lpBand->rcBand.left;
-    else
-        j = lpBand->rcBand.bottom - lpBand->rcBand.top;
-    if (j > ret) ret = j;
+        lpBand = &infoPtr->bands[i];
+        if (HIDDENBAND(lpBand)) continue;
+        if (lpBand->iRow != iRow) continue;
+        if (infoPtr->dwStyle & CCS_VERT)
+            j = lpBand->rcBand.right - lpBand->rcBand.left;
+        else
+            j = lpBand->rcBand.bottom - lpBand->rcBand.top;
+        if (j > ret) ret = j;
     }
 
@@ -2716 +2865 @@
 REBAR_GetUnicodeFormat (REBAR_INFO *infoPtr)
 {
-    TRACE("%s hwnd=0x%x\n",
-      infoPtr->bUnicode ? "TRUE" : "FALSE", infoPtr->hwndSelf);
+    TRACE("%s hwnd=0x%x\n", 
+          infoPtr->bUnicode ? "TRUE" : "FALSE", infoPtr->hwndSelf);
 
     return infoPtr->bUnicode;
@@ -2734 +2883 @@
 REBAR_HitTest (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
 {
-    LPRBHITTESTINFO lprbht = (LPRBHITTESTINFO)lParam;
+    LPRBHITTESTINFO lprbht = (LPRBHITTESTINFO)lParam; 
 
     if (!lprbht)
-    return -1;
+        return -1;
 
     REBAR_InternalHitTest (infoPtr, &lprbht->pt, &lprbht->flags, &lprbht->iBand);
@@ -2751 +2900 @@
 
     if (infoPtr == NULL)
-    return -1;
+        return -1;
 
     if (infoPtr->uNumBands < 1)
-    return -1;
+        return -1;
 
     for (i = 0; i < infoPtr->uNumBands; i++) {
-    if (infoPtr->bands[i].wID == (UINT)wParam) {
-        TRACE("id %u is band %u found!\n", (UINT)wParam, i);
-        return i;
-    }
+        if (infoPtr->bands[i].wID == (UINT)wParam) {
+            TRACE("id %u is band %u found!\n", (UINT)wParam, i);
+            return i;
+        }
     }
 
@@ -2776 +2925 @@
 
     if (infoPtr == NULL)
-    return FALSE;
+        return FALSE;
     if (lprbbi == NULL)
-    return FALSE;
+        return FALSE;
     if (lprbbi->cbSize < REBARBANDINFO_V3_SIZEA)
-    return FALSE;
+        return FALSE;
 
     /* trace the index as signed to see the -1 */
@@ -2787 +2936 @@
 
     if (infoPtr->uNumBands == 0) {
-    infoPtr->bands = (REBAR_BAND *)COMCTL32_Alloc (sizeof (REBAR_BAND));
-    uIndex = 0;
+        infoPtr->bands = (REBAR_BAND *)COMCTL32_Alloc (sizeof (REBAR_BAND));
+        uIndex = 0;
     }
     else {
-    REBAR_BAND *oldBands = infoPtr->bands;
-    infoPtr->bands =
-        (REBAR_BAND *)COMCTL32_Alloc ((infoPtr->uNumBands+1)*sizeof(REBAR_BAND));
-    if (((INT)uIndex == -1) || (uIndex > infoPtr->uNumBands))
-        uIndex = infoPtr->uNumBands;
-
-    /* pre insert copy */
-    if (uIndex > 0) {
-        memcpy (&infoPtr->bands[0], &oldBands[0],
-            uIndex * sizeof(REBAR_BAND));
-    }
-
-    /* post copy */
-    if (uIndex < infoPtr->uNumBands - 1) {
-        memcpy (&infoPtr->bands[uIndex+1], &oldBands[uIndex],
-            (infoPtr->uNumBands - uIndex - 1) * sizeof(REBAR_BAND));
-    }
-
-    COMCTL32_Free (oldBands);
+        REBAR_BAND *oldBands = infoPtr->bands;
+        infoPtr->bands =
+            (REBAR_BAND *)COMCTL32_Alloc ((infoPtr->uNumBands+1)*sizeof(REBAR_BAND));
+        if (((INT)uIndex == -1) || (uIndex > infoPtr->uNumBands))
+            uIndex = infoPtr->uNumBands;
+
+        /* pre insert copy */
+        if (uIndex > 0) {
+            memcpy (&infoPtr->bands[0], &oldBands[0],
+                    uIndex * sizeof(REBAR_BAND));
+        }
+
+        /* post copy */
+        if (uIndex < infoPtr->uNumBands - 1) {
+            memcpy (&infoPtr->bands[uIndex+1], &oldBands[uIndex],
+                    (infoPtr->uNumBands - uIndex - 1) * sizeof(REBAR_BAND));
+        }
+
+        COMCTL32_Free (oldBands);
     }
 
@@ -2832 +2981 @@
             lpBand->lpText = (LPWSTR)COMCTL32_Alloc (len*sizeof(WCHAR));
             MultiByteToWideChar( CP_ACP, 0, lprbbi->lpText, -1, lpBand->lpText, len );
-    }
+        }
     }
 
@@ -2838 +2987 @@
     /* On insert of second band, revalidate band 1 to possible add gripper */
     if (infoPtr->uNumBands == 2)
-    REBAR_ValidateBand (infoPtr, &infoPtr->bands[0]);
+        REBAR_ValidateBand (infoPtr, &infoPtr->bands[0]);
 
     REBAR_DumpBand (infoPtr);
 
     REBAR_Layout (infoPtr, NULL, TRUE, FALSE);
+    InvalidateRect(infoPtr->hwndSelf, 0, 1);
 
     return TRUE;
@@ -2856 +3006 @@
 
     if (infoPtr == NULL)
-    return FALSE;
+        return FALSE;
     if (lprbbi == NULL)
-    return FALSE;
+        return FALSE;
     if (lprbbi->cbSize < REBARBANDINFO_V3_SIZEW)
-    return FALSE;
+        return FALSE;
 
     /* trace the index as signed to see the -1 */
@@ -2867 +3017 @@
 
     if (infoPtr->uNumBands == 0) {
-    infoPtr->bands = (REBAR_BAND *)COMCTL32_Alloc (sizeof (REBAR_BAND));
-    uIndex = 0;
+        infoPtr->bands = (REBAR_BAND *)COMCTL32_Alloc (sizeof (REBAR_BAND));
+        uIndex = 0;
     }
     else {
-    REBAR_BAND *oldBands = infoPtr->bands;
-    infoPtr->bands =
-        (REBAR_BAND *)COMCTL32_Alloc ((infoPtr->uNumBands+1)*sizeof(REBAR_BAND));
-    if (((INT)uIndex == -1) || (uIndex > infoPtr->uNumBands))
-        uIndex = infoPtr->uNumBands;
-
-    /* pre insert copy */
-    if (uIndex > 0) {
-        memcpy (&infoPtr->bands[0], &oldBands[0],
-            uIndex * sizeof(REBAR_BAND));
-    }
-
-    /* post copy */
-    if (uIndex < infoPtr->uNumBands - 1) {
-        memcpy (&infoPtr->bands[uIndex+1], &oldBands[uIndex],
-            (infoPtr->uNumBands - uIndex - 1) * sizeof(REBAR_BAND));
-    }
-
-    COMCTL32_Free (oldBands);
+        REBAR_BAND *oldBands = infoPtr->bands;
+        infoPtr->bands =
+            (REBAR_BAND *)COMCTL32_Alloc ((infoPtr->uNumBands+1)*sizeof(REBAR_BAND));
+        if (((INT)uIndex == -1) || (uIndex > infoPtr->uNumBands))
+            uIndex = infoPtr->uNumBands;
+
+        /* pre insert copy */
+        if (uIndex > 0) {
+            memcpy (&infoPtr->bands[0], &oldBands[0],
+                    uIndex * sizeof(REBAR_BAND));
+        }
+
+        /* post copy */
+        if (uIndex < infoPtr->uNumBands - 1) {
+            memcpy (&infoPtr->bands[uIndex+1], &oldBands[uIndex],
+                    (infoPtr->uNumBands - uIndex - 1) * sizeof(REBAR_BAND));
+        }
+
+        COMCTL32_Free (oldBands);
     }
 
@@ -2908 +3058 @@
     lpBand->lpText = NULL;
     if ((lprbbi->fMask & RBBIM_TEXT) && (lprbbi->lpText)) {
-    INT len = lstrlenW (lprbbi->lpText);
-    if (len > 0) {
-        lpBand->lpText = (LPWSTR)COMCTL32_Alloc ((len + 1)*sizeof(WCHAR));
-        strcpyW (lpBand->lpText, lprbbi->lpText);
-    }
+        INT len = lstrlenW (lprbbi->lpText);
+        if (len > 0) {
+            lpBand->lpText = (LPWSTR)COMCTL32_Alloc ((len + 1)*sizeof(WCHAR));
+            strcpyW (lpBand->lpText, lprbbi->lpText);
+        }
     }
 
@@ -2918 +3068 @@
     /* On insert of second band, revalidate band 1 to possible add gripper */
     if (infoPtr->uNumBands == 2)
-    REBAR_ValidateBand (infoPtr, &infoPtr->bands[0]);
+        REBAR_ValidateBand (infoPtr, &infoPtr->bands[0]);
 
     REBAR_DumpBand (infoPtr);
 
     REBAR_Layout (infoPtr, NULL, TRUE, FALSE);
+    InvalidateRect(infoPtr->hwndSelf, 0, 1);
 
     return TRUE;
@@ -2931 +3082 @@
 REBAR_MaximizeBand (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
 {
-    FIXME("(uBand = %u fIdeal = %s) stub\n",
-       (UINT)wParam, lParam ? "TRUE" : "FALSE");
-
-    return 0;
+    REBAR_BAND *lpBand;
+    UINT uBand = (UINT) wParam;
+
+    /* Validate */
+    if ((infoPtr->uNumBands == 0) ||
+        ((INT)uBand < 0) || (uBand >= infoPtr->uNumBands)) {
+        /* error !!! */
+        ERR("Illegal MaximizeBand, requested=%d, current band count=%d\n",
+              (INT)uBand, infoPtr->uNumBands);
+        return FALSE;
+    }
+
+    lpBand = &infoPtr->bands[uBand];
+
+    if (lParam && (lpBand->fMask & RBBIM_IDEALSIZE)) {
+        /* handle setting ideal size */
+        lpBand->ccx = lpBand->cxIdeal;
+    }
+    else {
+        /* handle setting to max */
+        FIXME("(uBand = %u fIdeal = %s) case not coded\n",
+              (UINT)wParam, lParam ? "TRUE" : "FALSE");
+        return FALSE;
+    }
+
+    infoPtr->fStatus |= BAND_NEEDS_LAYOUT;
+    REBAR_Layout (infoPtr, 0, TRUE, TRUE);
+    InvalidateRect (infoPtr->hwndSelf, 0, TRUE);
+
+    return TRUE;
 
 }
@@ -2955 +3132 @@
     /* Validate */
     if ((infoPtr->uNumBands == 0) ||
-    ((INT)uBand < 0) || (uBand >= infoPtr->uNumBands)) {
-    /* error !!! */
-    ERR("Illegal MinimizeBand, requested=%d, current band count=%d\n",
-          (INT)uBand, infoPtr->uNumBands);
-        return FALSE;
+        ((INT)uBand < 0) || (uBand >= infoPtr->uNumBands)) {
+        /* error !!! */
+        ERR("Illegal MinimizeBand, requested=%d, current band count=%d\n",
+              (INT)uBand, infoPtr->uNumBands);
+        return FALSE;
     }
 
@@ -2966 +3143 @@
 
     if (infoPtr->dwStyle & CCS_VERT)
-    movement = lpBand->rcBand.bottom - lpBand->rcBand.top -
-        lpBand->cxHeader;
+        movement = lpBand->rcBand.bottom - lpBand->rcBand.top -
+            lpBand->cxHeader;
     else
-    movement = lpBand->rcBand.right - lpBand->rcBand.left -
-        lpBand->cxHeader;
+        movement = lpBand->rcBand.right - lpBand->rcBand.left -
+            lpBand->cxHeader;
     if (movement < 0) {
-    ERR("something is wrong, band=(%d,%d)-(%d,%d), cxheader=%d\n",
-        lpBand->rcBand.left, lpBand->rcBand.top,
-        lpBand->rcBand.right, lpBand->rcBand.bottom,
-        lpBand->cxHeader);
-    return FALSE;
+        ERR("something is wrong, band=(%d,%d)-(%d,%d), cxheader=%d\n",
+            lpBand->rcBand.left, lpBand->rcBand.top,
+            lpBand->rcBand.right, lpBand->rcBand.bottom,
+            lpBand->cxHeader);
+        return FALSE;
     }
 
@@ -2986 +3163 @@
     for (i=0; i<infoPtr->uNumBands; i++) {
         band = &infoPtr->bands[i];
-    if (HIDDENBAND(band)) continue;
-    if (band->iRow == lpBand->iRow) {
-        imaxdBand = i;
-        if (imindBand == -1) imindBand = i;
-    }
+        if (HIDDENBAND(band)) continue;
+        if (band->iRow == lpBand->iRow) {
+            imaxdBand = i;
+            if (imindBand == -1) imindBand = i;
+        }
     }
 
@@ -2996 +3173 @@
     /* next visible band                                        */
     if (imindBand == uBand) {
-    band = NULL;
-    movement = -movement;
-    /* find the first visible band to the right of the selected band */
-    for (i=uBand+1; i<=imaxdBand; i++) {
-        band = &infoPtr->bands[i];
-        if (!HIDDENBAND(band)) {
-        iprevBand = i;
-        LEADJ(band, movement);
-        band->ccx = rcBw(band);
-        break;
-        }
-    }
-    /* what case is this */
-    if (iprevBand == -1) {
-        ERR("no previous visible band\n");
-        return FALSE;
-    }
-    startBand = uBand;
-    endBand = iprevBand;
-    SetRect (&newrect,
-         lpBand->rcBand.left,
-         lpBand->rcBand.top,
-         band->rcBand.right,
-         band->rcBand.bottom);
+        band = NULL;
+        movement = -movement;
+        /* find the first visible band to the right of the selected band */
+        for (i=uBand+1; i<=imaxdBand; i++) {
+            band = &infoPtr->bands[i];
+            if (!HIDDENBAND(band)) {
+                iprevBand = i;
+                LEADJ(band, movement);
+                band->ccx = rcBw(band);
+                break;
+            }
+        }
+        /* what case is this */
+        if (iprevBand == -1) {
+            ERR("no previous visible band\n");
+            return FALSE;
+        }
+        startBand = uBand;
+        endBand = iprevBand;
+        SetRect (&newrect, 
+                 lpBand->rcBand.left,
+                 lpBand->rcBand.top,
+                 band->rcBand.right,
+                 band->rcBand.bottom);
     }
     /* otherwise expand previous visible band                   */
     else {
-    band = NULL;
-    /* find the first visible band to the left of the selected band */
-    for (i=uBand-1; i>=imindBand; i--) {
-        band = &infoPtr->bands[i];
-        if (!HIDDENBAND(band)) {
-        iprevBand = i;
-        READJ(band, movement);
-        band->ccx = rcBw(band);
-        break;
-        }
-    }
-    /* what case is this */
-    if (iprevBand == -1) {
-        ERR("no previous visible band\n");
-        return FALSE;
-    }
-    startBand = iprevBand;
-    endBand = uBand;
-    SetRect (&newrect,
-         band->rcBand.left,
-         band->rcBand.top,
-         lpBand->rcBand.right,
-         lpBand->rcBand.bottom);
+        band = NULL;
+        /* find the first visible band to the left of the selected band */
+        for (i=uBand-1; i>=imindBand; i--) {
+            band = &infoPtr->bands[i];
+            if (!HIDDENBAND(band)) {
+                iprevBand = i;
+                READJ(band, movement);
+                band->ccx = rcBw(band);
+                break;
+            }
+        }
+        /* what case is this */
+        if (iprevBand == -1) {
+            ERR("no previous visible band\n");
+            return FALSE;
+        }
+        startBand = iprevBand;
+        endBand = uBand;
+        SetRect (&newrect, 
+                 band->rcBand.left,
+                 band->rcBand.top,
+                 lpBand->rcBand.right,
+                 lpBand->rcBand.bottom);
     }
 
@@ -3052 +3229 @@
     /* recompute all rectangles */
     if (infoPtr->dwStyle & CCS_VERT) {
-    REBAR_CalcVertBand (infoPtr, startBand, endBand+1,
-                FALSE);
+        REBAR_CalcVertBand (infoPtr, startBand, endBand+1,
+                            FALSE);
     }
     else {
-    REBAR_CalcHorzBand (infoPtr, startBand, endBand+1,
-                FALSE);
+        REBAR_CalcHorzBand (infoPtr, startBand, endBand+1, 
+                            FALSE);
     }
 
     TRACE("bands after minimize, see band # %d, %d\n",
-      startBand, endBand);
+          startBand, endBand);
     REBAR_DumpBand (infoPtr);
 
@@ -3082 +3259 @@
     /* Validate */
     if ((infoPtr->uNumBands == 0) ||
-    ((INT)uFrom < 0) || (uFrom >= infoPtr->uNumBands) ||
-    ((INT)uTo < 0)   || (uTo >= infoPtr->uNumBands)) {
-    /* error !!! */
-    ERR("Illegal MoveBand, from=%d, to=%d, current band count=%d\n",
-          (INT)uFrom, (INT)uTo, infoPtr->uNumBands);
-        return FALSE;
+        ((INT)uFrom < 0) || (uFrom >= infoPtr->uNumBands) ||
+        ((INT)uTo < 0)   || (uTo >= infoPtr->uNumBands)) {
+        /* error !!! */
+        ERR("Illegal MoveBand, from=%d, to=%d, current band count=%d\n",
+              (INT)uFrom, (INT)uTo, infoPtr->uNumBands);
+        return FALSE;
     }
 
@@ -3095 +3272 @@
     /* close up rest of bands (psuedo delete) */
     if (uFrom < infoPtr->uNumBands - 1) {
-    memcpy (&oldBands[uFrom], &oldBands[uFrom+1],
-        (infoPtr->uNumBands - uFrom - 1) * sizeof(REBAR_BAND));
+        memcpy (&oldBands[uFrom], &oldBands[uFrom+1],
+                (infoPtr->uNumBands - uFrom - 1) * sizeof(REBAR_BAND));
     }
 
     /* allocate new space and copy rest of bands into it */
     infoPtr->bands =
-    (REBAR_BAND *)COMCTL32_Alloc ((infoPtr->uNumBands)*sizeof(REBAR_BAND));
+        (REBAR_BAND *)COMCTL32_Alloc ((infoPtr->uNumBands)*sizeof(REBAR_BAND));
 
     /* pre insert copy */
     if (uTo > 0) {
-    memcpy (&infoPtr->bands[0], &oldBands[0],
-        uTo * sizeof(REBAR_BAND));
+        memcpy (&infoPtr->bands[0], &oldBands[0],
+                uTo * sizeof(REBAR_BAND));
     }
 
@@ -3114 +3291 @@
     /* post copy */
     if (uTo < infoPtr->uNumBands - 1) {
-    memcpy (&infoPtr->bands[uTo+1], &oldBands[uTo],
-        (infoPtr->uNumBands - uTo - 1) * sizeof(REBAR_BAND));
+        memcpy (&infoPtr->bands[uTo+1], &oldBands[uTo],
+                (infoPtr->uNumBands - uTo - 1) * sizeof(REBAR_BAND));
     }
 
@@ -3144 +3321 @@
 
     if (lprbbi == NULL)
-    return FALSE;
+        return FALSE;
     if (lprbbi->cbSize < REBARBANDINFO_V3_SIZEA)
-    return FALSE;
+        return FALSE;
     if ((UINT)wParam >= infoPtr->uNumBands)
-    return FALSE;
+        return FALSE;
 
     TRACE("index %u\n", (UINT)wParam);
@@ -3158 +3335 @@
     REBAR_CommonSetupBand (infoPtr->hwndSelf, lprbbi, lpBand);
     if (lprbbi->fMask & RBBIM_TEXT) {
-    if (lpBand->lpText) {
-        COMCTL32_Free (lpBand->lpText);
-        lpBand->lpText = NULL;
-    }
-    if (lprbbi->lpText) {
+        if (lpBand->lpText) {
+            COMCTL32_Free (lpBand->lpText);
+            lpBand->lpText = NULL;
+        }
+        if (lprbbi->lpText) {
             INT len = MultiByteToWideChar( CP_ACP, 0, lprbbi->lpText, -1, NULL, 0 );
             lpBand->lpText = (LPWSTR)COMCTL32_Alloc (len*sizeof(WCHAR));
             MultiByteToWideChar( CP_ACP, 0, lprbbi->lpText, -1, lpBand->lpText, len );
-    }
+        }
     }
 
@@ -3173 +3350 @@
     REBAR_DumpBand (infoPtr);
 
-    if (lprbbi->fMask & (RBBIM_CHILDSIZE | RBBIM_SIZE))
-      REBAR_Layout (infoPtr, NULL, TRUE, FALSE);
+    if (lprbbi->fMask & (RBBIM_CHILDSIZE | RBBIM_SIZE)) {
+          REBAR_Layout (infoPtr, NULL, TRUE, FALSE);
+          InvalidateRect(infoPtr->hwndSelf, 0, 1);
+    }
 
     return TRUE;
@@ -3187 +3366 @@
 
     if (lprbbi == NULL)
-    return FALSE;
+        return FALSE;
     if (lprbbi->cbSize < REBARBANDINFO_V3_SIZEW)
-    return FALSE;
+        return FALSE;
     if ((UINT)wParam >= infoPtr->uNumBands)
-    return FALSE;
+        return FALSE;
 
     TRACE("index %u\n", (UINT)wParam);
@@ -3201 +3380 @@
     REBAR_CommonSetupBand (infoPtr->hwndSelf, (LPREBARBANDINFOA)lprbbi, lpBand);
     if (lprbbi->fMask & RBBIM_TEXT) {
-    if (lpBand->lpText) {
-        COMCTL32_Free (lpBand->lpText);
-        lpBand->lpText = NULL;
-    }
-    if (lprbbi->lpText) {
-        INT len = lstrlenW (lprbbi->lpText);
-        lpBand->lpText = (LPWSTR)COMCTL32_Alloc ((len + 1)*sizeof(WCHAR));
-        strcpyW (lpBand->lpText, lprbbi->lpText);
-    }
+        if (lpBand->lpText) {
+            COMCTL32_Free (lpBand->lpText);
+            lpBand->lpText = NULL;
+        }
+        if (lprbbi->lpText) {
+            INT len = lstrlenW (lprbbi->lpText);
+            lpBand->lpText = (LPWSTR)COMCTL32_Alloc ((len + 1)*sizeof(WCHAR));
+            strcpyW (lpBand->lpText, lprbbi->lpText);
+        }
     }
 
@@ -3216 +3395 @@
     REBAR_DumpBand (infoPtr);
 
-    if (lprbbi->fMask & (RBBIM_CHILDSIZE | RBBIM_SIZE))
+    if (lprbbi->fMask & (RBBIM_CHILDSIZE | RBBIM_SIZE)) {
       REBAR_Layout (infoPtr, NULL, TRUE, FALSE);
+      InvalidateRect(infoPtr->hwndSelf, 0, 1);
+    }
 
     return TRUE;
@@ -3231 +3412 @@
 
     if (lpInfo == NULL)
-    return FALSE;
+        return FALSE;
 
     if (lpInfo->cbSize < sizeof (REBARINFO))
-    return FALSE;
+        return FALSE;
 
     TRACE("setting bar info!\n");
 
     if (lpInfo->fMask & RBIM_IMAGELIST) {
-    infoPtr->himl = lpInfo->himl;
-    if (infoPtr->himl) {
+        infoPtr->himl = lpInfo->himl;
+        if (infoPtr->himl) {
             INT cx, cy;
-        ImageList_GetIconSize (infoPtr->himl, &cx, &cy);
-        infoPtr->imageSize.cx = cx;
-        infoPtr->imageSize.cy = cy;
-    }
-    else {
-        infoPtr->imageSize.cx = 0;
-        infoPtr->imageSize.cy = 0;
-    }
-    TRACE("new image cx=%ld, cy=%ld\n", infoPtr->imageSize.cx,
-          infoPtr->imageSize.cy);
+            ImageList_GetIconSize (infoPtr->himl, &cx, &cy);
+            infoPtr->imageSize.cx = cx;
+            infoPtr->imageSize.cy = cy;
+        }
+        else {
+            infoPtr->imageSize.cx = 0;
+            infoPtr->imageSize.cy = 0;
+        }
+        TRACE("new image cx=%ld, cy=%ld\n", infoPtr->imageSize.cx,
+              infoPtr->imageSize.cy);
     }
 
@@ -3257 +3438 @@
     for (i=0; i<infoPtr->uNumBands; i++) {
         lpBand = &infoPtr->bands[i];
-    REBAR_ValidateBand (infoPtr, lpBand);
+        REBAR_ValidateBand (infoPtr, lpBand);
     }
 
@@ -3315 +3496 @@
     BOOL bTemp = infoPtr->bUnicode;
 
-    TRACE("to %s hwnd=0x%04x, was %s\n",
-      ((BOOL)wParam) ? "TRUE" : "FALSE", infoPtr->hwndSelf,
-      (bTemp) ? "TRUE" : "FALSE");
+    TRACE("to %s hwnd=0x%04x, was %s\n", 
+          ((BOOL)wParam) ? "TRUE" : "FALSE", infoPtr->hwndSelf,
+          (bTemp) ? "TRUE" : "FALSE");
 
     infoPtr->bUnicode = (BOOL)wParam;
-
+ 
    return bTemp;
 }
@@ -3331 +3512 @@
 
     if (iVersion > COMCTL32_VERSION)
-    return -1;
+        return -1;
 
     infoPtr->iVersion = iVersion;
@@ -3347 +3528 @@
 
     if (((INT)wParam < 0) || ((INT)wParam > infoPtr->uNumBands))
-    return FALSE;
+        return FALSE;
 
     lpBand = &infoPtr->bands[(INT)wParam];
 
     if ((BOOL)lParam) {
-    TRACE("show band %d\n", (INT)wParam);
-    lpBand->fStyle = lpBand->fStyle & ~RBBS_HIDDEN;
-    if (IsWindow (lpBand->hwndChild))
-        ShowWindow (lpBand->hwndChild, SW_SHOW);
+        TRACE("show band %d\n", (INT)wParam);
+        lpBand->fStyle = lpBand->fStyle & ~RBBS_HIDDEN;
+        if (IsWindow (lpBand->hwndChild))
+            ShowWindow (lpBand->hwndChild, SW_SHOW);
     }
     else {
-    TRACE("hide band %d\n", (INT)wParam);
-    lpBand->fStyle = lpBand->fStyle | RBBS_HIDDEN;
-    if (IsWindow (lpBand->hwndChild))
-        ShowWindow (lpBand->hwndChild, SW_HIDE);
+        TRACE("hide band %d\n", (INT)wParam);
+        lpBand->fStyle = lpBand->fStyle | RBBS_HIDDEN;
+        if (IsWindow (lpBand->hwndChild))
+            ShowWindow (lpBand->hwndChild, SW_HIDE);
     }
 
     REBAR_Layout (infoPtr, NULL, TRUE, FALSE);
+    InvalidateRect(infoPtr->hwndSelf, 0, 1);
 
     return TRUE;
@@ -3380 +3562 @@
 
     TRACE("[%d %d %d %d]\n",
-      lpRect->left, lpRect->top, lpRect->right, lpRect->bottom);
+          lpRect->left, lpRect->top, lpRect->right, lpRect->bottom);
 
     /*  what is going on???? */
     GetWindowRect(infoPtr->hwndSelf, &t1);
     TRACE("window rect [%d %d %d %d]\n",
-      t1.left, t1.top, t1.right, t1.bottom);
+          t1.left, t1.top, t1.right, t1.bottom);
     GetClientRect(infoPtr->hwndSelf, &t1);
     TRACE("client rect [%d %d %d %d]\n",
-      t1.left, t1.top, t1.right, t1.bottom);
+          t1.left, t1.top, t1.right, t1.bottom);
 
     /* force full _Layout processing */
@@ -3407 +3589 @@
 
     if (TRACE_ON(rebar)) {
-    GetWindowRect(infoPtr->hwndSelf, &wnrc1);
-    GetClientRect(infoPtr->hwndSelf, &clrc1);
-    TRACE("window=(%d,%d)-(%d,%d) client=(%d,%d)-(%d,%d) cs=(%d,%d %dx%d)\n",
-          wnrc1.left, wnrc1.top, wnrc1.right, wnrc1.bottom,
-          clrc1.left, clrc1.top, clrc1.right, clrc1.bottom,
-          cs->x, cs->y, cs->cx, cs->cy);
+        GetWindowRect(infoPtr->hwndSelf, &wnrc1);
+        GetClientRect(infoPtr->hwndSelf, &clrc1);
+        TRACE("window=(%d,%d)-(%d,%d) client=(%d,%d)-(%d,%d) cs=(%d,%d %dx%d)\n",
+              wnrc1.left, wnrc1.top, wnrc1.right, wnrc1.bottom,
+              clrc1.left, clrc1.top, clrc1.right, clrc1.bottom,
+              cs->x, cs->y, cs->cx, cs->cy);
     }
 
@@ -3429 +3611 @@
     /* free rebar bands */
     if ((infoPtr->uNumBands > 0) && infoPtr->bands) {
-    /* clean up each band */
-    for (i = 0; i < infoPtr->uNumBands; i++) {
-        lpBand = &infoPtr->bands[i];
-
-        /* delete text strings */
-        if (lpBand->lpText) {
-        COMCTL32_Free (lpBand->lpText);
-        lpBand->lpText = NULL;
-        }
-        /* destroy child window */
-        DestroyWindow (lpBand->hwndChild);
-    }
-
-    /* free band array */
-    COMCTL32_Free (infoPtr->bands);
-    infoPtr->bands = NULL;
+        /* clean up each band */
+        for (i = 0; i < infoPtr->uNumBands; i++) {
+            lpBand = &infoPtr->bands[i];
+
+            /* delete text strings */
+            if (lpBand->lpText) {
+                COMCTL32_Free (lpBand->lpText);
+                lpBand->lpText = NULL;
+            }
+            /* destroy child window */
+            DestroyWindow (lpBand->hwndChild);
+        }
+
+        /* free band array */
+        COMCTL32_Free (infoPtr->bands);
+        infoPtr->bands = NULL;
     }
 
@@ -3451 +3633 @@
     DeleteObject (infoPtr->hcurVert);
     DeleteObject (infoPtr->hcurDrag);
+    DeleteObject (infoPtr->hFont);
     SetWindowLongA (infoPtr->hwndSelf, 0, 0);
 
@@ -3523 +3706 @@
     if (infoPtr->fStatus & BEGIN_DRAG_ISSUED) {
         REBAR_Notify((NMHDR *) &layout, infoPtr, RBN_LAYOUTCHANGED);
-    REBAR_Notify_NMREBAR (infoPtr, ihitBand, RBN_ENDDRAG);
-    infoPtr->fStatus &= ~BEGIN_DRAG_ISSUED;
+        REBAR_Notify_NMREBAR (infoPtr, ihitBand, RBN_ENDDRAG);
+        infoPtr->fStatus &= ~BEGIN_DRAG_ISSUED;
     }
 
@@ -3548 +3731 @@
     /* if mouse did not move much, exit */
     if ((abs(ptsmove.x - infoPtr->dragNow.x) <= mindragx) &&
-    (abs(ptsmove.y - infoPtr->dragNow.y) <= mindragy)) return 0;
+        (abs(ptsmove.y - infoPtr->dragNow.y) <= mindragy)) return 0;
 
     band1 = &infoPtr->bands[infoPtr->ihitBand-1];
@@ -3555 +3738 @@
     /* Test for valid drag case - must not be first band in row */
     if (infoPtr->dwStyle & CCS_VERT) {
-    if ((ptsmove.x < band2->rcBand.left) ||
-        (ptsmove.x > band2->rcBand.right) ||
-        ((infoPtr->ihitBand > 0) && (band1->iRow != band2->iRow))) {
-        FIXME("Cannot drag to other rows yet!!\n");
+        if ((ptsmove.x < band2->rcBand.left) ||
+            (ptsmove.x > band2->rcBand.right) ||
+            ((infoPtr->ihitBand > 0) && (band1->iRow != band2->iRow))) {
+            FIXME("Cannot drag to other rows yet!!\n");
+        }
+        else {
+            REBAR_HandleLRDrag (infoPtr, &ptsmove);
+        }
     }
     else {
-        REBAR_HandleLRDrag (infoPtr, &ptsmove);
-    }
-    }
-    else {
-    if ((ptsmove.y < band2->rcBand.top) ||
-        (ptsmove.y > band2->rcBand.bottom) ||
-        ((infoPtr->ihitBand > 0) && (band1->iRow != band2->iRow))) {
-        FIXME("Cannot drag to other rows yet!!\n");
-    }
-    else {
-        REBAR_HandleLRDrag (infoPtr, &ptsmove);
-    }
+        if ((ptsmove.y < band2->rcBand.top) ||
+            (ptsmove.y > band2->rcBand.bottom) ||
+            ((infoPtr->ihitBand > 0) && (band1->iRow != band2->iRow))) {
+            FIXME("Cannot drag to other rows yet!!\n");
+        }
+        else {
+            REBAR_HandleLRDrag (infoPtr, &ptsmove);
+        }
     }
     return 0;
@@ -3581 +3764 @@
 REBAR_NCCalcSize (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
 {
-    ((LPRECT)lParam)->top    += GetSystemMetrics(SM_CYEDGE);
-    ((LPRECT)lParam)->bottom -= GetSystemMetrics(SM_CYEDGE);
-
-    /* While the code below seems to be the reasonable way of   */
-    /*  handling the WS_BORDER style, the native version (as    */
-    /*  of 4.71 seems to only do the above. Go figure!!         */
-#if 0
-    if (GetWindowLongA (infoPtr->hwndSelf, GWL_STYLE) & WS_BORDER) {
-    ((LPRECT)lParam)->left   += GetSystemMetrics(SM_CXEDGE);
-    ((LPRECT)lParam)->top    += GetSystemMetrics(SM_CYEDGE);
-    ((LPRECT)lParam)->right  -= GetSystemMetrics(SM_CXEDGE);
-    ((LPRECT)lParam)->bottom -= GetSystemMetrics(SM_CYEDGE);
-    }
-#endif
-
+    if (infoPtr->dwStyle & WS_BORDER) {
+        InflateRect((LPRECT)lParam, -GetSystemMetrics(SM_CXEDGE),
+                    -GetSystemMetrics(SM_CYEDGE));
+    }
+    TRACE("new client=(%d,%d)-(%d,%d)\n",
+          ((LPRECT)lParam)->left, ((LPRECT)lParam)->top,
+          ((LPRECT)lParam)->right, ((LPRECT)lParam)->bottom);
     return 0;
 }
@@ -3606 +3781 @@
     REBAR_INFO *infoPtr = REBAR_GetInfoPtr (hwnd);
     RECT wnrc1, clrc1;
+    NONCLIENTMETRICSA ncm;
+    HFONT tfont;
     INT i;
 
     if (infoPtr != NULL) {
-    ERR("Strange info structure pointer *not* NULL\n");
-    return FALSE;
+        ERR("Strange info structure pointer *not* NULL\n");
+        return FALSE;
     }
 
     if (TRACE_ON(rebar)) {
-    GetWindowRect(hwnd, &wnrc1);
-    GetClientRect(hwnd, &clrc1);
-    TRACE("window=(%d,%d)-(%d,%d) client=(%d,%d)-(%d,%d) cs=(%d,%d %dx%d)\n",
-          wnrc1.left, wnrc1.top, wnrc1.right, wnrc1.bottom,
-          clrc1.left, clrc1.top, clrc1.right, clrc1.bottom,
-          cs->x, cs->y, cs->cx, cs->cy);
+        GetWindowRect(hwnd, &wnrc1);
+        GetClientRect(hwnd, &clrc1);
+        TRACE("window=(%d,%d)-(%d,%d) client=(%d,%d)-(%d,%d) cs=(%d,%d %dx%d)\n",
+              wnrc1.left, wnrc1.top, wnrc1.right, wnrc1.bottom,
+              clrc1.left, clrc1.top, clrc1.right, clrc1.bottom,
+              cs->x, cs->y, cs->cx, cs->cy);
     }
 
@@ -3644 +3821 @@
     infoPtr->bUnicode = IsWindowUnicode (hwnd);
     infoPtr->fStatus = CREATE_RUNNING;
+    infoPtr->hFont = GetStockObject (SYSTEM_FONT);
 
     /* issue WM_NOTIFYFORMAT to get unicode status of parent */
     i = SendMessageA(REBAR_GetNotifyParent (infoPtr),
-             WM_NOTIFYFORMAT, hwnd, NF_QUERY);
+                     WM_NOTIFYFORMAT, hwnd, NF_QUERY);
     if ((i < NFR_ANSI) || (i > NFR_UNICODE)) {
-    ERR("wrong response to WM_NOTIFYFORMAT (%d), assuming ANSI\n",
-        i);
-    i = NFR_ANSI;
+        ERR("wrong response to WM_NOTIFYFORMAT (%d), assuming ANSI\n",
+            i);
+        i = NFR_ANSI;
     }
     infoPtr->NtfUnicode = (i == NFR_UNICODE) ? 1 : 0;
@@ -3659 +3837 @@
     SetWindowLongA (hwnd, GWL_STYLE, infoPtr->dwStyle);
 
+    /* get font handle for Caption Font */
+    ncm.cbSize = sizeof(NONCLIENTMETRICSA);
+    SystemParametersInfoA (SPI_GETNONCLIENTMETRICS, 
+                          ncm.cbSize, &ncm, 0);
+    /* if the font is bold, set to normal */
+    if (ncm.lfCaptionFont.lfWeight > FW_NORMAL) {
+        ncm.lfCaptionFont.lfWeight = FW_NORMAL;
+    }
+    tfont = CreateFontIndirectA (&ncm.lfCaptionFont);
+    if (tfont) {
+        infoPtr->hFont = tfont;
+    }
+
 /* native does:
-        GetSysColor (numerous);
-        GetSysColorBrush (numerous) (see WM_SYSCOLORCHANGE);
-        GetStockObject (SYSTEM_FONT);
-       *SetWindowLong (hwnd, 0, info ptr);
-       *WM_NOTIFYFORMAT;
-       *SetWindowLong (hwnd, GWL_STYLE, style+0x10000001);
+            GetSysColor (numerous);
+            GetSysColorBrush (numerous) (see WM_SYSCOLORCHANGE);
+           *GetStockObject (SYSTEM_FONT);
+           *SetWindowLong (hwnd, 0, info ptr);
+           *WM_NOTIFYFORMAT;
+           *SetWindowLong (hwnd, GWL_STYLE, style+0x10000001);
                                     WS_VISIBLE = 0x10000000;
                                     CCS_TOP    = 0x00000001;
-        SystemParametersInfo (SPI_GETNONCLIENTMETRICS...);
-        CreateFontIndirect (lfCaptionFont from above);
-        GetDC ();
-        SelectObject (hdc, fontabove);
-        GetTextMetrics (hdc, );    guessing is tmHeight
-        SelectObject (hdc, oldfont);
-        ReleaseDC ();
-        GetWindowRect ();
-        MapWindowPoints (0, parent, rectabove, 2);
-        GetWindowRect ();
-        GetClientRect ();
-        ClientToScreen (clientrect);
-        SetWindowPos (hwnd, 0, 0, 0, 0, 0, SWP_NOZORDER);
+           *SystemParametersInfo (SPI_GETNONCLIENTMETRICS...);
+           *CreateFontIndirect (lfCaptionFont from above);
+            GetDC ();
+            SelectObject (hdc, fontabove);
+            GetTextMetrics (hdc, );    guessing is tmHeight
+            SelectObject (hdc, oldfont);
+            ReleaseDC ();
+            GetWindowRect ();
+            MapWindowPoints (0, parent, rectabove, 2);
+            GetWindowRect ();
+            GetClientRect ();
+            ClientToScreen (clientrect);
+            SetWindowPos (hwnd, 0, 0, 0, 0, 0, SWP_NOZORDER);
  */
     return TRUE;
@@ -3708 +3899 @@
     clpt = pt;
     ScreenToClient (infoPtr->hwndSelf, &clpt);
-    REBAR_InternalHitTest (infoPtr, &clpt, &scrap,
-               (INT *)&nmmouse.dwItemSpec);
+    REBAR_InternalHitTest (infoPtr, &clpt, &scrap, 
+                           (INT *)&nmmouse.dwItemSpec);
     nmmouse.dwItemData = 0;
     nmmouse.pt = clpt;
     nmmouse.dwHitInfo = 0;
     if ((i = REBAR_Notify((NMHDR *) &nmmouse, infoPtr, NM_NCHITTEST))) {
-    TRACE("notify changed return value from %ld to %d\n",
-          ret, i);
-    ret = (LRESULT) i;
+        TRACE("notify changed return value from %ld to %d\n",
+              ret, i); 
+        ret = (LRESULT) i;
     }
     TRACE("returning %ld, client point (%ld,%ld)\n", ret, clpt.x, clpt.y);
@@ -3730 +3921 @@
 
     if (infoPtr->dwStyle & WS_MINIMIZE)
-    return 0; /* Nothing to do */
-
-    DefWindowProcA (infoPtr->hwndSelf, WM_NCPAINT, wParam, lParam);
-
-    if (!(hdc = GetDCEx( infoPtr->hwndSelf, 0, DCX_USESTYLE | DCX_WINDOW )))
-    return 0;
+        return 0; /* Nothing to do */
 
     if (infoPtr->dwStyle & WS_BORDER) {
-    GetWindowRect (infoPtr->hwndSelf, &rcWindow);
-    OffsetRect (&rcWindow, -rcWindow.left, -rcWindow.top);
-    TRACE("rect (%d,%d)-(%d,%d)\n",
-          rcWindow.left, rcWindow.top,
-          rcWindow.right, rcWindow.bottom);
-    /* see comments in _NCCalcSize for reason this is not done */
-    /* DrawEdge (hdc, &rcWindow, EDGE_ETCHED, BF_RECT); */
-    DrawEdge (hdc, &rcWindow, EDGE_ETCHED, BF_TOP | BF_BOTTOM);
-    }
-
-    ReleaseDC( infoPtr->hwndSelf, hdc );
+
+        /* adjust rectangle and draw the necessary edge */
+        if (!(hdc = GetDCEx( infoPtr->hwndSelf, 0, DCX_USESTYLE | DCX_WINDOW )))
+            return 0;
+        GetWindowRect (infoPtr->hwndSelf, &rcWindow);
+        OffsetRect (&rcWindow, -rcWindow.left, -rcWindow.top);
+        TRACE("rect (%d,%d)-(%d,%d)\n",
+              rcWindow.left, rcWindow.top,
+              rcWindow.right, rcWindow.bottom);
+        DrawEdge (hdc, &rcWindow, EDGE_ETCHED, BF_RECT);
+        ReleaseDC( infoPtr->hwndSelf, hdc );
+    }
 
     return 0;
@@ -3760 +3947 @@
 
     if (lParam == NF_REQUERY) {
-    i = SendMessageA(REBAR_GetNotifyParent (infoPtr),
-             WM_NOTIFYFORMAT, infoPtr->hwndSelf, NF_QUERY);
-    if ((i < NFR_ANSI) || (i > NFR_UNICODE)) {
-        ERR("wrong response to WM_NOTIFYFORMAT (%d), assuming ANSI\n",
-        i);
-        i = NFR_ANSI;
-    }
-    infoPtr->NtfUnicode = (i == NFR_UNICODE) ? 1 : 0;
-    return (LRESULT)i;
+        i = SendMessageA(REBAR_GetNotifyParent (infoPtr),
+                         WM_NOTIFYFORMAT, infoPtr->hwndSelf, NF_QUERY);
+        if ((i < NFR_ANSI) || (i > NFR_UNICODE)) {
+            ERR("wrong response to WM_NOTIFYFORMAT (%d), assuming ANSI\n",
+                i);
+            i = NFR_ANSI;
+        }
+        infoPtr->NtfUnicode = (i == NFR_UNICODE) ? 1 : 0;
+        return (LRESULT)i;
     }
     return (LRESULT)((infoPtr->bUnicode) ? NFR_UNICODE : NFR_ANSI);
@@ -3785 +3972 @@
 
     TRACE("painting (%d,%d)-(%d,%d) client (%d,%d)-(%d,%d)\n",
-      ps.rcPaint.left, ps.rcPaint.top,
-      ps.rcPaint.right, ps.rcPaint.bottom,
-      rc.left, rc.top, rc.right, rc.bottom);
+          ps.rcPaint.left, ps.rcPaint.top,
+          ps.rcPaint.right, ps.rcPaint.bottom,
+          rc.left, rc.top, rc.right, rc.bottom);
 
     if (ps.fErase) {
-    /* Erase area of paint if requested */
+        /* Erase area of paint if requested */
         REBAR_InternalEraseBkGnd (infoPtr, wParam, lParam, &ps.rcPaint);
     }
@@ -3796 +3983 @@
     REBAR_Refresh (infoPtr, hdc);
     if (!wParam)
-    EndPaint (infoPtr->hwndSelf, &ps);
+        EndPaint (infoPtr->hwndSelf, &ps);
     return 0;
 }
@@ -3815 +4002 @@
 
     if (flags == RBHT_GRABBER) {
-    if ((infoPtr->dwStyle & CCS_VERT) &&
-        !(infoPtr->dwStyle & RBS_VERTICALGRIPPER))
-        SetCursor (infoPtr->hcurVert);
-    else
-        SetCursor (infoPtr->hcurHorz);
+        if ((infoPtr->dwStyle & CCS_VERT) &&
+            !(infoPtr->dwStyle & RBS_VERTICALGRIPPER))
+            SetCursor (infoPtr->hcurVert);
+        else
+            SetCursor (infoPtr->hcurHorz);
     }
     else if (flags != RBHT_CLIENT)
-    SetCursor (infoPtr->hcurArrow);
+        SetCursor (infoPtr->hcurArrow);
 
     return 0;
@@ -3840 +4027 @@
     for (i=0; i<infoPtr->uNumBands; i++) {
         lpBand = &infoPtr->bands[i];
-    REBAR_ValidateBand (infoPtr, lpBand);
+        REBAR_ValidateBand (infoPtr, lpBand);
     }
 
@@ -3861 +4048 @@
       *
       * Documentation:
-      *  According to testing V4.71 of COMCTL32 returns the
+      *  According to testing V4.71 of COMCTL32 returns the 
       *  *previous* status of the redraw flag (either 0 or -1)
       *  instead of the MSDN documented value of 0 if handled
@@ -3869 +4056 @@
     BOOL oldredraw = infoPtr->DoRedraw;
 
-    TRACE("set to %s, fStatus=%08x\n",
-      (wParam) ? "TRUE" : "FALSE", infoPtr->fStatus);
+    TRACE("set to %s, fStatus=%08x\n", 
+          (wParam) ? "TRUE" : "FALSE", infoPtr->fStatus);
     infoPtr->DoRedraw = (BOOL) wParam;
     if (wParam) {
-    if (infoPtr->fStatus & BAND_NEEDS_REDRAW) {
-        REBAR_MoveChildWindows (infoPtr, 0, infoPtr->uNumBands);
-        REBAR_ForceResize (infoPtr);
-        InvalidateRect (infoPtr->hwndSelf, 0, TRUE);
-    }
-    infoPtr->fStatus &= ~BAND_NEEDS_REDRAW;
+        if (infoPtr->fStatus & BAND_NEEDS_REDRAW) {
+            REBAR_MoveChildWindows (infoPtr, 0, infoPtr->uNumBands);
+            REBAR_ForceResize (infoPtr);
+            InvalidateRect (infoPtr->hwndSelf, 0, TRUE);
+        }
+        infoPtr->fStatus &= ~BAND_NEEDS_REDRAW;
     }
     return (oldredraw) ? -1 : 0;
@@ -3891 +4078 @@
     /* auto resize deadlock check */
     if (infoPtr->fStatus & AUTO_RESIZE) {
-    infoPtr->fStatus &= ~AUTO_RESIZE;
-    TRACE("AUTO_RESIZE was set, reset, fStatus=%08x lparam=%08lx\n",
-          infoPtr->fStatus, lParam);
-    return 0;
+        infoPtr->fStatus &= ~AUTO_RESIZE;
+        TRACE("AUTO_RESIZE was set, reset, fStatus=%08x lparam=%08lx\n",
+              infoPtr->fStatus, lParam);
+        return 0;
     }
 
     if (infoPtr->fStatus & CREATE_RUNNING) {
-    /* still in CreateWindow */
-    RECT rcWin;
-
-    TRACE("still in CreateWindow\n");
-    infoPtr->fStatus &= ~CREATE_RUNNING;
-    GetWindowRect ( infoPtr->hwndSelf, &rcWin);
-    TRACE("win rect (%d,%d)-(%d,%d)\n",
-          rcWin.left, rcWin.top, rcWin.right, rcWin.bottom);
-
-    if ((lParam == 0) && (rcWin.right-rcWin.left == 0) &&
-        (rcWin.bottom-rcWin.top == 0)) {
-        /* native control seems to do this */
-        GetClientRect (GetParent(infoPtr->hwndSelf), &rcClient);
-        TRACE("sizing rebar, message and client zero, parent client (%d,%d)\n",
-          rcClient.right, rcClient.bottom);
+        /* still in CreateWindow */
+        RECT rcWin;
+
+        if ((INT)wParam != SIZE_RESTORED) {
+            ERR("WM_SIZE in create and flags=%08x, lParam=%08lx\n",
+                wParam, lParam);
+        }
+
+        TRACE("still in CreateWindow\n");
+        infoPtr->fStatus &= ~CREATE_RUNNING;
+        GetWindowRect ( infoPtr->hwndSelf, &rcWin);
+        TRACE("win rect (%d,%d)-(%d,%d)\n",
+              rcWin.left, rcWin.top, rcWin.right, rcWin.bottom);
+
+        if ((lParam == 0) && (rcWin.right-rcWin.left == 0) && 
+            (rcWin.bottom-rcWin.top == 0)) {
+            /* native control seems to do this */
+            GetClientRect (GetParent(infoPtr->hwndSelf), &rcClient);
+            TRACE("sizing rebar, message and client zero, parent client (%d,%d)\n", 
+                  rcClient.right, rcClient.bottom);
+        }
+        else {
+            INT cx, cy;
+
+            cx = rcWin.right - rcWin.left;
+            cy = rcWin.bottom - rcWin.top;
+            if ((cx == LOWORD(lParam)) && (cy == HIWORD(lParam))) {
+                return 0;
+            }
+
+            /* do the actual WM_SIZE request */
+            GetClientRect (infoPtr->hwndSelf, &rcClient);
+            TRACE("sizing rebar from (%ld,%ld) to (%d,%d), client (%d,%d)\n", 
+                  infoPtr->calcSize.cx, infoPtr->calcSize.cy,
+                  LOWORD(lParam), HIWORD(lParam),
+                  rcClient.right, rcClient.bottom);
+        }
     }
     else {
-        INT cx, cy;
-
-        cx = rcWin.right - rcWin.left;
-        cy = rcWin.bottom - rcWin.top;
-        if ((cx == LOWORD(lParam)) && (cy == HIWORD(lParam))) {
-        return 0;
-        }
-
-        /* do the actual WM_SIZE request */
-        GetClientRect (infoPtr->hwndSelf, &rcClient);
-        TRACE("sizing rebar from (%ld,%ld) to (%d,%d), client (%d,%d)\n",
-          infoPtr->calcSize.cx, infoPtr->calcSize.cy,
-          LOWORD(lParam), HIWORD(lParam),
-          rcClient.right, rcClient.bottom);
-    }
-    }
-    else {
-    /* Handle cases when outside of the CreateWindow process */
-
-    GetClientRect (infoPtr->hwndSelf, &rcClient);
-    if ((lParam == 0) && (rcClient.right + rcClient.bottom != 0) &&
-        (infoPtr->dwStyle & RBS_AUTOSIZE)) {
-        /* on a WM_SIZE to zero and current client not zero and AUTOSIZE */
-        /* native seems to use the current client rect for the size      */
-        infoPtr->fStatus |= BAND_NEEDS_LAYOUT;
-        TRACE("sizing rebar to client (%d,%d) size is zero but AUTOSIZE set\n",
-          rcClient.right, rcClient.bottom);
-    }
-    else {
-        TRACE("sizing rebar from (%ld,%ld) to (%d,%d), client (%d,%d)\n",
-          infoPtr->calcSize.cx, infoPtr->calcSize.cy,
-          LOWORD(lParam), HIWORD(lParam),
-          rcClient.right, rcClient.bottom);
-    }
+        if ((INT)wParam != SIZE_RESTORED) {
+            ERR("WM_SIZE out of create and flags=%08x, lParam=%08lx\n",
+                wParam, lParam);
+        }
+
+        /* Handle cases when outside of the CreateWindow process */
+
+        GetClientRect (infoPtr->hwndSelf, &rcClient);
+        if ((lParam == 0) && (rcClient.right + rcClient.bottom != 0) &&
+            (infoPtr->dwStyle & RBS_AUTOSIZE)) {
+            /* on a WM_SIZE to zero and current client not zero and AUTOSIZE */
+            /* native seems to use the current client rect for the size      */
+            infoPtr->fStatus |= BAND_NEEDS_LAYOUT;
+            TRACE("sizing rebar to client (%d,%d) size is zero but AUTOSIZE set\n", 
+                  rcClient.right, rcClient.bottom);
+        }
+        else {
+            TRACE("sizing rebar from (%ld,%ld) to (%d,%d), client (%d,%d)\n", 
+                  infoPtr->calcSize.cx, infoPtr->calcSize.cy,
+                  LOWORD(lParam), HIWORD(lParam),
+                  rcClient.right, rcClient.bottom);
+        }
     }
 
     if (infoPtr->dwStyle & RBS_AUTOSIZE) {
-    NMRBAUTOSIZE autosize;
-
-    GetClientRect(infoPtr->hwndSelf, &autosize.rcTarget);
-    autosize.fChanged = 0;  /* ??? */
-    autosize.rcActual = autosize.rcTarget;  /* ??? */
-    REBAR_Notify((NMHDR *) &autosize, infoPtr, RBN_AUTOSIZE);
-    TRACE("RBN_AUTOSIZE client=(%d,%d), lp=%08lx\n",
-          autosize.rcTarget.right, autosize.rcTarget.bottom, lParam);
+        NMRBAUTOSIZE autosize;
+
+        GetClientRect(infoPtr->hwndSelf, &autosize.rcTarget);
+        autosize.fChanged = 0;  /* ??? */
+        autosize.rcActual = autosize.rcTarget;  /* ??? */
+        REBAR_Notify((NMHDR *) &autosize, infoPtr, RBN_AUTOSIZE);
+        TRACE("RBN_AUTOSIZE client=(%d,%d), lp=%08lx\n", 
+              autosize.rcTarget.right, autosize.rcTarget.bottom, lParam);
     }
 
     if ((infoPtr->calcSize.cx != rcClient.right) ||
-    (infoPtr->calcSize.cy != rcClient.bottom))
-    infoPtr->fStatus |= BAND_NEEDS_LAYOUT;
+        (infoPtr->calcSize.cy != rcClient.bottom))
+        infoPtr->fStatus |= BAND_NEEDS_LAYOUT;
 
     REBAR_Layout (infoPtr, &rcClient, TRUE, TRUE);
@@ -3979 +4176 @@
 
     TRACE("current style=%08lx, styleOld=%08lx, style being set to=%08lx\n",
-      infoPtr->dwStyle, ss->styleOld, ss->styleNew);
+          infoPtr->dwStyle, ss->styleOld, ss->styleNew);
     infoPtr->dwStyle = ss->styleNew;
 
@@ -3991 +4188 @@
     REBAR_INFO *infoPtr = REBAR_GetInfoPtr (hwnd);
 
-    TRACE("hwnd=%x msg=%x wparam=%x lparam=%lx\n",
-      hwnd, uMsg, /* SPY_GetMsgName(uMsg), */ wParam, lParam);
+    TRACE("hwnd=%x msg=%x wparam=%x lparam=%lx\n", 
+          hwnd, uMsg, /* SPY_GetMsgName(uMsg), */ wParam, lParam);
     if (!infoPtr && (uMsg != WM_NCCREATE))
-        return DefWindowProcA (hwnd, uMsg, wParam, lParam);
+            return DefWindowProcA (hwnd, uMsg, wParam, lParam);
     switch (uMsg)
     {
-/*  case RB_BEGINDRAG: */
-
-    case RB_DELETEBAND:
-        return REBAR_DeleteBand (infoPtr, wParam, lParam);
-
-/*  case RB_DRAGMOVE: */
-/*  case RB_ENDDRAG: */
-
-    case RB_GETBANDBORDERS:
-        return REBAR_GetBandBorders (infoPtr, wParam, lParam);
-
-    case RB_GETBANDCOUNT:
-        return REBAR_GetBandCount (infoPtr);
-
-    case RB_GETBANDINFO:    /* obsoleted after IE3, but we have to
-                   support it anyway. */
-    case RB_GETBANDINFOA:
-        return REBAR_GetBandInfoA (infoPtr, wParam, lParam);
-
-    case RB_GETBANDINFOW:
-        return REBAR_GetBandInfoW (infoPtr, wParam, lParam);
-
-    case RB_GETBARHEIGHT:
-        return REBAR_GetBarHeight (infoPtr, wParam, lParam);
-
-    case RB_GETBARINFO:
-        return REBAR_GetBarInfo (infoPtr, wParam, lParam);
-
-    case RB_GETBKCOLOR:
-        return REBAR_GetBkColor (infoPtr);
-
-/*  case RB_GETCOLORSCHEME: */
-/*  case RB_GETDROPTARGET: */
-
-    case RB_GETPALETTE:
-        return REBAR_GetPalette (infoPtr, wParam, lParam);
-
-    case RB_GETRECT:
-        return REBAR_GetRect (infoPtr, wParam, lParam);
-
-    case RB_GETROWCOUNT:
-        return REBAR_GetRowCount (infoPtr);
-
-    case RB_GETROWHEIGHT:
-        return REBAR_GetRowHeight (infoPtr, wParam, lParam);
-
-    case RB_GETTEXTCOLOR:
-        return REBAR_GetTextColor (infoPtr);
-
-    case RB_GETTOOLTIPS:
-        return REBAR_GetToolTips (infoPtr);
-
-    case RB_GETUNICODEFORMAT:
-        return REBAR_GetUnicodeFormat (infoPtr);
-
-    case CCM_GETVERSION:
-        return REBAR_GetVersion (infoPtr);
-
-    case RB_HITTEST:
-        return REBAR_HitTest (infoPtr, wParam, lParam);
-
-    case RB_IDTOINDEX:
-        return REBAR_IdToIndex (infoPtr, wParam, lParam);
-
-    case RB_INSERTBANDA:
-        return REBAR_InsertBandA (infoPtr, wParam, lParam);
-
-    case RB_INSERTBANDW:
-        return REBAR_InsertBandW (infoPtr, wParam, lParam);
-
-    case RB_MAXIMIZEBAND:
-        return REBAR_MaximizeBand (infoPtr, wParam, lParam);
-
-    case RB_MINIMIZEBAND:
-        return REBAR_MinimizeBand (infoPtr, wParam, lParam);
-
-    case RB_MOVEBAND:
-        return REBAR_MoveBand (infoPtr, wParam, lParam);
-
-    case RB_SETBANDINFOA:
-        return REBAR_SetBandInfoA (infoPtr, wParam, lParam);
-
-    case RB_SETBANDINFOW:
-        return REBAR_SetBandInfoW (infoPtr, wParam, lParam);
-
-    case RB_SETBARINFO:
-        return REBAR_SetBarInfo (infoPtr, wParam, lParam);
-
-    case RB_SETBKCOLOR:
-        return REBAR_SetBkColor (infoPtr, wParam, lParam);
-
-/*  case RB_SETCOLORSCHEME: */
-/*  case RB_SETPALETTE: */
-/*      return REBAR_GetPalette (infoPtr, wParam, lParam); */
-
-    case RB_SETPARENT:
-        return REBAR_SetParent (infoPtr, wParam, lParam);
-
-    case RB_SETTEXTCOLOR:
-        return REBAR_SetTextColor (infoPtr, wParam, lParam);
-
-/*  case RB_SETTOOLTIPS: */
-
-    case RB_SETUNICODEFORMAT:
-        return REBAR_SetUnicodeFormat (infoPtr, wParam);
-
-    case CCM_SETVERSION:
-        return REBAR_SetVersion (infoPtr, (INT)wParam);
-
-    case RB_SHOWBAND:
-        return REBAR_ShowBand (infoPtr, wParam, lParam);
-
-    case RB_SIZETORECT:
-        return REBAR_SizeToRect (infoPtr, wParam, lParam);
+/*      case RB_BEGINDRAG: */
+
+        case RB_DELETEBAND:
+            return REBAR_DeleteBand (infoPtr, wParam, lParam);
+
+/*      case RB_DRAGMOVE: */
+/*      case RB_ENDDRAG: */
+
+        case RB_GETBANDBORDERS:
+            return REBAR_GetBandBorders (infoPtr, wParam, lParam);
+
+        case RB_GETBANDCOUNT:
+            return REBAR_GetBandCount (infoPtr);
+
+        case RB_GETBANDINFO:    /* obsoleted after IE3, but we have to
+                                   support it anyway. */
+        case RB_GETBANDINFOA:
+            return REBAR_GetBandInfoA (infoPtr, wParam, lParam);
+
+        case RB_GETBANDINFOW:
+            return REBAR_GetBandInfoW (infoPtr, wParam, lParam);
+
+        case RB_GETBARHEIGHT:
+            return REBAR_GetBarHeight (infoPtr, wParam, lParam);
+
+        case RB_GETBARINFO:
+            return REBAR_GetBarInfo (infoPtr, wParam, lParam);
+
+        case RB_GETBKCOLOR:
+            return REBAR_GetBkColor (infoPtr);
+
+/*      case RB_GETCOLORSCHEME: */
+/*      case RB_GETDROPTARGET: */
+
+        case RB_GETPALETTE:
+            return REBAR_GetPalette (infoPtr, wParam, lParam);
+
+        case RB_GETRECT:
+            return REBAR_GetRect (infoPtr, wParam, lParam);
+
+        case RB_GETROWCOUNT:
+            return REBAR_GetRowCount (infoPtr);
+
+        case RB_GETROWHEIGHT:
+            return REBAR_GetRowHeight (infoPtr, wParam, lParam);
+
+        case RB_GETTEXTCOLOR:
+            return REBAR_GetTextColor (infoPtr);
+
+        case RB_GETTOOLTIPS:
+            return REBAR_GetToolTips (infoPtr);
+
+        case RB_GETUNICODEFORMAT:
+            return REBAR_GetUnicodeFormat (infoPtr);
+
+        case CCM_GETVERSION:
+            return REBAR_GetVersion (infoPtr);
+
+        case RB_HITTEST:
+            return REBAR_HitTest (infoPtr, wParam, lParam);
+
+        case RB_IDTOINDEX:
+            return REBAR_IdToIndex (infoPtr, wParam, lParam);
+
+        case RB_INSERTBANDA:
+            return REBAR_InsertBandA (infoPtr, wParam, lParam);
+
+        case RB_INSERTBANDW:
+            return REBAR_InsertBandW (infoPtr, wParam, lParam);
+
+        case RB_MAXIMIZEBAND:
+            return REBAR_MaximizeBand (infoPtr, wParam, lParam);
+
+        case RB_MINIMIZEBAND:
+            return REBAR_MinimizeBand (infoPtr, wParam, lParam);
+
+        case RB_MOVEBAND:
+            return REBAR_MoveBand (infoPtr, wParam, lParam);
+
+        case RB_SETBANDINFOA:
+            return REBAR_SetBandInfoA (infoPtr, wParam, lParam);
+
+        case RB_SETBANDINFOW:
+            return REBAR_SetBandInfoW (infoPtr, wParam, lParam);
+
+        case RB_SETBARINFO:
+            return REBAR_SetBarInfo (infoPtr, wParam, lParam);
+
+        case RB_SETBKCOLOR:
+            return REBAR_SetBkColor (infoPtr, wParam, lParam);
+
+/*      case RB_SETCOLORSCHEME: */
+/*      case RB_SETPALETTE: */
+/*          return REBAR_GetPalette (infoPtr, wParam, lParam); */
+
+        case RB_SETPARENT:
+            return REBAR_SetParent (infoPtr, wParam, lParam);
+
+        case RB_SETTEXTCOLOR:
+            return REBAR_SetTextColor (infoPtr, wParam, lParam);
+
+/*      case RB_SETTOOLTIPS: */
+
+        case RB_SETUNICODEFORMAT:
+            return REBAR_SetUnicodeFormat (infoPtr, wParam);
+
+        case CCM_SETVERSION:
+            return REBAR_SetVersion (infoPtr, (INT)wParam);
+
+        case RB_SHOWBAND:
+            return REBAR_ShowBand (infoPtr, wParam, lParam);
+
+        case RB_SIZETORECT:
+            return REBAR_SizeToRect (infoPtr, wParam, lParam);
 
 
 /*    Messages passed to parent */
-    case WM_COMMAND:
-    case WM_DRAWITEM:
-    case WM_NOTIFY:
-        if (infoPtr->NtfUnicode)
-        return SendMessageW (REBAR_GetNotifyParent (infoPtr),
-                     uMsg, wParam, lParam);
-        else
-        return SendMessageA (REBAR_GetNotifyParent (infoPtr),
-                     uMsg, wParam, lParam);
+        case WM_COMMAND:
+        case WM_DRAWITEM:
+        case WM_NOTIFY:
+            if (infoPtr->NtfUnicode)
+                return SendMessageW (REBAR_GetNotifyParent (infoPtr),
+                                     uMsg, wParam, lParam);
+            else
+                return SendMessageA (REBAR_GetNotifyParent (infoPtr),
+                                     uMsg, wParam, lParam);
 
 
 /*      case WM_CHARTOITEM:     supported according to ControlSpy */
 
-    case WM_CREATE:
-        return REBAR_Create (infoPtr, wParam, lParam);
-
-    case WM_DESTROY:
-        return REBAR_Destroy (infoPtr, wParam, lParam);
+        case WM_CREATE:
+            return REBAR_Create (infoPtr, wParam, lParam);
+
+        case WM_DESTROY:
+            return REBAR_Destroy (infoPtr, wParam, lParam);
 
         case WM_ERASEBKGND:
-        return REBAR_EraseBkGnd (infoPtr, wParam, lParam);
-
-    case WM_GETFONT:
-        return REBAR_GetFont (infoPtr, wParam, lParam);
+            return REBAR_EraseBkGnd (infoPtr, wParam, lParam);
+
+        case WM_GETFONT:
+            return REBAR_GetFont (infoPtr, wParam, lParam);
 
 /*      case WM_LBUTTONDBLCLK:  supported according to ControlSpy */
 
-    case WM_LBUTTONDOWN:
-        return REBAR_LButtonDown (infoPtr, wParam, lParam);
-
-    case WM_LBUTTONUP:
-        return REBAR_LButtonUp (infoPtr, wParam, lParam);
+        case WM_LBUTTONDOWN:
+            return REBAR_LButtonDown (infoPtr, wParam, lParam);
+
+        case WM_LBUTTONUP:
+            return REBAR_LButtonUp (infoPtr, wParam, lParam);
 
 /*      case WM_MEASUREITEM:    supported according to ControlSpy */
 
-    case WM_MOUSEMOVE:
-        return REBAR_MouseMove (infoPtr, wParam, lParam);
-
-    case WM_NCCALCSIZE:
-        return REBAR_NCCalcSize (infoPtr, wParam, lParam);
+        case WM_MOUSEMOVE:
+            return REBAR_MouseMove (infoPtr, wParam, lParam);
+
+        case WM_NCCALCSIZE:
+            return REBAR_NCCalcSize (infoPtr, wParam, lParam);
 
         case WM_NCCREATE:
-        return REBAR_NCCreate (hwnd, wParam, lParam);
+            return REBAR_NCCreate (hwnd, wParam, lParam);
 
         case WM_NCHITTEST:
-        return REBAR_NCHitTest (infoPtr, wParam, lParam);
-
-    case WM_NCPAINT:
-        return REBAR_NCPaint (infoPtr, wParam, lParam);
+            return REBAR_NCHitTest (infoPtr, wParam, lParam);
+
+        case WM_NCPAINT:
+            return REBAR_NCPaint (infoPtr, wParam, lParam);
 
         case WM_NOTIFYFORMAT:
-        return REBAR_NotifyFormat (infoPtr, wParam, lParam);
-
-    case WM_PAINT:
-        return REBAR_Paint (infoPtr, wParam, lParam);
+            return REBAR_NotifyFormat (infoPtr, wParam, lParam);
+
+        case WM_PAINT:
+            return REBAR_Paint (infoPtr, wParam, lParam);
 
 /*      case WM_PALETTECHANGED: supported according to ControlSpy */
@@ -4176 +4373 @@
 /*      case WM_RBUTTONUP:      supported according to ControlSpy */
 
-    case WM_SETCURSOR:
-        return REBAR_SetCursor (infoPtr, wParam, lParam);
-
-    case WM_SETFONT:
-        return REBAR_SetFont (infoPtr, wParam, lParam);
+        case WM_SETCURSOR:
+            return REBAR_SetCursor (infoPtr, wParam, lParam);
+
+        case WM_SETFONT:
+            return REBAR_SetFont (infoPtr, wParam, lParam);
 
         case WM_SETREDRAW:
-        return REBAR_SetRedraw (infoPtr, wParam, lParam);
-
-    case WM_SIZE:
-        return REBAR_Size (infoPtr, wParam, lParam);
+            return REBAR_SetRedraw (infoPtr, wParam, lParam);
+
+        case WM_SIZE:
+            return REBAR_Size (infoPtr, wParam, lParam);
 
         case WM_STYLECHANGED:
-        return REBAR_StyleChanged (infoPtr, wParam, lParam);
+            return REBAR_StyleChanged (infoPtr, wParam, lParam);
 
 /*      case WM_SYSCOLORCHANGE: supported according to ControlSpy */
 /*      "Applications that have brushes using the existing system colors
-         should delete those brushes and recreate them using the new
+         should delete those brushes and recreate them using the new 
          system colors."  per MSDN                                */
 
 /*      case WM_VKEYTOITEM:     supported according to ControlSpy */
-/*  case WM_WININICHANGE: */
-
-    default:
-        if (uMsg >= WM_USER)
-        ERR("unknown msg %04x wp=%08x lp=%08lx\n",
-             uMsg, wParam, lParam);
+/*      case WM_WININICHANGE: */
+
+        default:
+            if (uMsg >= WM_USER)
+                ERR("unknown msg %04x wp=%08x lp=%08lx\n",
+                     uMsg, wParam, lParam);
 #ifdef __WIN32OS2__
             return defComCtl32ProcA (hwnd, uMsg, wParam, lParam);
 #else
-        return DefWindowProcA (hwnd, uMsg, wParam, lParam);
+            return DefWindowProcA (hwnd, uMsg, wParam, lParam);
 #endif
     }
@@ -4225 +4422 @@
     wndClass.hCursor       = 0;
     wndClass.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1);
+#if GLATESTING
+    wndClass.hbrBackground = CreateSolidBrush(RGB(0,128,0));
+#endif
     wndClass.lpszClassName = REBARCLASSNAMEA;
-
+ 
     RegisterClassA (&wndClass);
 

trunk/src/comctl32/status.c

@@ -1 @@
-/* $Id: status.c,v 1.23 2001-09-05 12:05:02 bird Exp $ */
 /*
  * Interface code to StatusWindow widget/control

trunk/src/comctl32/tab.c

@@ -1 @@
-/* $Id: tab.c,v 1.21 2001-09-05 12:05:02 bird Exp $ */
 /*
  * Tab control

trunk/src/comctl32/toolbar.c

@@ -1 @@
-/* $Id: toolbar.c,v 1.29 2001-09-05 12:05:03 bird Exp $ */
 /*
  * Toolbar control
@@ -5 +4 @@
  * Copyright 1998,1999 Eric Kohl
  * Copyright 2000 Eric Kohl for CodeWeavers
+ *
+ *  Differences between MSDN and actual native control operation:
+ *   1. MSDN says: "TBSTYLE_LIST: Creates a flat toolbar with button text
+ *                  to the right of the bitmap. Otherwise, this style is
+ *                  identical to TBSTYLE_FLAT."
+ *      As implemented by both v4.71 and v5.80 of the native COMCTL32.DLL
+ *      you can create a TBSTYLE_LIST without TBSTYLE_FLAT and the result
+ *      is non-flat non-transparent buttons. Therefore TBSTYLE_LIST does
+ *      *not* imply TBSTYLE_FLAT as documented.  (GA 8/2001)
+ *
  *
  * TODO:
@@ -51 +60 @@
 DEFAULT_DEBUG_CHANNEL(toolbar);
 
+#ifdef __WIN32OS2__
+#undef inline
+#define inline
+#define COMCTL32_hPattern55AABrush GetPattern55AABrush()
+#endif
+
 typedef struct
 {
@@ -63 +78 @@
     INT nRow;
     RECT rect;
-} TBUTTON_INFO;
-
-#ifdef __WIN32OS2__
-#define COMCTL32_hPattern55AABrush GetPattern55AABrush()
-#endif
+} TBUTTON_INFO; 
 
 typedef struct
@@ -98 +109 @@
     HWND     hwndToolTip;     /* handle to tool tip control */
     HWND     hwndNotify;      /* handle to the window that gets notifications */
+    HWND     hwndSelf;        /* my own handle */
     BOOL     bTransparent;    /* background transparency flag */
+    BOOL     bBtnTranspnt;    /* button transparency flag */
     BOOL     bAutoSize;       /* auto size deadlock indicator */
     BOOL     bAnchor;         /* anchor highlight enabled */
+    BOOL     bNtfUnicode;     /* TRUE if NOTIFYs use {W} */
     DWORD      dwExStyle;       /* extended toolbar style */
     DWORD      dwDTFlags;       /* DrawText flags */
@@ -132 +146 @@
 #define TOP_BORDER         2
 #define BOTTOM_BORDER      2
-#define DDARROW_WIDTH      11
+#define DDARROW_WIDTH      11 
 
 #define TOOLBAR_GetInfoPtr(hwnd) ((TOOLBAR_INFO *)GetWindowLongA(hwnd,0))
 #define TOOLBAR_HasText(x, y) (TOOLBAR_GetText(x, y) ? TRUE : FALSE)
 #define TOOLBAR_HasDropDownArrows(exStyle) ((exStyle & TBSTYLE_EX_DRAWDDARROWS) ? TRUE : FALSE)
+
+
+static void
+TOOLBAR_DumpButton(TOOLBAR_INFO *infoPtr, TBUTTON_INFO *bP, INT btn_num, BOOL internal)
+{
+    if (TRACE_ON(toolbar)){
+        TRACE("button %d id %d, bitmap=%d, state=%02x, style=%02x, data=%08lx, string=%d\n",
+              btn_num, bP->idCommand,
+              bP->iBitmap, bP->fsState, bP->fsStyle, bP->dwData, bP->iString);
+        if (internal)
+            TRACE("button %d id %d, hot=%s, row=%d, rect=(%d,%d)-(%d,%d)\n",
+                  btn_num, bP->idCommand,
+                  (bP->bHot) ? "TRUE":"FALSE", bP->nRow,
+                  bP->rect.left, bP->rect.top, 
+                  bP->rect.right, bP->rect.bottom);
+    }
+}
+
+
+static void
+TOOLBAR_DumpToolbar(TOOLBAR_INFO *iP, INT line)
+{
+    if (TRACE_ON(toolbar)) {
+        INT i;
+        DWORD dwStyle;
+
+        dwStyle = GetWindowLongA (iP->hwndSelf, GWL_STYLE);
+        TRACE("toolbar %08x at line %d, exStyle=%08lx, buttons=%d, bitmaps=%d, strings=%d, style=%08lx\n",
+              iP->hwndSelf, line,
+              iP->dwExStyle, iP->nNumButtons, iP->nNumBitmaps,
+              iP->nNumStrings, dwStyle);
+        TRACE("toolbar %08x at line %d, himlInt=%p, himlDef=%p, himlHot=%p, himlDis=%p\n",
+              iP->hwndSelf, line,
+              iP->himlInt, iP->himlDef, iP->himlHot, iP->himlDis);
+        for(i=0; i<iP->nNumButtons; i++) {
+            TOOLBAR_DumpButton(iP, &iP->buttons[i], i, TRUE);
+        }
+    }
+}
+
+
+/***********************************************************************
+*               TOOLBAR_CheckStyle
+*
+* This function validates that the styles set are implemented and
+* issues FIXME's warning of possible problems. In a perfect world this
+* function should be null.
+*/
+static void
+TOOLBAR_CheckStyle (HWND hwnd, DWORD dwStyle)
+{
+    if (dwStyle & TBSTYLE_ALTDRAG)
+        FIXME("[%04x] TBSTYLE_ALTDRAG not implemented\n", hwnd);
+    if (dwStyle & TBSTYLE_REGISTERDROP)
+        FIXME("[%04x] TBSTYLE_REGISTERDROP not implemented\n", hwnd);
+}
+
+
+static INT
+TOOLBAR_SendNotify (NMHDR *nmhdr, TOOLBAR_INFO *infoPtr, UINT code)
+{
+    nmhdr->idFrom = GetDlgCtrlID (infoPtr->hwndSelf);
+    nmhdr->hwndFrom = infoPtr->hwndSelf;
+    nmhdr->code = code;
+
+    TRACE("to window %04x, code=%08x, %s\n", infoPtr->hwndNotify, code,
+          (infoPtr->bNtfUnicode) ? "via Unicode" : "via ANSI");
+
+    if (infoPtr->bNtfUnicode)
+        return SendMessageW (infoPtr->hwndNotify, WM_NOTIFY, 
+                             (WPARAM) nmhdr->idFrom, (LPARAM)nmhdr);
+    else
+        return SendMessageA (infoPtr->hwndNotify, WM_NOTIFY, 
+                             (WPARAM) nmhdr->idFrom, (LPARAM)nmhdr);
+}
 
 static LPWSTR
@@ -148 +237 @@
     else if ((btnPtr->iString >= 0) && (btnPtr->iString < infoPtr->nNumStrings))
         lpText = infoPtr->strings[btnPtr->iString];
-
+    
     return lpText;
 }
 
-static BOOL
+/***********************************************************************
+*               TOOLBAR_GetBitmapIndex
+*
+* This function returns the bitmap index associated with a button.
+* If the button specifies I_IMAGECALLBACK, then the TBN_GETDISPINFO
+* is issued to retrieve the index.
+*/
+static INT 
+TOOLBAR_GetBitmapIndex(TOOLBAR_INFO *infoPtr, TBUTTON_INFO *btnPtr)
+{
+    INT ret = btnPtr->iBitmap;
+
+    if (ret == I_IMAGECALLBACK) {
+        /* issue TBN_GETDISPINFO */
+        NMTBDISPINFOA nmgd;
+
+        nmgd.idCommand = btnPtr->idCommand;
+        nmgd.lParam = btnPtr->dwData;
+        nmgd.dwMask = TBNF_IMAGE;
+        TOOLBAR_SendNotify ((NMHDR *) &nmgd, infoPtr,
+                        (infoPtr->bNtfUnicode) ? TBN_GETDISPINFOW :
+                        TBN_GETDISPINFOA);
+        if (nmgd.dwMask & TBNF_DI_SETITEM) {
+            btnPtr->iBitmap = nmgd.iImage;
+        }
+        ret = nmgd.iImage;
+        TRACE("TBN_GETDISPINFOA returned bitmap id %d, mask=%08lx, nNumBitmaps=%d\n", 
+              ret, nmgd.dwMask, infoPtr->nNumBitmaps);
+    }
+    return ret;
+}
+
+
+static BOOL 
 TOOLBAR_IsValidBitmapIndex(TOOLBAR_INFO *infoPtr, INT index)
 {
-    if ((index>=0) && (index < infoPtr->nNumBitmaps))
+    if (((index>=0) && (index <= infoPtr->nNumBitmaps)) ||
+        (index == I_IMAGECALLBACK))
       return TRUE;
     else
       return FALSE;
+}
+
+
+/***********************************************************************
+*               TOOLBAR_DrawImageList
+*
+* This function validates the bitmap index (including I_IMAGECALLBACK
+* functionality). It then draws the image via the ImageList_Draw
+* function. It returns TRUE if the image was drawn, FALSE otherwise. 
+*/
+static BOOL
+TOOLBAR_DrawImageList (TOOLBAR_INFO *infoPtr, TBUTTON_INFO *btnPtr, HIMAGELIST himl,
+                        HDC hdc, UINT left, UINT top, UINT draw_flags)
+{
+    INT index;
+
+    if (!himl) return FALSE;
+
+    if (!TOOLBAR_IsValidBitmapIndex(infoPtr,btnPtr->iBitmap)) {
+        ERR("index %d is not valid, max %d\n", 
+            btnPtr->iBitmap, infoPtr->nNumBitmaps);
+        return FALSE;
+    }
+
+    if ((index = TOOLBAR_GetBitmapIndex(infoPtr, btnPtr)) < 0) {
+        if (index == -1) return FALSE;
+        ERR("TBN_GETDISPINFO returned invalid index %d\n",
+            index);
+        return FALSE;
+    }
+    TRACE("drawing index=%d, himl=%p, left=%d, top=%d, flags=%08x\n",
+          index, himl, left, top, draw_flags);
+
+    ImageList_Draw (himl, index, hdc, left, top, draw_flags);
+    return TRUE;
+}
+
+
+/***********************************************************************
+*               TOOLBAR_TestImageExist
+*
+* This function is similar to TOOLBAR_DrawImageList, except it does not
+* draw the image. The I_IMAGECALLBACK functionality is implemented.
+*/
+static BOOL
+TOOLBAR_TestImageExist (TOOLBAR_INFO *infoPtr, TBUTTON_INFO *btnPtr, HIMAGELIST himl)
+{
+    INT index;
+
+    if (!himl) return FALSE;
+
+    if (!TOOLBAR_IsValidBitmapIndex(infoPtr,btnPtr->iBitmap)) {
+        ERR("index %d is not valid, max %d\n", 
+            btnPtr->iBitmap, infoPtr->nNumBitmaps);
+        return FALSE;
+    }
+
+    if ((index = TOOLBAR_GetBitmapIndex(infoPtr, btnPtr)) < 0) {
+        if (index == -1) return FALSE;
+        ERR("TBN_GETDISPINFO returned invalid index %d\n",
+            index);
+        return FALSE;
+    }
+    return TRUE;
 }
 
@@ -177 +364 @@
     LineTo (hdc, x, yTop);
 }
+
+
+/***********************************************************************
+*               TOOLBAR_DrawDDFlatSeparator
+*
+* This function draws the separator that was flaged as TBSTYLE_DROPDOWN.
+* In this case, the separator is a pixel high line of COLOR_BTNSHADOW,
+* followed by a pixel high line of COLOR_BTNHIGHLIGHT. These separators
+* are horizontal as opposed to the vertical separators for not dropdown
+* type.
+*
+* FIXME: It is possible that the height of each line is really SM_CYBORDER.
+*/
+static void
+TOOLBAR_DrawDDFlatSeparator (LPRECT lpRect, HDC hdc, TBUTTON_INFO *btnPtr)
+{
+    RECT myrect;
+    COLORREF oldcolor, newcolor;
+
+    myrect.left = lpRect->left;
+    myrect.right = lpRect->right;
+    myrect.top = lpRect->top + (lpRect->bottom - lpRect->top - 2)/2;
+    myrect.bottom = myrect.top + 1;
+
+    InflateRect (&myrect, -2, 0);
+
+    TRACE("rect=(%d,%d)-(%d,%d)\n",
+          myrect.left, myrect.top, myrect.right, myrect.bottom);
+
+    newcolor = GetSysColor (COLOR_BTNSHADOW);
+    oldcolor = SetBkColor (hdc, newcolor);
+    ExtTextOutA (hdc, 0, 0, ETO_OPAQUE, &myrect, 0, 0, 0);
+
+    myrect.top = myrect.bottom;
+    myrect.bottom = myrect.top + 1;
+
+    newcolor = GetSysColor (COLOR_BTNHIGHLIGHT);
+    SetBkColor (hdc, newcolor);
+    ExtTextOutA (hdc, 0, 0, ETO_OPAQUE, &myrect, 0, 0, 0);
+
+    SetBkColor (hdc, oldcolor);
+}
+
 
 static void
@@ -196 +426 @@
  * Draw the text string for this button.
  * note: infoPtr->himlDis *SHOULD* be non-zero when infoPtr->himlDef
- *  is non-zero, so we can simply check himlDef to see if we have
+ *      is non-zero, so we can simply check himlDef to see if we have
  *      an image list
  */
 static void
 TOOLBAR_DrawString (TOOLBAR_INFO *infoPtr, TBUTTON_INFO *btnPtr,
-            HDC hdc, INT nState, DWORD dwStyle)
+                    HDC hdc, INT nState, DWORD dwStyle)
 {
     RECT   rcText = btnPtr->rect;
     HFONT  hOldFont;
-    INT    nOldBkMode;
     COLORREF clrOld;
     LPWSTR lpText = NULL;
@@ -220 +449 @@
     if (lpText) {
 
-    InflateRect (&rcText, -3, -3);
-
-    if (himl && TOOLBAR_IsValidBitmapIndex(infoPtr,btnPtr->iBitmap)) {
-        if ((dwStyle & TBSTYLE_LIST) &&
-            ((btnPtr->fsStyle & TBSTYLE_AUTOSIZE) == 0) &&
-            (btnPtr->iBitmap != I_IMAGENONE)) {
-            rcText.left += infoPtr->nBitmapWidth;
-        }
-        else {
-            rcText.top += infoPtr->nBitmapHeight;
-        }
-    }
-
-    if (nState & (TBSTATE_PRESSED | TBSTATE_CHECKED))
-        OffsetRect (&rcText, 1, 1);
-
-    hOldFont = SelectObject (hdc, infoPtr->hFont);
-    nOldBkMode = SetBkMode (hdc, TRANSPARENT);
-    if (!(nState & TBSTATE_ENABLED)) {
-        clrOld = SetTextColor (hdc, GetSysColor (COLOR_3DHILIGHT));
-        OffsetRect (&rcText, 1, 1);
-        DrawTextW (hdc, lpText, -1, &rcText, infoPtr->dwDTFlags);
-        SetTextColor (hdc, GetSysColor (COLOR_3DSHADOW));
-        OffsetRect (&rcText, -1, -1);
-        DrawTextW (hdc, lpText, -1, &rcText, infoPtr->dwDTFlags);
-    }
-    else if (nState & TBSTATE_INDETERMINATE) {
-        clrOld = SetTextColor (hdc, GetSysColor (COLOR_3DSHADOW));
-        DrawTextW (hdc, lpText, -1, &rcText, infoPtr->dwDTFlags);
-    }
-    else {
-        clrOld = SetTextColor (hdc, GetSysColor (COLOR_BTNTEXT));
-        DrawTextW (hdc, lpText, -1, &rcText, infoPtr->dwDTFlags);
-    }
-
-    SetTextColor (hdc, clrOld);
-    SelectObject (hdc, hOldFont);
-    if (nOldBkMode != TRANSPARENT)
-        SetBkMode (hdc, nOldBkMode);
+        InflateRect (&rcText, -3, -3);
+
+        if (himl && TOOLBAR_IsValidBitmapIndex(infoPtr,btnPtr->iBitmap)) {
+                /* The following test looked like this before
+                 * I changed it. IE4 "Links" toolbar would not
+                 * draw correctly with the original code.  - GA 8/01
+                 *   ((dwStyle & TBSTYLE_LIST) &&
+                 *    ((btnPtr->fsStyle & TBSTYLE_AUTOSIZE) == 0) &&
+                 *       (btnPtr->iBitmap != I_IMAGENONE))
+                 */ 
+                if (dwStyle & TBSTYLE_LIST) {
+                    /* LIST style w/ ICON offset is by matching native. */
+                    /* Matches IE4 "Links" bar.   - GA 8/01             */
+                    rcText.left += (infoPtr->nBitmapWidth + 2);
+                }
+                else {
+                    rcText.top += infoPtr->nBitmapHeight + 1;
+                }
+        }
+        else {
+                if (dwStyle & TBSTYLE_LIST) {
+                    /* LIST style w/o ICON offset is by matching native. */
+                    /* Matches IE4 "menu" bar.   - GA  8/01              */
+                    rcText.left += 4;
+                }
+        }
+
+        if (nState & (TBSTATE_PRESSED | TBSTATE_CHECKED))
+            OffsetRect (&rcText, 1, 1);
+
+        TRACE("string rect=(%d,%d)-(%d,%d)\n",
+              rcText.left, rcText.top, rcText.right, rcText.bottom);
+
+        hOldFont = SelectObject (hdc, infoPtr->hFont);
+        if (!(nState & TBSTATE_ENABLED)) {
+            clrOld = SetTextColor (hdc, GetSysColor (COLOR_3DHILIGHT));
+            OffsetRect (&rcText, 1, 1);
+            DrawTextW (hdc, lpText, -1, &rcText, infoPtr->dwDTFlags);
+            SetTextColor (hdc, GetSysColor (COLOR_3DSHADOW));
+            OffsetRect (&rcText, -1, -1);
+            DrawTextW (hdc, lpText, -1, &rcText, infoPtr->dwDTFlags);
+        }
+        else if (nState & TBSTATE_INDETERMINATE) {
+            clrOld = SetTextColor (hdc, GetSysColor (COLOR_3DSHADOW));
+            DrawTextW (hdc, lpText, -1, &rcText, infoPtr->dwDTFlags);
+        }
+        else {
+            clrOld = SetTextColor (hdc, GetSysColor (COLOR_BTNTEXT));
+            DrawTextW (hdc, lpText, -1, &rcText, infoPtr->dwDTFlags);
+        }
+
+        SetTextColor (hdc, clrOld);
+        SelectObject (hdc, hOldFont);
     }
 }
@@ -276 +519 @@
 static void
 TOOLBAR_DrawMasked (TOOLBAR_INFO *infoPtr, TBUTTON_INFO *btnPtr,
-            HDC hdc, INT x, INT y)
+                    HDC hdc, INT x, INT y)
 {
     /* FIXME: this function is a hack since it uses image list
-          internals directly */
+              internals directly */
 
     HIMAGELIST himl = infoPtr->himlDef;
@@ -287 +530 @@
 
     if (!himl)
-    return;
+        return;
 
     /* create new dc's */
@@ -302 +545 @@
     SetTextColor (hdcImageList, RGB(0, 0, 0));
     BitBlt (hdcMask, 0, 0, himl->cx, himl->cy,
-          hdcImageList, himl->cx * btnPtr->iBitmap, 0, SRCCOPY);
+              hdcImageList, himl->cx * btnPtr->iBitmap, 0, SRCCOPY);
 
     /* draw the new mask */
     SelectObject (hdc, GetSysColorBrush (COLOR_3DHILIGHT));
     BitBlt (hdc, x+1, y+1, himl->cx, himl->cy,
-          hdcMask, 0, 0, 0xB8074A);
+              hdcMask, 0, 0, 0xB8074A);
 
     SelectObject (hdc, GetSysColorBrush (COLOR_3DSHADOW));
     BitBlt (hdc, x, y, himl->cx, himl->cy,
-          hdcMask, 0, 0, 0xB8074A);
+              hdcMask, 0, 0, 0xB8074A);
 
     DeleteObject (hbmMask);
@@ -325 +568 @@
     DWORD dwStyle = GetWindowLongA (hwnd, GWL_STYLE);
     BOOL hasDropDownArrow = TOOLBAR_HasDropDownArrows(infoPtr->dwExStyle) &&
-                        (btnPtr->fsStyle & TBSTYLE_DROPDOWN);
+                            (btnPtr->fsStyle & TBSTYLE_DROPDOWN);
     RECT rc, rcArrow, rcBitmap;
 
     if (btnPtr->fsState & TBSTATE_HIDDEN)
-    return;
+        return;
 
     rc = btnPtr->rect;
@@ -335 +578 @@
     CopyRect(&rcBitmap, &rc);
 
-    FillRect( hdc, &rc, GetSysColorBrush(COLOR_BTNFACE));
+    if (!infoPtr->bBtnTranspnt)
+        FillRect( hdc, &rc, GetSysColorBrush(COLOR_BTNFACE));
 
     if (hasDropDownArrow)
     {
-    if (dwStyle & TBSTYLE_FLAT)
+        if (dwStyle & TBSTYLE_FLAT)
             rc.right = max(rc.left, rc.right - DDARROW_WIDTH);
+        else
+            rc.right = max(rc.left, rc.right - DDARROW_WIDTH - 2);
+        rcArrow.left = rc.right; 
+    }
+
+    /* Center the bitmap horizontally and vertically */
+    if (dwStyle & TBSTYLE_LIST)
+        rcBitmap.left += 3;
     else
-            rc.right = max(rc.left, rc.right - DDARROW_WIDTH - 2);
-    rcArrow.left = rc.right;
-    }
-
-    /* Center the bitmap horizontally and vertically */
-    rcBitmap.left+=(infoPtr->nButtonWidth - infoPtr->nBitmapWidth) / 2;
+        rcBitmap.left+=(infoPtr->nButtonWidth - infoPtr->nBitmapWidth) / 2;
 
     if(TOOLBAR_HasText(infoPtr, btnPtr))
@@ -354 +601 @@
         rcBitmap.top+=(infoPtr->nButtonHeight - infoPtr->nBitmapHeight) / 2;
 
-    TRACE("iBitmap: %d\n", btnPtr->iBitmap);
+    TRACE("iBitmap: %d, start=(%d,%d) w=%d, h=%d\n", 
+          btnPtr->iBitmap, rcBitmap.left, rcBitmap.top,
+          infoPtr->nBitmapWidth, infoPtr->nBitmapHeight);
 
     /* separator */
@@ -363 +612 @@
         /* empirical tests show that iBitmap can/will be non-zero    */
         /* when drawing the vertical bar...      */
-        if ((dwStyle & TBSTYLE_FLAT) /* && (btnPtr->iBitmap == 0) */)
-        TOOLBAR_DrawFlatSeparator (&rc, hdc);
-    return;
+        if ((dwStyle & TBSTYLE_FLAT) /* && (btnPtr->iBitmap == 0) */) {
+            if (btnPtr->fsStyle & TBSTYLE_DROPDOWN)
+                TOOLBAR_DrawDDFlatSeparator (&rc, hdc, btnPtr);
+            else
+                TOOLBAR_DrawFlatSeparator (&rc, hdc);
+        }
+        return;
     }
 
     /* disabled */
     if (!(btnPtr->fsState & TBSTATE_ENABLED)) {
-    if (!(dwStyle & TBSTYLE_FLAT))
-    {
-        DrawEdge (hdc, &rc, EDGE_RAISED,
-              BF_SOFT | BF_RECT | BF_MIDDLE | BF_ADJUST);
+        if (!(dwStyle & TBSTYLE_FLAT))
+        {
+            DrawEdge (hdc, &rc, EDGE_RAISED,
+                      BF_SOFT | BF_RECT | BF_MIDDLE | BF_ADJUST);
             if (hasDropDownArrow)
             DrawEdge (hdc, &rcArrow, EDGE_RAISED,
-              BF_SOFT | BF_RECT | BF_MIDDLE | BF_ADJUST);
-    }
-
+                      BF_SOFT | BF_RECT | BF_MIDDLE | BF_ADJUST);
+        }
+        
         if (hasDropDownArrow)
-    {
-        TOOLBAR_DrawArrow(hdc, rcArrow.left+1, rcArrow.top+1, COLOR_3DHIGHLIGHT);
-        TOOLBAR_DrawArrow(hdc, rcArrow.left, rcArrow.top, COLOR_3DSHADOW);
-    }
-
-    if (infoPtr->himlDis &&
-            TOOLBAR_IsValidBitmapIndex(infoPtr,btnPtr->iBitmap))
-        ImageList_Draw (infoPtr->himlDis, btnPtr->iBitmap, hdc,
-            rcBitmap.left, rcBitmap.top, ILD_NORMAL);
-    else
-        TOOLBAR_DrawMasked (infoPtr, btnPtr, hdc, rcBitmap.left, rcBitmap.top);
-
-    TOOLBAR_DrawString (infoPtr, btnPtr, hdc, btnPtr->fsState, dwStyle);
-    return;
+        {
+            TOOLBAR_DrawArrow(hdc, rcArrow.left+1, rcArrow.top+1, COLOR_3DHIGHLIGHT);
+            TOOLBAR_DrawArrow(hdc, rcArrow.left, rcArrow.top, COLOR_3DSHADOW);
+        }
+
+        if (!TOOLBAR_DrawImageList (infoPtr, btnPtr, infoPtr->himlDis,
+                                   hdc, rcBitmap.left, rcBitmap.top, 
+                                   ILD_NORMAL))
+            TOOLBAR_DrawMasked (infoPtr, btnPtr, hdc, rcBitmap.left, rcBitmap.top);
+
+        TOOLBAR_DrawString (infoPtr, btnPtr, hdc, btnPtr->fsState, dwStyle);
+        return;
     }
 
     /* pressed TBSTYLE_BUTTON */
     if (btnPtr->fsState & TBSTATE_PRESSED) {
-    if (dwStyle & TBSTYLE_FLAT)
-    {
-        DrawEdge (hdc, &rc, BDR_SUNKENOUTER, BF_RECT | BF_MIDDLE | BF_ADJUST);
+        if (dwStyle & TBSTYLE_FLAT)
+        {
+            DrawEdge (hdc, &rc, BDR_SUNKENOUTER, BF_RECT | BF_ADJUST);
             if (hasDropDownArrow)
-        DrawEdge (hdc, &rcArrow, BDR_SUNKENOUTER, BF_RECT | BF_MIDDLE | BF_ADJUST);
-    }
-    else
-    {
-        DrawEdge (hdc, &rc, EDGE_SUNKEN, BF_RECT | BF_MIDDLE | BF_ADJUST);
+            DrawEdge (hdc, &rcArrow, BDR_SUNKENOUTER, BF_RECT | BF_ADJUST);
+        }
+        else
+        {
+            DrawEdge (hdc, &rc, EDGE_SUNKEN, BF_RECT | BF_MIDDLE | BF_ADJUST);
             if (hasDropDownArrow)
-        DrawEdge (hdc, &rcArrow, EDGE_SUNKEN, BF_RECT | BF_MIDDLE | BF_ADJUST);
-    }
+            DrawEdge (hdc, &rcArrow, EDGE_SUNKEN, BF_RECT | BF_MIDDLE | BF_ADJUST);
+        }
 
         if (hasDropDownArrow)
-        TOOLBAR_DrawArrow(hdc, rcArrow.left, rcArrow.top, COLOR_WINDOWFRAME);
-
-        if (TOOLBAR_IsValidBitmapIndex(infoPtr,btnPtr->iBitmap))
-        ImageList_Draw (infoPtr->himlDef, btnPtr->iBitmap, hdc,
-            rcBitmap.left + 1, rcBitmap.top + 1, ILD_NORMAL);
-
-    TOOLBAR_DrawString (infoPtr, btnPtr, hdc, btnPtr->fsState, dwStyle);
-    return;
+            TOOLBAR_DrawArrow(hdc, rcArrow.left, rcArrow.top, COLOR_WINDOWFRAME);
+
+        TOOLBAR_DrawImageList (infoPtr, btnPtr, infoPtr->himlDef,
+                               hdc, rcBitmap.left+1, rcBitmap.top+1, 
+                               ILD_NORMAL);
+
+        TOOLBAR_DrawString (infoPtr, btnPtr, hdc, btnPtr->fsState, dwStyle);
+        return;
     }
 
     /* checked TBSTYLE_CHECK */
     if ((btnPtr->fsStyle & TBSTYLE_CHECK) &&
-    (btnPtr->fsState & TBSTATE_CHECKED)) {
-    if (dwStyle & TBSTYLE_FLAT)
-        DrawEdge (hdc, &rc, BDR_SUNKENOUTER,
-            BF_RECT | BF_MIDDLE | BF_ADJUST);
-    else
-        DrawEdge (hdc, &rc, EDGE_SUNKEN,
-            BF_RECT | BF_MIDDLE | BF_ADJUST);
-
-    TOOLBAR_DrawPattern (hdc, &rc);
-
-        if (TOOLBAR_IsValidBitmapIndex(infoPtr,btnPtr->iBitmap))
-        ImageList_Draw (infoPtr->himlDef, btnPtr->iBitmap, hdc,
-            rcBitmap.left + 1, rcBitmap.top + 1, ILD_NORMAL);
-    TOOLBAR_DrawString (infoPtr, btnPtr, hdc, btnPtr->fsState, dwStyle);
-    return;
-    }
-
-    /* indeterminate */
+        (btnPtr->fsState & TBSTATE_CHECKED)) {
+        if (dwStyle & TBSTYLE_FLAT)
+            DrawEdge (hdc, &rc, BDR_SUNKENOUTER,
+                        BF_RECT | BF_ADJUST);
+        else
+            DrawEdge (hdc, &rc, EDGE_SUNKEN,
+                        BF_RECT | BF_MIDDLE | BF_ADJUST);
+
+        TOOLBAR_DrawPattern (hdc, &rc);
+        
+        TOOLBAR_DrawImageList (infoPtr, btnPtr, infoPtr->himlDef,
+                               hdc, rcBitmap.left+1, rcBitmap.top+1, 
+                               ILD_NORMAL);
+
+        TOOLBAR_DrawString (infoPtr, btnPtr, hdc, btnPtr->fsState, dwStyle);
+        return;
+    }
+
+    /* indeterminate */ 
     if (btnPtr->fsState & TBSTATE_INDETERMINATE) {
-    DrawEdge (hdc, &rc, EDGE_RAISED,
-            BF_SOFT | BF_RECT | BF_MIDDLE | BF_ADJUST);
-
-    TOOLBAR_DrawPattern (hdc, &rc);
-    TOOLBAR_DrawMasked (infoPtr, btnPtr, hdc, rcBitmap.left, rcBitmap.top);
-    TOOLBAR_DrawString (infoPtr, btnPtr, hdc, btnPtr->fsState, dwStyle);
-    return;
+        DrawEdge (hdc, &rc, EDGE_RAISED,
+                    BF_SOFT | BF_RECT | BF_MIDDLE | BF_ADJUST);
+
+        TOOLBAR_DrawPattern (hdc, &rc);
+        TOOLBAR_DrawMasked (infoPtr, btnPtr, hdc, rcBitmap.left, rcBitmap.top);
+        TOOLBAR_DrawString (infoPtr, btnPtr, hdc, btnPtr->fsState, dwStyle);
+        return;
     }
 
@@ -455 +707 @@
     if (dwStyle & TBSTYLE_FLAT)
     {
-    if (btnPtr->bHot)
-    {
-        DrawEdge (hdc, &rc, BDR_RAISEDINNER, BF_RECT | BF_MIDDLE);
+        if (btnPtr->bHot)
+        {
+            DrawEdge (hdc, &rc, BDR_RAISEDINNER, BF_RECT);
             if (hasDropDownArrow)
-        DrawEdge (hdc, &rcArrow, BDR_RAISEDINNER, BF_RECT | BF_MIDDLE);
-    }
-        else
-    {
+            DrawEdge (hdc, &rcArrow, BDR_RAISEDINNER, BF_RECT);
+        }
+#if 1
+        else /* The following code needs to be removed after
+              * "hot item" support has been implemented for the
+              * case where it is being de-selected.
+              */
+        {
             FrameRect(hdc, &rc, GetSysColorBrush(COLOR_BTNFACE));
             if (hasDropDownArrow)
             FrameRect(hdc, &rcArrow, GetSysColorBrush(COLOR_BTNFACE));
-    }
+        }
+#endif
 
         if (hasDropDownArrow)
-        TOOLBAR_DrawArrow(hdc, rcArrow.left+1, rcArrow.top, COLOR_WINDOWFRAME);
-
-    if (btnPtr->bHot && infoPtr->himlHot &&
-            TOOLBAR_IsValidBitmapIndex(infoPtr,btnPtr->iBitmap))
-        ImageList_Draw (infoPtr->himlHot, btnPtr->iBitmap, hdc,
-            rcBitmap.left, rcBitmap.top, ILD_NORMAL);
-    else if (TOOLBAR_IsValidBitmapIndex(infoPtr,btnPtr->iBitmap))
-        ImageList_Draw (infoPtr->himlDef, btnPtr->iBitmap, hdc,
-            rcBitmap.left, rcBitmap.top, ILD_NORMAL);
+            TOOLBAR_DrawArrow(hdc, rcArrow.left+1, rcArrow.top, COLOR_WINDOWFRAME);
+
+        if (btnPtr->bHot) {
+            /* if hot, attempt to draw with himlHot, if fails, use himlDef */
+            if (!TOOLBAR_DrawImageList (infoPtr, btnPtr, 
+                                        infoPtr->himlHot,
+                                        hdc, rcBitmap.left, 
+                                        rcBitmap.top, ILD_NORMAL))
+                TOOLBAR_DrawImageList (infoPtr, btnPtr, infoPtr->himlDef,
+                                       hdc, rcBitmap.left, rcBitmap.top,
+                                       ILD_NORMAL);
+        }
+        else
+            TOOLBAR_DrawImageList (infoPtr, btnPtr, infoPtr->himlDef,
+                                   hdc, rcBitmap.left, rcBitmap.top,
+                                   ILD_NORMAL);
     }
     else
     {
-    DrawEdge (hdc, &rc, EDGE_RAISED,
-        BF_SOFT | BF_RECT | BF_MIDDLE | BF_ADJUST);
+        DrawEdge (hdc, &rc, EDGE_RAISED,
+                BF_SOFT | BF_RECT | BF_MIDDLE | BF_ADJUST);
 
         if (hasDropDownArrow)
-    {
-        DrawEdge (hdc, &rcArrow, EDGE_RAISED,
-            BF_SOFT | BF_RECT | BF_MIDDLE | BF_ADJUST);
-        TOOLBAR_DrawArrow(hdc, rcArrow.left, rcArrow.top, COLOR_WINDOWFRAME);
-    }
-
-        if (TOOLBAR_IsValidBitmapIndex(infoPtr,btnPtr->iBitmap))
-        ImageList_Draw (infoPtr->himlDef, btnPtr->iBitmap, hdc,
-            rcBitmap.left, rcBitmap.top, ILD_NORMAL);
+        {
+            DrawEdge (hdc, &rcArrow, EDGE_RAISED,
+                    BF_SOFT | BF_RECT | BF_MIDDLE | BF_ADJUST);
+            TOOLBAR_DrawArrow(hdc, rcArrow.left, rcArrow.top, COLOR_WINDOWFRAME);
+        }
+
+        TOOLBAR_DrawImageList (infoPtr, btnPtr, infoPtr->himlDef,
+                               hdc, rcBitmap.left, rcBitmap.top,
+                               ILD_NORMAL);
     }
 
@@ -505 +769 @@
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd);
     TBUTTON_INFO *btnPtr;
-    INT i;
+    INT i, oldBKmode = 0;
     RECT rcTemp;
 
@@ -512 +776 @@
     if (infoPtr->himlDef != infoPtr->himlInt)
         infoPtr->nNumBitmaps = ImageList_GetImageCount(infoPtr->himlDef);
+
+    TOOLBAR_DumpToolbar (infoPtr, __LINE__);
+
+    if (infoPtr->bBtnTranspnt)
+        oldBKmode = SetBkMode (hdc, TRANSPARENT);
+
     /* redraw necessary buttons */
     btnPtr = infoPtr->buttons;
@@ -519 +789 @@
             TOOLBAR_DrawButton (hwnd, btnPtr, hdc);
     }
-}
-
+
+    if (infoPtr->bBtnTranspnt && (oldBKmode != TRANSPARENT))
+        SetBkMode (hdc, oldBKmode);
+}
+
+/***********************************************************************
+*               TOOLBAR_MeasureString
+*
+* This function gets the width and height of a string in pixels. This
+* is done first by using GetTextExtentPoint to get the basic width
+* and height. The DrawText is called with DT_CALCRECT to get the exact
+* width. The reason is because the text may have more than one "&" (or
+* prefix characters as M$ likes to call them). The prefix character
+* indicates where the underline goes, except for the string "&&" which
+* is reduced to a single "&". GetTextExtentPoint does not process these
+* only DrawText does. Note that the TBSTYLE_NOPREFIX is handled here.
+*/
 static void
-TOOLBAR_MeasureString(HWND hwnd, INT index, LPSIZE lpSize)
-{
-    TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd);
-    TBUTTON_INFO *btnPtr;
-    HDC hdc;
-    HFONT hOldFont;
+TOOLBAR_MeasureString(TOOLBAR_INFO *infoPtr, TBUTTON_INFO *btnPtr, 
+                      HDC hdc, LPSIZE lpSize)
+{
+    RECT myrect;
 
     lpSize->cx = 0;
     lpSize->cy = 0;
-    hdc = GetDC (0);
-    hOldFont = SelectObject (hdc, infoPtr->hFont);
-
-    btnPtr = &infoPtr->buttons[index];
 
     if (!(btnPtr->fsState & TBSTATE_HIDDEN) &&
          (btnPtr->iString > -1) &&
-         (btnPtr->iString < infoPtr->nNumStrings))
+         (btnPtr->iString < infoPtr->nNumStrings)) 
     {
         LPWSTR lpText = infoPtr->strings[btnPtr->iString];
+
+        /* first get size of all the text */
         GetTextExtentPoint32W (hdc, lpText, strlenW (lpText), lpSize);
-    }
-
-    SelectObject (hdc, hOldFont);
-    ReleaseDC (0, hdc);
+
+        /* feed above size into the rectangle for DrawText */
+        myrect.left = myrect.top = 0;
+        myrect.right = lpSize->cx;
+        myrect.bottom = lpSize->cy;
+
+        /* Use DrawText to get true size as drawn (less pesky "&") */
+        DrawTextW (hdc, lpText, -1, &myrect, DT_VCENTER | DT_SINGLELINE |
+                   DT_CALCRECT | ((btnPtr->fsStyle & TBSTYLE_NOPREFIX) ?
+                                  DT_NOPREFIX : 0));
+
+        /* feed back to caller  */
+        lpSize->cx = myrect.right;
+        lpSize->cy = myrect.bottom;
+    }
 
     TRACE("string size %ld x %ld!\n", lpSize->cx, lpSize->cy);
 }
 
+/***********************************************************************
+*               TOOLBAR_CalcStrings
+*
+* This function walks through each string and measures it and returns
+* the largest height and width to caller.
+*/
 static void
 TOOLBAR_CalcStrings (HWND hwnd, LPSIZE lpSize)
@@ -557 +855 @@
     INT i;
     SIZE sz;
-
+    HDC hdc;
+    HFONT hOldFont;
 
     lpSize->cx = 0;
     lpSize->cy = 0;
+
+    hdc = GetDC (hwnd);
+    hOldFont = SelectObject (hdc, infoPtr->hFont);
 
     btnPtr = infoPtr->buttons;
@@ -566 +868 @@
         if(TOOLBAR_HasText(infoPtr, btnPtr))
         {
-            TOOLBAR_MeasureString(hwnd,i,&sz);
+            TOOLBAR_MeasureString(infoPtr, btnPtr, hdc, &sz);
             if (sz.cx > lpSize->cx)
                 lpSize->cx = sz.cx;
@@ -574 +876 @@
     }
 
-    TRACE("string size %ld x %ld!\n", lpSize->cx, lpSize->cy);
+    SelectObject (hdc, hOldFont);
+    ReleaseDC (hwnd, hdc);
+
+    TRACE("max string size %ld x %ld!\n", lpSize->cx, lpSize->cy);
 }
 
 /***********************************************************************
-*       TOOLBAR_WrapToolbar
+*               TOOLBAR_WrapToolbar
 *
-* This function walks through the buttons and seperators in the
-* toolbar, and sets the TBSTATE_WRAP flag only on those items where
-* wrapping should occur based on the width of the toolbar window.
-* It does *not* calculate button placement itself.  That task
-* takes place in TOOLBAR_CalcToolbar. If the program wants to manage
-* the toolbar wrapping on it's own, it can use the TBSTYLE_WRAPPABLE
+* This function walks through the buttons and seperators in the 
+* toolbar, and sets the TBSTATE_WRAP flag only on those items where 
+* wrapping should occur based on the width of the toolbar window.  
+* It does *not* calculate button placement itself.  That task 
+* takes place in TOOLBAR_CalcToolbar. If the program wants to manage 
+* the toolbar wrapping on its own, it can use the TBSTYLE_WRAPABLE 
 * flag, and set the TBSTATE_WRAP flags manually on the appropriate items.
-*/
+*/ 
 
 static void
@@ -598 +903 @@
     BOOL bWrap, bButtonWrap;
 
-    /*  When the toolbar window style is not TBSTYLE_WRAPABLE,  */
-    /*  no layout is necessary. Applications may use this style */
-    /*  to perform their own layout on the toolbar.         */
+    /*  When the toolbar window style is not TBSTYLE_WRAPABLE,  */ 
+    /*  no layout is necessary. Applications may use this style */
+    /*  to perform their own layout on the toolbar.             */
     if( !(dwStyle & TBSTYLE_WRAPABLE) )
-    return;
+        return;
 
     btnPtr = infoPtr->buttons;
@@ -615 +920 @@
     bButtonWrap = FALSE;
 
+    TRACE("start ButtonWidth=%d, BitmapWidth=%d, nWidth=%d, nIndent=%d\n",
+          infoPtr->nButtonWidth, infoPtr->nBitmapWidth, infoPtr->nWidth,
+          infoPtr->nIndent);
+
     for (i = 0; i < infoPtr->nNumButtons; i++ )
     {
-    bWrap = FALSE;
-    btnPtr[i].fsState &= ~TBSTATE_WRAP;
-
-    if (btnPtr[i].fsState & TBSTATE_HIDDEN)
-        continue;
-
-    /* UNDOCUMENTED: If a separator has a non zero bitmap index, */
-    /* it is the actual width of the separator. This is used for */
-    /* custom controls in toolbars.                              */
-    if (btnPtr[i].fsStyle & TBSTYLE_SEP)
-        cx = (btnPtr[i].iBitmap > 0) ?
-            btnPtr[i].iBitmap : SEPARATOR_WIDTH;
-    else
-        cx = infoPtr->nButtonWidth;
-
-    /* Two or more adjacent separators form a separator group.   */
-    /* The first separator in a group should be wrapped to the   */
-    /* next row if the previous wrapping is on a button.         */
-    if( bButtonWrap &&
-        (btnPtr[i].fsStyle & TBSTYLE_SEP) &&
-        (i + 1 < infoPtr->nNumButtons ) &&
-        (btnPtr[i + 1].fsStyle & TBSTYLE_SEP) )
-    {
-        btnPtr[i].fsState |= TBSTATE_WRAP;
-        x = infoPtr->nIndent;
-        i++;
-        bButtonWrap = FALSE;
-        continue;
-    }
-
-    /* The layout makes sure the bitmap is visible, but not the button. */
-    if ( x + cx - (infoPtr->nButtonWidth - infoPtr->nBitmapWidth) / 2
-         > infoPtr->nWidth )
-    {
-        BOOL bFound = FALSE;
-
-        /*  If the current button is a separator and not hidden,  */
-        /*  go to the next until it reaches a non separator.      */
-        /*  Wrap the last separator if it is before a button.     */
-        while( ( (btnPtr[i].fsStyle & TBSTYLE_SEP) ||
-            (btnPtr[i].fsState & TBSTATE_HIDDEN) ) &&
-            i < infoPtr->nNumButtons )
-        {
-        i++;
-        bFound = TRUE;
-        }
-
-        if( bFound && i < infoPtr->nNumButtons )
-        {
-        i--;
-        btnPtr[i].fsState |= TBSTATE_WRAP;
-        x = infoPtr->nIndent;
-        bButtonWrap = FALSE;
-        continue;
-        }
-        else if ( i >= infoPtr->nNumButtons)
-        break;
-
-        /*  If the current button is not a separator, find the last  */
-        /*  separator and wrap it.                   */
-        for ( j = i - 1; j >= 0  &&  !(btnPtr[j].fsState & TBSTATE_WRAP); j--)
-        {
-        if ((btnPtr[j].fsStyle & TBSTYLE_SEP) &&
-            !(btnPtr[j].fsState & TBSTATE_HIDDEN))
-        {
-            bFound = TRUE;
-            i = j;
-            x = infoPtr->nIndent;
-            btnPtr[j].fsState |= TBSTATE_WRAP;
-            bButtonWrap = FALSE;
-            break;
-        }
-        }
-
-        /*  If no separator available for wrapping, wrap one of     */
-        /*  non-hidden previous button.                     */
-        if (!bFound)
-        {
-        for ( j = i - 1;
-            j >= 0 && !(btnPtr[j].fsState & TBSTATE_WRAP); j--)
-        {
-            if (btnPtr[j].fsState & TBSTATE_HIDDEN)
-            continue;
-
-            bFound = TRUE;
-            i = j;
-            x = infoPtr->nIndent;
-            btnPtr[j].fsState |= TBSTATE_WRAP;
-            bButtonWrap = TRUE;
-            break;
-        }
-        }
-
-        /* If all above failed, wrap the current button. */
-        if (!bFound)
-        {
-        btnPtr[i].fsState |= TBSTATE_WRAP;
-        bFound = TRUE;
-        x = infoPtr->nIndent;
-        if (btnPtr[i].fsState & TBSTYLE_SEP )
-            bButtonWrap = FALSE;
-        else
-            bButtonWrap = TRUE;
-        }
-    }
-    else
-        x += cx;
+        bWrap = FALSE;
+        btnPtr[i].fsState &= ~TBSTATE_WRAP;
+        
+        if (btnPtr[i].fsState & TBSTATE_HIDDEN)
+            continue;
+
+        /* UNDOCUMENTED: If a separator has a non zero bitmap index, */
+        /* it is the actual width of the separator. This is used for */
+        /* custom controls in toolbars.                              */
+        /*                                                           */
+        /* TBSTYLE_DROPDOWN separators are treated as buttons for    */
+        /* width.  - GA 8/01                                         */
+        if ((btnPtr[i].fsStyle & TBSTYLE_SEP) &&
+            !(btnPtr[i].fsStyle & TBSTYLE_DROPDOWN))
+            cx = (btnPtr[i].iBitmap > 0) ?  
+                        btnPtr[i].iBitmap : SEPARATOR_WIDTH;
+        else
+            cx = infoPtr->nButtonWidth;
+
+        /* Two or more adjacent separators form a separator group.   */ 
+        /* The first separator in a group should be wrapped to the   */
+        /* next row if the previous wrapping is on a button.         */
+        if( bButtonWrap &&
+                (btnPtr[i].fsStyle & TBSTYLE_SEP) && 
+                (i + 1 < infoPtr->nNumButtons ) &&
+                (btnPtr[i + 1].fsStyle & TBSTYLE_SEP) ) 
+        {
+            TRACE("wrap point 1 btn %d style %02x\n", i, btnPtr[i].fsStyle);
+            btnPtr[i].fsState |= TBSTATE_WRAP;
+            x = infoPtr->nIndent;
+            i++;
+            bButtonWrap = FALSE;
+            continue;
+        }
+
+        /* The layout makes sure the bitmap is visible, but not the button. */
+        /* Test added to also wrap after a button that starts a row but     */
+        /* is bigger than the area.  - GA  8/01                             */
+        if (( x + cx - (infoPtr->nButtonWidth - infoPtr->nBitmapWidth) / 2 
+           > infoPtr->nWidth ) ||
+            ((x == infoPtr->nIndent) && (cx > infoPtr->nWidth)))
+        {
+            BOOL bFound = FALSE;
+
+            /*  If the current button is a separator and not hidden,  */ 
+            /*  go to the next until it reaches a non separator.      */
+            /*  Wrap the last separator if it is before a button.     */
+            while( ( (btnPtr[i].fsStyle & TBSTYLE_SEP) || 
+                        (btnPtr[i].fsState & TBSTATE_HIDDEN) ) && 
+                        i < infoPtr->nNumButtons )
+            {
+                i++;
+                bFound = TRUE;
+            }
+    
+            if( bFound && i < infoPtr->nNumButtons )
+            {
+                i--;
+                TRACE("wrap point 2 btn %d style %02x, x=%d, cx=%d\n", 
+                      i, btnPtr[i].fsStyle, x, cx);
+                btnPtr[i].fsState |= TBSTATE_WRAP;
+                x = infoPtr->nIndent;
+                bButtonWrap = FALSE;
+                continue;
+            }
+            else if ( i >= infoPtr->nNumButtons)
+                break;
+
+            /*  If the current button is not a separator, find the last  */ 
+            /*  separator and wrap it.                                   */
+            for ( j = i - 1; j >= 0  &&  !(btnPtr[j].fsState & TBSTATE_WRAP); j--)
+            {
+                if ((btnPtr[j].fsStyle & TBSTYLE_SEP) &&
+                        !(btnPtr[j].fsState & TBSTATE_HIDDEN))
+                {
+                    bFound = TRUE; 
+                    i = j; 
+                    TRACE("wrap point 3 btn %d style %02x, x=%d, cx=%d\n", 
+                          i, btnPtr[i].fsStyle, x, cx);
+                    x = infoPtr->nIndent;
+                    btnPtr[j].fsState |= TBSTATE_WRAP;
+                    bButtonWrap = FALSE; 
+                    break;
+                }
+            }
+
+            /*  If no separator available for wrapping, wrap one of     */
+            /*  non-hidden previous button.                             */
+            if (!bFound)
+            {
+                for ( j = i - 1; 
+                        j >= 0 && !(btnPtr[j].fsState & TBSTATE_WRAP); j--)
+                {
+                    if (btnPtr[j].fsState & TBSTATE_HIDDEN) 
+                        continue;
+
+                    bFound = TRUE; 
+                    i = j; 
+                    TRACE("wrap point 4 btn %d style %02x, x=%d, cx=%d\n", 
+                          i, btnPtr[i].fsStyle, x, cx);
+                    x = infoPtr->nIndent;
+                    btnPtr[j].fsState |= TBSTATE_WRAP;
+                    bButtonWrap = TRUE;
+                    break;
+                }
+            }
+
+            /* If all above failed, wrap the current button. */
+            if (!bFound)  
+            {
+                TRACE("wrap point 5 btn %d style %02x, x=%d, cx=%d\n",
+                      i, btnPtr[i].fsStyle, x, cx);
+                btnPtr[i].fsState |= TBSTATE_WRAP;
+                bFound = TRUE;
+                x = infoPtr->nIndent;
+                if (btnPtr[i].fsStyle & TBSTYLE_SEP )
+                    bButtonWrap = FALSE;
+                else
+                    bButtonWrap = TRUE;
+            }               
+        }
+        else {
+            TRACE("wrap point 6 btn %d style %02x, x=%d, cx=%d\n", 
+                  i, btnPtr[i].fsStyle, x, cx);
+            x += cx;
+        }
     }
 }
@@ -729 +1057 @@
 
 /***********************************************************************
-*       TOOLBAR_CalcToolbar
+*               TOOLBAR_CalcToolbar
 *
-* This function calculates button and separator placement. It first
-* calculates the button sizes, gets the toolbar window width and then
-* calls TOOLBAR_WrapToolbar to determine which buttons we need to wrap
+* This function calculates button and separator placement. It first 
+* calculates the button sizes, gets the toolbar window width and then 
+* calls TOOLBAR_WrapToolbar to determine which buttons we need to wrap 
 * on. It assigns a new location to each item and sends this location to
-* the tooltip window if appropriate. Finally, it updates the rcBound
-* rect and calculates the new required toolbar window height.
-*/
+* the tooltip window if appropriate. Finally, it updates the rcBound 
+* rect and calculates the new required toolbar window height. 
+*/  
 
 static void
@@ -756 +1084 @@
     if (dwStyle & TBSTYLE_LIST)
     {
-    infoPtr->nButtonHeight = max(infoPtr->nBitmapHeight, sizeString.cy) + 6;
-    infoPtr->nButtonWidth = infoPtr->nBitmapWidth + sizeString.cx + 6;
+        for (i = 0; i < infoPtr->nNumButtons && !usesBitmaps; i++)
+        {
+            if (infoPtr->buttons[i].iBitmap >= 0)
+                usesBitmaps = TRUE;
+        }
+        infoPtr->nButtonHeight = max((usesBitmaps) ? infoPtr->nBitmapHeight :
+                                     0, sizeString.cy) + 6;
+        infoPtr->nButtonWidth = ((usesBitmaps) ? infoPtr->nBitmapWidth :
+                                 0) + sizeString.cx + 6;
+        TRACE("LIST style, But w=%d h=%d, useBitmaps=%d, Bit w=%d h=%d\n",
+              infoPtr->nButtonWidth, infoPtr->nButtonHeight, usesBitmaps,
+              infoPtr->nBitmapWidth, infoPtr->nBitmapHeight);
+        TOOLBAR_DumpToolbar (infoPtr, __LINE__);
     }
     else {
         for (i = 0; i < infoPtr->nNumButtons && !usesBitmaps; i++)
         {
-        if (TOOLBAR_IsValidBitmapIndex(infoPtr,infoPtr->buttons[i].iBitmap))
-            usesBitmaps = TRUE;
+            if (TOOLBAR_IsValidBitmapIndex(infoPtr,infoPtr->buttons[i].iBitmap))
+                usesBitmaps = TRUE;
         }
 
@@ -769 +1108 @@
         {
             if (usesBitmaps)
-          infoPtr->nButtonHeight = sizeString.cy +
+                infoPtr->nButtonHeight = sizeString.cy + 
+                    2 + /* this is the space to separate text from bitmap */
                   infoPtr->nBitmapHeight + 6;
-            else
+            else 
                 infoPtr->nButtonHeight = sizeString.cy + 6;
         }
         else if (infoPtr->nButtonHeight < infoPtr->nBitmapHeight + 6)
-        infoPtr->nButtonHeight = infoPtr->nBitmapHeight + 6;
+            infoPtr->nButtonHeight = infoPtr->nBitmapHeight + 6;
 
         if (sizeString.cx > infoPtr->nBitmapWidth)
-        infoPtr->nButtonWidth = sizeString.cx + 6;
+            infoPtr->nButtonWidth = sizeString.cx + 6;
         else if (infoPtr->nButtonWidth < infoPtr->nBitmapWidth + 6)
-        infoPtr->nButtonWidth = infoPtr->nBitmapWidth + 6;
+            infoPtr->nButtonWidth = infoPtr->nBitmapWidth + 6;
     }
 
     if ( infoPtr->cxMin >= 0 && infoPtr->nButtonWidth < infoPtr->cxMin )
         infoPtr->nButtonWidth = infoPtr->cxMin;
-    if ( infoPtr->cxMax >= 0 && infoPtr->nButtonWidth > infoPtr->cxMax )
+    if ( infoPtr->cxMax > 0 && infoPtr->nButtonWidth > infoPtr->cxMax )
         infoPtr->nButtonWidth = infoPtr->cxMax;
 
@@ -791 +1131 @@
 
     x  = infoPtr->nIndent;
-    y  = (dwStyle & TBSTYLE_FLAT) ? 0 : TOP_BORDER;
+    y  = 0;
 
    /*
-    * We will set the height below, and we set the width on entry
-    * so we do not reset them here..
+    * We will set the height below, and we set the width on entry 
+    * so we do not reset them here.. 
     */
 #if 0
@@ -828 +1168 @@
 /*    cy = rc.bottom - rc.top; */
 
+    TRACE("cy=%d\n", cy);
+
     for (i = 0; i < infoPtr->nNumButtons; i++, btnPtr++ )
     {
-    bWrap = FALSE;
-    if (btnPtr->fsState & TBSTATE_HIDDEN)
-    {
-        SetRectEmpty (&btnPtr->rect);
-        continue;
-    }
-
-        /* UNDOCUMENTED: If a separator has a non zero bitmap index, */
-        /* it is the actual width of the separator. This is used for */
-        /* custom controls in toolbars.                              */
-    if (btnPtr->fsStyle & TBSTYLE_SEP)
-        cx = (btnPtr->iBitmap > 0) ?
-             btnPtr->iBitmap : SEPARATOR_WIDTH;
-    else
-    {
-            if (btnPtr->fsStyle & TBSTYLE_AUTOSIZE)
+        bWrap = FALSE;
+        if (btnPtr->fsState & TBSTATE_HIDDEN)
+        {
+            SetRectEmpty (&btnPtr->rect);
+            continue;
+        }
+
+        cy = infoPtr->nHeight;
+
+        /* UNDOCUMENTED: If a separator has a non zero bitmap index, */
+        /* it is the actual width of the separator. This is used for */
+        /* custom controls in toolbars.                              */
+        if (btnPtr->fsStyle & TBSTYLE_SEP) {
+            if (btnPtr->fsStyle & TBSTYLE_DROPDOWN) {
+                cy = (btnPtr->iBitmap > 0) ?
+                     btnPtr->iBitmap : SEPARATOR_WIDTH;
+                cx = infoPtr->nButtonWidth;
+            }
+            else
+                cx = (btnPtr->iBitmap > 0) ?
+                     btnPtr->iBitmap : SEPARATOR_WIDTH;
+        }
+        else
+        {
+            if (btnPtr->fsStyle & TBSTYLE_AUTOSIZE) 
             {
               SIZE sz;
-              TOOLBAR_MeasureString(hwnd,i,&sz);
-              cx = sz.cx + 6;
+              HDC hdc;
+              HFONT hOldFont;
+
+              hdc = GetDC (hwnd);
+              hOldFont = SelectObject (hdc, infoPtr->hFont);
+
+              TOOLBAR_MeasureString(infoPtr, btnPtr, hdc, &sz);
+
+              SelectObject (hdc, hOldFont);
+              ReleaseDC (hwnd, hdc);
+
+              /* Fudge amount measured against IE4 "menu" and "Links" */
+              /* toolbars with native control (v4.71).  -  GA 8/01    */
+              cx = sz.cx + 6 + 5 + 5;
+              if ((dwStyle & TBSTYLE_LIST) && 
+                  (TOOLBAR_TestImageExist (infoPtr, btnPtr, infoPtr->himlDef)))
+                  cx += infoPtr->nBitmapWidth;
             }
             else
-          cx = infoPtr->nButtonWidth;
-
-        if (hasDropDownArrows && (btnPtr->fsStyle & TBSTYLE_DROPDOWN))
-          cx += DDARROW_WIDTH;
-    }
-    cy = infoPtr->nHeight;
-
-    if (btnPtr->fsState & TBSTATE_WRAP )
-            bWrap = TRUE;
-
-    SetRect (&btnPtr->rect, x, y, x + cx, y + cy);
-
-    if (infoPtr->rcBound.left > x)
-        infoPtr->rcBound.left = x;
-    if (infoPtr->rcBound.right < x + cx)
-        infoPtr->rcBound.right = x + cx;
-    if (infoPtr->rcBound.bottom < y + cy)
-        infoPtr->rcBound.bottom = y + cy;
-
-    /* Set the toolTip only for non-hidden, non-separator button */
-    if (infoPtr->hwndToolTip && !(btnPtr->fsStyle & TBSTYLE_SEP ))
-    {
-        TTTOOLINFOA ti;
-
-        ZeroMemory (&ti, sizeof(TTTOOLINFOA));
-        ti.cbSize = sizeof(TTTOOLINFOA);
-        ti.hwnd = hwnd;
-        ti.uId = btnPtr->idCommand;
-        ti.rect = btnPtr->rect;
-        SendMessageA (infoPtr->hwndToolTip, TTM_NEWTOOLRECTA,
-                0, (LPARAM)&ti);
-    }
-
-    /* btnPtr->nRow is zero based. The space between the rows is    */
-    /* also considered as a row.                    */
-    btnPtr->nRow = nRows + nSepRows;
-    if( bWrap )
-    {
-        if ( !(btnPtr->fsStyle & TBSTYLE_SEP) )
-            y += cy;
-        else
-        {
-        /* UNDOCUMENTED: If a separator has a non zero bitmap index, */
-        /* it is the actual width of the separator. This is used for */
-        /* custom controls in toolbars.                  */
-        y += cy + ( (btnPtr->iBitmap > 0 ) ?
-            btnPtr->iBitmap : SEPARATOR_WIDTH) * 2 /3;
-
-        /* nSepRows is used to calculate the extra height follwoing  */
-        /* the last row.                         */
-        nSepRows++;
-        }
-        x = infoPtr->nIndent;
-        nRows++;
-    }
-    else
-        x += cx;
+              cx = infoPtr->nButtonWidth;
+
+            if (hasDropDownArrows && (btnPtr->fsStyle & TBSTYLE_DROPDOWN))
+              cx += DDARROW_WIDTH; 
+        }
+        if (btnPtr->fsState & TBSTATE_WRAP )
+                    bWrap = TRUE;
+
+        SetRect (&btnPtr->rect, x, y, x + cx, y + cy);
+
+        if (infoPtr->rcBound.left > x)
+            infoPtr->rcBound.left = x;
+        if (infoPtr->rcBound.right < x + cx)
+            infoPtr->rcBound.right = x + cx;
+        if (infoPtr->rcBound.bottom < y + cy)
+            infoPtr->rcBound.bottom = y + cy;
+
+        /* Set the toolTip only for non-hidden, non-separator button */
+        if (infoPtr->hwndToolTip && !(btnPtr->fsStyle & TBSTYLE_SEP )) 
+        {
+            TTTOOLINFOA ti;
+
+            ZeroMemory (&ti, sizeof(TTTOOLINFOA));
+            ti.cbSize = sizeof(TTTOOLINFOA);
+            ti.hwnd = hwnd;
+            ti.uId = btnPtr->idCommand;
+            ti.rect = btnPtr->rect;
+            SendMessageA (infoPtr->hwndToolTip, TTM_NEWTOOLRECTA,
+                            0, (LPARAM)&ti);
+        }
+
+        /* btnPtr->nRow is zero based. The space between the rows is    */
+        /* also considered as a row.                                    */
+        btnPtr->nRow = nRows + nSepRows;
+
+        TRACE("button %d style=%x, bWrap=%d, nRows=%d, nSepRows=%d, btnrow=%d\n",
+              i, btnPtr->fsStyle, bWrap, nRows, nSepRows, btnPtr->nRow);
+
+        if( bWrap )
+        {
+            if ( !(btnPtr->fsStyle & TBSTYLE_SEP) )
+                y += cy;
+            else 
+            {   
+                /* UNDOCUMENTED: If a separator has a non zero bitmap index, */
+                /* it is the actual width of the separator. This is used for */
+                /* custom controls in toolbars.                              */
+                if ( !(btnPtr->fsStyle & TBSTYLE_DROPDOWN))
+                    y += cy + ( (btnPtr->iBitmap > 0 ) ?
+                                btnPtr->iBitmap : SEPARATOR_WIDTH) * 2 /3; 
+                else
+                    y += cy;
+             
+                /* nSepRows is used to calculate the extra height follwoing  */
+                /* the last row.                                             */
+                nSepRows++;
+            }
+            x = infoPtr->nIndent;
+                nRows++;
+        }
+        else
+            x += cx;
     }
 
@@ -914 +1285 @@
     infoPtr->nRows = nRows + nSepRows + 1;
 
-    /* nSepRows * (infoPtr->nBitmapHeight + 1) is the space following   */
-    /* the last row.                            */
-    infoPtr->nHeight = TOP_BORDER + (nRows + 1) * infoPtr->nButtonHeight +
-                nSepRows * (SEPARATOR_WIDTH * 2 / 3) +
-            nSepRows * (infoPtr->nBitmapHeight + 1) +
-            BOTTOM_BORDER;
+    /* nSepRows * (infoPtr->nBitmapHeight + 1) is the space following   */
+    /* the last row.                                                    */
+    infoPtr->nHeight = TOP_BORDER + (nRows + 1) * infoPtr->nButtonHeight + 
+                        nSepRows * (SEPARATOR_WIDTH * 2 / 3) +
+                        nSepRows * (infoPtr->nBitmapHeight + 1) + 
+                        BOTTOM_BORDER; 
     TRACE("toolbar height %d, button width %d\n", infoPtr->nHeight, infoPtr->nButtonWidth);
 }
@@ -930 +1301 @@
     TBUTTON_INFO *btnPtr;
     INT i;
-
+    
     btnPtr = infoPtr->buttons;
     for (i = 0; i < infoPtr->nNumButtons; i++, btnPtr++) {
-    if (btnPtr->fsState & TBSTATE_HIDDEN)
-        continue;
-
-    if (btnPtr->fsStyle & TBSTYLE_SEP) {
-        if (PtInRect (&btnPtr->rect, *lpPt)) {
-        TRACE(" ON SEPARATOR %d!\n", i);
-        return -i;
-        }
-    }
-    else {
-        if (PtInRect (&btnPtr->rect, *lpPt)) {
-        TRACE(" ON BUTTON %d!\n", i);
-        return i;
-        }
-    }
+        if (btnPtr->fsState & TBSTATE_HIDDEN)
+            continue;
+
+        if (btnPtr->fsStyle & TBSTYLE_SEP) {
+            if (PtInRect (&btnPtr->rect, *lpPt)) {
+                TRACE(" ON SEPARATOR %d!\n", i);
+                return -i;
+            }
+        }
+        else {
+            if (PtInRect (&btnPtr->rect, *lpPt)) {
+                TRACE(" ON BUTTON %d!\n", i);
+                return i;
+            }
+        }
     }
 
@@ -963 +1334 @@
     btnPtr = infoPtr->buttons;
     for (i = 0; i < infoPtr->nNumButtons; i++, btnPtr++) {
-    if (btnPtr->idCommand == idCommand) {
-        TRACE("command=%d index=%d\n", idCommand, i);
-        return i;
-    }
+        if (btnPtr->idCommand == idCommand) {
+            TRACE("command=%d index=%d\n", idCommand, i);
+            return i;
+        }
     }
     TRACE("no index found for command=%d\n", idCommand);
@@ -980 +1351 @@
 
     if ((nIndex < 0) || (nIndex > infoPtr->nNumButtons))
-    return -1;
+        return -1;
 
     /* check index button */
     btnPtr = &infoPtr->buttons[nIndex];
     if ((btnPtr->fsStyle & TBSTYLE_CHECKGROUP) == TBSTYLE_CHECKGROUP) {
-    if (btnPtr->fsState & TBSTATE_CHECKED)
-        return nIndex;
+        if (btnPtr->fsState & TBSTATE_CHECKED)
+            return nIndex;
     }
 
@@ -992 +1363 @@
     nRunIndex = nIndex - 1;
     while (nRunIndex >= 0) {
-    btnPtr = &infoPtr->buttons[nRunIndex];
-    if ((btnPtr->fsStyle & TBSTYLE_CHECKGROUP) == TBSTYLE_CHECKGROUP) {
-        if (btnPtr->fsState & TBSTATE_CHECKED)
-        return nRunIndex;
-    }
-    else
-        break;
-    nRunIndex--;
+        btnPtr = &infoPtr->buttons[nRunIndex];
+        if ((btnPtr->fsStyle & TBSTYLE_CHECKGROUP) == TBSTYLE_CHECKGROUP) {
+            if (btnPtr->fsState & TBSTATE_CHECKED)
+                return nRunIndex;
+        }
+        else
+            break;
+        nRunIndex--;
     }
 
@@ -1005 +1376 @@
     nRunIndex = nIndex + 1;
     while (nRunIndex < infoPtr->nNumButtons) {
-    btnPtr = &infoPtr->buttons[nRunIndex];
-    if ((btnPtr->fsStyle & TBSTYLE_CHECKGROUP) == TBSTYLE_CHECKGROUP) {
-        if (btnPtr->fsState & TBSTATE_CHECKED)
-        return nRunIndex;
-    }
-    else
-        break;
-    nRunIndex++;
+        btnPtr = &infoPtr->buttons[nRunIndex];  
+        if ((btnPtr->fsStyle & TBSTYLE_CHECKGROUP) == TBSTYLE_CHECKGROUP) {
+            if (btnPtr->fsState & TBSTATE_CHECKED)
+                return nRunIndex;
+        }
+        else
+            break;
+        nRunIndex++;
     }
 
@@ -1021 +1392 @@
 static VOID
 TOOLBAR_RelayEvent (HWND hwndTip, HWND hwndMsg, UINT uMsg,
-            WPARAM wParam, LPARAM lParam)
+                    WPARAM wParam, LPARAM lParam)
 {
     MSG msg;
@@ -1047 +1418 @@
     PCUSTOMBUTTON btnInfo;
     NMTOOLBARA nmtb;
+    TOOLBAR_INFO *infoPtr = custInfo->tbInfo;
 
     switch (uMsg)
     {
-    case WM_INITDIALOG:
-        custInfo = (PCUSTDLG_INFO)lParam;
-        SetWindowLongA (hwnd, DWL_USER, (DWORD)custInfo);
-
-        if (custInfo)
-        {
-        char Buffer[256];
-        int i = 0;
-        int index;
-
-        /* send TBN_QUERYINSERT notification */
-        nmtb.hdr.hwndFrom = hwnd;
-        nmtb.hdr.idFrom   = GetWindowLongA (hwnd, GWL_ID);
-        nmtb.hdr.code     = TBN_QUERYINSERT;
-        nmtb.iItem = custInfo->tbInfo->nNumButtons;
-
-        if (!SendMessageA (custInfo->tbInfo->hwndNotify, WM_NOTIFY,
-                   (WPARAM)nmtb.hdr.idFrom, (LPARAM)&nmtb))
-            return FALSE;
-
-        /* add items to 'toolbar buttons' list and check if removable */
-        for (i = 0; i < custInfo->tbInfo->nNumButtons; i++)
-        {
-            btnInfo = (PCUSTOMBUTTON)COMCTL32_Alloc(sizeof(CUSTOMBUTTON));
-            memset (&btnInfo->btn, 0, sizeof(TBBUTTON));
-            btnInfo->btn.fsStyle = TBSTYLE_SEP;
-            btnInfo->bVirtual = FALSE;
-            LoadStringA (COMCTL32_hModule, IDS_SEPARATOR, btnInfo->text, 64);
-
-            /* send TBN_QUERYDELETE notification */
-            nmtb.hdr.hwndFrom = hwnd;
-            nmtb.hdr.idFrom   = GetWindowLongA (hwnd, GWL_ID);
-            nmtb.hdr.code     = TBN_QUERYDELETE;
-            nmtb.iItem = i;
-
-            btnInfo->bRemovable = SendMessageA (custInfo->tbInfo->hwndNotify, WM_NOTIFY,
-                            (WPARAM)nmtb.hdr.idFrom, (LPARAM)&nmtb);
-
-            index = (int)SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_ADDSTRING, 0, 0);
-            SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_SETITEMDATA, index, (LPARAM)btnInfo);
-        }
-
-        /* insert separator button into 'available buttons' list */
-        btnInfo = (PCUSTOMBUTTON)COMCTL32_Alloc(sizeof(CUSTOMBUTTON));
-        memset (&btnInfo->btn, 0, sizeof(TBBUTTON));
-        btnInfo->btn.fsStyle = TBSTYLE_SEP;
-        btnInfo->bVirtual = FALSE;
-        btnInfo->bRemovable = TRUE;
-        LoadStringA (COMCTL32_hModule, IDS_SEPARATOR, btnInfo->text, 64);
-        index = (int)SendDlgItemMessageA (hwnd, IDC_AVAILBTN_LBOX, LB_ADDSTRING, 0, (LPARAM)btnInfo);
-        SendDlgItemMessageA (hwnd, IDC_AVAILBTN_LBOX, LB_SETITEMDATA, index, (LPARAM)btnInfo);
-
-        /* insert all buttons into dsa */
-        for (i = 0;; i++)
-        {
-            /* send TBN_GETBUTTONINFO notification */
-            nmtb.hdr.hwndFrom = hwnd;
-            nmtb.hdr.idFrom   = GetWindowLongA (hwnd, GWL_ID);
-            nmtb.hdr.code     = TBN_GETBUTTONINFOA;
-            nmtb.iItem = i;
-            nmtb.pszText = Buffer;
-            nmtb.cchText = 256;
-
-            if (!SendMessageA (custInfo->tbInfo->hwndNotify, WM_NOTIFY,
-                       (WPARAM)nmtb.hdr.idFrom, (LPARAM)&nmtb))
-            break;
-
-            TRACE("style: %x\n", nmtb.tbButton.fsStyle);
-
-            /* insert button into the apropriate list */
-            index = TOOLBAR_GetButtonIndex (custInfo->tbInfo, nmtb.tbButton.idCommand);
-            if (index == -1)
-            {
-            btnInfo = (PCUSTOMBUTTON)COMCTL32_Alloc(sizeof(CUSTOMBUTTON));
-            memcpy (&btnInfo->btn, &nmtb.tbButton, sizeof(TBBUTTON));
-            btnInfo->bVirtual = FALSE;
-            btnInfo->bRemovable = TRUE;
-            if (!(nmtb.tbButton.fsStyle & TBSTYLE_SEP))
-                strcpy (btnInfo->text, nmtb.pszText);
-
-            index = SendDlgItemMessageA (hwnd, IDC_AVAILBTN_LBOX, LB_ADDSTRING, 0, 0);
-            SendDlgItemMessageA (hwnd, IDC_AVAILBTN_LBOX, LB_SETITEMDATA, index, (LPARAM)btnInfo);
+        case WM_INITDIALOG:
+            custInfo = (PCUSTDLG_INFO)lParam;
+            SetWindowLongA (hwnd, DWL_USER, (DWORD)custInfo);
+
+            if (custInfo)
+            {
+                char Buffer[256];
+                int i = 0;
+                int index;
+
+                /* send TBN_QUERYINSERT notification */
+                nmtb.iItem = custInfo->tbInfo->nNumButtons;
+
+                if (!TOOLBAR_SendNotify ((NMHDR *) &nmtb, infoPtr, TBN_QUERYINSERT))
+                    return FALSE;
+
+                /* add items to 'toolbar buttons' list and check if removable */
+                for (i = 0; i < custInfo->tbInfo->nNumButtons; i++)
+                {
+                    btnInfo = (PCUSTOMBUTTON)COMCTL32_Alloc(sizeof(CUSTOMBUTTON));
+                    memset (&btnInfo->btn, 0, sizeof(TBBUTTON));
+                    btnInfo->btn.fsStyle = TBSTYLE_SEP;
+                    btnInfo->bVirtual = FALSE;
+                    LoadStringA (COMCTL32_hModule, IDS_SEPARATOR, btnInfo->text, 64);
+
+                    /* send TBN_QUERYDELETE notification */
+                    nmtb.iItem = i;
+                    btnInfo->bRemovable = TOOLBAR_SendNotify ((NMHDR *) &nmtb, 
+                                                      infoPtr, 
+                                                      TBN_QUERYDELETE);
+
+                    index = (int)SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_ADDSTRING, 0, 0);
+                    SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_SETITEMDATA, index, (LPARAM)btnInfo);
+                }
+
+                /* insert separator button into 'available buttons' list */
+                btnInfo = (PCUSTOMBUTTON)COMCTL32_Alloc(sizeof(CUSTOMBUTTON));
+                memset (&btnInfo->btn, 0, sizeof(TBBUTTON));
+                btnInfo->btn.fsStyle = TBSTYLE_SEP;
+                btnInfo->bVirtual = FALSE;
+                btnInfo->bRemovable = TRUE;
+                LoadStringA (COMCTL32_hModule, IDS_SEPARATOR, btnInfo->text, 64);
+                index = (int)SendDlgItemMessageA (hwnd, IDC_AVAILBTN_LBOX, LB_ADDSTRING, 0, (LPARAM)btnInfo);
+                SendDlgItemMessageA (hwnd, IDC_AVAILBTN_LBOX, LB_SETITEMDATA, index, (LPARAM)btnInfo);
+
+                /* insert all buttons into dsa */
+                for (i = 0;; i++)
+                {
+                    /* send TBN_GETBUTTONINFO notification */
+                    nmtb.iItem = i;
+                    nmtb.pszText = Buffer;
+                    nmtb.cchText = 256;
+
+                    if (!TOOLBAR_SendNotify ((NMHDR *) &nmtb, infoPtr, TBN_GETBUTTONINFOA))
+                        break;
+
+                    TRACE("style: %x\n", nmtb.tbButton.fsStyle);                
+
+                    /* insert button into the apropriate list */
+                    index = TOOLBAR_GetButtonIndex (custInfo->tbInfo, nmtb.tbButton.idCommand);
+                    if (index == -1)
+                    {
+                        btnInfo = (PCUSTOMBUTTON)COMCTL32_Alloc(sizeof(CUSTOMBUTTON));
+                        memcpy (&btnInfo->btn, &nmtb.tbButton, sizeof(TBBUTTON));
+                        btnInfo->bVirtual = FALSE;
+                        btnInfo->bRemovable = TRUE;
+                        if (!(nmtb.tbButton.fsStyle & TBSTYLE_SEP))
+                            strcpy (btnInfo->text, nmtb.pszText);
+
+                        index = SendDlgItemMessageA (hwnd, IDC_AVAILBTN_LBOX, LB_ADDSTRING, 0, 0);
+                        SendDlgItemMessageA (hwnd, IDC_AVAILBTN_LBOX, LB_SETITEMDATA, index, (LPARAM)btnInfo);
+                    }
+                    else
+                    {
+                        btnInfo = (PCUSTOMBUTTON)SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_GETITEMDATA, index, 0);
+                        memcpy (&btnInfo->btn, &nmtb.tbButton, sizeof(TBBUTTON));
+                        if (!(nmtb.tbButton.fsStyle & TBSTYLE_SEP))
+                            strcpy (btnInfo->text, nmtb.pszText);
+
+                        SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_SETITEMDATA, index, (LPARAM)btnInfo);
+                    }
+                }
+
+                /* select first item in the 'available' list */
+                SendDlgItemMessageA (hwnd, IDC_AVAILBTN_LBOX, LB_SETCURSEL, 0, 0);
+
+                /* append 'virtual' separator button to the 'toolbar buttons' list */
+                btnInfo = (PCUSTOMBUTTON)COMCTL32_Alloc(sizeof(CUSTOMBUTTON));
+                memset (&btnInfo->btn, 0, sizeof(TBBUTTON));
+                btnInfo->btn.fsStyle = TBSTYLE_SEP;
+                btnInfo->bVirtual = TRUE;
+                btnInfo->bRemovable = FALSE;
+                LoadStringA (COMCTL32_hModule, IDS_SEPARATOR, btnInfo->text, 64);
+                index = (int)SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_ADDSTRING, 0, (LPARAM)btnInfo);
+                SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_SETITEMDATA, index, (LPARAM)btnInfo);
+
+                /* select last item in the 'toolbar' list */
+                SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_SETCURSEL, index, 0);
+                SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_SETTOPINDEX, index, 0);
+
+                /* set focus and disable buttons */
+                PostMessageA (hwnd, WM_USER, 0, 0);
+            }
+            return TRUE;
+
+        case WM_USER:
+            EnableWindow (GetDlgItem (hwnd,IDC_MOVEUP_BTN), FALSE);
+            EnableWindow (GetDlgItem (hwnd,IDC_MOVEDN_BTN), FALSE);
+            EnableWindow (GetDlgItem (hwnd,IDC_REMOVE_BTN), FALSE);
+            SetFocus (GetDlgItem (hwnd, IDC_TOOLBARBTN_LBOX));
+            return TRUE;
+
+        case WM_CLOSE:
+            EndDialog(hwnd, FALSE);
+            return TRUE;
+
+        case WM_COMMAND:
+            switch (LOWORD(wParam))
+            {
+                case IDC_TOOLBARBTN_LBOX:
+                    if (HIWORD(wParam) == LBN_SELCHANGE)
+                    {
+                        PCUSTOMBUTTON btnInfo;
+                        NMTOOLBARA nmtb;
+                        int count;
+                        int index;
+
+                        count = SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_GETCOUNT, 0, 0);
+                        index = SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_GETCURSEL, 0, 0);
+
+                        /* send TBN_QUERYINSERT notification */
+                        nmtb.iItem = index;
+                        TOOLBAR_SendNotify ((NMHDR *) &nmtb, infoPtr, 
+                                        TBN_QUERYINSERT);
+
+                        /* get list box item */
+                        btnInfo = (PCUSTOMBUTTON)SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_GETITEMDATA, index, 0);
+
+                        if (index == (count - 1))
+                        {
+                            /* last item (virtual separator) */
+                            EnableWindow (GetDlgItem (hwnd,IDC_MOVEUP_BTN), FALSE);
+                            EnableWindow (GetDlgItem (hwnd,IDC_MOVEDN_BTN), FALSE);
+                        }
+                        else if (index == (count - 2))
+                        {
+                            /* second last item (last non-virtual item) */
+                            EnableWindow (GetDlgItem (hwnd,IDC_MOVEUP_BTN), TRUE);
+                            EnableWindow (GetDlgItem (hwnd,IDC_MOVEDN_BTN), FALSE);
+                        }
+                        else if (index == 0)
+                        {
+                            /* first item */
+                            EnableWindow (GetDlgItem (hwnd,IDC_MOVEUP_BTN), FALSE);
+                            EnableWindow (GetDlgItem (hwnd,IDC_MOVEDN_BTN), TRUE);
+                        }
+                        else
+                        {
+                            EnableWindow (GetDlgItem (hwnd,IDC_MOVEUP_BTN), TRUE);
+                            EnableWindow (GetDlgItem (hwnd,IDC_MOVEDN_BTN), TRUE);
+                        }
+
+                        EnableWindow (GetDlgItem (hwnd,IDC_REMOVE_BTN), btnInfo->bRemovable);
+                    }
+                    break;
+
+                case IDC_MOVEUP_BTN:
+                    {
+                        PCUSTOMBUTTON btnInfo;
+                        int index;
+                        int count;
+
+                        count = SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_GETCOUNT, 0, 0);
+                        index = SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_GETCURSEL, 0, 0);
+                        TRACE("Move up: index %d\n", index);
+
+                        /* send TBN_QUERYINSERT notification */
+                        nmtb.iItem = index;
+
+                        if (TOOLBAR_SendNotify ((NMHDR *) &nmtb, infoPtr,
+                                            TBN_QUERYINSERT))
+                        {
+                            btnInfo = (PCUSTOMBUTTON)SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_GETITEMDATA, index, 0);
+
+                            SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_DELETESTRING, index, 0);
+                            SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_INSERTSTRING, index-1, 0);
+                            SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_SETITEMDATA, index-1, (LPARAM)btnInfo);
+                            SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_SETCURSEL, index-1 , 0);
+
+                            if (index <= 1)
+                                EnableWindow (GetDlgItem (hwnd,IDC_MOVEUP_BTN), FALSE);
+                            else if (index >= (count - 3))
+                                EnableWindow (GetDlgItem (hwnd,IDC_MOVEDN_BTN), TRUE);
+
+                            SendMessageA (custInfo->tbHwnd, TB_DELETEBUTTON, index, 0);
+                            SendMessageA (custInfo->tbHwnd, TB_INSERTBUTTONA, index-1, (LPARAM)&(btnInfo->btn));
+                        }
+                    }
+                    break;
+
+                case IDC_MOVEDN_BTN: /* move down */
+                    {
+                        PCUSTOMBUTTON btnInfo;
+                        int index;
+                        int count;
+
+                        count = SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_GETCOUNT, 0, 0);
+                        index = SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_GETCURSEL, 0, 0);
+                        TRACE("Move up: index %d\n", index);
+
+                        /* send TBN_QUERYINSERT notification */
+                        nmtb.iItem = index;
+                        if (TOOLBAR_SendNotify ((NMHDR *) &nmtb, infoPtr,
+                                            TBN_QUERYINSERT))
+                        {
+                            btnInfo = (PCUSTOMBUTTON)SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_GETITEMDATA, index, 0);
+
+                            /* move button down */
+                            SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_DELETESTRING, index, 0);
+                            SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_INSERTSTRING, index+1, 0);
+                            SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_SETITEMDATA, index+1, (LPARAM)btnInfo);
+                            SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_SETCURSEL, index+1 , 0);
+
+                            if (index == 0)
+                                EnableWindow (GetDlgItem (hwnd,IDC_MOVEUP_BTN), TRUE);
+                            else if (index >= (count - 3))
+                                EnableWindow (GetDlgItem (hwnd,IDC_MOVEDN_BTN), FALSE);
+
+                            SendMessageA (custInfo->tbHwnd, TB_DELETEBUTTON, index, 0);
+                            SendMessageA (custInfo->tbHwnd, TB_INSERTBUTTONA, index+1, (LPARAM)&(btnInfo->btn));
+                        }
+                    }
+                    break;
+
+                case IDC_REMOVE_BTN: /* remove button */
+                    {
+                        PCUSTOMBUTTON btnInfo;
+                        int index;
+
+                        index = SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_GETCURSEL, 0, 0);
+                        TRACE("Remove: index %d\n", index);
+
+                        /* send TBN_QUERYDELETE notification */
+                        nmtb.iItem = index;
+                        if (TOOLBAR_SendNotify ((NMHDR *) &nmtb, infoPtr,
+                                            TBN_QUERYDELETE))
+                        {
+                            btnInfo = (PCUSTOMBUTTON)SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_GETITEMDATA, index, 0);
+                            SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_DELETESTRING, index, 0);
+                            SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_SETCURSEL, index , 0);
+
+                            SendMessageA (custInfo->tbHwnd, TB_DELETEBUTTON, index, 0);
+
+                            /* insert into 'available button' list */
+                            if (!(btnInfo->btn.fsStyle & TBSTYLE_SEP))
+                            {
+                                index = (int)SendDlgItemMessageA (hwnd, IDC_AVAILBTN_LBOX, LB_ADDSTRING, 0, 0);
+                                SendDlgItemMessageA (hwnd, IDC_AVAILBTN_LBOX, LB_SETITEMDATA, index, (LPARAM)btnInfo);
+                            }
+                            else
+                                COMCTL32_Free (btnInfo);
+                        }
+                    }
+                    break;
+
+                case IDOK: /* Add button */
+                    {
+                        int index;
+                        int count;
+
+                        count = SendDlgItemMessageA (hwnd, IDC_AVAILBTN_LBOX, LB_GETCOUNT, 0, 0);
+                        index = SendDlgItemMessageA (hwnd, IDC_AVAILBTN_LBOX, LB_GETCURSEL, 0, 0);
+                        TRACE("Add: index %d\n", index);
+
+                        /* send TBN_QUERYINSERT notification */
+                        nmtb.iItem = index;
+                        if (TOOLBAR_SendNotify ((NMHDR *) &nmtb, infoPtr,
+                                            TBN_QUERYINSERT))
+                        {
+                            btnInfo = (PCUSTOMBUTTON)SendDlgItemMessageA (hwnd, IDC_AVAILBTN_LBOX, LB_GETITEMDATA, index, 0);
+
+                            if (index != 0)
+                            {
+                                /* remove from 'available buttons' list */
+                                SendDlgItemMessageA (hwnd, IDC_AVAILBTN_LBOX, LB_DELETESTRING, index, 0);
+                                if (index == count-1)
+                                    SendDlgItemMessageA (hwnd, IDC_AVAILBTN_LBOX, LB_SETCURSEL, index-1 , 0);
+                                else
+                                    SendDlgItemMessageA (hwnd, IDC_AVAILBTN_LBOX, LB_SETCURSEL, index , 0);
+                            }
+                            else
+                            {
+                                PCUSTOMBUTTON btnNew;
+
+                                /* duplicate 'separator' button */
+                                btnNew = (PCUSTOMBUTTON)COMCTL32_Alloc (sizeof(CUSTOMBUTTON));
+                                memcpy (btnNew, btnInfo, sizeof(CUSTOMBUTTON));
+                                btnInfo = btnNew;
+                            }
+
+                            /* insert into 'toolbar button' list */
+                            index = SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_GETCURSEL, 0, 0);
+                            SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_INSERTSTRING, index, 0);
+                            SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_SETITEMDATA, index, (LPARAM)btnInfo);
+
+                            SendMessageA (custInfo->tbHwnd, TB_INSERTBUTTONA, index, (LPARAM)&(btnInfo->btn));
+                        }
+                    }
+                    break;
+
+                case IDCANCEL:
+                    EndDialog(hwnd, FALSE);
+                    break;
+            }
+            return TRUE;
+
+        case WM_DESTROY:
+            {
+                int count;
+                int i;
+
+                /* delete items from 'toolbar buttons' listbox*/
+                count = SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_GETCOUNT, 0, 0);
+                for (i = 0; i < count; i++)
+                {
+                    btnInfo = (PCUSTOMBUTTON)SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_GETITEMDATA, i, 0);
+                    COMCTL32_Free(btnInfo);
+                    SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_SETITEMDATA, 0, 0);
+                }
+                SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_RESETCONTENT, 0, 0);
+
+
+                /* delete items from 'available buttons' listbox*/
+                count = SendDlgItemMessageA (hwnd, IDC_AVAILBTN_LBOX, LB_GETCOUNT, 0, 0);
+                for (i = 0; i < count; i++)
+                {
+                    btnInfo = (PCUSTOMBUTTON)SendDlgItemMessageA (hwnd, IDC_AVAILBTN_LBOX, LB_GETITEMDATA, i, 0);
+                    COMCTL32_Free(btnInfo);
+                    SendDlgItemMessageA (hwnd, IDC_AVAILBTN_LBOX, LB_SETITEMDATA, i, 0);
+                }
+                SendDlgItemMessageA (hwnd, IDC_AVAILBTN_LBOX, LB_RESETCONTENT, 0, 0);
             }
-            else
-            {
-            btnInfo = (PCUSTOMBUTTON)SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_GETITEMDATA, index, 0);
-            memcpy (&btnInfo->btn, &nmtb.tbButton, sizeof(TBBUTTON));
-            if (!(nmtb.tbButton.fsStyle & TBSTYLE_SEP))
-                strcpy (btnInfo->text, nmtb.pszText);
-
-            SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_SETITEMDATA, index, (LPARAM)btnInfo);
-            }
-        }
-
-        /* select first item in the 'available' list */
-        SendDlgItemMessageA (hwnd, IDC_AVAILBTN_LBOX, LB_SETCURSEL, 0, 0);
-
-        /* append 'virtual' separator button to the 'toolbar buttons' list */
-        btnInfo = (PCUSTOMBUTTON)COMCTL32_Alloc(sizeof(CUSTOMBUTTON));
-        memset (&btnInfo->btn, 0, sizeof(TBBUTTON));
-        btnInfo->btn.fsStyle = TBSTYLE_SEP;
-        btnInfo->bVirtual = TRUE;
-        btnInfo->bRemovable = FALSE;
-        LoadStringA (COMCTL32_hModule, IDS_SEPARATOR, btnInfo->text, 64);
-        index = (int)SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_ADDSTRING, 0, (LPARAM)btnInfo);
-        SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_SETITEMDATA, index, (LPARAM)btnInfo);
-
-        /* select last item in the 'toolbar' list */
-        SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_SETCURSEL, index, 0);
-        SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_SETTOPINDEX, index, 0);
-
-        /* set focus and disable buttons */
-        PostMessageA (hwnd, WM_USER, 0, 0);
-        }
-        return TRUE;
-
-    case WM_USER:
-        EnableWindow (GetDlgItem (hwnd,IDC_MOVEUP_BTN), FALSE);
-        EnableWindow (GetDlgItem (hwnd,IDC_MOVEDN_BTN), FALSE);
-        EnableWindow (GetDlgItem (hwnd,IDC_REMOVE_BTN), FALSE);
-        SetFocus (GetDlgItem (hwnd, IDC_TOOLBARBTN_LBOX));
-        return TRUE;
-
-    case WM_CLOSE:
-        EndDialog(hwnd, FALSE);
-        return TRUE;
-
-    case WM_COMMAND:
-        switch (LOWORD(wParam))
-        {
-        case IDC_TOOLBARBTN_LBOX:
-            if (HIWORD(wParam) == LBN_SELCHANGE)
-            {
-            PCUSTOMBUTTON btnInfo;
-            NMTOOLBARA nmtb;
-            int count;
-            int index;
-
-            count = SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_GETCOUNT, 0, 0);
-            index = SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_GETCURSEL, 0, 0);
-
-            /* send TBN_QUERYINSERT notification */
-            nmtb.hdr.hwndFrom = hwnd;
-            nmtb.hdr.idFrom   = GetWindowLongA (hwnd, GWL_ID);
-            nmtb.hdr.code     = TBN_QUERYINSERT;
-            nmtb.iItem = index;
-
-            SendMessageA (custInfo->tbInfo->hwndNotify, WM_NOTIFY,
-                      (WPARAM)nmtb.hdr.idFrom, (LPARAM)&nmtb);
-
-            /* get list box item */
-            btnInfo = (PCUSTOMBUTTON)SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_GETITEMDATA, index, 0);
-
-            if (index == (count - 1))
-            {
-                /* last item (virtual separator) */
-                EnableWindow (GetDlgItem (hwnd,IDC_MOVEUP_BTN), FALSE);
-                EnableWindow (GetDlgItem (hwnd,IDC_MOVEDN_BTN), FALSE);
-            }
-            else if (index == (count - 2))
-            {
-                /* second last item (last non-virtual item) */
-                EnableWindow (GetDlgItem (hwnd,IDC_MOVEUP_BTN), TRUE);
-                EnableWindow (GetDlgItem (hwnd,IDC_MOVEDN_BTN), FALSE);
-            }
-            else if (index == 0)
-            {
-                /* first item */
-                EnableWindow (GetDlgItem (hwnd,IDC_MOVEUP_BTN), FALSE);
-                EnableWindow (GetDlgItem (hwnd,IDC_MOVEDN_BTN), TRUE);
-            }
-            else
-            {
-                EnableWindow (GetDlgItem (hwnd,IDC_MOVEUP_BTN), TRUE);
-                EnableWindow (GetDlgItem (hwnd,IDC_MOVEDN_BTN), TRUE);
-            }
-
-            EnableWindow (GetDlgItem (hwnd,IDC_REMOVE_BTN), btnInfo->bRemovable);
-            }
-            break;
-
-        case IDC_MOVEUP_BTN:
-            {
-            PCUSTOMBUTTON btnInfo;
-            int index;
-            int count;
-
-            count = SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_GETCOUNT, 0, 0);
-            index = SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_GETCURSEL, 0, 0);
-            TRACE("Move up: index %d\n", index);
-
-            /* send TBN_QUERYINSERT notification */
-            nmtb.hdr.hwndFrom = hwnd;
-            nmtb.hdr.idFrom   = GetWindowLongA (hwnd, GWL_ID);
-            nmtb.hdr.code     = TBN_QUERYINSERT;
-            nmtb.iItem = index;
-
-            if (SendMessageA (custInfo->tbInfo->hwndNotify, WM_NOTIFY,
-                      (WPARAM)nmtb.hdr.idFrom, (LPARAM)&nmtb))
-            {
-                btnInfo = (PCUSTOMBUTTON)SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_GETITEMDATA, index, 0);
-
-                SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_DELETESTRING, index, 0);
-                SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_INSERTSTRING, index-1, 0);
-                SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_SETITEMDATA, index-1, (LPARAM)btnInfo);
-                SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_SETCURSEL, index-1 , 0);
-
-                if (index <= 1)
-                EnableWindow (GetDlgItem (hwnd,IDC_MOVEUP_BTN), FALSE);
-                else if (index >= (count - 3))
-                EnableWindow (GetDlgItem (hwnd,IDC_MOVEDN_BTN), TRUE);
-
-                SendMessageA (custInfo->tbHwnd, TB_DELETEBUTTON, index, 0);
-                SendMessageA (custInfo->tbHwnd, TB_INSERTBUTTONA, index-1, (LPARAM)&(btnInfo->btn));
-            }
-            }
-            break;
-
-        case IDC_MOVEDN_BTN: /* move down */
-            {
-            PCUSTOMBUTTON btnInfo;
-            int index;
-            int count;
-
-            count = SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_GETCOUNT, 0, 0);
-            index = SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_GETCURSEL, 0, 0);
-            TRACE("Move up: index %d\n", index);
-
-            /* send TBN_QUERYINSERT notification */
-            nmtb.hdr.hwndFrom = hwnd;
-            nmtb.hdr.idFrom   = GetWindowLongA (hwnd, GWL_ID);
-            nmtb.hdr.code     = TBN_QUERYINSERT;
-            nmtb.iItem = index;
-
-            if (SendMessageA (custInfo->tbInfo->hwndNotify, WM_NOTIFY,
-                      (WPARAM)nmtb.hdr.idFrom, (LPARAM)&nmtb))
-            {
-                btnInfo = (PCUSTOMBUTTON)SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_GETITEMDATA, index, 0);
-
-                /* move button down */
-                SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_DELETESTRING, index, 0);
-                SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_INSERTSTRING, index+1, 0);
-                SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_SETITEMDATA, index+1, (LPARAM)btnInfo);
-                SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_SETCURSEL, index+1 , 0);
-
-                if (index == 0)
-                EnableWindow (GetDlgItem (hwnd,IDC_MOVEUP_BTN), TRUE);
-                else if (index >= (count - 3))
-                EnableWindow (GetDlgItem (hwnd,IDC_MOVEDN_BTN), FALSE);
-
-                SendMessageA (custInfo->tbHwnd, TB_DELETEBUTTON, index, 0);
-                SendMessageA (custInfo->tbHwnd, TB_INSERTBUTTONA, index+1, (LPARAM)&(btnInfo->btn));
-            }
-            }
-            break;
-
-        case IDC_REMOVE_BTN: /* remove button */
-            {
-            PCUSTOMBUTTON btnInfo;
-            int index;
-
-            index = SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_GETCURSEL, 0, 0);
-            TRACE("Remove: index %d\n", index);
-
-            /* send TBN_QUERYDELETE notification */
-            nmtb.hdr.hwndFrom = hwnd;
-            nmtb.hdr.idFrom   = GetWindowLongA (hwnd, GWL_ID);
-            nmtb.hdr.code     = TBN_QUERYDELETE;
-            nmtb.iItem = index;
-
-            if (SendMessageA (custInfo->tbInfo->hwndNotify, WM_NOTIFY,
-                      (WPARAM)nmtb.hdr.idFrom, (LPARAM)&nmtb))
-            {
-                btnInfo = (PCUSTOMBUTTON)SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_GETITEMDATA, index, 0);
-                SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_DELETESTRING, index, 0);
-                SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_SETCURSEL, index , 0);
-
-                SendMessageA (custInfo->tbHwnd, TB_DELETEBUTTON, index, 0);
-
-                /* insert into 'available button' list */
-                if (!(btnInfo->btn.fsStyle & TBSTYLE_SEP))
-                {
-                index = (int)SendDlgItemMessageA (hwnd, IDC_AVAILBTN_LBOX, LB_ADDSTRING, 0, 0);
-                SendDlgItemMessageA (hwnd, IDC_AVAILBTN_LBOX, LB_SETITEMDATA, index, (LPARAM)btnInfo);
-                }
-                else
-                COMCTL32_Free (btnInfo);
-            }
-            }
-            break;
-
-        case IDOK: /* Add button */
-            {
-            int index;
-            int count;
-
-            count = SendDlgItemMessageA (hwnd, IDC_AVAILBTN_LBOX, LB_GETCOUNT, 0, 0);
-            index = SendDlgItemMessageA (hwnd, IDC_AVAILBTN_LBOX, LB_GETCURSEL, 0, 0);
-            TRACE("Add: index %d\n", index);
-
-            /* send TBN_QUERYINSERT notification */
-            nmtb.hdr.hwndFrom = hwnd;
-            nmtb.hdr.idFrom   = GetWindowLongA (hwnd, GWL_ID);
-            nmtb.hdr.code     = TBN_QUERYINSERT;
-            nmtb.iItem = index;
-
-            if (SendMessageA (custInfo->tbInfo->hwndNotify, WM_NOTIFY,
-                      (WPARAM)nmtb.hdr.idFrom, (LPARAM)&nmtb))
-            {
-                btnInfo = (PCUSTOMBUTTON)SendDlgItemMessageA (hwnd, IDC_AVAILBTN_LBOX, LB_GETITEMDATA, index, 0);
-
-                if (index != 0)
-                {
-                /* remove from 'available buttons' list */
-                SendDlgItemMessageA (hwnd, IDC_AVAILBTN_LBOX, LB_DELETESTRING, index, 0);
-                if (index == count-1)
-                    SendDlgItemMessageA (hwnd, IDC_AVAILBTN_LBOX, LB_SETCURSEL, index-1 , 0);
-                else
-                    SendDlgItemMessageA (hwnd, IDC_AVAILBTN_LBOX, LB_SETCURSEL, index , 0);
-                }
-                else
-                {
-                PCUSTOMBUTTON btnNew;
-
-                /* duplicate 'separator' button */
-                btnNew = (PCUSTOMBUTTON)COMCTL32_Alloc (sizeof(CUSTOMBUTTON));
-                memcpy (btnNew, btnInfo, sizeof(CUSTOMBUTTON));
-                btnInfo = btnNew;
-                }
-
-                /* insert into 'toolbar button' list */
-                index = SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_GETCURSEL, 0, 0);
-                SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_INSERTSTRING, index, 0);
-                SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_SETITEMDATA, index, (LPARAM)btnInfo);
-
-                SendMessageA (custInfo->tbHwnd, TB_INSERTBUTTONA, index, (LPARAM)&(btnInfo->btn));
-            }
-            }
-            break;
-
-        case IDCANCEL:
-            EndDialog(hwnd, FALSE);
-            break;
-        }
-        return TRUE;
-
-    case WM_DESTROY:
-        {
-        int count;
-        int i;
-
-        /* delete items from 'toolbar buttons' listbox*/
-        count = SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_GETCOUNT, 0, 0);
-        for (i = 0; i < count; i++)
-        {
-            btnInfo = (PCUSTOMBUTTON)SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_GETITEMDATA, i, 0);
-            COMCTL32_Free(btnInfo);
-            SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_SETITEMDATA, 0, 0);
-        }
-        SendDlgItemMessageA (hwnd, IDC_TOOLBARBTN_LBOX, LB_RESETCONTENT, 0, 0);
-
-
-        /* delete items from 'available buttons' listbox*/
-        count = SendDlgItemMessageA (hwnd, IDC_AVAILBTN_LBOX, LB_GETCOUNT, 0, 0);
-        for (i = 0; i < count; i++)
-        {
-            btnInfo = (PCUSTOMBUTTON)SendDlgItemMessageA (hwnd, IDC_AVAILBTN_LBOX, LB_GETITEMDATA, i, 0);
-            COMCTL32_Free(btnInfo);
-            SendDlgItemMessageA (hwnd, IDC_AVAILBTN_LBOX, LB_SETITEMDATA, i, 0);
-        }
-        SendDlgItemMessageA (hwnd, IDC_AVAILBTN_LBOX, LB_RESETCONTENT, 0, 0);
-            }
-        return TRUE;
-
-    case WM_DRAWITEM:
-        if (wParam == IDC_AVAILBTN_LBOX || wParam == IDC_TOOLBARBTN_LBOX)
-        {
-        LPDRAWITEMSTRUCT lpdis = (LPDRAWITEMSTRUCT)lParam;
-        RECT rcButton;
-        RECT rcText;
-        HPEN hOldPen;
-        HBRUSH hOldBrush;
-        COLORREF oldText = 0;
-        COLORREF oldBk = 0;
-
-        /* get item data */
-        btnInfo = (PCUSTOMBUTTON)SendDlgItemMessageA (hwnd, wParam, LB_GETITEMDATA, (WPARAM)lpdis->itemID, 0);
-        if (btnInfo == NULL)
-        {
-            FIXME("btnInfo invalid!\n");
-            return TRUE;
-        }
-
-        /* set colors and select objects */
-        oldBk = SetBkColor (lpdis->hDC, GetSysColor((lpdis->itemState & ODS_FOCUS)?COLOR_HIGHLIGHT:COLOR_WINDOW));
-        if (btnInfo->bVirtual)
-           oldText = SetTextColor (lpdis->hDC, GetSysColor(COLOR_GRAYTEXT));
-        else
-           oldText = SetTextColor (lpdis->hDC, GetSysColor((lpdis->itemState & ODS_FOCUS)?COLOR_HIGHLIGHTTEXT:COLOR_WINDOWTEXT));
-        hOldPen = SelectObject (lpdis->hDC, GetSysColorPen ((lpdis->itemState & ODS_SELECTED)?COLOR_HIGHLIGHT:COLOR_WINDOW));
-        hOldBrush = SelectObject (lpdis->hDC, GetSysColorBrush ((lpdis->itemState & ODS_FOCUS)?COLOR_HIGHLIGHT:COLOR_WINDOW));
-
-        /* fill background rectangle */
-        Rectangle (lpdis->hDC, lpdis->rcItem.left, lpdis->rcItem.top,
-               lpdis->rcItem.right, lpdis->rcItem.bottom);
-
-        /* calculate button and text rectangles */
-        CopyRect (&rcButton, &lpdis->rcItem);
-        InflateRect (&rcButton, -1, -1);
-        CopyRect (&rcText, &rcButton);
-        rcButton.right = rcButton.left + custInfo->tbInfo->nBitmapWidth + 6;
-        rcText.left = rcButton.right + 2;
-
-        /* draw focus rectangle */
-        if (lpdis->itemState & ODS_FOCUS)
-            DrawFocusRect (lpdis->hDC, &lpdis->rcItem);
-
-        /* draw button */
-        DrawEdge (lpdis->hDC, &rcButton, EDGE_RAISED, BF_RECT|BF_MIDDLE|BF_SOFT);
-
-        /* draw image and text */
-        if ((btnInfo->btn.fsStyle & TBSTYLE_SEP) == 0)
-            ImageList_Draw (custInfo->tbInfo->himlDef, btnInfo->btn.iBitmap, lpdis->hDC,
-                    rcButton.left+3, rcButton.top+3, ILD_NORMAL);
-        DrawTextA (lpdis->hDC,  btnInfo->text, -1, &rcText,
-                   DT_LEFT | DT_VCENTER | DT_SINGLELINE);
-
-        /* delete objects and reset colors */
-        SelectObject (lpdis->hDC, hOldBrush);
-        SelectObject (lpdis->hDC, hOldPen);
-        SetBkColor (lpdis->hDC, oldBk);
-        SetTextColor (lpdis->hDC, oldText);
-
-        return TRUE;
-        }
-        return FALSE;
-
-    case WM_MEASUREITEM:
-        if (wParam == IDC_AVAILBTN_LBOX || wParam == IDC_TOOLBARBTN_LBOX)
-        {
-        MEASUREITEMSTRUCT *lpmis = (MEASUREITEMSTRUCT*)lParam;
-
-        if (custInfo && custInfo->tbInfo)
-            lpmis->itemHeight = custInfo->tbInfo->nBitmapHeight + 8;
-        else
-            lpmis->itemHeight = 15 + 8; /* default height */
-
-        return TRUE;
-        }
-        return FALSE;
-
-    default:
-        return FALSE;
+            return TRUE;
+
+        case WM_DRAWITEM:
+            if (wParam == IDC_AVAILBTN_LBOX || wParam == IDC_TOOLBARBTN_LBOX)
+            {
+                LPDRAWITEMSTRUCT lpdis = (LPDRAWITEMSTRUCT)lParam;
+                RECT rcButton;
+                RECT rcText;
+                HPEN hOldPen;
+                HBRUSH hOldBrush;
+                COLORREF oldText = 0;
+                COLORREF oldBk = 0;
+
+                /* get item data */
+                btnInfo = (PCUSTOMBUTTON)SendDlgItemMessageA (hwnd, wParam, LB_GETITEMDATA, (WPARAM)lpdis->itemID, 0);
+                if (btnInfo == NULL)
+                {
+                    FIXME("btnInfo invalid!\n");
+                    return TRUE;
+                }
+
+                /* set colors and select objects */
+                oldBk = SetBkColor (lpdis->hDC, GetSysColor((lpdis->itemState & ODS_FOCUS)?COLOR_HIGHLIGHT:COLOR_WINDOW));
+                if (btnInfo->bVirtual)
+                   oldText = SetTextColor (lpdis->hDC, GetSysColor(COLOR_GRAYTEXT));
+                else
+                   oldText = SetTextColor (lpdis->hDC, GetSysColor((lpdis->itemState & ODS_FOCUS)?COLOR_HIGHLIGHTTEXT:COLOR_WINDOWTEXT));
+                hOldPen = SelectObject (lpdis->hDC, GetSysColorPen ((lpdis->itemState & ODS_SELECTED)?COLOR_HIGHLIGHT:COLOR_WINDOW));
+                hOldBrush = SelectObject (lpdis->hDC, GetSysColorBrush ((lpdis->itemState & ODS_FOCUS)?COLOR_HIGHLIGHT:COLOR_WINDOW));
+
+                /* fill background rectangle */
+                Rectangle (lpdis->hDC, lpdis->rcItem.left, lpdis->rcItem.top,
+                           lpdis->rcItem.right, lpdis->rcItem.bottom);
+
+                /* calculate button and text rectangles */
+                CopyRect (&rcButton, &lpdis->rcItem);
+                InflateRect (&rcButton, -1, -1);
+                CopyRect (&rcText, &rcButton);
+                rcButton.right = rcButton.left + custInfo->tbInfo->nBitmapWidth + 6;
+                rcText.left = rcButton.right + 2;
+
+                /* draw focus rectangle */
+                if (lpdis->itemState & ODS_FOCUS)
+                    DrawFocusRect (lpdis->hDC, &lpdis->rcItem);
+
+                /* draw button */
+                DrawEdge (lpdis->hDC, &rcButton, EDGE_RAISED, BF_RECT|BF_MIDDLE|BF_SOFT);
+
+                /* draw image and text */
+                if ((btnInfo->btn.fsStyle & TBSTYLE_SEP) == 0)
+                    ImageList_Draw (custInfo->tbInfo->himlDef, btnInfo->btn.iBitmap, lpdis->hDC,
+                                    rcButton.left+3, rcButton.top+3, ILD_NORMAL);
+                DrawTextA (lpdis->hDC,  btnInfo->text, -1, &rcText,
+                               DT_LEFT | DT_VCENTER | DT_SINGLELINE);
+
+                /* delete objects and reset colors */
+                SelectObject (lpdis->hDC, hOldBrush);
+                SelectObject (lpdis->hDC, hOldPen);
+                SetBkColor (lpdis->hDC, oldBk);
+                SetTextColor (lpdis->hDC, oldText);
+
+                return TRUE;
+            }
+            return FALSE;
+
+        case WM_MEASUREITEM:
+            if (wParam == IDC_AVAILBTN_LBOX || wParam == IDC_TOOLBARBTN_LBOX)
+            {
+                MEASUREITEMSTRUCT *lpmis = (MEASUREITEMSTRUCT*)lParam;
+
+                if (custInfo && custInfo->tbInfo)
+                    lpmis->itemHeight = custInfo->tbInfo->nBitmapHeight + 8;
+                else
+                    lpmis->itemHeight = 15 + 8; /* default height */
+
+                return TRUE;
+            }
+            return FALSE;
+
+        default:
+            return FALSE;
     }
 }
@@ -1521 +1863 @@
     TRACE("hwnd=%x wParam=%x lParam=%lx\n", hwnd, wParam, lParam);
     if (!lpAddBmp)
-    return -1;
+        return -1;
 
     if (lpAddBmp->hInst == HINST_COMMCTRL)
     {
-    if ((lpAddBmp->nID & ~1) == IDB_STD_SMALL_COLOR)
-        nButtons = 15;
-    else if ((lpAddBmp->nID & ~1) == IDB_VIEW_SMALL_COLOR)
-        nButtons = 13;
-    else if ((lpAddBmp->nID & ~1) == IDB_HIST_SMALL_COLOR)
-        nButtons = 5;
-    else
-        return -1;
-
-    TRACE ("adding %d internal bitmaps!\n", nButtons);
-
-    /* Windows resize all the buttons to the size of a newly added standard image */
-    if (lpAddBmp->nID & 1)
-    {
-        /* large icons */
-        /* FIXME: on windows the size of the images is 25x24 but the size of the bitmap
-             * in rsrc is only 24x24. Fix the bitmap (how?) and then fix this
+        if ((lpAddBmp->nID & ~1) == IDB_STD_SMALL_COLOR)
+            nButtons = 15;
+        else if ((lpAddBmp->nID & ~1) == IDB_VIEW_SMALL_COLOR)
+            nButtons = 13;
+        else if ((lpAddBmp->nID & ~1) == IDB_HIST_SMALL_COLOR)
+            nButtons = 5;
+        else
+            return -1;
+
+        TRACE ("adding %d internal bitmaps!\n", nButtons);
+
+        /* Windows resize all the buttons to the size of a newly added standard image */
+        if (lpAddBmp->nID & 1) 
+        {
+            /* large icons */
+            /* FIXME: on windows the size of the images is 25x24 but the size of the bitmap 
+             * in rsrc is only 24x24. Fix the bitmap (how?) and then fix this 
              */
-        SendMessageA (hwnd, TB_SETBITMAPSIZE, 0,
-              MAKELPARAM((WORD)24, (WORD)24));
-        SendMessageA (hwnd, TB_SETBUTTONSIZE, 0,
-              MAKELPARAM((WORD)31, (WORD)30));
+            SendMessageA (hwnd, TB_SETBITMAPSIZE, 0,
+                          MAKELPARAM((WORD)24, (WORD)24));
+            SendMessageA (hwnd, TB_SETBUTTONSIZE, 0,
+                          MAKELPARAM((WORD)31, (WORD)30));
+        }       
+        else 
+        {
+            /* small icons */
+            SendMessageA (hwnd, TB_SETBITMAPSIZE, 0,
+                          MAKELPARAM((WORD)16, (WORD)16));
+            SendMessageA (hwnd, TB_SETBUTTONSIZE, 0,
+                          MAKELPARAM((WORD)22, (WORD)22));
+        }
+        
+        TOOLBAR_CalcToolbar (hwnd);
     }
     else
     {
-        /* small icons */
-        SendMessageA (hwnd, TB_SETBITMAPSIZE, 0,
-              MAKELPARAM((WORD)16, (WORD)16));
-        SendMessageA (hwnd, TB_SETBUTTONSIZE, 0,
-              MAKELPARAM((WORD)22, (WORD)22));
-    }
-
-    TOOLBAR_CalcToolbar (hwnd);
-    }
-    else
-    {
-    nButtons = (INT)wParam;
-    if (nButtons <= 0)
-        return -1;
-
-    TRACE ("adding %d bitmaps!\n", nButtons);
-    }
-
+        nButtons = (INT)wParam;
+        if (nButtons <= 0)
+            return -1;
+        
+        TRACE ("adding %d bitmaps!\n", nButtons);
+    }
+    
     if (!(infoPtr->himlDef)) {
-    /* create new default image list */
-    TRACE ("creating default image list!\n");
-
-    infoPtr->himlDef =
-        ImageList_Create (infoPtr->nBitmapWidth, infoPtr->nBitmapHeight,
-                  ILC_COLOR | ILC_MASK, nButtons, 2);
-    infoPtr->himlInt = infoPtr->himlDef;
+        /* create new default image list */
+        TRACE ("creating default image list!\n");
+
+        infoPtr->himlDef =
+            ImageList_Create (infoPtr->nBitmapWidth, infoPtr->nBitmapHeight,
+                              ILC_COLOR | ILC_MASK, nButtons, 2);
+        infoPtr->himlInt = infoPtr->himlDef;
     }
 
@@ -1583 +1925 @@
     if (lpAddBmp->hInst == (HINSTANCE)0)
     {
-    nIndex =
-        ImageList_AddMasked (infoPtr->himlDef, (HBITMAP)lpAddBmp->nID,
-                 CLR_DEFAULT);
+        nIndex = 
+            ImageList_AddMasked (infoPtr->himlDef, (HBITMAP)lpAddBmp->nID,
+                                 CLR_DEFAULT);
     }
     else if (lpAddBmp->hInst == HINST_COMMCTRL)
     {
-    /* Add system bitmaps */
-    switch (lpAddBmp->nID)
+        /* Add system bitmaps */
+        switch (lpAddBmp->nID)
     {
-        case IDB_STD_SMALL_COLOR:
-        hbmLoad = LoadBitmapA (COMCTL32_hModule,
-                       MAKEINTRESOURCEA(IDB_STD_SMALL));
-        nIndex = ImageList_AddMasked (infoPtr->himlDef,
-                          hbmLoad, CLR_DEFAULT);
-        DeleteObject (hbmLoad);
-        break;
-
-        case IDB_STD_LARGE_COLOR:
-        hbmLoad = LoadBitmapA (COMCTL32_hModule,
-                       MAKEINTRESOURCEA(IDB_STD_LARGE));
-        nIndex = ImageList_AddMasked (infoPtr->himlDef,
-                          hbmLoad, CLR_DEFAULT);
-        DeleteObject (hbmLoad);
-        break;
-
-        case IDB_VIEW_SMALL_COLOR:
-        hbmLoad = LoadBitmapA (COMCTL32_hModule,
-                       MAKEINTRESOURCEA(IDB_VIEW_SMALL));
-        nIndex = ImageList_AddMasked (infoPtr->himlDef,
-                          hbmLoad, CLR_DEFAULT);
-        DeleteObject (hbmLoad);
-        break;
-
-        case IDB_VIEW_LARGE_COLOR:
-        hbmLoad = LoadBitmapA (COMCTL32_hModule,
-                       MAKEINTRESOURCEA(IDB_VIEW_LARGE));
-        nIndex = ImageList_AddMasked (infoPtr->himlDef,
-                          hbmLoad, CLR_DEFAULT);
-        DeleteObject (hbmLoad);
-        break;
-
-        case IDB_HIST_SMALL_COLOR:
-        hbmLoad = LoadBitmapA (COMCTL32_hModule,
-                       MAKEINTRESOURCEA(IDB_HIST_SMALL));
-        nIndex = ImageList_AddMasked (infoPtr->himlDef,
-                          hbmLoad, CLR_DEFAULT);
-        DeleteObject (hbmLoad);
-        break;
-
-        case IDB_HIST_LARGE_COLOR:
-        hbmLoad = LoadBitmapA (COMCTL32_hModule,
-                       MAKEINTRESOURCEA(IDB_HIST_LARGE));
-        nIndex = ImageList_AddMasked (infoPtr->himlDef,
-                          hbmLoad, CLR_DEFAULT);
-        DeleteObject (hbmLoad);
-        break;
-
-        default:
-    nIndex = ImageList_GetImageCount (infoPtr->himlDef);
-        ERR ("invalid imagelist!\n");
-        break;
-    }
+            case IDB_STD_SMALL_COLOR:
+                hbmLoad = LoadBitmapA (COMCTL32_hModule,
+                                       MAKEINTRESOURCEA(IDB_STD_SMALL));
+                nIndex = ImageList_AddMasked (infoPtr->himlDef,
+                                              hbmLoad, CLR_DEFAULT);
+                DeleteObject (hbmLoad);
+                break;
+
+            case IDB_STD_LARGE_COLOR:
+                hbmLoad = LoadBitmapA (COMCTL32_hModule,
+                                       MAKEINTRESOURCEA(IDB_STD_LARGE));
+                nIndex = ImageList_AddMasked (infoPtr->himlDef,
+                                              hbmLoad, CLR_DEFAULT);
+                DeleteObject (hbmLoad);
+                break;
+
+            case IDB_VIEW_SMALL_COLOR:
+                hbmLoad = LoadBitmapA (COMCTL32_hModule,
+                                       MAKEINTRESOURCEA(IDB_VIEW_SMALL));
+                nIndex = ImageList_AddMasked (infoPtr->himlDef,
+                                              hbmLoad, CLR_DEFAULT);
+                DeleteObject (hbmLoad);
+                break;
+
+            case IDB_VIEW_LARGE_COLOR:
+                hbmLoad = LoadBitmapA (COMCTL32_hModule,
+                                       MAKEINTRESOURCEA(IDB_VIEW_LARGE));
+                nIndex = ImageList_AddMasked (infoPtr->himlDef,
+                                              hbmLoad, CLR_DEFAULT);
+                DeleteObject (hbmLoad);
+                break;
+
+            case IDB_HIST_SMALL_COLOR:
+                hbmLoad = LoadBitmapA (COMCTL32_hModule,
+                                       MAKEINTRESOURCEA(IDB_HIST_SMALL));
+                nIndex = ImageList_AddMasked (infoPtr->himlDef,
+                                              hbmLoad, CLR_DEFAULT);
+                DeleteObject (hbmLoad);
+                break;
+
+            case IDB_HIST_LARGE_COLOR:
+                hbmLoad = LoadBitmapA (COMCTL32_hModule,
+                                       MAKEINTRESOURCEA(IDB_HIST_LARGE));
+                nIndex = ImageList_AddMasked (infoPtr->himlDef,
+                                              hbmLoad, CLR_DEFAULT);
+                DeleteObject (hbmLoad);
+                break;
+
+            default:
+        nIndex = ImageList_GetImageCount (infoPtr->himlDef);
+                ERR ("invalid imagelist!\n");
+                break;
+        }
     }
     else
     {
-    hbmLoad = LoadBitmapA (lpAddBmp->hInst, (LPSTR)lpAddBmp->nID);
-    nIndex = ImageList_AddMasked (infoPtr->himlDef, hbmLoad, CLR_DEFAULT);
-    DeleteObject (hbmLoad);
+        hbmLoad = LoadBitmapA (lpAddBmp->hInst, (LPSTR)lpAddBmp->nID);
+        nIndex = ImageList_AddMasked (infoPtr->himlDef, hbmLoad, CLR_DEFAULT);
+        DeleteObject (hbmLoad);
     }
 
@@ -1660 +2002 @@
        {
          WARN("Desired images do not match received images : Previous image number %i Previous images in list %i added %i expecting total %i, Images in list %i\n",
-          infoPtr->nNumBitmaps, nCount, imagecount - nCount,
-          infoPtr->nNumBitmaps+nButtons,imagecount);
-
-     infoPtr->nNumBitmaps = imagecount;
+              infoPtr->nNumBitmaps, nCount, imagecount - nCount,
+              infoPtr->nNumBitmaps+nButtons,imagecount);
+
+         infoPtr->nNumBitmaps = imagecount;
        }
        else
@@ -1689 +2031 @@
 
     if (infoPtr->nNumButtons == 0) {
-    infoPtr->buttons =
-        COMCTL32_Alloc (sizeof(TBUTTON_INFO) * nNewButtons);
+        infoPtr->buttons =
+            COMCTL32_Alloc (sizeof(TBUTTON_INFO) * nNewButtons);
     }
     else {
-    TBUTTON_INFO *oldButtons = infoPtr->buttons;
-    infoPtr->buttons =
-        COMCTL32_Alloc (sizeof(TBUTTON_INFO) * nNewButtons);
-    memcpy (&infoPtr->buttons[0], &oldButtons[0],
-        nOldButtons * sizeof(TBUTTON_INFO));
+        TBUTTON_INFO *oldButtons = infoPtr->buttons;
+        infoPtr->buttons =
+            COMCTL32_Alloc (sizeof(TBUTTON_INFO) * nNewButtons);
+        memcpy (&infoPtr->buttons[0], &oldButtons[0],
+                nOldButtons * sizeof(TBUTTON_INFO));
         COMCTL32_Free (oldButtons);
     }
@@ -1705 +2047 @@
     /* insert new button data */
     for (nCount = 0; nCount < nAddButtons; nCount++) {
-    TBUTTON_INFO *btnPtr = &infoPtr->buttons[nOldButtons+nCount];
-    btnPtr->iBitmap   = lpTbb[nCount].iBitmap;
-    btnPtr->idCommand = lpTbb[nCount].idCommand;
-    btnPtr->fsState   = lpTbb[nCount].fsState;
-    btnPtr->fsStyle   = lpTbb[nCount].fsStyle;
-    btnPtr->dwData    = lpTbb[nCount].dwData;
-    btnPtr->iString   = lpTbb[nCount].iString;
-    btnPtr->bHot      = FALSE;
-
-    if ((infoPtr->hwndToolTip) && !(btnPtr->fsStyle & TBSTYLE_SEP)) {
-        TTTOOLINFOA ti;
-
-        ZeroMemory (&ti, sizeof(TTTOOLINFOA));
-        ti.cbSize   = sizeof (TTTOOLINFOA);
-        ti.hwnd     = hwnd;
-        ti.uId      = btnPtr->idCommand;
-        ti.hinst    = 0;
-        ti.lpszText = LPSTR_TEXTCALLBACKA;
-
-        SendMessageA (infoPtr->hwndToolTip, TTM_ADDTOOLA,
-                0, (LPARAM)&ti);
-    }
+        TBUTTON_INFO *btnPtr = &infoPtr->buttons[nOldButtons+nCount];
+        btnPtr->iBitmap   = lpTbb[nCount].iBitmap;
+        btnPtr->idCommand = lpTbb[nCount].idCommand;
+        btnPtr->fsState   = lpTbb[nCount].fsState;
+        btnPtr->fsStyle   = lpTbb[nCount].fsStyle;
+        btnPtr->dwData    = lpTbb[nCount].dwData;
+        btnPtr->iString   = lpTbb[nCount].iString;
+        btnPtr->bHot      = FALSE;
+
+        if ((infoPtr->hwndToolTip) && !(btnPtr->fsStyle & TBSTYLE_SEP)) {
+            TTTOOLINFOA ti;
+
+            ZeroMemory (&ti, sizeof(TTTOOLINFOA));
+            ti.cbSize   = sizeof (TTTOOLINFOA);
+            ti.hwnd     = hwnd;
+            ti.uId      = btnPtr->idCommand;
+            ti.hinst    = 0;
+            ti.lpszText = LPSTR_TEXTCALLBACKA;
+
+            SendMessageA (infoPtr->hwndToolTip, TTM_ADDTOOLA,
+                            0, (LPARAM)&ti);
+        }
     }
 
@@ -1751 +2093 @@
 
     if (infoPtr->nNumButtons == 0) {
-    infoPtr->buttons =
-        COMCTL32_Alloc (sizeof(TBUTTON_INFO) * nNewButtons);
+        infoPtr->buttons =
+            COMCTL32_Alloc (sizeof(TBUTTON_INFO) * nNewButtons);
     }
     else {
-    TBUTTON_INFO *oldButtons = infoPtr->buttons;
-    infoPtr->buttons =
-        COMCTL32_Alloc (sizeof(TBUTTON_INFO) * nNewButtons);
-    memcpy (&infoPtr->buttons[0], &oldButtons[0],
-        nOldButtons * sizeof(TBUTTON_INFO));
+        TBUTTON_INFO *oldButtons = infoPtr->buttons;
+        infoPtr->buttons =
+            COMCTL32_Alloc (sizeof(TBUTTON_INFO) * nNewButtons);
+        memcpy (&infoPtr->buttons[0], &oldButtons[0],
+                nOldButtons * sizeof(TBUTTON_INFO));
         COMCTL32_Free (oldButtons);
     }
@@ -1767 +2109 @@
     /* insert new button data */
     for (nCount = 0; nCount < nAddButtons; nCount++) {
-    TBUTTON_INFO *btnPtr = &infoPtr->buttons[nOldButtons+nCount];
-    btnPtr->iBitmap   = lpTbb[nCount].iBitmap;
-    btnPtr->idCommand = lpTbb[nCount].idCommand;
-    btnPtr->fsState   = lpTbb[nCount].fsState;
-    btnPtr->fsStyle   = lpTbb[nCount].fsStyle;
-    btnPtr->dwData    = lpTbb[nCount].dwData;
-    btnPtr->iString   = lpTbb[nCount].iString;
-    btnPtr->bHot      = FALSE;
-
-    if ((infoPtr->hwndToolTip) && !(btnPtr->fsStyle & TBSTYLE_SEP)) {
-        TTTOOLINFOW ti;
-
-        ZeroMemory (&ti, sizeof(TTTOOLINFOW));
-        ti.cbSize   = sizeof (TTTOOLINFOW);
-        ti.hwnd     = hwnd;
-        ti.uId      = btnPtr->idCommand;
-        ti.hinst    = 0;
-        ti.lpszText = LPSTR_TEXTCALLBACKW;
-
-        SendMessageW (infoPtr->hwndToolTip, TTM_ADDTOOLW,
-                0, (LPARAM)&ti);
-    }
+        TBUTTON_INFO *btnPtr = &infoPtr->buttons[nOldButtons+nCount];
+        btnPtr->iBitmap   = lpTbb[nCount].iBitmap;
+        btnPtr->idCommand = lpTbb[nCount].idCommand;
+        btnPtr->fsState   = lpTbb[nCount].fsState;
+        btnPtr->fsStyle   = lpTbb[nCount].fsStyle;
+        btnPtr->dwData    = lpTbb[nCount].dwData;
+        btnPtr->iString   = lpTbb[nCount].iString;
+        btnPtr->bHot      = FALSE;
+
+        if ((infoPtr->hwndToolTip) && !(btnPtr->fsStyle & TBSTYLE_SEP)) {
+            TTTOOLINFOW ti;
+
+            ZeroMemory (&ti, sizeof(TTTOOLINFOW));
+            ti.cbSize   = sizeof (TTTOOLINFOW);
+            ti.hwnd     = hwnd;
+            ti.uId      = btnPtr->idCommand;
+            ti.hinst    = 0;
+            ti.lpszText = LPSTR_TEXTCALLBACKW;
+
+            SendMessageW (infoPtr->hwndToolTip, TTM_ADDTOOLW,
+                            0, (LPARAM)&ti);
+        }
     }
 
@@ -1806 +2148 @@
 
     if ((wParam) && (HIWORD(lParam) == 0)) {
-    char szString[256];
-    INT len, lenW;
-    TRACE("adding string from resource!\n");
-
-    len = LoadStringA ((HINSTANCE)wParam, (UINT)lParam,
-                 szString, 256);
-
-    TRACE("len=%d \"%s\"\n", len, szString);
-    nIndex = infoPtr->nNumStrings;
-    if (infoPtr->nNumStrings == 0) {
-        infoPtr->strings =
-        COMCTL32_Alloc (sizeof(LPWSTR));
-    }
-    else {
-        LPWSTR *oldStrings = infoPtr->strings;
-        infoPtr->strings =
-        COMCTL32_Alloc (sizeof(LPWSTR) * (infoPtr->nNumStrings + 1));
-        memcpy (&infoPtr->strings[0], &oldStrings[0],
-            sizeof(LPWSTR) * infoPtr->nNumStrings);
-        COMCTL32_Free (oldStrings);
-    }
+        char szString[256];
+        INT len, lenW;
+        TRACE("adding string from resource!\n");
+
+        len = LoadStringA ((HINSTANCE)wParam, (UINT)lParam,
+                             szString, 256);
+
+        TRACE("len=%d \"%s\"\n", len, szString);
+        nIndex = infoPtr->nNumStrings;
+        if (infoPtr->nNumStrings == 0) {
+            infoPtr->strings =
+                COMCTL32_Alloc (sizeof(LPWSTR));
+        }
+        else {
+            LPWSTR *oldStrings = infoPtr->strings;
+            infoPtr->strings =
+                COMCTL32_Alloc (sizeof(LPWSTR) * (infoPtr->nNumStrings + 1));
+            memcpy (&infoPtr->strings[0], &oldStrings[0],
+                    sizeof(LPWSTR) * infoPtr->nNumStrings);
+            COMCTL32_Free (oldStrings);
+        }
 
         lenW = MultiByteToWideChar( CP_ACP, 0, szString, -1, NULL, 0 );
@@ -1832 +2174 @@
         MultiByteToWideChar( CP_ACP, 0, szString, -1,
                              infoPtr->strings[infoPtr->nNumStrings], lenW );
-    infoPtr->nNumStrings++;
+        infoPtr->nNumStrings++;
     }
     else {
-    LPSTR p = (LPSTR)lParam;
-    INT len, lenW;
-
-    if (p == NULL)
-        return -1;
-    TRACE("adding string(s) from array!\n");
-
-    nIndex = infoPtr->nNumStrings;
-    while (*p) {
-        len = strlen (p);
-        TRACE("len=%d \"%s\"\n", len, p);
-
-        if (infoPtr->nNumStrings == 0) {
-        infoPtr->strings =
-            COMCTL32_Alloc (sizeof(LPWSTR));
-        }
-        else {
-        LPWSTR *oldStrings = infoPtr->strings;
-        infoPtr->strings =
-            COMCTL32_Alloc (sizeof(LPWSTR) * (infoPtr->nNumStrings + 1));
-        memcpy (&infoPtr->strings[0], &oldStrings[0],
-            sizeof(LPWSTR) * infoPtr->nNumStrings);
-        COMCTL32_Free (oldStrings);
-        }
+        LPSTR p = (LPSTR)lParam;
+        INT len, lenW;
+
+        if (p == NULL)
+            return -1;
+        TRACE("adding string(s) from array!\n");
+
+        nIndex = infoPtr->nNumStrings;
+        while (*p) {
+            len = strlen (p);
+            TRACE("len=%d \"%s\"\n", len, p);
+
+            if (infoPtr->nNumStrings == 0) {
+                infoPtr->strings =
+                    COMCTL32_Alloc (sizeof(LPWSTR));
+            }
+            else {
+                LPWSTR *oldStrings = infoPtr->strings;
+                infoPtr->strings =
+                    COMCTL32_Alloc (sizeof(LPWSTR) * (infoPtr->nNumStrings + 1));
+                memcpy (&infoPtr->strings[0], &oldStrings[0],
+                        sizeof(LPWSTR) * infoPtr->nNumStrings);
+                COMCTL32_Free (oldStrings);
+            }
 
             lenW = MultiByteToWideChar( CP_ACP, 0, p, -1, NULL, 0 );
@@ -1864 +2206 @@
             MultiByteToWideChar( CP_ACP, 0, p, -1,
                                  infoPtr->strings[infoPtr->nNumStrings], lenW );
-        infoPtr->nNumStrings++;
-
-        p += (len+1);
-    }
+            infoPtr->nNumStrings++;
+
+            p += (len+1);
+        }
     }
 
@@ -1882 +2224 @@
 
     if ((wParam) && (HIWORD(lParam) == 0)) {
-    WCHAR szString[MAX_RESOURCE_STRING_LENGTH];
-    INT len;
-    TRACE("adding string from resource!\n");
-
-    len = LoadStringW ((HINSTANCE)wParam, (UINT)lParam,
-                 szString, MAX_RESOURCE_STRING_LENGTH);
-
-    TRACE("len=%d %s\n", len, debugstr_w(szString));
-    TRACE("First char: 0x%x\n", *szString);
-    if (szString[0] == L'|')
-    {
-        PWSTR p = szString + 1;
-
-        nIndex = infoPtr->nNumStrings;
-        while (*p != L'|') {
-
-        if (infoPtr->nNumStrings == 0) {
-        infoPtr->strings =
-            COMCTL32_Alloc (sizeof(LPWSTR));
-        }
-        else {
-        LPWSTR *oldStrings = infoPtr->strings;
-        infoPtr->strings =
-            COMCTL32_Alloc (sizeof(LPWSTR) * (infoPtr->nNumStrings + 1));
-        memcpy (&infoPtr->strings[0], &oldStrings[0],
-            sizeof(LPWSTR) * infoPtr->nNumStrings);
-        COMCTL32_Free (oldStrings);
-        }
-
-        len = COMCTL32_StrChrW (p, L'|') - p;
-        TRACE("len=%d %s\n", len, debugstr_w(p));
-        infoPtr->strings[infoPtr->nNumStrings] =
-        COMCTL32_Alloc (sizeof(WCHAR)*(len+1));
-        lstrcpynW (infoPtr->strings[infoPtr->nNumStrings], p, len);
-        infoPtr->nNumStrings++;
-
-        p += (len+1);
-        }
-    }
-    else
-    {
+        WCHAR szString[MAX_RESOURCE_STRING_LENGTH];
+        INT len;
+        TRACE("adding string from resource!\n");
+
+        len = LoadStringW ((HINSTANCE)wParam, (UINT)lParam,
+                             szString, MAX_RESOURCE_STRING_LENGTH);
+
+        TRACE("len=%d %s\n", len, debugstr_w(szString));
+        TRACE("First char: 0x%x\n", *szString);
+        if (szString[0] == L'|')
+        {
+            PWSTR p = szString + 1;
+                
+            nIndex = infoPtr->nNumStrings;
+            while (*p != L'|') {
+
+            if (infoPtr->nNumStrings == 0) {
+                infoPtr->strings =
+                    COMCTL32_Alloc (sizeof(LPWSTR));
+            }
+            else {
+                LPWSTR *oldStrings = infoPtr->strings;
+                infoPtr->strings =
+                    COMCTL32_Alloc (sizeof(LPWSTR) * (infoPtr->nNumStrings + 1));
+                memcpy (&infoPtr->strings[0], &oldStrings[0],
+                        sizeof(LPWSTR) * infoPtr->nNumStrings);
+                COMCTL32_Free (oldStrings);
+            }
+
+            len = COMCTL32_StrChrW (p, L'|') - p;
+            TRACE("len=%d %s\n", len, debugstr_w(p));
+            infoPtr->strings[infoPtr->nNumStrings] =
+                COMCTL32_Alloc (sizeof(WCHAR)*(len+1));
+            lstrcpynW (infoPtr->strings[infoPtr->nNumStrings], p, len);
+            infoPtr->nNumStrings++;
+
+                p += (len+1);
+            }
+        }
+        else
+        {
             nIndex = infoPtr->nNumStrings;
             if (infoPtr->nNumStrings == 0) {
@@ -1944 +2286 @@
     }
     else {
-    LPWSTR p = (LPWSTR)lParam;
-    INT len;
-
-    if (p == NULL)
-        return -1;
-    TRACE("adding string(s) from array!\n");
-    nIndex = infoPtr->nNumStrings;
-    while (*p) {
-        len = strlenW (p);
-
-        TRACE("len=%d %s\n", len, debugstr_w(p));
-        if (infoPtr->nNumStrings == 0) {
-        infoPtr->strings =
-            COMCTL32_Alloc (sizeof(LPWSTR));
-        }
-        else {
-        LPWSTR *oldStrings = infoPtr->strings;
-        infoPtr->strings =
-            COMCTL32_Alloc (sizeof(LPWSTR) * (infoPtr->nNumStrings + 1));
-        memcpy (&infoPtr->strings[0], &oldStrings[0],
-            sizeof(LPWSTR) * infoPtr->nNumStrings);
-        COMCTL32_Free (oldStrings);
-        }
-
-        infoPtr->strings[infoPtr->nNumStrings] =
-        COMCTL32_Alloc (sizeof(WCHAR)*(len+1));
-        strcpyW (infoPtr->strings[infoPtr->nNumStrings], p);
-        infoPtr->nNumStrings++;
-
-        p += (len+1);
-    }
+        LPWSTR p = (LPWSTR)lParam;
+        INT len;
+
+        if (p == NULL)
+            return -1;
+        TRACE("adding string(s) from array!\n");
+        nIndex = infoPtr->nNumStrings;
+        while (*p) {
+            len = strlenW (p);
+
+            TRACE("len=%d %s\n", len, debugstr_w(p));
+            if (infoPtr->nNumStrings == 0) {
+                infoPtr->strings =
+                    COMCTL32_Alloc (sizeof(LPWSTR));
+            }
+            else {
+                LPWSTR *oldStrings = infoPtr->strings;
+                infoPtr->strings =
+                    COMCTL32_Alloc (sizeof(LPWSTR) * (infoPtr->nNumStrings + 1));
+                memcpy (&infoPtr->strings[0], &oldStrings[0],
+                        sizeof(LPWSTR) * infoPtr->nNumStrings);
+                COMCTL32_Free (oldStrings);
+            }
+
+            infoPtr->strings[infoPtr->nNumStrings] =
+                COMCTL32_Alloc (sizeof(WCHAR)*(len+1));
+            strcpyW (infoPtr->strings[infoPtr->nNumStrings], p);
+            infoPtr->nNumStrings++;
+
+            p += (len+1);
+        }
     }
 
@@ -2005 +2347 @@
 
     if (dwStyle & CCS_NORESIZE) {
-    uPosFlags |= (SWP_NOSIZE | SWP_NOMOVE);
-    cx = 0;
-    cy = 0;
+        uPosFlags |= (SWP_NOSIZE | SWP_NOMOVE);
+        cx = 0;
+        cy = 0;
     }
     else {
-    infoPtr->nWidth = parent_rect.right - parent_rect.left;
-    TOOLBAR_CalcToolbar (hwnd);
-    InvalidateRect( hwnd, NULL, TRUE );
-    cy = infoPtr->nHeight;
-    cx = infoPtr->nWidth;
-
-    if (dwStyle & CCS_NOMOVEY) {
-        GetWindowRect(hwnd, &window_rect);
-        ScreenToClient(parent, (LPPOINT)&window_rect.left);
-        y = window_rect.top;
-    }
+        infoPtr->nWidth = parent_rect.right - parent_rect.left;
+        TOOLBAR_CalcToolbar (hwnd);
+        InvalidateRect( hwnd, NULL, TRUE );
+        cy = infoPtr->nHeight;
+        cx = infoPtr->nWidth;
+
+        if (dwStyle & CCS_NOMOVEY) {
+                GetWindowRect(hwnd, &window_rect);
+                ScreenToClient(parent, (LPPOINT)&window_rect.left);
+                y = window_rect.top;
+        }
     }
 
     if (dwStyle & CCS_NOPARENTALIGN)
-    uPosFlags |= SWP_NOMOVE;
+        uPosFlags |= SWP_NOMOVE;
 
     if (!(dwStyle & CCS_NODIVIDER))
-    cy += GetSystemMetrics(SM_CYEDGE);
+        cy += GetSystemMetrics(SM_CYEDGE);
 
     if (dwStyle & WS_BORDER)
@@ -2062 +2404 @@
 
     if (infoPtr == NULL) {
-    ERR("(0x%x, 0x%x, 0x%lx)\n", hwnd, wParam, lParam);
-    ERR("infoPtr == NULL!\n");
-    return 0;
+        ERR("(0x%x, 0x%x, 0x%lx)\n", hwnd, wParam, lParam);
+        ERR("infoPtr == NULL!\n");
+        return 0;
     }
 
@@ -2082 +2424 @@
     nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam);
     if (nIndex == -1)
-    return FALSE;
+        return FALSE;
 
     btnPtr = &infoPtr->buttons[nIndex];
@@ -2106 +2448 @@
     nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam);
     if (nIndex == -1)
-    return FALSE;
+        return FALSE;
 
     btnPtr = &infoPtr->buttons[nIndex];
 
     if (!(btnPtr->fsStyle & TBSTYLE_CHECK))
-    return FALSE;
+        return FALSE;
 
     bChecked = (btnPtr->fsState & TBSTATE_CHECKED) ? TRUE : FALSE;
 
     if (LOWORD(lParam) == FALSE)
-    btnPtr->fsState &= ~TBSTATE_CHECKED;
+        btnPtr->fsState &= ~TBSTATE_CHECKED;
     else {
-    if (btnPtr->fsStyle & TBSTYLE_GROUP) {
-        nOldIndex =
-        TOOLBAR_GetCheckedGroupButtonIndex (infoPtr, nIndex);
-        if (nOldIndex == nIndex)
-        return 0;
-        if (nOldIndex != -1)
-        infoPtr->buttons[nOldIndex].fsState &= ~TBSTATE_CHECKED;
-    }
-    btnPtr->fsState |= TBSTATE_CHECKED;
+        if (btnPtr->fsStyle & TBSTYLE_GROUP) {
+            nOldIndex = 
+                TOOLBAR_GetCheckedGroupButtonIndex (infoPtr, nIndex);
+            if (nOldIndex == nIndex)
+                return 0;
+            if (nOldIndex != -1)
+                infoPtr->buttons[nOldIndex].fsState &= ~TBSTATE_CHECKED;
+        }
+        btnPtr->fsState |= TBSTATE_CHECKED;
     }
 
     if( bChecked != LOWORD(lParam) )
     {
-    if (nOldIndex != -1)
+        if (nOldIndex != -1)
         {
             InvalidateRect(hwnd, &infoPtr->buttons[nOldIndex].rect,
@@ -2157 +2499 @@
 TOOLBAR_Customize (HWND hwnd)
 {
+    TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd);
     CUSTDLG_INFO custInfo;
     LRESULT ret;
@@ -2163 +2506 @@
     NMHDR nmhdr;
 
-    custInfo.tbInfo = TOOLBAR_GetInfoPtr (hwnd);
+    custInfo.tbInfo = infoPtr;
     custInfo.tbHwnd = hwnd;
 
     /* send TBN_BEGINADJUST notification */
-    nmhdr.hwndFrom = hwnd;
-    nmhdr.idFrom   = GetWindowLongA (hwnd, GWL_ID);
-    nmhdr.code     = TBN_BEGINADJUST;
-
-    SendMessageA (custInfo.tbInfo->hwndNotify, WM_NOTIFY,
-          (WPARAM)nmhdr.idFrom, (LPARAM)&nmhdr);
+    TOOLBAR_SendNotify ((NMHDR *) &nmhdr, infoPtr,
+                    TBN_BEGINADJUST);
 
     if (!(hRes = FindResourceA (COMCTL32_hModule,
                                 MAKEINTRESOURCEA(IDD_TBCUSTOMIZE),
                                 RT_DIALOGA)))
-    return FALSE;
+        return FALSE;
 
     if(!(template = (LPVOID)LoadResource (COMCTL32_hModule, hRes)))
-    return FALSE;
+        return FALSE;
 
     ret = DialogBoxIndirectParamA (GetWindowLongA (hwnd, GWL_HINSTANCE),
@@ -2189 +2528 @@
 
     /* send TBN_ENDADJUST notification */
-    nmhdr.code = TBN_ENDADJUST;
-    SendMessageA (custInfo.tbInfo->hwndNotify, WM_NOTIFY,
-          (WPARAM)nmhdr.idFrom, (LPARAM)&nmhdr);
+    TOOLBAR_SendNotify ((NMHDR *) &nmhdr, infoPtr,
+                    TBN_ENDADJUST);
 
     return ret;
@@ -2204 +2542 @@
 
     if ((nIndex < 0) || (nIndex >= infoPtr->nNumButtons))
-    return FALSE;
-
-    if ((infoPtr->hwndToolTip) &&
-    !(infoPtr->buttons[nIndex].fsStyle & TBSTYLE_SEP)) {
-    TTTOOLINFOA ti;
-
-    ZeroMemory (&ti, sizeof(TTTOOLINFOA));
-    ti.cbSize   = sizeof (TTTOOLINFOA);
-    ti.hwnd     = hwnd;
-    ti.uId      = infoPtr->buttons[nIndex].idCommand;
-
-    SendMessageA (infoPtr->hwndToolTip, TTM_DELTOOLA, 0, (LPARAM)&ti);
+        return FALSE;
+
+    if ((infoPtr->hwndToolTip) && 
+        !(infoPtr->buttons[nIndex].fsStyle & TBSTYLE_SEP)) {
+        TTTOOLINFOA ti;
+
+        ZeroMemory (&ti, sizeof(TTTOOLINFOA));
+        ti.cbSize   = sizeof (TTTOOLINFOA);
+        ti.hwnd     = hwnd;
+        ti.uId      = infoPtr->buttons[nIndex].idCommand;
+
+        SendMessageA (infoPtr->hwndToolTip, TTM_DELTOOLA, 0, (LPARAM)&ti);
     }
 
     if (infoPtr->nNumButtons == 1) {
-    TRACE(" simple delete!\n");
-    COMCTL32_Free (infoPtr->buttons);
-    infoPtr->buttons = NULL;
-    infoPtr->nNumButtons = 0;
+        TRACE(" simple delete!\n");
+        COMCTL32_Free (infoPtr->buttons);
+        infoPtr->buttons = NULL;
+        infoPtr->nNumButtons = 0;
     }
     else {
-    TBUTTON_INFO *oldButtons = infoPtr->buttons;
+        TBUTTON_INFO *oldButtons = infoPtr->buttons;
         TRACE("complex delete! [nIndex=%d]\n", nIndex);
 
-    infoPtr->nNumButtons--;
-    infoPtr->buttons = COMCTL32_Alloc (sizeof (TBUTTON_INFO) * infoPtr->nNumButtons);
+        infoPtr->nNumButtons--;
+        infoPtr->buttons = COMCTL32_Alloc (sizeof (TBUTTON_INFO) * infoPtr->nNumButtons);
         if (nIndex > 0) {
             memcpy (&infoPtr->buttons[0], &oldButtons[0],
@@ -2240 +2578 @@
         }
 
-    COMCTL32_Free (oldButtons);
+        COMCTL32_Free (oldButtons);
     }
 
@@ -2261 +2599 @@
     nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam);
     if (nIndex == -1)
-    return FALSE;
+        return FALSE;
 
     btnPtr = &infoPtr->buttons[nIndex];
@@ -2269 +2607 @@
     /* update the toolbar button state */
     if(LOWORD(lParam) == FALSE) {
-    btnPtr->fsState &= ~(TBSTATE_ENABLED | TBSTATE_PRESSED);
+        btnPtr->fsState &= ~(TBSTATE_ENABLED | TBSTATE_PRESSED);
     } else {
-    btnPtr->fsState |= TBSTATE_ENABLED;
+        btnPtr->fsState |= TBSTATE_ENABLED;
     }
 
@@ -2302 +2640 @@
     nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam);
     if (nIndex == -1)
-    return -1;
+        return -1;
 
     return infoPtr->buttons[nIndex].iBitmap;
@@ -2324 +2662 @@
 
     if (infoPtr == NULL)
-    return FALSE;
+        return FALSE;
 
     if (lpTbb == NULL)
-    return FALSE;
+        return FALSE;
 
     if ((nIndex < 0) || (nIndex >= infoPtr->nNumButtons))
-    return FALSE;
+        return FALSE;
 
     btnPtr = &infoPtr->buttons[nIndex];
@@ -2353 +2691 @@
 
     if (infoPtr == NULL)
-    return -1;
+        return -1;
     if (lpTbInfo == NULL)
-    return -1;
+        return -1;
     if (lpTbInfo->cbSize < sizeof(TBBUTTONINFOA))
-    return -1;
+        return -1;
 
     nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam);
     if (nIndex == -1)
-    return -1;
+        return -1;
 
     btnPtr = &infoPtr->buttons[nIndex];
 
     if (lpTbInfo->dwMask & TBIF_COMMAND)
-    lpTbInfo->idCommand = btnPtr->idCommand;
+        lpTbInfo->idCommand = btnPtr->idCommand;
     if (lpTbInfo->dwMask & TBIF_IMAGE)
-    lpTbInfo->iImage = btnPtr->iBitmap;
+        lpTbInfo->iImage = btnPtr->iBitmap;
     if (lpTbInfo->dwMask & TBIF_LPARAM)
-    lpTbInfo->lParam = btnPtr->dwData;
+        lpTbInfo->lParam = btnPtr->dwData;
     if (lpTbInfo->dwMask & TBIF_SIZE)
-    lpTbInfo->cx = (WORD)(btnPtr->rect.right - btnPtr->rect.left);
+        lpTbInfo->cx = (WORD)(btnPtr->rect.right - btnPtr->rect.left);
     if (lpTbInfo->dwMask & TBIF_STATE)
-    lpTbInfo->fsState = btnPtr->fsState;
+        lpTbInfo->fsState = btnPtr->fsState;
     if (lpTbInfo->dwMask & TBIF_STYLE)
-    lpTbInfo->fsStyle = btnPtr->fsStyle;
+        lpTbInfo->fsStyle = btnPtr->fsStyle;
      if (lpTbInfo->dwMask & TBIF_TEXT) {
          if ((btnPtr->iString >= 0) && (btnPtr->iString < infoPtr->nNumStrings))
-         {
+         {      
              if (!WideCharToMultiByte( CP_ACP, 0, (LPWSTR)infoPtr->strings[btnPtr->iString], -1,
                                        lpTbInfo->pszText, lpTbInfo->cchText, NULL, NULL ))
@@ -2399 +2737 @@
 
     if (infoPtr == NULL)
-    return -1;
+        return -1;
     if (lpTbInfo == NULL)
-    return -1;
+        return -1;
     if (lpTbInfo->cbSize < sizeof(TBBUTTONINFOW))
-    return -1;
+        return -1;
 
     nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam);
     if (nIndex == -1)
-    return -1;
+        return -1;
 
     btnPtr = &infoPtr->buttons[nIndex];
 
     if (lpTbInfo->dwMask & TBIF_COMMAND)
-    lpTbInfo->idCommand = btnPtr->idCommand;
+        lpTbInfo->idCommand = btnPtr->idCommand;
     if (lpTbInfo->dwMask & TBIF_IMAGE)
-    lpTbInfo->iImage = btnPtr->iBitmap;
+        lpTbInfo->iImage = btnPtr->iBitmap;
     if (lpTbInfo->dwMask & TBIF_LPARAM)
-    lpTbInfo->lParam = btnPtr->dwData;
+        lpTbInfo->lParam = btnPtr->dwData;
     if (lpTbInfo->dwMask & TBIF_SIZE)
-    lpTbInfo->cx = (WORD)(btnPtr->rect.right - btnPtr->rect.left);
+        lpTbInfo->cx = (WORD)(btnPtr->rect.right - btnPtr->rect.left);
     if (lpTbInfo->dwMask & TBIF_STATE)
-    lpTbInfo->fsState = btnPtr->fsState;
+        lpTbInfo->fsState = btnPtr->fsState;
     if (lpTbInfo->dwMask & TBIF_STYLE)
-    lpTbInfo->fsStyle = btnPtr->fsStyle;
+        lpTbInfo->fsStyle = btnPtr->fsStyle;
     if (lpTbInfo->dwMask & TBIF_TEXT) {
-    if ((btnPtr->iString >= 0) || (btnPtr->iString < infoPtr->nNumStrings))
-        lstrcpynW (lpTbInfo->pszText,
-               (LPWSTR)infoPtr->strings[btnPtr->iString],
-               lpTbInfo->cchText);
+        if ((btnPtr->iString >= 0) || (btnPtr->iString < infoPtr->nNumStrings))
+            lstrcpynW (lpTbInfo->pszText,
+                       (LPWSTR)infoPtr->strings[btnPtr->iString],
+                       lpTbInfo->cchText);
     }
 
@@ -2439 +2777 @@
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd);
 
-    return MAKELONG((WORD)infoPtr->nButtonWidth,
-            (WORD)infoPtr->nButtonHeight);
+    if (infoPtr->nNumButtons > 0)
+        return MAKELONG((WORD)infoPtr->nButtonWidth,
+                        (WORD)infoPtr->nButtonHeight);
+    else
+        return MAKELONG(8,7);
 }
 
@@ -2452 +2793 @@
     nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam);
     if (nIndex == -1)
-    return -1;
+        return -1;
 
     nStringIndex = infoPtr->buttons[nIndex].iString;
@@ -2459 +2800 @@
 
     if ((nStringIndex < 0) || (nStringIndex >= infoPtr->nNumStrings))
-    return -1;
+        return -1;
 
     if (lParam == 0)
-    return -1;
+        return -1;
 
     return WideCharToMultiByte( CP_ACP, 0, (LPWSTR)infoPtr->strings[nStringIndex], -1,
@@ -2477 +2818 @@
     nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam);
     if (nIndex == -1)
-    return -1;
+        return -1;
 
     nStringIndex = infoPtr->buttons[nIndex].iString;
@@ -2484 +2825 @@
 
     if ((nStringIndex < 0) || (nStringIndex >= infoPtr->nNumStrings))
-    return -1;
+        return -1;
 
     if (lParam == 0)
-    return -1;
+        return -1;
 
     strcpyW ((LPWSTR)lParam, (LPWSTR)infoPtr->strings[nStringIndex]);
@@ -2531 +2872 @@
 
     if (!(GetWindowLongA (hwnd, GWL_STYLE) & TBSTYLE_FLAT))
-    return -1;
+        return -1;
 
     if (infoPtr->nHotItem < 0)
-    return -1;
+        return -1;
 
     return (LRESULT)infoPtr->nHotItem;
@@ -2562 +2903 @@
 
     if (infoPtr == NULL)
-    return FALSE;
+        return FALSE;
     nIndex = (INT)wParam;
     btnPtr = &infoPtr->buttons[nIndex];
     if ((nIndex < 0) || (nIndex >= infoPtr->nNumButtons))
-    return FALSE;
+        return FALSE;
     lpRect = (LPRECT)lParam;
     if (lpRect == NULL)
-    return FALSE;
+        return FALSE;
     if (btnPtr->fsState & TBSTATE_HIDDEN)
-    return FALSE;
-
+        return FALSE;
+    
     lpRect->left   = btnPtr->rect.left;
     lpRect->right  = btnPtr->rect.right;
@@ -2589 +2930 @@
 
     if (lpSize == NULL)
-    return FALSE;
+        return FALSE;
 
     lpSize->cx = infoPtr->rcBound.right - infoPtr->rcBound.left;
@@ -2595 +2936 @@
 
     TRACE("maximum size %d x %d\n",
-       infoPtr->rcBound.right - infoPtr->rcBound.left,
-       infoPtr->rcBound.bottom - infoPtr->rcBound.top);
+           infoPtr->rcBound.right - infoPtr->rcBound.left,
+           infoPtr->rcBound.bottom - infoPtr->rcBound.top);
 
     return TRUE;
@@ -2615 +2956 @@
 
     if (infoPtr == NULL)
-    return FALSE;
+        return FALSE;
     nIndex = (INT)wParam;
     btnPtr = &infoPtr->buttons[nIndex];
     if ((nIndex < 0) || (nIndex >= infoPtr->nNumButtons))
-    return FALSE;
+        return FALSE;
     lpRect = (LPRECT)lParam;
     if (lpRect == NULL)
-    return FALSE;
-
+        return FALSE;
+    
     lpRect->left   = btnPtr->rect.left;
     lpRect->right  = btnPtr->rect.right;
@@ -2639 +2980 @@
 
     if (GetWindowLongA (hwnd, GWL_STYLE) & TBSTYLE_WRAPABLE)
-    return infoPtr->nRows;
+        return infoPtr->nRows;
     else
-    return 1;
+        return 1;
 }
 
@@ -2653 +2994 @@
     nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam);
     if (nIndex == -1)
-    return -1;
+        return -1;
 
     return infoPtr->buttons[nIndex].fsState;
@@ -2667 +3008 @@
     nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam);
     if (nIndex == -1)
-    return -1;
+        return -1;
 
     return infoPtr->buttons[nIndex].fsStyle;
@@ -2679 +3020 @@
 
     if (infoPtr == NULL)
-    return 0;
+        return 0;
 
     return infoPtr->nMaxTextRows;
@@ -2691 +3032 @@
 
     if (infoPtr == NULL)
-    return 0;
+        return 0;
     return infoPtr->hwndToolTip;
 }
@@ -2701 +3042 @@
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd);
 
-    TRACE("%s hwnd=0x%x stub!\n",
-       infoPtr->bUnicode ? "TRUE" : "FALSE", hwnd);
+    TRACE("%s hwnd=0x%x stub!\n", 
+           infoPtr->bUnicode ? "TRUE" : "FALSE", hwnd);
 
     return infoPtr->bUnicode;
@@ -2727 +3068 @@
     nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam);
     if (nIndex == -1)
-    return FALSE;
+        return FALSE;
 
     btnPtr = &infoPtr->buttons[nIndex];
     if (LOWORD(lParam) == FALSE)
-    btnPtr->fsState &= ~TBSTATE_HIDDEN;
+        btnPtr->fsState &= ~TBSTATE_HIDDEN;
     else
-    btnPtr->fsState |= TBSTATE_HIDDEN;
+        btnPtr->fsState |= TBSTATE_HIDDEN;
 
     TOOLBAR_CalcToolbar (hwnd);
@@ -2759 +3100 @@
     nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam);
     if (nIndex == -1)
-    return FALSE;
+        return FALSE;
 
     btnPtr = &infoPtr->buttons[nIndex];
     if (LOWORD(lParam) == FALSE)
-    btnPtr->fsState &= ~TBSTATE_INDETERMINATE;
+        btnPtr->fsState &= ~TBSTATE_INDETERMINATE;
     else
-    btnPtr->fsState |= TBSTATE_INDETERMINATE;
+        btnPtr->fsState |= TBSTATE_INDETERMINATE;
 
     InvalidateRect(hwnd, &btnPtr->rect, TOOLBAR_HasText(infoPtr, btnPtr));
@@ -2782 +3123 @@
 
     if (lpTbb == NULL)
-    return FALSE;
+        return FALSE;
+
+    TOOLBAR_DumpButton(infoPtr, (TBUTTON_INFO *)lpTbb, nIndex, FALSE);
 
     if (nIndex == -1) {
        /* EPP: this seems to be an undocumented call (from my IE4)
-    * I assume in that case that:
-    * - lpTbb->iString is a string pointer (not a string index in strings[] table
-    * - index of insertion is at the end of existing buttons
-    * I only see this happen with nIndex == -1, but it could have a special
-    * meaning (like -nIndex (or ~nIndex) to get the real position of insertion).
-    */
-       int  len;
-       LPSTR    ptr;
+        * I assume in that case that:
+        * - lpTbb->iString is a string pointer (not a string index in strings[] table
+        * - index of insertion is at the end of existing buttons
+        * I only see this happen with nIndex == -1, but it could have a special
+        * meaning (like -nIndex (or ~nIndex) to get the real position of insertion).
+        */
+       int      len;
+       LPSTR    ptr;
 
        /* FIXME: iString == -1 is undocumented */
@@ -2815 +3158 @@
     TRACE("inserting button index=%d\n", nIndex);
     if (nIndex > infoPtr->nNumButtons) {
-    nIndex = infoPtr->nNumButtons;
-    TRACE("adjust index=%d\n", nIndex);
+        nIndex = infoPtr->nNumButtons;
+        TRACE("adjust index=%d\n", nIndex);
     }
 
@@ -2824 +3167 @@
     /* pre insert copy */
     if (nIndex > 0) {
-    memcpy (&infoPtr->buttons[0], &oldButtons[0],
-        nIndex * sizeof(TBUTTON_INFO));
+        memcpy (&infoPtr->buttons[0], &oldButtons[0],
+                nIndex * sizeof(TBUTTON_INFO));
     }
 
@@ -2837 +3180 @@
 
     if ((infoPtr->hwndToolTip) && !(lpTbb->fsStyle & TBSTYLE_SEP)) {
-    TTTOOLINFOA ti;
-
-    ZeroMemory (&ti, sizeof(TTTOOLINFOA));
-    ti.cbSize   = sizeof (TTTOOLINFOA);
-    ti.hwnd     = hwnd;
-    ti.uId      = lpTbb->idCommand;
-    ti.hinst    = 0;
-    ti.lpszText = LPSTR_TEXTCALLBACKA;
-
-    SendMessageA (infoPtr->hwndToolTip, TTM_ADDTOOLA,
-            0, (LPARAM)&ti);
+        TTTOOLINFOA ti;
+
+        ZeroMemory (&ti, sizeof(TTTOOLINFOA));
+        ti.cbSize   = sizeof (TTTOOLINFOA);
+        ti.hwnd     = hwnd;
+        ti.uId      = lpTbb->idCommand;
+        ti.hinst    = 0;
+        ti.lpszText = LPSTR_TEXTCALLBACKA;
+
+        SendMessageA (infoPtr->hwndToolTip, TTM_ADDTOOLA,
+                        0, (LPARAM)&ti);
     }
 
     /* post insert copy */
     if (nIndex < infoPtr->nNumButtons - 1) {
-    memcpy (&infoPtr->buttons[nIndex+1], &oldButtons[nIndex],
-        (infoPtr->nNumButtons - nIndex - 1) * sizeof(TBUTTON_INFO));
+        memcpy (&infoPtr->buttons[nIndex+1], &oldButtons[nIndex],
+                (infoPtr->nNumButtons - nIndex - 1) * sizeof(TBUTTON_INFO));
     }
 
@@ -2875 +3218 @@
 
     if (lpTbb == NULL)
-    return FALSE;
+        return FALSE;
     if (nIndex < 0)
-    return FALSE;
+        return FALSE;
 
     TRACE("inserting button index=%d\n", nIndex);
     if (nIndex > infoPtr->nNumButtons) {
-    nIndex = infoPtr->nNumButtons;
-    TRACE("adjust index=%d\n", nIndex);
+        nIndex = infoPtr->nNumButtons;
+        TRACE("adjust index=%d\n", nIndex);
     }
 
@@ -2890 +3233 @@
     /* pre insert copy */
     if (nIndex > 0) {
-    memcpy (&infoPtr->buttons[0], &oldButtons[0],
-        nIndex * sizeof(TBUTTON_INFO));
+        memcpy (&infoPtr->buttons[0], &oldButtons[0],
+                nIndex * sizeof(TBUTTON_INFO));
     }
 
@@ -2903 +3246 @@
 
     if ((infoPtr->hwndToolTip) && !(lpTbb->fsStyle & TBSTYLE_SEP)) {
-    TTTOOLINFOW ti;
-
-    ZeroMemory (&ti, sizeof(TTTOOLINFOW));
-    ti.cbSize   = sizeof (TTTOOLINFOW);
-    ti.hwnd     = hwnd;
-    ti.uId      = lpTbb->idCommand;
-    ti.hinst    = 0;
-    ti.lpszText = LPSTR_TEXTCALLBACKW;
-
-    SendMessageW (infoPtr->hwndToolTip, TTM_ADDTOOLW,
-            0, (LPARAM)&ti);
+        TTTOOLINFOW ti;
+
+        ZeroMemory (&ti, sizeof(TTTOOLINFOW));
+        ti.cbSize   = sizeof (TTTOOLINFOW);
+        ti.hwnd     = hwnd;
+        ti.uId      = lpTbb->idCommand;
+        ti.hinst    = 0;
+        ti.lpszText = LPSTR_TEXTCALLBACKW;
+
+        SendMessageW (infoPtr->hwndToolTip, TTM_ADDTOOLW,
+                        0, (LPARAM)&ti);
     }
 
     /* post insert copy */
     if (nIndex < infoPtr->nNumButtons - 1) {
-    memcpy (&infoPtr->buttons[nIndex+1], &oldButtons[nIndex],
-        (infoPtr->nNumButtons - nIndex - 1) * sizeof(TBUTTON_INFO));
+        memcpy (&infoPtr->buttons[nIndex+1], &oldButtons[nIndex],
+                (infoPtr->nNumButtons - nIndex - 1) * sizeof(TBUTTON_INFO));
     }
 
@@ -2941 +3284 @@
     nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam);
     if (nIndex == -1)
-    return FALSE;
+        return FALSE;
 
     return (infoPtr->buttons[nIndex].fsState & TBSTATE_CHECKED);
@@ -2955 +3298 @@
     nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam);
     if (nIndex == -1)
-    return FALSE;
+        return FALSE;
 
     return (infoPtr->buttons[nIndex].fsState & TBSTATE_ENABLED);
@@ -2969 +3312 @@
     nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam);
     if (nIndex == -1)
-    return TRUE;
+        return TRUE;
 
     return (infoPtr->buttons[nIndex].fsState & TBSTATE_HIDDEN);
@@ -2983 +3326 @@
     nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam);
     if (nIndex == -1)
-    return FALSE;
+        return FALSE;
 
     return (infoPtr->buttons[nIndex].fsState & TBSTATE_MARKED);
@@ -2997 +3340 @@
     nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam);
     if (nIndex == -1)
-    return FALSE;
+        return FALSE;
 
     return (infoPtr->buttons[nIndex].fsState & TBSTATE_INDETERMINATE);
@@ -3011 +3354 @@
     nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam);
     if (nIndex == -1)
-    return FALSE;
+        return FALSE;
 
     return (infoPtr->buttons[nIndex].fsState & TBSTATE_PRESSED);
@@ -3032 +3375 @@
     nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam);
     if (nIndex == -1)
-    return FALSE;
+        return FALSE;
 
     btnPtr = &infoPtr->buttons[nIndex];
     if (LOWORD(lParam) == FALSE)
-    btnPtr->fsState &= ~TBSTATE_PRESSED;
+        btnPtr->fsState &= ~TBSTATE_PRESSED;
     else
-    btnPtr->fsState |= TBSTATE_PRESSED;
+        btnPtr->fsState |= TBSTATE_PRESSED;
 
     InvalidateRect(hwnd, &btnPtr->rect, TOOLBAR_HasText(infoPtr, btnPtr));
@@ -3059 +3402 @@
 
     if ((BOOL)wParam) {
-    /* save toolbar information */
-    FIXME("save to \"%s\" \"%s\"\n",
-           lpSave->pszSubKey, lpSave->pszValueName);
+        /* save toolbar information */
+        FIXME("save to \"%s\" \"%s\"\n",
+               lpSave->pszSubKey, lpSave->pszValueName);
 
 
     }
     else {
-    /* restore toolbar information */
-
-    FIXME("restore from \"%s\" \"%s\"\n",
-           lpSave->pszSubKey, lpSave->pszValueName);
+        /* restore toolbar information */
+
+        FIXME("restore from \"%s\" \"%s\"\n",
+               lpSave->pszSubKey, lpSave->pszValueName);
 
 
@@ -3087 +3430 @@
 
     if (lpSave == NULL)
+        return 0;
+
+    if ((BOOL)wParam) {
+        /* save toolbar information */
+        FIXME("save to \"%s\" \"%s\"\n",
+               lpSave->pszSubKey, lpSave->pszValueName);
+
+
+    }
+    else {
+        /* restore toolbar information */
+
+        FIXME("restore from \"%s\" \"%s\"\n",
+               lpSave->pszSubKey, lpSave->pszValueName);
+
+
+    }
+#endif
+
     return 0;
-
-    if ((BOOL)wParam) {
-    /* save toolbar information */
-    FIXME("save to \"%s\" \"%s\"\n",
-           lpSave->pszSubKey, lpSave->pszValueName);
-
-
-    }
-    else {
-    /* restore toolbar information */
-
-    FIXME("restore from \"%s\" \"%s\"\n",
-           lpSave->pszSubKey, lpSave->pszValueName);
-
-
-    }
-#endif
-
-    return 0;
 }
 
@@ -3128 +3471 @@
 
     if ((LOWORD(lParam) <= 0) || (HIWORD(lParam)<=0))
-    return FALSE;
+        return FALSE;
 
     if (infoPtr->nNumButtons > 0)
@@ -3158 +3501 @@
 
     if (lptbbi == NULL)
-    return FALSE;
+        return FALSE;
     if (lptbbi->cbSize < sizeof(TBBUTTONINFOA))
-    return FALSE;
-
+        return FALSE;
+    
     nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam);
     if (nIndex == -1)
-    return FALSE;
+        return FALSE;
 
     btnPtr = &infoPtr->buttons[nIndex];
     if (lptbbi->dwMask & TBIF_COMMAND)
-    btnPtr->idCommand = lptbbi->idCommand;
+        btnPtr->idCommand = lptbbi->idCommand;
     if (lptbbi->dwMask & TBIF_IMAGE)
-    btnPtr->iBitmap = lptbbi->iImage;
+        btnPtr->iBitmap = lptbbi->iImage;
     if (lptbbi->dwMask & TBIF_LPARAM)
-    btnPtr->dwData = lptbbi->lParam;
+        btnPtr->dwData = lptbbi->lParam;
 /*    if (lptbbi->dwMask & TBIF_SIZE) */
-/*  btnPtr->cx = lptbbi->cx; */
+/*      btnPtr->cx = lptbbi->cx; */
     if (lptbbi->dwMask & TBIF_STATE)
-    btnPtr->fsState = lptbbi->fsState;
+        btnPtr->fsState = lptbbi->fsState;
     if (lptbbi->dwMask & TBIF_STYLE)
-    btnPtr->fsStyle = lptbbi->fsStyle;
+        btnPtr->fsStyle = lptbbi->fsStyle;
 
     if (lptbbi->dwMask & TBIF_TEXT) {
-    if ((btnPtr->iString >= 0) ||
-        (btnPtr->iString < infoPtr->nNumStrings)) {
-       TRACE("Ooooooch\n");
+        if ((btnPtr->iString >= 0) || 
+            (btnPtr->iString < infoPtr->nNumStrings)) {
+           TRACE("Ooooooch\n");
 #if 0
-        WCHAR **lpString = &infoPtr->strings[btnPtr->iString];
-        INT len = lstrlenA (lptbbi->pszText);
-        *lpString = COMCTL32_ReAlloc (lpString, sizeof(WCHAR)*(len+1));
+            WCHAR **lpString = &infoPtr->strings[btnPtr->iString];
+            INT len = lstrlenA (lptbbi->pszText);
+            *lpString = COMCTL32_ReAlloc (lpString, sizeof(WCHAR)*(len+1));
 #endif
 
-        /* this is the ultimate sollution */
-/*      Str_SetPtrA (&infoPtr->strings[btnPtr->iString], lptbbi->pszText); */
-    }
+            /* this is the ultimate sollution */
+/*          Str_SetPtrA (&infoPtr->strings[btnPtr->iString], lptbbi->pszText); */
+        }
     }
 
@@ -3208 +3551 @@
 
     if (lptbbi == NULL)
-    return FALSE;
+        return FALSE;
     if (lptbbi->cbSize < sizeof(TBBUTTONINFOW))
-    return FALSE;
+        return FALSE;
 
     nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam);
     if (nIndex == -1)
-    return FALSE;
+        return FALSE;
 
     btnPtr = &infoPtr->buttons[nIndex];
     if (lptbbi->dwMask & TBIF_COMMAND)
-    btnPtr->idCommand = lptbbi->idCommand;
+        btnPtr->idCommand = lptbbi->idCommand;
     if (lptbbi->dwMask & TBIF_IMAGE)
-    btnPtr->iBitmap = lptbbi->iImage;
+        btnPtr->iBitmap = lptbbi->iImage;
     if (lptbbi->dwMask & TBIF_LPARAM)
-    btnPtr->dwData = lptbbi->lParam;
+        btnPtr->dwData = lptbbi->lParam;
 /*    if (lptbbi->dwMask & TBIF_SIZE) */
-/*  btnPtr->cx = lptbbi->cx; */
+/*      btnPtr->cx = lptbbi->cx; */
     if (lptbbi->dwMask & TBIF_STATE)
-    btnPtr->fsState = lptbbi->fsState;
+        btnPtr->fsState = lptbbi->fsState;
     if (lptbbi->dwMask & TBIF_STYLE)
-    btnPtr->fsStyle = lptbbi->fsStyle;
+        btnPtr->fsStyle = lptbbi->fsStyle;
 
     if (lptbbi->dwMask & TBIF_TEXT) {
-    if ((btnPtr->iString >= 0) ||
-        (btnPtr->iString < infoPtr->nNumStrings)) {
+        if ((btnPtr->iString >= 0) ||
+            (btnPtr->iString < infoPtr->nNumStrings)) {
 #if 0
-        WCHAR **lpString = &infoPtr->strings[btnPtr->iString];
-        INT len = lstrlenW (lptbbi->pszText);
-        *lpString = COMCTL32_ReAlloc (lpString, sizeof(WCHAR)*(len+1));
+            WCHAR **lpString = &infoPtr->strings[btnPtr->iString];
+            INT len = lstrlenW (lptbbi->pszText);
+            *lpString = COMCTL32_ReAlloc (lpString, sizeof(WCHAR)*(len+1));
 #endif
 
-        /* this is the ultimate solution */
-/*      Str_SetPtrA (&infoPtr->strings[btnPtr->iString], lptbbi->pszText); */
-    }
+            /* this is the ultimate solution */
+/*          Str_SetPtrA (&infoPtr->strings[btnPtr->iString], lptbbi->pszText); */
+        }
     }
 
@@ -3256 +3599 @@
     {
         ERR("invalid parameter\n");
-    return FALSE;
+        return FALSE;
     }
 
     /* The documentation claims you can only change the button size before
-     * any button has been added. But this is wrong.
-     * WINZIP32.EXE (ver 8) calls this on one of its buttons after adding
+     * any button has been added. But this is wrong. 
+     * WINZIP32.EXE (ver 8) calls this on one of its buttons after adding 
      * it to the toolbar, and it checks that the return value is nonzero - mjm
      * Further testing shows that we must actually perform the change too.
@@ -3277 +3620 @@
 
     if (infoPtr == NULL) {
-    TRACE("Toolbar not initialized yet?????\n");
-    return FALSE;
+        TRACE("Toolbar not initialized yet?????\n");
+        return FALSE;
     }
 
     /* if setting to current values, ignore */
     if ((infoPtr->cxMin == (INT)LOWORD(lParam)) &&
-    (infoPtr->cxMax == (INT)HIWORD(lParam))) {
-    TRACE("matches current width, min=%d, max=%d, no recalc\n",
-          infoPtr->cxMin, infoPtr->cxMax);
-    return TRUE;
+        (infoPtr->cxMax == (INT)HIWORD(lParam))) {
+        TRACE("matches current width, min=%d, max=%d, no recalc\n",
+              infoPtr->cxMin, infoPtr->cxMax);
+        return TRUE; 
     }
 
@@ -3295 +3638 @@
     /* if both values are 0 then we are done */
     if (lParam == 0) {
-    TRACE("setting both min and max to 0, norecalc\n");
-    return TRUE;
+        TRACE("setting both min and max to 0, norecalc\n"); 
+        return TRUE;
     }
 
@@ -3302 +3645 @@
        recalc the bounding rectangle (does DrawText w/ DT_CALCRECT
        which doesn't actually draw - GA). */
-    TRACE("number of buttons %d, cx=%d, cy=%d, recalcing\n",
-    infoPtr->nNumButtons, infoPtr->cxMin, infoPtr->cxMax);
+    TRACE("number of buttons %d, cx=%d, cy=%d, recalcing\n", 
+        infoPtr->nNumButtons, infoPtr->cxMin, infoPtr->cxMax);
 
     TOOLBAR_CalcToolbar (hwnd);
@@ -3320 +3663 @@
 
     if ((nIndex < 0) || (nIndex >= infoPtr->nNumButtons))
-    return FALSE;
+        return FALSE;
 
     infoPtr->buttons[nIndex].idCommand = (INT)lParam;
@@ -3326 +3669 @@
     if (infoPtr->hwndToolTip) {
 
-    FIXME("change tool tip!\n");
+        FIXME("change tool tip!\n");
 
     }
@@ -3349 +3692 @@
     /* FIXME: redraw ? */
 
-    return (LRESULT)himlTemp;
+    return (LRESULT)himlTemp; 
 }
 
@@ -3361 +3704 @@
     dwTemp = infoPtr->dwDTFlags;
     infoPtr->dwDTFlags =
-    (infoPtr->dwDTFlags & (DWORD)wParam) | (DWORD)lParam;
+        (infoPtr->dwDTFlags & (DWORD)wParam) | (DWORD)lParam;
 
     return (LRESULT)dwTemp;
@@ -3376 +3719 @@
     infoPtr->dwExStyle = (DWORD)lParam;
 
-    return (LRESULT)dwTemp;
+    return (LRESULT)dwTemp; 
 }
 
@@ -3391 +3734 @@
     /* FIXME: redraw ? */
 
-    return (LRESULT)himlTemp;
+    return (LRESULT)himlTemp; 
 }
 
@@ -3408 +3751 @@
     {
 
-        infoPtr->nHotItem = (INT)wParam;
+        infoPtr->nHotItem = (INT)wParam;
         if ((INT)wParam >=0)
         {
             btnPtr = &infoPtr->buttons[(INT)wParam];
             btnPtr->bHot = TRUE;
-            InvalidateRect (hwnd, &btnPtr->rect,
+                InvalidateRect (hwnd, &btnPtr->rect,
                     TOOLBAR_HasText(infoPtr, btnPtr));
         }
@@ -3420 +3763 @@
             btnPtr = &infoPtr->buttons[nOldHotItem];
             btnPtr->bHot = FALSE;
-            InvalidateRect (hwnd, &btnPtr->rect,
+                InvalidateRect (hwnd, &btnPtr->rect,
                     TOOLBAR_HasText(infoPtr, btnPtr));
         }
@@ -3426 +3769 @@
 
     if (nOldHotItem < 0)
-    return -1;
+        return -1;
 
     return (LRESULT)nOldHotItem;
@@ -3441 +3784 @@
     infoPtr->himlDef = (HIMAGELIST)lParam;
 
-     infoPtr->nNumBitmaps = ImageList_GetImageCount(infoPtr->himlDef);
+    infoPtr->nNumBitmaps = ImageList_GetImageCount(infoPtr->himlDef);
+
+    ImageList_GetIconSize(infoPtr->himlDef, &infoPtr->nBitmapWidth,
+                          &infoPtr->nBitmapHeight);
+    TRACE("hwnd %08x, new himl=%08x, count=%d, bitmap w=%d, h=%d\n",
+          hwnd, (INT)infoPtr->himlDef, infoPtr->nNumBitmaps,
+          infoPtr->nBitmapWidth, infoPtr->nBitmapHeight);
+
     /* FIXME: redraw ? */
 
-    return (LRESULT)himlTemp;
+    return (LRESULT)himlTemp; 
 }
 
@@ -3491 +3841 @@
 
     if (infoPtr == NULL)
-    return FALSE;
+        return FALSE;
 
     infoPtr->nMaxTextRows = (INT)wParam;
@@ -3511 +3861 @@
 
     if (infoPtr == NULL)
-    return 0;
+        return 0;
     hwndOldNotify = infoPtr->hwndNotify;
     infoPtr->hwndNotify = (HWND)wParam;
@@ -3528 +3878 @@
 
     if (LOWORD(wParam) > 1) {
-    FIXME("multiple rows not supported!\n");
+        FIXME("multiple rows not supported!\n");
     }
 
@@ -3544 +3894 @@
     /* return bounding rectangle */
     if (lprc) {
-    lprc->left   = infoPtr->rcBound.left;
-    lprc->right  = infoPtr->rcBound.right;
-    lprc->top    = infoPtr->rcBound.top;
-    lprc->bottom = infoPtr->rcBound.bottom;
+        lprc->left   = infoPtr->rcBound.left;
+        lprc->right  = infoPtr->rcBound.right;
+        lprc->top    = infoPtr->rcBound.top;
+        lprc->bottom = infoPtr->rcBound.bottom;
     }
 
@@ -3563 +3913 @@
     nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam);
     if (nIndex == -1)
-    return FALSE;
+        return FALSE;
 
     btnPtr = &infoPtr->buttons[nIndex];
+
+    /* if hidden state has changed the invalidate entire window and recalc */
+    if ((btnPtr->fsState & TBSTATE_HIDDEN) != (LOWORD(lParam) & TBSTATE_HIDDEN)) {
+        btnPtr->fsState = LOWORD(lParam);
+        TOOLBAR_CalcToolbar (hwnd);
+        InvalidateRect(hwnd, 0, TOOLBAR_HasText(infoPtr, btnPtr));
+        return TRUE;
+    }
 
     /* process state changing if current state doesn't match new state */
@@ -3588 +3946 @@
     nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam);
     if (nIndex == -1)
-    return FALSE;
+        return FALSE;
 
     btnPtr = &infoPtr->buttons[nIndex];
@@ -3600 +3958 @@
 
         if (infoPtr->hwndToolTip) {
-        FIXME("change tool tip!\n");
+            FIXME("change tool tip!\n");
         }
     }
@@ -3614 +3972 @@
 
     if (infoPtr == NULL)
-    return 0;
+        return 0;
     infoPtr->hwndToolTip = (HWND)wParam;
     return 0;
@@ -3626 +3984 @@
     BOOL bTemp;
 
-    TRACE("%s hwnd=0x%04x stub!\n",
-       ((BOOL)wParam) ? "TRUE" : "FALSE", hwnd);
+    TRACE("%s hwnd=0x%04x stub!\n", 
+           ((BOOL)wParam) ? "TRUE" : "FALSE", hwnd);
 
     bTemp = infoPtr->bUnicode;
@@ -3675 +4033 @@
     infoPtr->nHotItem = -2; /* It has to be initially different from nOldHit */
     infoPtr->hwndNotify = GetParent (hwnd);
-    infoPtr->bTransparent = (dwStyle & TBSTYLE_FLAT);
+    infoPtr->bTransparent = (dwStyle & TBSTYLE_TRANSPARENT);
+    infoPtr->bBtnTranspnt = (dwStyle & (TBSTYLE_FLAT | TBSTYLE_LIST));
     infoPtr->dwDTFlags = (dwStyle & TBSTYLE_LIST) ? DT_LEFT | DT_VCENTER | DT_SINGLELINE : DT_CENTER;
     infoPtr->bAnchor = FALSE; /* no anchor highlighting */
     infoPtr->iVersion = 0;
+    infoPtr->bNtfUnicode = FALSE;
+    infoPtr->hwndSelf = hwnd;
 
     SystemParametersInfoA (SPI_GETICONTITLELOGFONT, 0, &logFont, 0);
@@ -3684 +4045 @@
 
     if (dwStyle & TBSTYLE_TOOLTIPS) {
-    /* Create tooltip control */
-    infoPtr->hwndToolTip =
-        CreateWindowExA (0, TOOLTIPS_CLASSA, NULL, 0,
-                   CW_USEDEFAULT, CW_USEDEFAULT,
-                   CW_USEDEFAULT, CW_USEDEFAULT,
-                   hwnd, 0, 0, 0);
-
-    /* Send NM_TOOLTIPSCREATED notification */
-    if (infoPtr->hwndToolTip) {
-        NMTOOLTIPSCREATED nmttc;
-
-        nmttc.hdr.hwndFrom = hwnd;
-        nmttc.hdr.idFrom   = GetWindowLongA (hwnd, GWL_ID);
-        nmttc.hdr.code = NM_TOOLTIPSCREATED;
-        nmttc.hwndToolTips = infoPtr->hwndToolTip;
-
-        SendMessageA (infoPtr->hwndNotify, WM_NOTIFY,
-              (WPARAM)nmttc.hdr.idFrom, (LPARAM)&nmttc);
-    }
-    }
+        /* Create tooltip control */
+        infoPtr->hwndToolTip =
+            CreateWindowExA (0, TOOLTIPS_CLASSA, NULL, 0,
+                               CW_USEDEFAULT, CW_USEDEFAULT,
+                               CW_USEDEFAULT, CW_USEDEFAULT,
+                               hwnd, 0, 0, 0);
+
+        /* Send NM_TOOLTIPSCREATED notification */
+        if (infoPtr->hwndToolTip) {
+            NMTOOLTIPSCREATED nmttc;
+
+            nmttc.hwndToolTips = infoPtr->hwndToolTip;
+
+            TOOLBAR_SendNotify ((NMHDR *) &nmttc, infoPtr,
+                            NM_TOOLTIPSCREATED);
+        }
+    }
+
+    TOOLBAR_CheckStyle (hwnd, dwStyle);
 
     TOOLBAR_CalcToolbar(hwnd);
@@ -3718 +4078 @@
     /* delete tooltip control */
     if (infoPtr->hwndToolTip)
-    DestroyWindow (infoPtr->hwndToolTip);
+        DestroyWindow (infoPtr->hwndToolTip);
 
     /* delete button data */
     if (infoPtr->buttons)
-    COMCTL32_Free (infoPtr->buttons);
+        COMCTL32_Free (infoPtr->buttons);
 
     /* delete strings */
     if (infoPtr->strings) {
-    INT i;
-    for (i = 0; i < infoPtr->nNumStrings; i++)
-        if (infoPtr->strings[i])
-        COMCTL32_Free (infoPtr->strings[i]);
-
-    COMCTL32_Free (infoPtr->strings);
+        INT i;
+        for (i = 0; i < infoPtr->nNumStrings; i++)
+            if (infoPtr->strings[i])
+                COMCTL32_Free (infoPtr->strings[i]);
+
+        COMCTL32_Free (infoPtr->strings);
     }
 
     /* destroy internal image list */
     if (infoPtr->himlInt)
-    ImageList_Destroy (infoPtr->himlInt);
+        ImageList_Destroy (infoPtr->himlInt);
 
     /* delete default font */
     if (infoPtr->hFont)
-    DeleteObject (infoPtr->hFont);
+        DeleteObject (infoPtr->hFont);
 
     /* free toolbar info data */
@@ -3754 +4114 @@
 {
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd);
-
-    if (infoPtr->bTransparent)
-    return SendMessageA (GetParent (hwnd), WM_ERASEBKGND, wParam, lParam);
-
-    return DefWindowProcA (hwnd, WM_ERASEBKGND, wParam, lParam);
+    DWORD dwStyle = GetWindowLongA (hwnd, GWL_STYLE);
+    NMTBCUSTOMDRAW tbcd;
+    INT ret, ntfret;
+
+    if (dwStyle & TBSTYLE_CUSTOMERASE) {
+        ZeroMemory (&tbcd, sizeof(NMTBCUSTOMDRAW));
+        tbcd.nmcd.dwDrawStage = CDDS_PREERASE;
+        tbcd.nmcd.hdc = (HDC)wParam;
+        ntfret = TOOLBAR_SendNotify ((NMHDR *)&tbcd, infoPtr, NM_CUSTOMDRAW);
+        /* FIXME: in general the return flags *can* be or'ed together */
+        switch (ntfret) 
+            {
+            case CDRF_DODEFAULT:
+                break;
+            case CDRF_SKIPDEFAULT:
+                return TRUE;
+            default:
+                FIXME("[%04x] response %d not handled to NM_CUSTOMDRAW (CDDS_PREERASE)\n",
+                      hwnd, ntfret);
+            }
+    }
+
+    /* If the toolbar is "transparent" then pass the WM_ERASEBKGND up 
+     * to my parent for processing.
+     */
+    if (infoPtr->bTransparent) {
+        POINT pt, ptorig;
+        HDC hdc = (HDC)wParam;
+        HWND parent;
+
+        pt.x = 0;
+        pt.y = 0;
+        parent = GetParent(hwnd);
+        MapWindowPoints(hwnd, parent, &pt, 1);
+        OffsetWindowOrgEx (hdc, pt.x, pt.y, &ptorig);
+        SendMessageA (parent, WM_ERASEBKGND, wParam, lParam);
+        SetWindowOrgEx (hdc, ptorig.x, ptorig.y, 0);
+        return TRUE;
+    }
+    ret = DefWindowProcA (hwnd, WM_ERASEBKGND, wParam, lParam);
+
+    if (dwStyle & TBSTYLE_CUSTOMERASE) {
+        ZeroMemory (&tbcd, sizeof(NMTBCUSTOMDRAW));
+        tbcd.nmcd.dwDrawStage = CDDS_POSTERASE;
+        tbcd.nmcd.hdc = (HDC)wParam;
+        ntfret = TOOLBAR_SendNotify ((NMHDR *)&tbcd, infoPtr, NM_CUSTOMDRAW);
+        switch (ntfret) 
+            {
+            case CDRF_DODEFAULT:
+                break;
+            case CDRF_SKIPDEFAULT:
+                return TRUE;
+            default:
+                FIXME("[%04x] response %d not handled to NM_CUSTOMDRAW (CDDS_PREERASE)\n",
+                      hwnd, ntfret);
+            }
+    }
+    return ret;
 }
 
@@ -3784 +4197 @@
 
     if (nHit >= 0) {
-    btnPtr = &infoPtr->buttons[nHit];
-    if (!(btnPtr->fsState & TBSTATE_ENABLED))
-        return 0;
-    SetCapture (hwnd);
-    infoPtr->bCaptured = TRUE;
-    infoPtr->nButtonDown = nHit;
-
-    btnPtr->fsState |= TBSTATE_PRESSED;
+        btnPtr = &infoPtr->buttons[nHit];
+        if (!(btnPtr->fsState & TBSTATE_ENABLED))
+            return 0;
+        SetCapture (hwnd);
+        infoPtr->bCaptured = TRUE;
+        infoPtr->nButtonDown = nHit;
+
+        btnPtr->fsState |= TBSTATE_PRESSED;
 
         InvalidateRect(hwnd, &btnPtr->rect, TOOLBAR_HasText(infoPtr,
@@ -3797 +4210 @@
     }
     else if (GetWindowLongA (hwnd, GWL_STYLE) & CCS_ADJUSTABLE)
-    TOOLBAR_Customize (hwnd);
+        TOOLBAR_Customize (hwnd);
 
     return 0;
@@ -3810 +4223 @@
     POINT pt;
     INT   nHit;
+    NMTOOLBARA nmtb;
 
     if (infoPtr->hwndToolTip)
-    TOOLBAR_RelayEvent (infoPtr->hwndToolTip, hwnd,
-                WM_LBUTTONDOWN, wParam, lParam);
+        TOOLBAR_RelayEvent (infoPtr->hwndToolTip, hwnd,
+                            WM_LBUTTONDOWN, wParam, lParam);
 
     pt.x = (INT)LOWORD(lParam);
@@ -3820 +4234 @@
 
     if (nHit >= 0) {
-    RECT arrowRect;
-    btnPtr = &infoPtr->buttons[nHit];
-    if (!(btnPtr->fsState & TBSTATE_ENABLED))
-        return 0;
-
-    infoPtr->nOldHit = nHit;
-
-    CopyRect(&arrowRect, &btnPtr->rect);
-    arrowRect.left = max(btnPtr->rect.left, btnPtr->rect.right - DDARROW_WIDTH);
-
-    /* for EX_DRAWDDARROWS style,  click must be in the drop-down arrow rect */
-    if ((btnPtr->fsStyle & TBSTYLE_DROPDOWN) &&
-         ((TOOLBAR_HasDropDownArrows(infoPtr->dwExStyle) && PtInRect(&arrowRect, pt)) ||
-          (!TOOLBAR_HasDropDownArrows(infoPtr->dwExStyle))))
-    {
-        NMTOOLBARA nmtb;
-        /*
-         * this time we must force a Redraw, so the btn is
-         * painted down before CaptureChanged repaints it up
-         */
-        RedrawWindow(hwnd,&btnPtr->rect,0,
-            RDW_ERASE|RDW_INVALIDATE|RDW_UPDATENOW);
-
-        nmtb.hdr.hwndFrom = hwnd;
-        nmtb.hdr.idFrom = GetWindowLongA (hwnd, GWL_ID);
-        nmtb.hdr.code = TBN_DROPDOWN;
-        nmtb.iItem = btnPtr->idCommand;
-
-        SendMessageA (infoPtr->hwndNotify, WM_NOTIFY,
-              (WPARAM)nmtb.hdr.idFrom, (LPARAM)&nmtb);
-    }
-    else
-    {
-        SetCapture (hwnd);
-        infoPtr->bCaptured = TRUE;
-        infoPtr->nButtonDown = nHit;
-
-        btnPtr->fsState |= TBSTATE_PRESSED;
-        btnPtr->bHot = FALSE;
-
-        InvalidateRect(hwnd, &btnPtr->rect,
-               TOOLBAR_HasText(infoPtr, btnPtr));
-    }
+        RECT arrowRect;
+        btnPtr = &infoPtr->buttons[nHit];
+        if (!(btnPtr->fsState & TBSTATE_ENABLED))
+            return 0;
+
+        infoPtr->nOldHit = nHit;
+
+        CopyRect(&arrowRect, &btnPtr->rect);
+        arrowRect.left = max(btnPtr->rect.left, btnPtr->rect.right - DDARROW_WIDTH);
+
+        /* for EX_DRAWDDARROWS style,  click must be in the drop-down arrow rect */
+        if ((btnPtr->fsStyle & TBSTYLE_DROPDOWN) &&
+             ((TOOLBAR_HasDropDownArrows(infoPtr->dwExStyle) && PtInRect(&arrowRect, pt)) ||
+              (!TOOLBAR_HasDropDownArrows(infoPtr->dwExStyle))))
+        {
+            LRESULT res;
+            /*
+             * this time we must force a Redraw, so the btn is
+             * painted down before CaptureChanged repaints it up
+             */
+            RedrawWindow(hwnd,&btnPtr->rect,0,
+                        RDW_ERASE|RDW_INVALIDATE|RDW_UPDATENOW);
+
+            nmtb.iItem = btnPtr->idCommand;
+            memset(&nmtb.tbButton, 0, sizeof(TBBUTTON));
+            nmtb.cchText = 0;
+            nmtb.pszText = 0;
+            memset(&nmtb.rcButton, 0, sizeof(RECT));
+            res = TOOLBAR_SendNotify ((NMHDR *) &nmtb, infoPtr,
+                                  TBN_DROPDOWN);
+            if (res != TBDDRET_TREATPRESSED)
+                /* ??? guess  (GA)  */
+                return 0;
+            /* otherwise drop through and process as pushed */
+        }
+        /* SetCapture (hwnd); */
+        infoPtr->bCaptured = TRUE;
+        infoPtr->nButtonDown = nHit;
+
+        btnPtr->fsState |= TBSTATE_PRESSED;
+        btnPtr->bHot = FALSE;
+
+        InvalidateRect(hwnd, &btnPtr->rect,
+                       TOOLBAR_HasText(infoPtr, btnPtr));
+        UpdateWindow(hwnd);
+        SetCapture (hwnd);
+
+        /* native issues the TBN_BEGINDRAG here */
+        nmtb.iItem = btnPtr->idCommand;
+        nmtb.tbButton.iBitmap = btnPtr->iBitmap;
+        nmtb.tbButton.idCommand = btnPtr->idCommand;
+        nmtb.tbButton.fsState = btnPtr->fsState;
+        nmtb.tbButton.fsStyle = btnPtr->fsStyle;
+        nmtb.tbButton.dwData = btnPtr->dwData;
+        nmtb.tbButton.iString = btnPtr->iString;
+        nmtb.cchText = 0;  /* !!! not correct */
+        nmtb.pszText = 0;  /* !!! not correct */
+        TOOLBAR_SendNotify ((NMHDR *) &nmtb, infoPtr,
+                        TBN_BEGINDRAG);
     }
 
@@ -3877 +4307 @@
     INT   nOldIndex = -1;
     BOOL  bSendMessage = TRUE;
+    NMHDR hdr;
+    NMMOUSE nmmouse;
+    NMTOOLBARA nmtb;
 
     if (infoPtr->hwndToolTip)
-    TOOLBAR_RelayEvent (infoPtr->hwndToolTip, hwnd,
-                WM_LBUTTONUP, wParam, lParam);
+        TOOLBAR_RelayEvent (infoPtr->hwndToolTip, hwnd,
+                            WM_LBUTTONUP, wParam, lParam);
 
     pt.x = (INT)LOWORD(lParam);
@@ -3892 +4325 @@
 
     if ((infoPtr->bCaptured) && (infoPtr->nButtonDown >= 0)) {
-    btnPtr = &infoPtr->buttons[infoPtr->nButtonDown];
-    btnPtr->fsState &= ~TBSTATE_PRESSED;
-
-    if (nHit == infoPtr->nButtonDown) {
-        if (btnPtr->fsStyle & TBSTYLE_CHECK) {
-        if (btnPtr->fsStyle & TBSTYLE_GROUP) {
-            nOldIndex = TOOLBAR_GetCheckedGroupButtonIndex (infoPtr,
-            infoPtr->nButtonDown);
-            if (nOldIndex == infoPtr->nButtonDown)
-            bSendMessage = FALSE;
-            if ((nOldIndex != infoPtr->nButtonDown) &&
-            (nOldIndex != -1))
-            infoPtr->buttons[nOldIndex].fsState &= ~TBSTATE_CHECKED;
-            btnPtr->fsState |= TBSTATE_CHECKED;
-        }
-        else {
-            if (btnPtr->fsState & TBSTATE_CHECKED)
-            btnPtr->fsState &= ~TBSTATE_CHECKED;
-            else
-            btnPtr->fsState |= TBSTATE_CHECKED;
-        }
-        }
-    }
-    else
-        bSendMessage = FALSE;
-
-    if (nOldIndex != -1)
+        btnPtr = &infoPtr->buttons[infoPtr->nButtonDown];
+        btnPtr->fsState &= ~TBSTATE_PRESSED;
+
+        if (nHit == infoPtr->nButtonDown) {
+            if (btnPtr->fsStyle & TBSTYLE_CHECK) {
+                if (btnPtr->fsStyle & TBSTYLE_GROUP) {
+                    nOldIndex = TOOLBAR_GetCheckedGroupButtonIndex (infoPtr,
+                        infoPtr->nButtonDown);
+                    if (nOldIndex == infoPtr->nButtonDown)
+                        bSendMessage = FALSE;
+                    if ((nOldIndex != infoPtr->nButtonDown) && 
+                        (nOldIndex != -1))
+                        infoPtr->buttons[nOldIndex].fsState &= ~TBSTATE_CHECKED;
+                    btnPtr->fsState |= TBSTATE_CHECKED;
+                }
+                else {
+                    if (btnPtr->fsState & TBSTATE_CHECKED)
+                        btnPtr->fsState &= ~TBSTATE_CHECKED;
+                    else
+                        btnPtr->fsState |= TBSTATE_CHECKED;
+                }
+            }
+        }
+        else
+            bSendMessage = FALSE;
+
+        if (nOldIndex != -1)
         {
             InvalidateRect(hwnd, &infoPtr->buttons[nOldIndex].rect,
@@ -3924 +4357 @@
         }
 
-    /*
-     * now we can ReleaseCapture, which triggers CAPTURECHANGED msg,
-     * that resets bCaptured and btn TBSTATE_PRESSED flags,
-     * and obliterates nButtonDown and nOldHit (see TOOLBAR_CaptureChanged)
-     */
-    ReleaseCapture ();
-
-    if (bSendMessage)
-        SendMessageA (GetParent(hwnd), WM_COMMAND,
-              MAKEWPARAM(btnPtr->idCommand, 0), (LPARAM)hwnd);
+        /*
+         * now we can ReleaseCapture, which triggers CAPTURECHANGED msg,
+         * that resets bCaptured and btn TBSTATE_PRESSED flags,
+         * and obliterates nButtonDown and nOldHit (see TOOLBAR_CaptureChanged) 
+         */
+        ReleaseCapture ();
+
+        /* Issue NM_RELEASEDCAPTURE to parent to let him know it is released */
+        TOOLBAR_SendNotify ((NMHDR *) &hdr, infoPtr,
+                        NM_RELEASEDCAPTURE);
+
+        /* native issues TBN_ENDDRAG here, if _LBUTTONDOWN issued the 
+         * TBN_BEGINDRAG
+         */
+        nmtb.iItem = btnPtr->idCommand;
+        nmtb.tbButton.iBitmap = btnPtr->iBitmap;
+        nmtb.tbButton.idCommand = btnPtr->idCommand;
+        nmtb.tbButton.fsState = btnPtr->fsState;
+        nmtb.tbButton.fsStyle = btnPtr->fsStyle;
+        nmtb.tbButton.dwData = btnPtr->dwData;
+        nmtb.tbButton.iString = btnPtr->iString;
+        nmtb.cchText = 0;  /* !!! not correct */
+        nmtb.pszText = 0;  /* !!! not correct */
+        TOOLBAR_SendNotify ((NMHDR *) &nmtb, infoPtr,
+                        TBN_ENDDRAG);
+
+        if (bSendMessage)
+            SendMessageA (GetParent(hwnd), WM_COMMAND,
+                          MAKEWPARAM(btnPtr->idCommand, 0), (LPARAM)hwnd);
+
+        /* !!! Undocumented - toolbar at 4.71 level and above sends
+         * either NMRCLICK or NM_CLICK with the NMMOUSE structure.
+         * Only NM_RCLICK is documented.
+         */
+        nmmouse.dwItemSpec = btnPtr->idCommand;
+        nmmouse.dwItemData = btnPtr->dwData;
+        TOOLBAR_SendNotify ((NMHDR *) &nmmouse, infoPtr,
+                        NM_CLICK);
     }
 
@@ -3950 +4411 @@
     {
         btnPtr = &infoPtr->buttons[infoPtr->nButtonDown];
-        btnPtr->fsState &= ~TBSTATE_PRESSED;
+        btnPtr->fsState &= ~TBSTATE_PRESSED;
 
         infoPtr->nButtonDown = -1;
@@ -3966 +4427 @@
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd);
     TBUTTON_INFO *hotBtnPtr, *btnPtr;
+    RECT rc1;
 
     if (infoPtr->nOldHit < 0)
@@ -3976 +4438 @@
     if((infoPtr->nOldHit == infoPtr->nHotItem) && (hotBtnPtr->fsState & TBSTATE_ENABLED))
     {
-    hotBtnPtr->bHot = FALSE;
-
-        InvalidateRect (hwnd, &hotBtnPtr->rect, TOOLBAR_HasText(infoPtr,
+        hotBtnPtr->bHot = FALSE;
+        rc1 = hotBtnPtr->rect;
+        InflateRect (&rc1, 1, 1);
+        InvalidateRect (hwnd, &rc1, TOOLBAR_HasText(infoPtr,
             hotBtnPtr));
     }
@@ -3990 +4453 @@
       btnPtr->fsState &= ~TBSTATE_PRESSED;
 
-      InvalidateRect (hwnd, &(btnPtr->rect), TRUE);
+      rc1 = hotBtnPtr->rect;
+      InflateRect (&rc1, 1, 1);
+      InvalidateRect (hwnd, &rc1, TRUE);
     }
 
@@ -4020 +4485 @@
     if(!(trackinfo.dwFlags & TME_LEAVE)) {
         trackinfo.dwFlags = TME_LEAVE; /* notify upon leaving */
-
+ 
         /* call TRACKMOUSEEVENT so we receive a WM_MOUSELEAVE message */
         /* and can properly deactivate the hot toolbar button */
@@ -4027 +4492 @@
 
     if (infoPtr->hwndToolTip)
-    TOOLBAR_RelayEvent (infoPtr->hwndToolTip, hwnd,
-                WM_MOUSEMOVE, wParam, lParam);
+        TOOLBAR_RelayEvent (infoPtr->hwndToolTip, hwnd,
+                            WM_MOUSEMOVE, wParam, lParam);
 
     pt.x = (INT)LOWORD(lParam);
@@ -4037 +4502 @@
     if (infoPtr->nOldHit != nHit)
     {
-    /* Remove the effect of an old hot button if the button was enabled and was
-       drawn with the hot button effect */
-    if(infoPtr->nOldHit >= 0 && infoPtr->nOldHit == infoPtr->nHotItem &&
-        (infoPtr->buttons[infoPtr->nOldHit].fsState & TBSTATE_ENABLED))
-    {
-        oldBtnPtr = &infoPtr->buttons[infoPtr->nOldHit];
-        oldBtnPtr->bHot = FALSE;
-
-        InvalidateRect (hwnd, &oldBtnPtr->rect,
+        /* Remove the effect of an old hot button if the button was enabled and was
+           drawn with the hot button effect */
+        if(infoPtr->nOldHit >= 0 && infoPtr->nOldHit == infoPtr->nHotItem && 
+                (infoPtr->buttons[infoPtr->nOldHit].fsState & TBSTATE_ENABLED))
+        {
+            oldBtnPtr = &infoPtr->buttons[infoPtr->nOldHit];
+            oldBtnPtr->bHot = FALSE;
+                    
+            InvalidateRect (hwnd, &oldBtnPtr->rect,
                 TOOLBAR_HasText(infoPtr, oldBtnPtr));
-    }
-
-    /* It's not a separator or in nowhere. It's a hot button. */
-    if (nHit >= 0)
-    {
-        btnPtr = &infoPtr->buttons[nHit];
-        btnPtr->bHot = TRUE;
-
-        infoPtr->nHotItem = nHit;
-
-            /* only enabled buttons show hot effect */
+        }
+
+        /* It's not a separator or in nowhere. It's a hot button. */
+        if (nHit >= 0)
+        {
+            btnPtr = &infoPtr->buttons[nHit];
+
+            infoPtr->nHotItem = nHit;
+
+            /* only enabled buttons show hot effect */            
             if(infoPtr->buttons[nHit].fsState & TBSTATE_ENABLED)
             {
+                btnPtr->bHot = TRUE;
                 InvalidateRect(hwnd, &btnPtr->rect,
                     TOOLBAR_HasText(infoPtr, btnPtr));
             }
 
-    }
+        }
 
     if (infoPtr->bCaptured) {
-        btnPtr = &infoPtr->buttons[infoPtr->nButtonDown];
-        if (infoPtr->nOldHit == infoPtr->nButtonDown) {
-        btnPtr->fsState &= ~TBSTATE_PRESSED;
+            btnPtr = &infoPtr->buttons[infoPtr->nButtonDown];
+            if (infoPtr->nOldHit == infoPtr->nButtonDown) {
+                btnPtr->fsState &= ~TBSTATE_PRESSED;
                 InvalidateRect(hwnd, &btnPtr->rect, TRUE);
-        }
-        else if (nHit == infoPtr->nButtonDown) {
-        btnPtr->fsState |= TBSTATE_PRESSED;
+            }
+            else if (nHit == infoPtr->nButtonDown) {
+                btnPtr->fsState |= TBSTATE_PRESSED;
                 InvalidateRect(hwnd, &btnPtr->rect, TRUE);
-        }
-    }
-    infoPtr->nOldHit = nHit;
+            }
+        }
+        infoPtr->nOldHit = nHit;
     }
     return 0;
@@ -4087 +4552 @@
 {
 /*    if (wndPtr->dwStyle & CCS_NODIVIDER) */
-    return DefWindowProcA (hwnd, WM_NCACTIVATE, wParam, lParam);
+        return DefWindowProcA (hwnd, WM_NCACTIVATE, wParam, lParam);
 /*    else */
-/*  return TOOLBAR_NCPaint (wndPtr, wParam, lParam); */
+/*      return TOOLBAR_NCPaint (wndPtr, wParam, lParam); */
 }
 
@@ -4097 +4562 @@
 {
     if (!(GetWindowLongA (hwnd, GWL_STYLE) & CCS_NODIVIDER))
-    ((LPRECT)lParam)->top += GetSystemMetrics(SM_CYEDGE);
+        ((LPRECT)lParam)->top += GetSystemMetrics(SM_CYEDGE);
 
     return DefWindowProcA (hwnd, WM_NCCALCSIZE, wParam, lParam);
@@ -4107 +4572 @@
 {
     TOOLBAR_INFO *infoPtr;
+    LPCREATESTRUCTA cs = (LPCREATESTRUCTA)lParam;
+    DWORD styleadd = 0;
 
     /* allocate memory for info structure */
@@ -4118 +4585 @@
     if (!GetWindowLongA (hwnd, GWL_HINSTANCE)) {
         HINSTANCE hInst = (HINSTANCE)GetWindowLongA (GetParent (hwnd), GWL_HINSTANCE);
-    SetWindowLongA (hwnd, GWL_HINSTANCE, (DWORD)hInst);
+        SetWindowLongA (hwnd, GWL_HINSTANCE, (DWORD)hInst);
+    }
+
+    /* native control does:
+     *    Get a lot of colors and brushes
+     *    WM_NOTIFYFORMAT
+     *    SystemParametersInfoA(0x1f, 0x3c, adr1, 0)
+     *    CreateFontIndirectA(adr1)
+     *    CreateBitmap(0x27, 0x24, 1, 1, 0)
+     *    hdc = GetDC(toolbar)
+     *    GetSystemMetrics(0x48)
+     *    fnt2=CreateFontA(0xe, 0, 0, 0, 0x190, 0, 0, 0, 0, 2, 
+     *                     0, 0, 0, 0, "MARLETT")
+     *    oldfnt = SelectObject(hdc, fnt2)
+     *    GetCharWidthA(hdc, 0x36, 0x36, adr2)
+     *    GetTextMetricsA(hdc, adr3)
+     *    SelectObject(hdc, oldfnt)
+     *    DeleteObject(fnt2)
+     *    ReleaseDC(hdc)
+     *    InvalidateRect(toolbar, 0, 1)
+     *    SetWindowLongA(toolbar, 0, addr)
+     *    SetWindowLongA(toolbar, -16, xxx)  **sometimes**
+     *                                          WM_STYLECHANGING
+     *                             CallWinEx   old         new
+     *                       ie 1  0x56000a4c  0x46000a4c  0x56008a4d
+     *                       ie 2  0x4600094c  0x4600094c  0x4600894d
+     *                       ie 3  0x56000b4c  0x46000b4c  0x56008b4d
+     *                      rebar  0x50008844  0x40008844  0x50008845
+     *                      pager  0x50000844  0x40000844  0x50008845
+     *                    IC35mgr  0x5400084e  **nochange**
+     *           on entry to _NCCREATE         0x5400084e
+     *                    rowlist  0x5400004e  **nochange**
+     *           on entry to _NCCREATE         0x5400004e
+     *
+     */
+
+    /* I think the code below is a bug, but it is the way that the native
+     * controls seem to work. The effect is that if the user of TBSTYLE_FLAT
+     * forgets to specify TBSTYLE_TRANSPARENT but does specify either
+     * CCS_TOP or CCS_BOTTOM (_NOMOVEY and _TOP), then the control
+     * does *not* set TBSTYLE_TRANSPARENT even though it should!!!!
+     * Some how, the only cases of this seem to be MFC programs.
+     *
+     * Note also that the addition of _TRANSPARENT occurs *only* here. It
+     * does not occur in the WM_STYLECHANGING routine.
+     *    (Guy Albertelli   9/2001)
+     *
+     */
+    if ((cs->style & TBSTYLE_FLAT) && !(cs->style & TBSTYLE_TRANSPARENT))
+        styleadd |= TBSTYLE_TRANSPARENT;
+    if (!(cs->style & (CCS_TOP | CCS_NOMOVEY))) {
+        styleadd |= CCS_TOP;   /* default to top */
+        SetWindowLongA (hwnd, GWL_STYLE, cs->style | styleadd);
     }
 
@@ -4133 +4652 @@
 
     if (dwStyle & WS_MINIMIZE)
-    return 0; /* Nothing to do */
+        return 0; /* Nothing to do */
 
     DefWindowProcA (hwnd, WM_NCPAINT, wParam, lParam);
 
     if (!(hdc = GetDCEx (hwnd, 0, DCX_USESTYLE | DCX_WINDOW)))
-    return 0;
+        return 0;
 
     if (!(dwStyle & CCS_NODIVIDER))
     {
-    GetWindowRect (hwnd, &rcWindow);
-    OffsetRect (&rcWindow, -rcWindow.left, -rcWindow.top);
-    if( dwStyle & WS_BORDER )
-        OffsetRect (&rcWindow, 1, 1);
-    DrawEdge (hdc, &rcWindow, EDGE_ETCHED, BF_TOP);
+        GetWindowRect (hwnd, &rcWindow);
+        OffsetRect (&rcWindow, -rcWindow.left, -rcWindow.top);
+        if( dwStyle & WS_BORDER )
+            OffsetRect (&rcWindow, 1, 1);
+        DrawEdge (hdc, &rcWindow, EDGE_ETCHED, BF_TOP);
     }
 
@@ -4161 +4680 @@
     LPNMHDR lpnmh = (LPNMHDR)lParam;
 
+    if (lpnmh->code == PGN_CALCSIZE) {
+        LPNMPGCALCSIZE lppgc = (LPNMPGCALCSIZE)lParam;
+
+        if (lppgc->dwFlag == PGF_CALCWIDTH) {
+            lppgc->iWidth = infoPtr->nWidth;
+            TRACE("processed PGN_CALCSIZE, returning horz size = %d\n", 
+                  infoPtr->nWidth);
+        }
+        else {
+            lppgc->iHeight = infoPtr->nHeight;
+            TRACE("processed PGN_CALCSIZE, returning vert size = %d\n", 
+                  infoPtr->nHeight);
+        }
+        return 0;
+    }
+
+
     TRACE("passing WM_NOTIFY!\n");
 
     if ((infoPtr->hwndToolTip) && (lpnmh->hwndFrom == infoPtr->hwndToolTip)) {
-    SendMessageA (infoPtr->hwndNotify, WM_NOTIFY,   wParam, lParam);
+        SendMessageA (infoPtr->hwndNotify, WM_NOTIFY,   wParam, lParam);
 
 #if 0
-    if (lpnmh->code == TTN_GETDISPINFOA) {
-        LPNMTTDISPINFOA lpdi = (LPNMTTDISPINFOA)lParam;
-
-        FIXME("retrieving ASCII string\n");
-
-    }
-    else if (lpnmh->code == TTN_GETDISPINFOW) {
-        LPNMTTDISPINFOW lpdi = (LPNMTTDISPINFOW)lParam;
-
-        FIXME("retrieving UNICODE string\n");
-
-    }
+        if (lpnmh->code == TTN_GETDISPINFOA) {
+            LPNMTTDISPINFOA lpdi = (LPNMTTDISPINFOA)lParam;
+
+            FIXME("retrieving ASCII string\n");
+
+        }
+        else if (lpnmh->code == TTN_GETDISPINFOW) {
+            LPNMTTDISPINFOW lpdi = (LPNMTTDISPINFOW)lParam;
+
+            FIXME("retrieving UNICODE string\n");
+
+        }
 #endif
     }
@@ -4194 +4730 @@
 
     /* fill ps.rcPaint with a default rect */
-    memcpy(&(ps.rcPaint), &(infoPtr->rcBound), sizeof(infoPtr->rcBound));
+    memcpy(&(ps.rcPaint), &(infoPtr->rcBound), sizeof(infoPtr->rcBound)); 
 
     hdc = wParam==0 ? BeginPaint(hwnd, &ps) : (HDC)wParam;
 
     TRACE("psrect=(%d,%d)-(%d,%d)\n",
-      ps.rcPaint.left, ps.rcPaint.top,
-      ps.rcPaint.right, ps.rcPaint.bottom);
+          ps.rcPaint.left, ps.rcPaint.top,
+          ps.rcPaint.right, ps.rcPaint.bottom);
 
     TOOLBAR_Refresh (hwnd, hdc, &ps);
@@ -4224 +4760 @@
     /* Resize deadlock check */
     if (infoPtr->bAutoSize) {
-    infoPtr->bAutoSize = FALSE;
-    return 0;
+        infoPtr->bAutoSize = FALSE;
+        return 0;
     }
 
@@ -4240 +4776 @@
 
     if (flags == SIZE_RESTORED) {
-    /* width and height don't apply */
-    parent = GetParent (hwnd);
-    GetClientRect(parent, &parent_rect);
-    x = parent_rect.left;
-    y = parent_rect.top;
-
-    if (dwStyle & CCS_NORESIZE) {
-        uPosFlags |= (SWP_NOSIZE | SWP_NOMOVE);
-
-        /*
+        /* width and height don't apply */
+        parent = GetParent (hwnd);
+        GetClientRect(parent, &parent_rect);
+        x = parent_rect.left;
+        y = parent_rect.top;
+
+        if (dwStyle & CCS_NORESIZE) {
+            uPosFlags |= (SWP_NOSIZE | SWP_NOMOVE);
+
+            /*
              * this sets the working width of the toolbar, and
              * Calc Toolbar will not adjust it, only the height
              */
-        infoPtr->nWidth = parent_rect.right - parent_rect.left;
-        cy = infoPtr->nHeight;
-        cx = infoPtr->nWidth;
-        TOOLBAR_CalcToolbar (hwnd);
-        infoPtr->nWidth = cx;
-        infoPtr->nHeight = cy;
-    }
-    else {
-        infoPtr->nWidth = parent_rect.right - parent_rect.left;
-        TOOLBAR_CalcToolbar (hwnd);
-        cy = infoPtr->nHeight;
-        cx = infoPtr->nWidth;
-
-        if (dwStyle & CCS_NOMOVEY) {
-        GetWindowRect(hwnd, &window_rect);
-        ScreenToClient(parent, (LPPOINT)&window_rect.left);
-        y = window_rect.top;
-        }
-    }
-
-    if (dwStyle & CCS_NOPARENTALIGN) {
-        uPosFlags |= SWP_NOMOVE;
-        cy = infoPtr->nHeight;
-        cx = infoPtr->nWidth;
-    }
-
-    if (!(dwStyle & CCS_NODIVIDER))
-        cy += GetSystemMetrics(SM_CYEDGE);
-
-    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);
+            infoPtr->nWidth = parent_rect.right - parent_rect.left; 
+            cy = infoPtr->nHeight;
+            cx = infoPtr->nWidth;
+            TOOLBAR_CalcToolbar (hwnd);
+            infoPtr->nWidth = cx;
+            infoPtr->nHeight = cy;
+        }
+        else {
+            infoPtr->nWidth = parent_rect.right - parent_rect.left;
+            TOOLBAR_CalcToolbar (hwnd);
+            cy = infoPtr->nHeight;
+            cx = infoPtr->nWidth;
+
+            if (dwStyle & CCS_NOMOVEY) {
+                GetWindowRect(hwnd, &window_rect);
+                ScreenToClient(parent, (LPPOINT)&window_rect.left);
+                y = window_rect.top;
+            }
+        }
+
+        if (dwStyle & CCS_NOPARENTALIGN) {
+            uPosFlags |= SWP_NOMOVE;
+            cy = infoPtr->nHeight;
+            cx = infoPtr->nWidth;
+        }
+
+        if (!(dwStyle & CCS_NODIVIDER))
+            cy += GetSystemMetrics(SM_CYEDGE);
+
+        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);
     }
     return 0;
@@ -4302 +4838 @@
 
     if (nType == GWL_STYLE) {
-    if (lpStyle->styleNew & TBSTYLE_LIST) {
-        infoPtr->dwDTFlags = DT_LEFT | DT_VCENTER | DT_SINGLELINE;
-    }
-    else {
-        infoPtr->dwDTFlags = DT_CENTER;
-    }
+        if (lpStyle->styleNew & TBSTYLE_LIST) {
+            infoPtr->dwDTFlags = DT_LEFT | DT_VCENTER | DT_SINGLELINE;
+        }
+        else {
+            infoPtr->dwDTFlags = DT_CENTER;
+        }
+        infoPtr->bTransparent = (lpStyle->styleNew & TBSTYLE_TRANSPARENT);
+        infoPtr->bBtnTranspnt = (lpStyle->styleNew & 
+                                 (TBSTYLE_FLAT | TBSTYLE_LIST));
+        TOOLBAR_CheckStyle (hwnd, lpStyle->styleNew);
     }
 
@@ -4322 +4862 @@
 ToolbarWindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
+    TRACE("hwnd=%x msg=%x wparam=%x lparam=%lx\n", 
+          hwnd, uMsg, /* SPY_GetMsgName(uMsg), */ wParam, lParam);
+
     if (!TOOLBAR_GetInfoPtr(hwnd) && (uMsg != WM_NCCREATE))
-    return DefWindowProcA( hwnd, uMsg, wParam, lParam );
+        return DefWindowProcA( hwnd, uMsg, wParam, lParam );
 
     switch (uMsg)
     {
-    case TB_ADDBITMAP:
-        return TOOLBAR_AddBitmap (hwnd, wParam, lParam);
-
-    case TB_ADDBUTTONSA:
-        return TOOLBAR_AddButtonsA (hwnd, wParam, lParam);
-
-    case TB_ADDBUTTONSW:
-        return TOOLBAR_AddButtonsW (hwnd, wParam, lParam);
-
-    case TB_ADDSTRINGA:
-        return TOOLBAR_AddStringA (hwnd, wParam, lParam);
-
-    case TB_ADDSTRINGW:
-        return TOOLBAR_AddStringW (hwnd, wParam, lParam);
-
-    case TB_AUTOSIZE:
-        return TOOLBAR_AutoSize (hwnd);
-
-    case TB_BUTTONCOUNT:
-        return TOOLBAR_ButtonCount (hwnd, wParam, lParam);
-
-    case TB_BUTTONSTRUCTSIZE:
-        return TOOLBAR_ButtonStructSize (hwnd, wParam, lParam);
-
-    case TB_CHANGEBITMAP:
-        return TOOLBAR_ChangeBitmap (hwnd, wParam, lParam);
-
-    case TB_CHECKBUTTON:
-        return TOOLBAR_CheckButton (hwnd, wParam, lParam);
-
-    case TB_COMMANDTOINDEX:
-        return TOOLBAR_CommandToIndex (hwnd, wParam, lParam);
-
-    case TB_CUSTOMIZE:
-        return TOOLBAR_Customize (hwnd);
-
-    case TB_DELETEBUTTON:
-        return TOOLBAR_DeleteButton (hwnd, wParam, lParam);
-
-    case TB_ENABLEBUTTON:
-        return TOOLBAR_EnableButton (hwnd, wParam, lParam);
-
-    case TB_GETANCHORHIGHLIGHT:
-        return TOOLBAR_GetAnchorHighlight (hwnd);
-
-    case TB_GETBITMAP:
-        return TOOLBAR_GetBitmap (hwnd, wParam, lParam);
-
-    case TB_GETBITMAPFLAGS:
-        return TOOLBAR_GetBitmapFlags (hwnd, wParam, lParam);
-
-    case TB_GETBUTTON:
-        return TOOLBAR_GetButton (hwnd, wParam, lParam);
-
-    case TB_GETBUTTONINFOA:
-        return TOOLBAR_GetButtonInfoA (hwnd, wParam, lParam);
-
-    case TB_GETBUTTONINFOW:
-        return TOOLBAR_GetButtonInfoW (hwnd, wParam, lParam);
-
-    case TB_GETBUTTONSIZE:
-        return TOOLBAR_GetButtonSize (hwnd);
-
-    case TB_GETBUTTONTEXTA:
-        return TOOLBAR_GetButtonTextA (hwnd, wParam, lParam);
-
-    case TB_GETBUTTONTEXTW:
-        return TOOLBAR_GetButtonTextW (hwnd, wParam, lParam);
-
-/*  case TB_GETCOLORSCHEME:         */ /* 4.71 */
-
-    case TB_GETDISABLEDIMAGELIST:
-        return TOOLBAR_GetDisabledImageList (hwnd, wParam, lParam);
-
-    case TB_GETEXTENDEDSTYLE:
-        return TOOLBAR_GetExtendedStyle (hwnd);
-
-    case TB_GETHOTIMAGELIST:
-        return TOOLBAR_GetHotImageList (hwnd, wParam, lParam);
-
-    case TB_GETHOTITEM:
-        return TOOLBAR_GetHotItem (hwnd);
-
-    case TB_GETIMAGELIST:
-        return TOOLBAR_GetImageList (hwnd, wParam, lParam);
-
-/*  case TB_GETINSERTMARK:          */ /* 4.71 */
-/*  case TB_GETINSERTMARKCOLOR:     */ /* 4.71 */
-
-    case TB_GETITEMRECT:
-        return TOOLBAR_GetItemRect (hwnd, wParam, lParam);
-
-    case TB_GETMAXSIZE:
-        return TOOLBAR_GetMaxSize (hwnd, wParam, lParam);
-
-/*  case TB_GETOBJECT:          */ /* 4.71 */
-/*  case TB_GETPADDING:         */ /* 4.71 */
-
-    case TB_GETRECT:
-        return TOOLBAR_GetRect (hwnd, wParam, lParam);
-
-    case TB_GETROWS:
-        return TOOLBAR_GetRows (hwnd, wParam, lParam);
-
-    case TB_GETSTATE:
-        return TOOLBAR_GetState (hwnd, wParam, lParam);
-
-    case TB_GETSTYLE:
-        return TOOLBAR_GetStyle (hwnd, wParam, lParam);
-
-    case TB_GETTEXTROWS:
-        return TOOLBAR_GetTextRows (hwnd, wParam, lParam);
-
-    case TB_GETTOOLTIPS:
-        return TOOLBAR_GetToolTips (hwnd, wParam, lParam);
-
-    case TB_GETUNICODEFORMAT:
-        return TOOLBAR_GetUnicodeFormat (hwnd, wParam, lParam);
-
-    case CCM_GETVERSION:
-        return TOOLBAR_GetVersion (hwnd);
-
-    case TB_HIDEBUTTON:
-        return TOOLBAR_HideButton (hwnd, wParam, lParam);
-
-    case TB_HITTEST:
-        return TOOLBAR_HitTest (hwnd, wParam, lParam);
-
-    case TB_INDETERMINATE:
-        return TOOLBAR_Indeterminate (hwnd, wParam, lParam);
-
-    case TB_INSERTBUTTONA:
-        return TOOLBAR_InsertButtonA (hwnd, wParam, lParam);
-
-    case TB_INSERTBUTTONW:
-        return TOOLBAR_InsertButtonW (hwnd, wParam, lParam);
-
-/*  case TB_INSERTMARKHITTEST:      */ /* 4.71 */
-
-    case TB_ISBUTTONCHECKED:
-        return TOOLBAR_IsButtonChecked (hwnd, wParam, lParam);
-
-    case TB_ISBUTTONENABLED:
-        return TOOLBAR_IsButtonEnabled (hwnd, wParam, lParam);
-
-    case TB_ISBUTTONHIDDEN:
-        return TOOLBAR_IsButtonHidden (hwnd, wParam, lParam);
-
-    case TB_ISBUTTONHIGHLIGHTED:
-        return TOOLBAR_IsButtonHighlighted (hwnd, wParam, lParam);
-
-    case TB_ISBUTTONINDETERMINATE:
-        return TOOLBAR_IsButtonIndeterminate (hwnd, wParam, lParam);
-
-    case TB_ISBUTTONPRESSED:
-        return TOOLBAR_IsButtonPressed (hwnd, wParam, lParam);
-
-    case TB_LOADIMAGES:            /* 4.70 */
-        FIXME("missing standard imagelists\n");
-        return 0;
-
-/*  case TB_MAPACCELERATORA:        */ /* 4.71 */
-/*  case TB_MAPACCELERATORW:        */ /* 4.71 */
-/*  case TB_MARKBUTTON:         */ /* 4.71 */
-/*  case TB_MOVEBUTTON:         */ /* 4.71 */
-
-    case TB_PRESSBUTTON:
-        return TOOLBAR_PressButton (hwnd, wParam, lParam);
-
-/*  case TB_REPLACEBITMAP: */
-
-    case TB_SAVERESTOREA:
-        return TOOLBAR_SaveRestoreA (hwnd, wParam, lParam);
-
-    case TB_SAVERESTOREW:
-        return TOOLBAR_SaveRestoreW (hwnd, wParam, lParam);
-
-    case TB_SETANCHORHIGHLIGHT:
-        return TOOLBAR_SetAnchorHighlight (hwnd, wParam);
-
-    case TB_SETBITMAPSIZE:
-        return TOOLBAR_SetBitmapSize (hwnd, wParam, lParam);
-
-    case TB_SETBUTTONINFOA:
-        return TOOLBAR_SetButtonInfoA (hwnd, wParam, lParam);
-
-    case TB_SETBUTTONINFOW:
-        return TOOLBAR_SetButtonInfoW (hwnd, wParam, lParam);
-
-    case TB_SETBUTTONSIZE:
-        return TOOLBAR_SetButtonSize (hwnd, wParam, lParam);
-
-    case TB_SETBUTTONWIDTH:
-        return TOOLBAR_SetButtonWidth (hwnd, wParam, lParam);
-
-    case TB_SETCMDID:
-        return TOOLBAR_SetCmdId (hwnd, wParam, lParam);
-
-/*  case TB_SETCOLORSCHEME:         */ /* 4.71 */
-
-    case TB_SETDISABLEDIMAGELIST:
-        return TOOLBAR_SetDisabledImageList (hwnd, wParam, lParam);
-
-    case TB_SETDRAWTEXTFLAGS:
-        return TOOLBAR_SetDrawTextFlags (hwnd, wParam, lParam);
-
-    case TB_SETEXTENDEDSTYLE:
-        return TOOLBAR_SetExtendedStyle (hwnd, wParam, lParam);
-
-    case TB_SETHOTIMAGELIST:
-        return TOOLBAR_SetHotImageList (hwnd, wParam, lParam);
-
-    case TB_SETHOTITEM:
-        return TOOLBAR_SetHotItem (hwnd, wParam);
-
-    case TB_SETIMAGELIST:
-        return TOOLBAR_SetImageList (hwnd, wParam, lParam);
-
-    case TB_SETINDENT:
-        return TOOLBAR_SetIndent (hwnd, wParam, lParam);
-
-/*  case TB_SETINSERTMARK:          */ /* 4.71 */
-
-    case TB_SETINSERTMARKCOLOR:
-        return TOOLBAR_SetInsertMarkColor (hwnd, wParam, lParam);
-
-    case TB_SETMAXTEXTROWS:
-        return TOOLBAR_SetMaxTextRows (hwnd, wParam, lParam);
-
-/*  case TB_SETPADDING:         */ /* 4.71 */
-
-    case TB_SETPARENT:
-        return TOOLBAR_SetParent (hwnd, wParam, lParam);
-
-    case TB_SETROWS:
-        return TOOLBAR_SetRows (hwnd, wParam, lParam);
-
-    case TB_SETSTATE:
-        return TOOLBAR_SetState (hwnd, wParam, lParam);
-
-    case TB_SETSTYLE:
-        return TOOLBAR_SetStyle (hwnd, wParam, lParam);
-
-    case TB_SETTOOLTIPS:
-        return TOOLBAR_SetToolTips (hwnd, wParam, lParam);
-
-    case TB_SETUNICODEFORMAT:
-        return TOOLBAR_SetUnicodeFormat (hwnd, wParam, lParam);
-
-    case CCM_SETVERSION:
-        return TOOLBAR_SetVersion (hwnd, (INT)wParam);
-
-
-/*  case WM_CHAR: */
-
-    case WM_CREATE:
-        return TOOLBAR_Create (hwnd, wParam, lParam);
-
-    case WM_DESTROY:
-      return TOOLBAR_Destroy (hwnd, wParam, lParam);
-
-    case WM_ERASEBKGND:
-        return TOOLBAR_EraseBackground (hwnd, wParam, lParam);
-
-    case WM_GETFONT:
-        return TOOLBAR_GetFont (hwnd, wParam, lParam);
-
-/*  case WM_KEYDOWN: */
-/*  case WM_KILLFOCUS: */
-
-    case WM_LBUTTONDBLCLK:
-        return TOOLBAR_LButtonDblClk (hwnd, wParam, lParam);
-
-    case WM_LBUTTONDOWN:
-        return TOOLBAR_LButtonDown (hwnd, wParam, lParam);
-
-    case WM_LBUTTONUP:
-        return TOOLBAR_LButtonUp (hwnd, wParam, lParam);
-
-    case WM_MOUSEMOVE:
-        return TOOLBAR_MouseMove (hwnd, wParam, lParam);
-
-    case WM_MOUSELEAVE:
-        return TOOLBAR_MouseLeave (hwnd, wParam, lParam);
-
-    case WM_CAPTURECHANGED:
-        return TOOLBAR_CaptureChanged(hwnd);
-
-    case WM_NCACTIVATE:
-        return TOOLBAR_NCActivate (hwnd, wParam, lParam);
-
-    case WM_NCCALCSIZE:
-        return TOOLBAR_NCCalcSize (hwnd, wParam, lParam);
-
-    case WM_NCCREATE:
-        return TOOLBAR_NCCreate (hwnd, wParam, lParam);
-
-    case WM_NCPAINT:
-        return TOOLBAR_NCPaint (hwnd, wParam, lParam);
-
-    case WM_NOTIFY:
-        return TOOLBAR_Notify (hwnd, wParam, lParam);
-
-/*  case WM_NOTIFYFORMAT: */
-
-    case WM_PAINT:
-        return TOOLBAR_Paint (hwnd, wParam);
-
-    case WM_SIZE:
-        return TOOLBAR_Size (hwnd, wParam, lParam);
-
-    case WM_STYLECHANGED:
-        return TOOLBAR_StyleChanged (hwnd, (INT)wParam, (LPSTYLESTRUCT)lParam);
-
-/*  case WM_SYSCOLORCHANGE: */
-
-/*  case WM_WININICHANGE: */
-
-    case WM_CHARTOITEM:
-    case WM_COMMAND:
-    case WM_DRAWITEM:
-    case WM_MEASUREITEM:
-    case WM_VKEYTOITEM:
-        return SendMessageA (GetParent (hwnd), uMsg, wParam, lParam);
-
-    default:
-        if (uMsg >= WM_USER)
-        ERR("unknown msg %04x wp=%08x lp=%08lx\n",
-             uMsg, wParam, lParam);
-        return DefWindowProcA (hwnd, uMsg, wParam, lParam);
+        case TB_ADDBITMAP:
+            return TOOLBAR_AddBitmap (hwnd, wParam, lParam);
+
+        case TB_ADDBUTTONSA:
+            return TOOLBAR_AddButtonsA (hwnd, wParam, lParam);
+
+        case TB_ADDBUTTONSW:
+            return TOOLBAR_AddButtonsW (hwnd, wParam, lParam);
+
+        case TB_ADDSTRINGA:
+            return TOOLBAR_AddStringA (hwnd, wParam, lParam);
+
+        case TB_ADDSTRINGW:
+            return TOOLBAR_AddStringW (hwnd, wParam, lParam);
+
+        case TB_AUTOSIZE:
+            return TOOLBAR_AutoSize (hwnd);
+
+        case TB_BUTTONCOUNT:
+            return TOOLBAR_ButtonCount (hwnd, wParam, lParam);
+
+        case TB_BUTTONSTRUCTSIZE:
+            return TOOLBAR_ButtonStructSize (hwnd, wParam, lParam);
+
+        case TB_CHANGEBITMAP:
+            return TOOLBAR_ChangeBitmap (hwnd, wParam, lParam);
+
+        case TB_CHECKBUTTON:
+            return TOOLBAR_CheckButton (hwnd, wParam, lParam);
+
+        case TB_COMMANDTOINDEX:
+            return TOOLBAR_CommandToIndex (hwnd, wParam, lParam);
+
+        case TB_CUSTOMIZE:
+            return TOOLBAR_Customize (hwnd);
+
+        case TB_DELETEBUTTON:
+            return TOOLBAR_DeleteButton (hwnd, wParam, lParam);
+
+        case TB_ENABLEBUTTON:
+            return TOOLBAR_EnableButton (hwnd, wParam, lParam);
+
+        case TB_GETANCHORHIGHLIGHT:
+            return TOOLBAR_GetAnchorHighlight (hwnd);
+
+        case TB_GETBITMAP:
+            return TOOLBAR_GetBitmap (hwnd, wParam, lParam);
+
+        case TB_GETBITMAPFLAGS:
+            return TOOLBAR_GetBitmapFlags (hwnd, wParam, lParam);
+
+        case TB_GETBUTTON:
+            return TOOLBAR_GetButton (hwnd, wParam, lParam);
+
+        case TB_GETBUTTONINFOA:
+            return TOOLBAR_GetButtonInfoA (hwnd, wParam, lParam);
+
+        case TB_GETBUTTONINFOW:
+            return TOOLBAR_GetButtonInfoW (hwnd, wParam, lParam);
+
+        case TB_GETBUTTONSIZE:
+            return TOOLBAR_GetButtonSize (hwnd);
+
+        case TB_GETBUTTONTEXTA:
+            return TOOLBAR_GetButtonTextA (hwnd, wParam, lParam);
+
+        case TB_GETBUTTONTEXTW:
+            return TOOLBAR_GetButtonTextW (hwnd, wParam, lParam);
+
+/*      case TB_GETCOLORSCHEME:                 */ /* 4.71 */
+
+        case TB_GETDISABLEDIMAGELIST:
+            return TOOLBAR_GetDisabledImageList (hwnd, wParam, lParam);
+
+        case TB_GETEXTENDEDSTYLE:
+            return TOOLBAR_GetExtendedStyle (hwnd);
+
+        case TB_GETHOTIMAGELIST:
+            return TOOLBAR_GetHotImageList (hwnd, wParam, lParam);
+
+        case TB_GETHOTITEM:
+            return TOOLBAR_GetHotItem (hwnd);
+
+        case TB_GETIMAGELIST:
+            return TOOLBAR_GetImageList (hwnd, wParam, lParam);
+
+/*      case TB_GETINSERTMARK:                  */ /* 4.71 */
+/*      case TB_GETINSERTMARKCOLOR:             */ /* 4.71 */
+
+        case TB_GETITEMRECT:
+            return TOOLBAR_GetItemRect (hwnd, wParam, lParam);
+
+        case TB_GETMAXSIZE:
+            return TOOLBAR_GetMaxSize (hwnd, wParam, lParam);
+
+/*      case TB_GETOBJECT:                      */ /* 4.71 */
+/*      case TB_GETPADDING:                     */ /* 4.71 */
+
+        case TB_GETRECT:
+            return TOOLBAR_GetRect (hwnd, wParam, lParam);
+
+        case TB_GETROWS:
+            return TOOLBAR_GetRows (hwnd, wParam, lParam);
+
+        case TB_GETSTATE:
+            return TOOLBAR_GetState (hwnd, wParam, lParam);
+
+        case TB_GETSTYLE:
+            return TOOLBAR_GetStyle (hwnd, wParam, lParam);
+
+        case TB_GETTEXTROWS:
+            return TOOLBAR_GetTextRows (hwnd, wParam, lParam);
+
+        case TB_GETTOOLTIPS:
+            return TOOLBAR_GetToolTips (hwnd, wParam, lParam);
+
+        case TB_GETUNICODEFORMAT:
+            return TOOLBAR_GetUnicodeFormat (hwnd, wParam, lParam);
+
+        case CCM_GETVERSION:
+            return TOOLBAR_GetVersion (hwnd);
+
+        case TB_HIDEBUTTON:
+            return TOOLBAR_HideButton (hwnd, wParam, lParam);
+
+        case TB_HITTEST:
+            return TOOLBAR_HitTest (hwnd, wParam, lParam);
+
+        case TB_INDETERMINATE:
+            return TOOLBAR_Indeterminate (hwnd, wParam, lParam);
+
+        case TB_INSERTBUTTONA:
+            return TOOLBAR_InsertButtonA (hwnd, wParam, lParam);
+
+        case TB_INSERTBUTTONW:
+            return TOOLBAR_InsertButtonW (hwnd, wParam, lParam);
+
+/*      case TB_INSERTMARKHITTEST:              */ /* 4.71 */
+
+        case TB_ISBUTTONCHECKED:
+            return TOOLBAR_IsButtonChecked (hwnd, wParam, lParam);
+
+        case TB_ISBUTTONENABLED:
+            return TOOLBAR_IsButtonEnabled (hwnd, wParam, lParam);
+
+        case TB_ISBUTTONHIDDEN:
+            return TOOLBAR_IsButtonHidden (hwnd, wParam, lParam);
+
+        case TB_ISBUTTONHIGHLIGHTED:
+            return TOOLBAR_IsButtonHighlighted (hwnd, wParam, lParam);
+
+        case TB_ISBUTTONINDETERMINATE:
+            return TOOLBAR_IsButtonIndeterminate (hwnd, wParam, lParam);
+
+        case TB_ISBUTTONPRESSED:
+            return TOOLBAR_IsButtonPressed (hwnd, wParam, lParam);
+
+        case TB_LOADIMAGES:                        /* 4.70 */
+            FIXME("missing standard imagelists\n");
+            return 0;
+
+/*      case TB_MAPACCELERATORA:                */ /* 4.71 */
+/*      case TB_MAPACCELERATORW:                */ /* 4.71 */
+/*      case TB_MARKBUTTON:                     */ /* 4.71 */
+/*      case TB_MOVEBUTTON:                     */ /* 4.71 */
+
+        case TB_PRESSBUTTON:
+            return TOOLBAR_PressButton (hwnd, wParam, lParam);
+
+/*      case TB_REPLACEBITMAP: */
+
+        case TB_SAVERESTOREA:
+            return TOOLBAR_SaveRestoreA (hwnd, wParam, lParam);
+
+        case TB_SAVERESTOREW:
+            return TOOLBAR_SaveRestoreW (hwnd, wParam, lParam);
+
+        case TB_SETANCHORHIGHLIGHT:
+            return TOOLBAR_SetAnchorHighlight (hwnd, wParam);
+
+        case TB_SETBITMAPSIZE:
+            return TOOLBAR_SetBitmapSize (hwnd, wParam, lParam);
+
+        case TB_SETBUTTONINFOA:
+            return TOOLBAR_SetButtonInfoA (hwnd, wParam, lParam);
+
+        case TB_SETBUTTONINFOW:
+            return TOOLBAR_SetButtonInfoW (hwnd, wParam, lParam);
+
+        case TB_SETBUTTONSIZE:
+            return TOOLBAR_SetButtonSize (hwnd, wParam, lParam);
+
+        case TB_SETBUTTONWIDTH:
+            return TOOLBAR_SetButtonWidth (hwnd, wParam, lParam);
+
+        case TB_SETCMDID:
+            return TOOLBAR_SetCmdId (hwnd, wParam, lParam);
+
+/*      case TB_SETCOLORSCHEME:                 */ /* 4.71 */
+
+        case TB_SETDISABLEDIMAGELIST:
+            return TOOLBAR_SetDisabledImageList (hwnd, wParam, lParam);
+
+        case TB_SETDRAWTEXTFLAGS:
+            return TOOLBAR_SetDrawTextFlags (hwnd, wParam, lParam);
+
+        case TB_SETEXTENDEDSTYLE:
+            return TOOLBAR_SetExtendedStyle (hwnd, wParam, lParam);
+
+        case TB_SETHOTIMAGELIST:
+            return TOOLBAR_SetHotImageList (hwnd, wParam, lParam);
+
+        case TB_SETHOTITEM:
+            return TOOLBAR_SetHotItem (hwnd, wParam);
+
+        case TB_SETIMAGELIST:
+            return TOOLBAR_SetImageList (hwnd, wParam, lParam);
+
+        case TB_SETINDENT:
+            return TOOLBAR_SetIndent (hwnd, wParam, lParam);
+
+/*      case TB_SETINSERTMARK:                  */ /* 4.71 */
+
+        case TB_SETINSERTMARKCOLOR:
+            return TOOLBAR_SetInsertMarkColor (hwnd, wParam, lParam);
+
+        case TB_SETMAXTEXTROWS:
+            return TOOLBAR_SetMaxTextRows (hwnd, wParam, lParam);
+
+/*      case TB_SETPADDING:                     */ /* 4.71 */
+
+        case TB_SETPARENT:
+            return TOOLBAR_SetParent (hwnd, wParam, lParam);
+
+        case TB_SETROWS:
+            return TOOLBAR_SetRows (hwnd, wParam, lParam);
+
+        case TB_SETSTATE:
+            return TOOLBAR_SetState (hwnd, wParam, lParam);
+
+        case TB_SETSTYLE:
+            return TOOLBAR_SetStyle (hwnd, wParam, lParam);
+
+        case TB_SETTOOLTIPS:
+            return TOOLBAR_SetToolTips (hwnd, wParam, lParam);
+
+        case TB_SETUNICODEFORMAT:
+            return TOOLBAR_SetUnicodeFormat (hwnd, wParam, lParam);
+
+        case CCM_SETVERSION:
+            return TOOLBAR_SetVersion (hwnd, (INT)wParam);
+
+
+/*      case WM_CHAR: */
+
+        case WM_CREATE:
+            return TOOLBAR_Create (hwnd, wParam, lParam);
+
+        case WM_DESTROY:
+          return TOOLBAR_Destroy (hwnd, wParam, lParam);
+
+        case WM_ERASEBKGND:
+            return TOOLBAR_EraseBackground (hwnd, wParam, lParam);
+
+        case WM_GETFONT:
+                return TOOLBAR_GetFont (hwnd, wParam, lParam);
+
+/*      case WM_KEYDOWN: */
+/*      case WM_KILLFOCUS: */
+
+        case WM_LBUTTONDBLCLK:
+            return TOOLBAR_LButtonDblClk (hwnd, wParam, lParam);
+
+        case WM_LBUTTONDOWN:
+            return TOOLBAR_LButtonDown (hwnd, wParam, lParam);
+
+        case WM_LBUTTONUP:
+            return TOOLBAR_LButtonUp (hwnd, wParam, lParam);
+
+        case WM_MOUSEMOVE:
+            return TOOLBAR_MouseMove (hwnd, wParam, lParam);
+
+        case WM_MOUSELEAVE:
+            return TOOLBAR_MouseLeave (hwnd, wParam, lParam);   
+
+        case WM_CAPTURECHANGED:
+            return TOOLBAR_CaptureChanged(hwnd);        
+
+        case WM_NCACTIVATE:
+            return TOOLBAR_NCActivate (hwnd, wParam, lParam);
+
+        case WM_NCCALCSIZE:
+            return TOOLBAR_NCCalcSize (hwnd, wParam, lParam);
+
+        case WM_NCCREATE:
+            return TOOLBAR_NCCreate (hwnd, wParam, lParam);
+
+        case WM_NCPAINT:
+            return TOOLBAR_NCPaint (hwnd, wParam, lParam);
+
+        case WM_NOTIFY:
+            return TOOLBAR_Notify (hwnd, wParam, lParam);
+
+/*      case WM_NOTIFYFORMAT: */
+
+        case WM_PAINT:
+            return TOOLBAR_Paint (hwnd, wParam);
+
+        case WM_SIZE:
+            return TOOLBAR_Size (hwnd, wParam, lParam);
+
+        case WM_STYLECHANGED:
+            return TOOLBAR_StyleChanged (hwnd, (INT)wParam, (LPSTYLESTRUCT)lParam);
+
+/*      case WM_SYSCOLORCHANGE: */
+
+/*      case WM_WININICHANGE: */
+
+        case WM_CHARTOITEM:
+        case WM_COMMAND:
+        case WM_DRAWITEM:
+        case WM_MEASUREITEM:
+        case WM_VKEYTOITEM:
+            return SendMessageA (GetParent (hwnd), uMsg, wParam, lParam);
+
+        default:
+            if (uMsg >= WM_USER)
+                ERR("unknown msg %04x wp=%08x lp=%08lx\n",
+                     uMsg, wParam, lParam);
+            return DefWindowProcA (hwnd, uMsg, wParam, lParam);
     }
     return 0;
@@ -4675 +5218 @@
     wndClass.hbrBackground = (HBRUSH)(COLOR_3DFACE + 1);
     wndClass.lpszClassName = TOOLBARCLASSNAMEA;
-
+ 
     RegisterClassA (&wndClass);
 }
@@ -4685 +5228 @@
     UnregisterClassA (TOOLBARCLASSNAMEA, (HINSTANCE)NULL);
 }
-

trunk/src/comctl32/treeview.cpp

@@ -1 @@
-/* $Id: treeview.cpp,v 1.18 2000-08-15 17:04:39 cbratschi Exp $ */
+/* $Id: treeview.cpp,v 1.19 2001-09-15 09:13:31 sandervl Exp $ */
 /* Treeview control
  *
@@ -1335 +1335 @@
     if (oldSelection == infoPtr->selectedItem)
     {
+#ifdef __WIN32OS2__
+      //Crash in UltraEdit when opening file, because the old selected
+      //item is already freed
+      if (oldSelection == (TREEVIEW_ITEM *)lParam) {
+          infoPtr->selectedItem = 0;
+      }
+#endif
       if (TREEVIEW_ValidItem(infoPtr, newSelection))
         TREEVIEW_DoSelectItem(infoPtr, TVGN_CARET, newSelection, TVC_UNKNOWN);