From 883a18e10ad8a2e989430f0fbc480638ae9457d4 Mon Sep 17 00:00:00 2001
From: alexs75 <alexs75@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Fri, 18 Jul 2014 06:58:04 +0000
Subject: [PATCH] RxToolBar - fix load images on classic style from another
 form

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@3330 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 components/rx/trunk/Demos/ToolPanel/toolbardemo.cfg | 2 +-
 components/rx/trunk/rxtoolbar.pas                   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/components/rx/trunk/Demos/ToolPanel/toolbardemo.cfg b/components/rx/trunk/Demos/ToolPanel/toolbardemo.cfg
index 476852936..ea321fb0e 100644
--- a/components/rx/trunk/Demos/ToolPanel/toolbardemo.cfg
+++ b/components/rx/trunk/Demos/ToolPanel/toolbardemo.cfg
@@ -2,6 +2,6 @@
 <CONFIG>
   <TApplication>
     <Form1 Form1_Top="255" Form1_Left="310" Form1_Width="592" Form1_Height="289" Form1.ToolPanel1.Count="7" Form1.ToolPanel1.Options="tpFlatBtns,tpCustomizable,tpGlyphPopup,tpCaptionPopup" Form1.ToolPanel1.Version="1" Form1.ToolPanel1.ShowHint="1" Form1.ToolPanel1.Item0.Top="4" Form1.ToolPanel1.Item1.Top="4" Form1.ToolPanel1.Item2.Top="4" Form1.ToolPanel1.Item3.Top="4" Form1.ToolPanel1.Item4.Top="4" Form1.ToolPanel1.Item5.Top="4" Form1.ToolPanel1.Item6.Top="4" Form1.ToolPanel1.Item0.Left="8" Form1.ToolPanel1.Item1.Left="328" Form1.ToolPanel1.Item2.Left="152" Form1.ToolPanel1.Item3.Left="96" Form1.ToolPanel1.Item4.Left="504" Form1.ToolPanel1.Item5.Left="216" Form1.ToolPanel1.Item6.Left="328" Form1.ToolPanel1.Item0.Width="49" Form1.ToolPanel1.Item1.Width="64" Form1.ToolPanel1.Item2.Width="24" Form1.ToolPanel1.Item3.Width="50" Form1.ToolPanel1.Item4.Width="46" Form1.ToolPanel1.Item5.Width="85" Form1.ToolPanel1.Item6.Width="64" Form1.ToolPanel1.Item0.Action="actNew" Form1.ToolPanel1.Item1.Action="actCustom" Form1.ToolPanel1.Item2.Action="actNext" Form1.ToolPanel1.Item3.Action="actPrior" Form1.ToolPanel1.Item4.Action="actExit" Form1.ToolPanel1.Item5.Action="actDemo" Form1.ToolPanel1.Item6.Action="actCustom" Form1.ToolPanel1.ToolBarStyle="tbsStandart" Form1.ToolPanel1.Item0.Visible="1" Form1.ToolPanel1.Item1.Visible="1" Form1.ToolPanel1.Item2.Visible="1" Form1.ToolPanel1.Item3.Visible="1" Form1.ToolPanel1.Item4.Visible="1" Form1.ToolPanel1.Item5.Visible="1" Form1.ToolPanel1.Item6.Visible="1" Form1.ToolPanel1.Item0.ShowCaption="1" Form1.ToolPanel1.Item1.ShowCaption="1" Form1.ToolPanel1.Item2.ShowCaption="0" Form1.ToolPanel1.Item3.ShowCaption="1" Form1.ToolPanel1.Item4.ShowCaption="1" Form1.ToolPanel1.Item5.ShowCaption="1" Form1.ToolPanel1.Item6.ShowCaption="1"/>
-    <MainForm MainForm_Top="417" MainForm_Left="578" MainForm_Width="838" MainForm_Height="352" MainForm.ToolPanel1.Count="7" MainForm.ToolPanel1.Options="tpFlatBtns,tpCustomizable,tpGlyphPopup,tpCaptionPopup" MainForm.ToolPanel1.Version="4" MainForm.ToolPanel1.ShowHint="1" MainForm.ToolPanel1.Item0.Top="2" MainForm.ToolPanel1.Item1.Top="2" MainForm.ToolPanel1.Item2.Top="2" MainForm.ToolPanel1.Item3.Top="2" MainForm.ToolPanel1.Item4.Top="2" MainForm.ToolPanel1.Item5.Top="2" MainForm.ToolPanel1.Item6.Top="2" MainForm.ToolPanel1.Item0.Left="2" MainForm.ToolPanel1.Item1.Left="61" MainForm.ToolPanel1.Item2.Left="140" MainForm.ToolPanel1.Item3.Left="179" MainForm.ToolPanel1.Item4.Left="237" MainForm.ToolPanel1.Item5.Left="290" MainForm.ToolPanel1.Item6.Left="368" MainForm.ToolPanel1.Item0.Width="59" MainForm.ToolPanel1.Item1.Width="79" MainForm.ToolPanel1.Item2.Width="39" MainForm.ToolPanel1.Item3.Width="58" MainForm.ToolPanel1.Item4.Width="53" MainForm.ToolPanel1.Item5.Width="78" MainForm.ToolPanel1.Item6.Width="67" MainForm.ToolPanel1.ButtonAllign="tbaLeft" MainForm.ToolPanel1.Item0.Action="actNew" MainForm.ToolPanel1.Item1.Action="actCustom" MainForm.ToolPanel1.Item2.Action="actNext" MainForm.ToolPanel1.Item3.Action="actPrior" MainForm.ToolPanel1.Item4.Action="actExit" MainForm.ToolPanel1.Item5.Action="actSysMenu" MainForm.ToolPanel1.Item6.Action="sysAbout" MainForm.ToolPanel1.ToolBarStyle="tbsNative" MainForm.ToolPanel1.Item0.Visible="1" MainForm.ToolPanel1.Item1.Visible="1" MainForm.ToolPanel1.Item2.Visible="1" MainForm.ToolPanel1.Item3.Visible="1" MainForm.ToolPanel1.Item4.Visible="1" MainForm.ToolPanel1.Item5.Visible="1" MainForm.ToolPanel1.Item6.Visible="1" MainForm.ToolPanel1.Item0.ShowCaption="1" MainForm.ToolPanel1.Item1.ShowCaption="1" MainForm.ToolPanel1.Item2.ShowCaption="0" MainForm.ToolPanel1.Item3.ShowCaption="1" MainForm.ToolPanel1.Item4.ShowCaption="1" MainForm.ToolPanel1.Item5.ShowCaption="1" MainForm.ToolPanel1.Item6.ShowCaption="1"/>
+    <MainForm MainForm_Top="364" MainForm_Left="541" MainForm_Width="838" MainForm_Height="352" MainForm.ToolPanel1.Count="7" MainForm.ToolPanel1.Options="tpFlatBtns,tpCustomizable,tpGlyphPopup,tpCaptionPopup" MainForm.ToolPanel1.Version="4" MainForm.ToolPanel1.ShowHint="1" MainForm.ToolPanel1.Item0.Top="2" MainForm.ToolPanel1.Item1.Top="1" MainForm.ToolPanel1.Item2.Top="2" MainForm.ToolPanel1.Item3.Top="2" MainForm.ToolPanel1.Item4.Top="2" MainForm.ToolPanel1.Item5.Top="2" MainForm.ToolPanel1.Item6.Top="2" MainForm.ToolPanel1.Item0.Left="55" MainForm.ToolPanel1.Item1.Left="61" MainForm.ToolPanel1.Item2.Left="114" MainForm.ToolPanel1.Item3.Left="153" MainForm.ToolPanel1.Item4.Left="2" MainForm.ToolPanel1.Item5.Left="211" MainForm.ToolPanel1.Item6.Left="289" MainForm.ToolPanel1.Item0.Width="59" MainForm.ToolPanel1.Item1.Width="79" MainForm.ToolPanel1.Item2.Width="39" MainForm.ToolPanel1.Item3.Width="58" MainForm.ToolPanel1.Item4.Width="53" MainForm.ToolPanel1.Item5.Width="78" MainForm.ToolPanel1.Item6.Width="67" MainForm.ToolPanel1.ButtonAllign="tbaLeft" MainForm.ToolPanel1.Item0.Action="actNew" MainForm.ToolPanel1.Item1.Action="actCustom" MainForm.ToolPanel1.Item2.Action="actNext" MainForm.ToolPanel1.Item3.Action="actPrior" MainForm.ToolPanel1.Item4.Action="actExit" MainForm.ToolPanel1.Item5.Action="actSysMenu" MainForm.ToolPanel1.Item6.Action="sysAbout" MainForm.ToolPanel1.ToolBarStyle="tbsNative" MainForm.ToolPanel1.Item0.Visible="1" MainForm.ToolPanel1.Item1.Visible="0" MainForm.ToolPanel1.Item2.Visible="1" MainForm.ToolPanel1.Item3.Visible="1" MainForm.ToolPanel1.Item4.Visible="1" MainForm.ToolPanel1.Item5.Visible="1" MainForm.ToolPanel1.Item6.Visible="1" MainForm.ToolPanel1.Item0.ShowCaption="1" MainForm.ToolPanel1.Item1.ShowCaption="1" MainForm.ToolPanel1.Item2.ShowCaption="0" MainForm.ToolPanel1.Item3.ShowCaption="1" MainForm.ToolPanel1.Item4.ShowCaption="1" MainForm.ToolPanel1.Item5.ShowCaption="1" MainForm.ToolPanel1.Item6.ShowCaption="1"/>
   </TApplication>
 </CONFIG>
diff --git a/components/rx/trunk/rxtoolbar.pas b/components/rx/trunk/rxtoolbar.pas
index bfc32131e..49c4a1265 100644
--- a/components/rx/trunk/rxtoolbar.pas
+++ b/components/rx/trunk/rxtoolbar.pas
@@ -1134,6 +1134,7 @@ begin
     B.UpdateLeftAfterLoad;
     B.FButton.Align:=BtnAl2Align[FButtonAllign];
   end;
+  SetCustomizing(false);
   //ReAlignToolBtn;
 end;