From 697a621a7c1f936c8b5887e7aeb5c6252a9c5c62 Mon Sep 17 00:00:00 2001
From: Marcus Meissner <marcus@jet.franken.de>
Date: Wed, 1 Nov 2000 01:49:01 +0000
Subject: [PATCH] Removed unnecessary calls of TOOLBAR_CalcToolbar() (which
 would be recalculated due to InvalidateRect()->WM_PAINT anyway).

---
 dlls/comctl32/toolbar.c | 24 ++----------------------
 1 file changed, 2 insertions(+), 22 deletions(-)

diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c
index 6379f714bd3..483958ba5bf 100644
--- a/dlls/comctl32/toolbar.c
+++ b/dlls/comctl32/toolbar.c
@@ -1223,8 +1223,6 @@ TOOLBAR_AddBitmap (HWND hwnd, WPARAM wParam, LPARAM lParam)
 	    SendMessageA (hwnd, TB_SETBUTTONSIZE, 0,
 			  MAKELPARAM((WORD)22, (WORD)22));
 	}
-	
-	TOOLBAR_CalcToolbar (hwnd);
     }
     else
     {
@@ -1336,6 +1334,8 @@ TOOLBAR_AddBitmap (HWND hwnd, WPARAM wParam, LPARAM lParam)
          infoPtr->nNumBitmaps += nButtons;
     }
 
+    InvalidateRect(hwnd, NULL, FALSE);
+
     return nIndex;
 }
 
@@ -1394,8 +1394,6 @@ TOOLBAR_AddButtonsA (HWND hwnd, WPARAM wParam, LPARAM lParam)
 	}
     }
 
-    TOOLBAR_CalcToolbar (hwnd);
-
     InvalidateRect(hwnd, NULL, FALSE);
 
     return TRUE;
@@ -1456,8 +1454,6 @@ TOOLBAR_AddButtonsW (HWND hwnd, WPARAM wParam, LPARAM lParam)
 	}
     }
 
-    TOOLBAR_CalcToolbar (hwnd);
-
     InvalidateRect(hwnd, NULL, FALSE);
 
     return TRUE;
@@ -1674,7 +1670,6 @@ TOOLBAR_AutoSize (HWND hwnd)
     }
     else {
 	infoPtr->nWidth = parent_rect.right - parent_rect.left;
-	TOOLBAR_CalcToolbar (hwnd);
 	InvalidateRect( hwnd, NULL, TRUE );
 	cy = infoPtr->nHeight;
 	cx = infoPtr->nWidth;
@@ -1904,8 +1899,6 @@ TOOLBAR_DeleteButton (HWND hwnd, WPARAM wParam, LPARAM lParam)
 	COMCTL32_Free (oldButtons);
     }
 
-    TOOLBAR_CalcToolbar (hwnd);
-
     InvalidateRect (hwnd, NULL, TRUE);
 
     return TRUE;
@@ -2397,8 +2390,6 @@ TOOLBAR_HideButton (HWND hwnd, WPARAM wParam, LPARAM lParam)
     else
 	btnPtr->fsState |= TBSTATE_HIDDEN;
 
-    TOOLBAR_CalcToolbar (hwnd);
-
     InvalidateRect (hwnd, NULL, TRUE);
 
     return TRUE;
@@ -2519,8 +2510,6 @@ TOOLBAR_InsertButtonA (HWND hwnd, WPARAM wParam, LPARAM lParam)
 
     COMCTL32_Free (oldButtons);
 
-    TOOLBAR_CalcToolbar (hwnd);
-
     InvalidateRect (hwnd, NULL, FALSE);
 
     return TRUE;
@@ -2585,8 +2574,6 @@ TOOLBAR_InsertButtonW (HWND hwnd, WPARAM wParam, LPARAM lParam)
 
     COMCTL32_Free (oldButtons);
 
-    TOOLBAR_CalcToolbar (hwnd);
-
     InvalidateRect (hwnd, NULL, FALSE);
 
     return TRUE;
@@ -3084,7 +3071,6 @@ TOOLBAR_SetIndent (HWND hwnd, WPARAM wParam, LPARAM lParam)
     if(infoPtr->nIndent != (INT)wParam)
     {
         infoPtr->nIndent = (INT)wParam;
-        TOOLBAR_CalcToolbar (hwnd);
         InvalidateRect(hwnd, NULL, FALSE);
     }
 
@@ -3158,9 +3144,6 @@ TOOLBAR_SetRows (HWND hwnd, WPARAM wParam, LPARAM lParam)
     {
         infoPtr->nRows = LOWORD(wParam);
 
-        /* recalculate toolbar */
-        TOOLBAR_CalcToolbar (hwnd);
-
         /* repaint toolbar */
         InvalidateRect(hwnd, NULL, FALSE);
     }
@@ -3327,9 +3310,6 @@ TOOLBAR_Create (HWND hwnd, WPARAM wParam, LPARAM lParam)
 			  (WPARAM)nmttc.hdr.idFrom, (LPARAM)&nmttc);
 	}
     }
-
-    TOOLBAR_CalcToolbar(hwnd);
-
     return 0;
 }
 
-- 
2.11.4.GIT