From f71e98f6d9a960e2c9a77251e713c7c742aa9ee5 Mon Sep 17 00:00:00 2001
From: dopi <dopi@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Thu, 19 Apr 2012 21:52:48 +0000
Subject: [PATCH] git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@2395
 8e941d3f-bd1b-0410-a28a-d453659cc2b4

---
 components/tdi/Demo/TDIDemo.lps | 177 +++++++++++++++++---------------
 components/tdi/Demo/uform1.pas  |   3 +-
 components/tdi/tdiclass.pas     |  17 +--
 3 files changed, 104 insertions(+), 93 deletions(-)

diff --git a/components/tdi/Demo/TDIDemo.lps b/components/tdi/Demo/TDIDemo.lps
index 87078ce53..1493cb449 100644
--- a/components/tdi/Demo/TDIDemo.lps
+++ b/components/tdi/Demo/TDIDemo.lps
@@ -4,7 +4,7 @@
     <PathDelim Value="\"/>
     <Version Value="9"/>
     <BuildModes Active="Default"/>
-    <Units Count="61">
+    <Units Count="62">
       <Unit0>
         <Filename Value="TDIDemo.lpr"/>
         <IsPartOfProject Value="True"/>
@@ -32,10 +32,11 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="uForm1"/>
+        <IsVisibleTab Value="True"/>
         <EditorIndex Value="1"/>
         <WindowIndex Value="0"/>
-        <TopLine Value="70"/>
-        <CursorPos X="49" Y="82"/>
+        <TopLine Value="77"/>
+        <CursorPos X="2" Y="88"/>
         <UsageCount Value="97"/>
         <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>
@@ -57,14 +58,13 @@
       <Unit4>
         <Filename Value="..\tdiclass.pas"/>
         <UnitName Value="TDIClass"/>
-        <IsVisibleTab Value="True"/>
-        <EditorIndex Value="2"/>
+        <EditorIndex Value="4"/>
         <WindowIndex Value="0"/>
-        <TopLine Value="499"/>
-        <CursorPos X="20" Y="519"/>
+        <TopLine Value="748"/>
+        <CursorPos X="53" Y="754"/>
         <UsageCount Value="48"/>
         <Bookmarks Count="3">
-          <Item0 X="17" Y="778" ID="3"/>
+          <Item0 X="17" Y="779" ID="3"/>
           <Item1 X="3" Y="673" ID="2"/>
           <Item2 X="3" Y="460" ID="1"/>
         </Bookmarks>
@@ -80,16 +80,16 @@
       </Unit5>
       <Unit6>
         <Filename Value="C:\lazarus\lcl\include\customnotebook.inc"/>
-        <EditorIndex Value="7"/>
+        <EditorIndex Value="9"/>
         <WindowIndex Value="0"/>
-        <TopLine Value="587"/>
-        <CursorPos X="3" Y="582"/>
+        <TopLine Value="292"/>
+        <CursorPos X="1" Y="303"/>
         <UsageCount Value="17"/>
         <Loaded Value="True"/>
       </Unit6>
       <Unit7>
         <Filename Value="C:\lazarus\lcl\include\control.inc"/>
-        <EditorIndex Value="4"/>
+        <EditorIndex Value="6"/>
         <WindowIndex Value="0"/>
         <TopLine Value="659"/>
         <CursorPos X="3" Y="646"/>
@@ -99,7 +99,7 @@
       <Unit8>
         <Filename Value="..\tdireg.pas"/>
         <UnitName Value="TDIReg"/>
-        <EditorIndex Value="10"/>
+        <EditorIndex Value="12"/>
         <WindowIndex Value="0"/>
         <TopLine Value="3"/>
         <CursorPos X="29" Y="16"/>
@@ -166,7 +166,7 @@
       <Unit15>
         <Filename Value="..\tdiconst.pas"/>
         <UnitName Value="TDIConst"/>
-        <EditorIndex Value="9"/>
+        <EditorIndex Value="11"/>
         <WindowIndex Value="0"/>
         <TopLine Value="1"/>
         <CursorPos X="13" Y="10"/>
@@ -176,7 +176,7 @@
       <Unit16>
         <Filename Value="C:\lazarus\lcl\controls.pp"/>
         <UnitName Value="Controls"/>
-        <EditorIndex Value="3"/>
+        <EditorIndex Value="5"/>
         <WindowIndex Value="0"/>
         <TopLine Value="1203"/>
         <CursorPos X="15" Y="1214"/>
@@ -202,7 +202,7 @@
       <Unit19>
         <Filename Value="C:\lazarus\lcl\comctrls.pp"/>
         <UnitName Value="ComCtrls"/>
-        <EditorIndex Value="6"/>
+        <EditorIndex Value="8"/>
         <WindowIndex Value="0"/>
         <TopLine Value="385"/>
         <CursorPos X="22" Y="395"/>
@@ -341,10 +341,12 @@
       </Unit36>
       <Unit37>
         <Filename Value="C:\lazarus\fpc\2.6.0\source\rtl\objpas\classes\classesh.inc"/>
+        <EditorIndex Value="2"/>
         <WindowIndex Value="0"/>
-        <TopLine Value="1535"/>
-        <CursorPos X="5" Y="1546"/>
-        <UsageCount Value="7"/>
+        <TopLine Value="1653"/>
+        <CursorPos X="15" Y="1664"/>
+        <UsageCount Value="10"/>
+        <Loaded Value="True"/>
       </Unit37>
       <Unit38>
         <Filename Value="C:\lazarus\lcl\registerlcl.pas"/>
@@ -467,7 +469,7 @@
       <Unit53>
         <Filename Value="C:\lazarus\lcl\lclproc.pas"/>
         <UnitName Value="LCLProc"/>
-        <EditorIndex Value="5"/>
+        <EditorIndex Value="7"/>
         <WindowIndex Value="0"/>
         <TopLine Value="851"/>
         <CursorPos X="40" Y="862"/>
@@ -501,7 +503,7 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="DJ_FormPrincipal"/>
-        <EditorIndex Value="8"/>
+        <EditorIndex Value="10"/>
         <WindowIndex Value="0"/>
         <TopLine Value="388"/>
         <CursorPos X="1" Y="404"/>
@@ -530,130 +532,139 @@
         <CursorPos X="15" Y="90"/>
         <UsageCount Value="9"/>
       </Unit60>
+      <Unit61>
+        <Filename Value="C:\lazarus\fpc\2.6.0\source\rtl\objpas\classes\compon.inc"/>
+        <EditorIndex Value="3"/>
+        <WindowIndex Value="0"/>
+        <TopLine Value="514"/>
+        <CursorPos X="6" Y="519"/>
+        <UsageCount Value="10"/>
+        <Loaded Value="True"/>
+      </Unit61>
     </Units>
     <General>
       <ActiveWindowIndexAtStart Value="0"/>
     </General>
     <JumpHistory Count="30" HistoryIndex="29">
       <Position1>
-        <Filename Value="..\tdiclass.pas"/>
-        <Caret Line="745" Column="1" TopLine="727"/>
+        <Filename Value="umainform.pas"/>
+        <Caret Line="79" Column="22" TopLine="71"/>
       </Position1>
       <Position2>
-        <Filename Value="..\tdiclass.pas"/>
-        <Caret Line="738" Column="1" TopLine="727"/>
+        <Filename Value="umainform.pas"/>
+        <Caret Line="81" Column="22" TopLine="73"/>
       </Position2>
       <Position3>
-        <Filename Value="..\tdiclass.pas"/>
-        <Caret Line="743" Column="1" TopLine="727"/>
+        <Filename Value="umainform.pas"/>
+        <Caret Line="121" Column="26" TopLine="110"/>
       </Position3>
       <Position4>
         <Filename Value="..\tdiclass.pas"/>
-        <Caret Line="744" Column="1" TopLine="727"/>
+        <Caret Line="144" Column="61" TopLine="127"/>
       </Position4>
       <Position5>
-        <Filename Value="umainform.pas"/>
-        <Caret Line="78" Column="22" TopLine="70"/>
-      </Position5>
-      <Position6>
-        <Filename Value="umainform.pas"/>
-        <Caret Line="79" Column="22" TopLine="71"/>
-      </Position6>
-      <Position7>
-        <Filename Value="umainform.pas"/>
-        <Caret Line="81" Column="22" TopLine="73"/>
-      </Position7>
-      <Position8>
-        <Filename Value="umainform.pas"/>
-        <Caret Line="121" Column="26" TopLine="110"/>
-      </Position8>
-      <Position9>
-        <Filename Value="..\tdiclass.pas"/>
-        <Caret Line="144" Column="61" TopLine="127"/>
-      </Position9>
-      <Position10>
         <Filename Value="..\tdiclass.pas"/>
         <Caret Line="446" Column="2" TopLine="441"/>
-      </Position10>
-      <Position11>
+      </Position5>
+      <Position6>
         <Filename Value="..\tdiclass.pas"/>
         <Caret Line="512" Column="3" TopLine="510"/>
-      </Position11>
-      <Position12>
+      </Position6>
+      <Position7>
         <Filename Value="C:\lazarus\lcl\lclproc.pas"/>
         <Caret Line="864" Column="51" TopLine="851"/>
+      </Position7>
+      <Position8>
+        <Filename Value="..\tdiclass.pas"/>
+        <Caret Line="512" Column="3" TopLine="510"/>
+      </Position8>
+      <Position9>
+        <Filename Value="..\..\..\..\TOOLS\DJ_FormPrincipal.pas"/>
+        <Caret Line="141" Column="38" TopLine="141"/>
+      </Position9>
+      <Position10>
+        <Filename Value="..\..\..\..\TOOLS\DJ_FormPrincipal.pas"/>
+        <Caret Line="1" Column="1" TopLine="1"/>
+      </Position10>
+      <Position11>
+        <Filename Value="..\..\..\..\TOOLS\DJ_FormPrincipal.pas"/>
+        <Caret Line="304" Column="21" TopLine="291"/>
+      </Position11>
+      <Position12>
+        <Filename Value="..\..\..\..\TOOLS\DJ_FormPrincipal.pas"/>
+        <Caret Line="305" Column="21" TopLine="291"/>
       </Position12>
       <Position13>
         <Filename Value="..\tdiclass.pas"/>
-        <Caret Line="512" Column="3" TopLine="510"/>
+        <Caret Line="114" Column="15" TopLine="112"/>
       </Position13>
       <Position14>
-        <Filename Value="..\..\..\..\TOOLS\DJ_FormPrincipal.pas"/>
-        <Caret Line="141" Column="38" TopLine="141"/>
+        <Filename Value="..\tdiclass.pas"/>
+        <Caret Line="508" Column="2" TopLine="493"/>
       </Position14>
       <Position15>
-        <Filename Value="..\..\..\..\TOOLS\DJ_FormPrincipal.pas"/>
-        <Caret Line="1" Column="1" TopLine="1"/>
+        <Filename Value="uform1.pas"/>
+        <Caret Line="87" Column="3" TopLine="69"/>
       </Position15>
       <Position16>
-        <Filename Value="..\..\..\..\TOOLS\DJ_FormPrincipal.pas"/>
-        <Caret Line="304" Column="21" TopLine="291"/>
+        <Filename Value="uform1.pas"/>
+        <Caret Line="84" Column="27" TopLine="70"/>
       </Position16>
       <Position17>
-        <Filename Value="..\..\..\..\TOOLS\DJ_FormPrincipal.pas"/>
-        <Caret Line="305" Column="21" TopLine="291"/>
+        <Filename Value="..\tdiclass.pas"/>
+        <Caret Line="502" Column="30" TopLine="493"/>
       </Position17>
       <Position18>
         <Filename Value="..\tdiclass.pas"/>
-        <Caret Line="114" Column="15" TopLine="112"/>
+        <Caret Line="503" Column="1" TopLine="493"/>
       </Position18>
       <Position19>
-        <Filename Value="..\tdiclass.pas"/>
-        <Caret Line="508" Column="2" TopLine="493"/>
+        <Filename Value="C:\lazarus\lcl\controls.pp"/>
+        <Caret Line="1625" Column="14" TopLine="1614"/>
       </Position19>
       <Position20>
-        <Filename Value="uform1.pas"/>
-        <Caret Line="87" Column="3" TopLine="69"/>
+        <Filename Value="C:\lazarus\lcl\include\control.inc"/>
+        <Caret Line="3994" Column="3" TopLine="3987"/>
       </Position20>
       <Position21>
-        <Filename Value="uform1.pas"/>
-        <Caret Line="84" Column="27" TopLine="70"/>
+        <Filename Value="C:\lazarus\lcl\include\control.inc"/>
+        <Caret Line="3680" Column="3" TopLine="3675"/>
       </Position21>
       <Position22>
         <Filename Value="..\tdiclass.pas"/>
-        <Caret Line="502" Column="30" TopLine="493"/>
+        <Caret Line="506" Column="39" TopLine="493"/>
       </Position22>
       <Position23>
         <Filename Value="..\tdiclass.pas"/>
-        <Caret Line="503" Column="1" TopLine="493"/>
+        <Caret Line="1" Column="1" TopLine="1"/>
       </Position23>
       <Position24>
-        <Filename Value="C:\lazarus\lcl\controls.pp"/>
-        <Caret Line="1625" Column="14" TopLine="1614"/>
+        <Filename Value="..\tdiclass.pas"/>
+        <Caret Line="59" Column="15" TopLine="48"/>
       </Position24>
       <Position25>
-        <Filename Value="C:\lazarus\lcl\include\control.inc"/>
-        <Caret Line="3994" Column="3" TopLine="3987"/>
+        <Filename Value="..\tdiclass.pas"/>
+        <Caret Line="514" Column="25" TopLine="499"/>
       </Position25>
       <Position26>
-        <Filename Value="C:\lazarus\lcl\include\control.inc"/>
-        <Caret Line="3680" Column="3" TopLine="3675"/>
+        <Filename Value="..\tdiclass.pas"/>
+        <Caret Line="519" Column="20" TopLine="499"/>
       </Position26>
       <Position27>
-        <Filename Value="..\tdiclass.pas"/>
-        <Caret Line="506" Column="39" TopLine="493"/>
+        <Filename Value="uform1.pas"/>
+        <Caret Line="88" Column="1" TopLine="77"/>
       </Position27>
       <Position28>
-        <Filename Value="..\tdiclass.pas"/>
-        <Caret Line="1" Column="1" TopLine="1"/>
+        <Filename Value="uform1.pas"/>
+        <Caret Line="89" Column="1" TopLine="77"/>
       </Position28>
       <Position29>
         <Filename Value="..\tdiclass.pas"/>
-        <Caret Line="59" Column="15" TopLine="48"/>
+        <Caret Line="327" Column="1" TopLine="316"/>
       </Position29>
       <Position30>
-        <Filename Value="..\tdiclass.pas"/>
-        <Caret Line="514" Column="25" TopLine="499"/>
+        <Filename Value="C:\lazarus\lcl\include\customnotebook.inc"/>
+        <Caret Line="303" Column="1" TopLine="292"/>
       </Position30>
     </JumpHistory>
   </ProjectSession>
diff --git a/components/tdi/Demo/uform1.pas b/components/tdi/Demo/uform1.pas
index a32dfe739..f8af745d9 100644
--- a/components/tdi/Demo/uform1.pas
+++ b/components/tdi/Demo/uform1.pas
@@ -85,8 +85,7 @@ begin
     Edit2.Text := 'Ok, fixed';
   end ;
 
-  if Assigned( fMainForm ) then
-    fMainForm.mEvents.Lines.Add( 'Form1.CloseQuery: '+BoolToStr(CanClose,'True','False') );
+  fMainForm.mEvents.Lines.Add( 'Form1.CloseQuery: '+BoolToStr(CanClose,'True','False') );
 end;
 
 procedure TForm1.FormDestroy(Sender : TObject) ;
diff --git a/components/tdi/tdiclass.pas b/components/tdi/tdiclass.pas
index 570fdb6b1..8e0e7bb1b 100644
--- a/components/tdi/tdiclass.pas
+++ b/components/tdi/tdiclass.pas
@@ -751,16 +751,17 @@ Var
 begin
   CanRemovePage := True;
 
-  if Pages[Index] is TTDIPage then
-    with TTDIPage(Pages[Index]) do
-    begin
-      if Assigned( FormInPage ) then
+  if ([csDesigning, csDestroying] * ComponentState = []) then
+    if Pages[Index] is TTDIPage then
+      with TTDIPage(Pages[Index]) do
       begin
-        CanRemovePage := FormInPage.CloseQuery ;
-        if CanRemovePage then
-          FormInPage.Close ;
+        if Assigned( FormInPage ) then
+        begin
+          CanRemovePage := FormInPage.CloseQuery ;
+          if CanRemovePage then
+            FormInPage.Close ;
+        end ;
       end ;
-    end ;
 
   if CanRemovePage then
   begin