From 5324bbc6fb063ca7769ed8057262454f7250958e Mon Sep 17 00:00:00 2001
From: alexs75 <alexs75@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Thu, 6 Nov 2008 08:36:09 +0000
Subject: [PATCH] try to fix loading TToolBar in Windows Vista

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@602 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 components/rx/rxtoolbar.pas | 37 +++++++++++++++++++++++++++----------
 1 file changed, 27 insertions(+), 10 deletions(-)

diff --git a/components/rx/rxtoolbar.pas b/components/rx/rxtoolbar.pas
index cff9477de..55c95cab6 100644
--- a/components/rx/rxtoolbar.pas
+++ b/components/rx/rxtoolbar.pas
@@ -188,6 +188,7 @@ type
     procedure MouseUp(Button: TMouseButton; Shift: TShiftState;
       X, Y: Integer); override;
     procedure RequestAlign; override;
+    procedure Loaded; override;
   public
     constructor Create(AOwner: TComponent); override;
     destructor Destroy; override;
@@ -1027,19 +1028,23 @@ var
 begin
 
   if not AutoSizeCanStart then exit;
+  if csDesigning in ComponentState then exit;
 
   if Items.Count > 0 then
   begin
-    H:=0;
-    for i:=0 to Items.Count-1 do
-      if Assigned(Items[i].FButton) and Items[i].FButton.HandleObjectShouldBeVisible then
-        H:=Max(H, Items[i].Height);
-    if H>0 then
-    begin
-      H:=H +BorderWidth * 2;
-      SetBoundsKeepBase(Left,Top,Width,H,true);
-      ReAlignToolBtn;
-    end;
+    try
+      H:=0;
+      for i:=0 to Items.Count-1 do
+        if Assigned(Items[i].FButton) and Items[i].FButton.HandleObjectShouldBeVisible then
+          H:=Max(H, Items[i].Height);
+      if H>0 then
+      begin
+        H:=H +BorderWidth * 2;
+        SetBoundsKeepBase(Left,Top,Width,H,true);
+        ReAlignToolBtn;
+      end;
+    finally
+    end
 //    Exclude(FControlFlags,cfAutoSizeNeeded);
   end
   else
@@ -1065,6 +1070,18 @@ begin
   ReAlignToolBtn;
 end;
 
+procedure TToolPanel.Loaded;
+var
+  i, L:integer;
+begin
+  if csDesigning in ComponentState then
+  begin
+     for i:=0 to FToolbarItems.Count - 1 do
+       FToolbarItems[i].UpdateLeftAfterLoad;
+  end;
+  inherited Loaded;
+end;
+
 constructor TToolPanel.Create(AOwner: TComponent);
 begin
   inherited Create(AOwner);