From b28934bb745b654a017999d1d0ade74ae98852ac Mon Sep 17 00:00:00 2001
From: dopi <dopi@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Sat, 21 Apr 2012 15:38:55 +0000
Subject: [PATCH] git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@2398
 8e941d3f-bd1b-0410-a28a-d453659cc2b4

---
 components/tdi/Demo/TDIDemo.lpi   |   1 +
 components/tdi/Demo/TDIDemo.lps   | 584 ++++++++++++++----------------
 components/tdi/Demo/uform2.lfm    |  35 +-
 components/tdi/Demo/uform2.pas    |   1 +
 components/tdi/Demo/umainform.lfm |   5 +
 components/tdi/Demo/umainform.pas |  13 +
 components/tdi/tdiclass.pas       | 106 +++++-
 7 files changed, 410 insertions(+), 335 deletions(-)

diff --git a/components/tdi/Demo/TDIDemo.lpi b/components/tdi/Demo/TDIDemo.lpi
index 2d0ae6403..766f69113 100644
--- a/components/tdi/Demo/TDIDemo.lpi
+++ b/components/tdi/Demo/TDIDemo.lpi
@@ -69,6 +69,7 @@
         <Filename Value="uform2.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="Form2"/>
+        <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="uForm2"/>
       </Unit3>
diff --git a/components/tdi/Demo/TDIDemo.lps b/components/tdi/Demo/TDIDemo.lps
index 730b21570..d0607d33d 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="63">
+    <Units Count="65">
       <Unit0>
         <Filename Value="TDIDemo.lpr"/>
         <IsPartOfProject Value="True"/>
@@ -12,7 +12,7 @@
         <WindowIndex Value="0"/>
         <TopLine Value="1"/>
         <CursorPos X="36" Y="18"/>
-        <UsageCount Value="100"/>
+        <UsageCount Value="105"/>
       </Unit0>
       <Unit1>
         <Filename Value="mainform.pas"/>
@@ -23,7 +23,7 @@
         <WindowIndex Value="0"/>
         <TopLine Value="1"/>
         <CursorPos X="10" Y="8"/>
-        <UsageCount Value="100"/>
+        <UsageCount Value="105"/>
       </Unit1>
       <Unit2>
         <Filename Value="uform1.pas"/>
@@ -34,75 +34,91 @@
         <UnitName Value="uForm1"/>
         <EditorIndex Value="1"/>
         <WindowIndex Value="0"/>
-        <TopLine Value="77"/>
-        <CursorPos X="1" Y="94"/>
-        <UsageCount Value="100"/>
+        <TopLine Value="51"/>
+        <CursorPos X="28" Y="64"/>
+        <UsageCount Value="105"/>
         <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>
       </Unit2>
       <Unit3>
+        <Filename Value="uform2.pas"/>
+        <IsPartOfProject Value="True"/>
+        <ComponentName Value="Form2"/>
+        <HasResources Value="True"/>
+        <ResourceBaseClass Value="Form"/>
+        <UnitName Value="uForm2"/>
+        <EditorIndex Value="2"/>
+        <WindowIndex Value="0"/>
+        <TopLine Value="53"/>
+        <CursorPos X="21" Y="64"/>
+        <UsageCount Value="27"/>
+        <Loaded Value="True"/>
+        <LoadedDesigner Value="True"/>
+      </Unit3>
+      <Unit4>
         <Filename Value="umainform.pas"/>
         <ComponentName Value="fMainForm"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="uMainForm"/>
+        <IsVisibleTab Value="True"/>
         <EditorIndex Value="0"/>
         <WindowIndex Value="0"/>
-        <TopLine Value="111"/>
-        <CursorPos X="32" Y="113"/>
-        <UsageCount Value="49"/>
+        <TopLine Value="71"/>
+        <CursorPos X="1" Y="80"/>
+        <UsageCount Value="52"/>
         <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>
-      </Unit3>
-      <Unit4>
-        <Filename Value="..\tdiclass.pas"/>
-        <UnitName Value="TDIClass"/>
-        <IsVisibleTab Value="True"/>
-        <EditorIndex Value="3"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="244"/>
-        <CursorPos X="22" Y="254"/>
-        <UsageCount Value="49"/>
-        <Bookmarks Count="3">
-          <Item0 X="17" Y="809" ID="3"/>
-          <Item1 X="3" Y="703" ID="2"/>
-          <Item2 X="3" Y="461" ID="1"/>
-        </Bookmarks>
-        <Loaded Value="True"/>
       </Unit4>
       <Unit5>
+        <Filename Value="..\tdiclass.pas"/>
+        <UnitName Value="TDIClass"/>
+        <EditorIndex Value="3"/>
+        <WindowIndex Value="0"/>
+        <TopLine Value="237"/>
+        <CursorPos X="35" Y="248"/>
+        <UsageCount Value="52"/>
+        <Bookmarks Count="4">
+          <Item0 X="17" Y="877" ID="3"/>
+          <Item1 X="5" Y="315" ID="2"/>
+          <Item2 X="23" Y="267" ID="1"/>
+          <Item3 X="45" Y="56" ID="5"/>
+        </Bookmarks>
+        <Loaded Value="True"/>
+      </Unit5>
+      <Unit6>
         <Filename Value="..\tdinotebookclass.pas"/>
         <UnitName Value="TDINoteBookClass"/>
         <WindowIndex Value="0"/>
         <TopLine Value="1"/>
         <CursorPos X="1" Y="10"/>
-        <UsageCount Value="3"/>
-      </Unit5>
-      <Unit6>
+        <UsageCount Value="2"/>
+      </Unit6>
+      <Unit7>
         <Filename Value="C:\lazarus\lcl\include\customnotebook.inc"/>
         <WindowIndex Value="0"/>
         <TopLine Value="292"/>
         <CursorPos X="1" Y="303"/>
-        <UsageCount Value="17"/>
-      </Unit6>
-      <Unit7>
-        <Filename Value="C:\lazarus\lcl\include\control.inc"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="659"/>
-        <CursorPos X="3" Y="646"/>
-        <UsageCount Value="10"/>
+        <UsageCount Value="16"/>
       </Unit7>
       <Unit8>
+        <Filename Value="C:\lazarus\lcl\include\control.inc"/>
+        <WindowIndex Value="0"/>
+        <TopLine Value="4834"/>
+        <CursorPos X="42" Y="4846"/>
+        <UsageCount Value="11"/>
+      </Unit8>
+      <Unit9>
         <Filename Value="..\tdireg.pas"/>
         <UnitName Value="TDIReg"/>
-        <EditorIndex Value="5"/>
+        <EditorIndex Value="6"/>
         <WindowIndex Value="0"/>
         <TopLine Value="3"/>
         <CursorPos X="29" Y="16"/>
-        <UsageCount Value="33"/>
+        <UsageCount Value="36"/>
         <Loaded Value="True"/>
-      </Unit8>
-      <Unit9>
+      </Unit9>
+      <Unit10>
         <Filename Value="..\..\..\TOOLS\DJ_FormPrincipal.pas"/>
         <ComponentName Value="FormDJ_Main"/>
         <HasResources Value="True"/>
@@ -111,41 +127,41 @@
         <WindowIndex Value="0"/>
         <TopLine Value="130"/>
         <CursorPos X="37" Y="146"/>
-        <UsageCount Value="34"/>
-      </Unit9>
-      <Unit10>
+        <UsageCount Value="33"/>
+      </Unit10>
+      <Unit11>
         <Filename Value="C:\lazarus\lcl\stdctrls.pp"/>
         <UnitName Value="StdCtrls"/>
         <WindowIndex Value="0"/>
         <TopLine Value="1126"/>
         <CursorPos X="3" Y="1137"/>
-        <UsageCount Value="8"/>
-      </Unit10>
-      <Unit11>
+        <UsageCount Value="7"/>
+      </Unit11>
+      <Unit12>
         <Filename Value="C:\lazarus\lcl\buttons.pp"/>
         <UnitName Value="Buttons"/>
         <WindowIndex Value="0"/>
         <TopLine Value="173"/>
         <CursorPos X="14" Y="184"/>
-        <UsageCount Value="9"/>
-      </Unit11>
-      <Unit12>
+        <UsageCount Value="8"/>
+      </Unit12>
+      <Unit13>
         <Filename Value="..\..\..\TOOLS\DJ_FormPrincipal.lfm"/>
         <WindowIndex Value="0"/>
         <TopLine Value="2191"/>
         <CursorPos X="1" Y="2212"/>
-        <UsageCount Value="6"/>
+        <UsageCount Value="5"/>
         <DefaultSyntaxHighlighter Value="LFM"/>
-      </Unit12>
-      <Unit13>
+      </Unit13>
+      <Unit14>
         <Filename Value="..\..\..\ACBr\trunk\Fontes\ACBrTEFD\ACBrTEFD.pas"/>
         <UnitName Value="ACBrTEFD"/>
         <WindowIndex Value="0"/>
         <TopLine Value="349"/>
         <CursorPos X="22" Y="12"/>
-        <UsageCount Value="5"/>
-      </Unit13>
-      <Unit14>
+        <UsageCount Value="4"/>
+      </Unit14>
+      <Unit15>
         <Filename Value="umainform.lfm"/>
         <WindowIndex Value="0"/>
         <TopLine Value="2229"/>
@@ -156,243 +172,245 @@
           <TopLine Value="2474"/>
           <CursorPos X="32" Y="2480"/>
         </ExtraEditor1>
-        <UsageCount Value="9"/>
+        <UsageCount Value="8"/>
         <DefaultSyntaxHighlighter Value="LFM"/>
-      </Unit14>
-      <Unit15>
+      </Unit15>
+      <Unit16>
         <Filename Value="..\tdiconst.pas"/>
         <UnitName Value="TDIConst"/>
-        <EditorIndex Value="4"/>
+        <EditorIndex Value="5"/>
         <WindowIndex Value="0"/>
         <TopLine Value="1"/>
         <CursorPos X="13" Y="10"/>
-        <UsageCount Value="46"/>
+        <UsageCount Value="49"/>
         <Loaded Value="True"/>
-      </Unit15>
-      <Unit16>
+      </Unit16>
+      <Unit17>
         <Filename Value="C:\lazarus\lcl\controls.pp"/>
         <UnitName Value="Controls"/>
         <WindowIndex Value="0"/>
-        <TopLine Value="1203"/>
-        <CursorPos X="15" Y="1214"/>
-        <UsageCount Value="10"/>
-      </Unit16>
-      <Unit17>
+        <TopLine Value="153"/>
+        <CursorPos X="19" Y="162"/>
+        <UsageCount Value="11"/>
+      </Unit17>
+      <Unit18>
         <Filename Value="C:\lazarus\lcl\graphics.pp"/>
         <UnitName Value="Graphics"/>
         <WindowIndex Value="0"/>
         <TopLine Value="1466"/>
         <CursorPos X="3" Y="1477"/>
-        <UsageCount Value="5"/>
-      </Unit17>
-      <Unit18>
+        <UsageCount Value="4"/>
+      </Unit18>
+      <Unit19>
         <Filename Value="C:\lazarus\components\lazcontrols\extendednotebook.pas"/>
         <UnitName Value="ExtendedNotebook"/>
         <WindowIndex Value="0"/>
         <TopLine Value="35"/>
-        <CursorPos X="3" Y="57"/>
+        <CursorPos X="3" Y="46"/>
         <UsageCount Value="19"/>
-      </Unit18>
-      <Unit19>
-        <Filename Value="C:\lazarus\lcl\comctrls.pp"/>
-        <UnitName Value="ComCtrls"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="385"/>
-        <CursorPos X="22" Y="395"/>
-        <UsageCount Value="21"/>
       </Unit19>
       <Unit20>
+        <Filename Value="C:\lazarus\lcl\comctrls.pp"/>
+        <UnitName Value="ComCtrls"/>
+        <EditorIndex Value="4"/>
+        <WindowIndex Value="0"/>
+        <TopLine Value="679"/>
+        <CursorPos X="3" Y="690"/>
+        <UsageCount Value="23"/>
+        <Loaded Value="True"/>
+      </Unit20>
+      <Unit21>
         <Filename Value="C:\lazarus\lcl\include\pagecontrol.inc"/>
         <WindowIndex Value="0"/>
         <TopLine Value="22"/>
         <CursorPos X="1" Y="34"/>
-        <UsageCount Value="15"/>
-      </Unit20>
-      <Unit21>
+        <UsageCount Value="14"/>
+      </Unit21>
+      <Unit22>
         <Filename Value="..\..\..\ACBr\trunk\Fontes\ACBrComum\ACBrAAC.pas"/>
         <UnitName Value="ACBrAAC"/>
         <WindowIndex Value="0"/>
         <TopLine Value="1"/>
         <CursorPos X="1" Y="1"/>
-        <UsageCount Value="4"/>
-      </Unit21>
-      <Unit22>
+        <UsageCount Value="3"/>
+      </Unit22>
+      <Unit23>
         <Filename Value="..\..\..\ACBr\trunk\Fontes\ACBrComum\ACBrPAFClass.pas"/>
         <UnitName Value="ACBrPAFClass"/>
         <WindowIndex Value="0"/>
         <TopLine Value="241"/>
         <CursorPos X="17" Y="252"/>
-        <UsageCount Value="4"/>
-      </Unit22>
-      <Unit23>
+        <UsageCount Value="3"/>
+      </Unit23>
+      <Unit24>
         <Filename Value="C:\lazarus\lcl\include\bitbtn.inc"/>
         <WindowIndex Value="0"/>
         <TopLine Value="67"/>
         <CursorPos X="40" Y="79"/>
-        <UsageCount Value="6"/>
-      </Unit23>
-      <Unit24>
+        <UsageCount Value="5"/>
+      </Unit24>
+      <Unit25>
         <Filename Value="C:\lazarus\lcl\menus.pp"/>
         <UnitName Value="Menus"/>
         <WindowIndex Value="0"/>
         <TopLine Value="110"/>
         <CursorPos X="3" Y="118"/>
-        <UsageCount Value="7"/>
-      </Unit24>
-      <Unit25>
+        <UsageCount Value="6"/>
+      </Unit25>
+      <Unit26>
         <Filename Value="C:\lazarus\lcl\include\menuitem.inc"/>
         <WindowIndex Value="0"/>
         <TopLine Value="1085"/>
         <CursorPos X="1" Y="1103"/>
-        <UsageCount Value="8"/>
-      </Unit25>
-      <Unit26>
+        <UsageCount Value="7"/>
+      </Unit26>
+      <Unit27>
         <Filename Value="C:\lazarus\lcl\include\buttons.inc"/>
         <WindowIndex Value="0"/>
         <TopLine Value="234"/>
         <CursorPos X="42" Y="254"/>
-        <UsageCount Value="6"/>
-      </Unit26>
-      <Unit27>
+        <UsageCount Value="5"/>
+      </Unit27>
+      <Unit28>
         <Filename Value="C:\lazarus\lcl\actnlist.pas"/>
         <UnitName Value="ActnList"/>
         <WindowIndex Value="0"/>
         <TopLine Value="365"/>
         <CursorPos X="1" Y="378"/>
-        <UsageCount Value="6"/>
-      </Unit27>
-      <Unit28>
+        <UsageCount Value="5"/>
+      </Unit28>
+      <Unit29>
         <Filename Value="C:\lazarus\lcl\extctrls.pp"/>
         <UnitName Value="ExtCtrls"/>
         <WindowIndex Value="0"/>
         <TopLine Value="1144"/>
         <CursorPos X="19" Y="1161"/>
-        <UsageCount Value="6"/>
-      </Unit28>
-      <Unit29>
+        <UsageCount Value="5"/>
+      </Unit29>
+      <Unit30>
         <Filename Value="C:\lazarus\lcl\include\buttonglyph.inc"/>
         <WindowIndex Value="0"/>
         <TopLine Value="209"/>
         <CursorPos X="61" Y="219"/>
-        <UsageCount Value="6"/>
-      </Unit29>
-      <Unit30>
+        <UsageCount Value="5"/>
+      </Unit30>
+      <Unit31>
         <Filename Value="C:\lazarus\lcl\alllclunits.pp"/>
         <UnitName Value="alllclunits"/>
         <WindowIndex Value="0"/>
         <TopLine Value="19"/>
         <CursorPos X="1" Y="34"/>
-        <UsageCount Value="6"/>
-      </Unit30>
-      <Unit31>
+        <UsageCount Value="5"/>
+      </Unit31>
+      <Unit32>
         <Filename Value="C:\lazarus\lcl\arrow.pp"/>
         <UnitName Value="Arrow"/>
         <WindowIndex Value="0"/>
         <TopLine Value="69"/>
         <CursorPos X="1" Y="87"/>
-        <UsageCount Value="6"/>
-      </Unit31>
-      <Unit32>
+        <UsageCount Value="5"/>
+      </Unit32>
+      <Unit33>
         <Filename Value="C:\lazarus\lcl\customdrawndrawers.pas"/>
         <UnitName Value="customdrawndrawers"/>
         <WindowIndex Value="0"/>
         <TopLine Value="402"/>
         <CursorPos X="3" Y="404"/>
-        <UsageCount Value="6"/>
-      </Unit32>
-      <Unit33>
+        <UsageCount Value="5"/>
+      </Unit33>
+      <Unit34>
         <Filename Value="C:\lazarus\lcl\interfaces\wince\wincewsfactory.pas"/>
         <UnitName Value="WinCEWSFactory"/>
         <WindowIndex Value="0"/>
         <TopLine Value="503"/>
         <CursorPos X="23" Y="514"/>
-        <UsageCount Value="6"/>
-      </Unit33>
-      <Unit34>
+        <UsageCount Value="5"/>
+      </Unit34>
+      <Unit35>
         <Filename Value="C:\lazarus\lcl\widgetset\wsmenus.pp"/>
         <UnitName Value="WSMenus"/>
         <WindowIndex Value="0"/>
         <TopLine Value="196"/>
         <CursorPos X="3" Y="200"/>
-        <UsageCount Value="6"/>
-      </Unit34>
-      <Unit35>
+        <UsageCount Value="5"/>
+      </Unit35>
+      <Unit36>
         <Filename Value="C:\lazarus\lcl\widgetset\wsfactory.pas"/>
         <UnitName Value="WSFactory"/>
         <WindowIndex Value="0"/>
         <TopLine Value="89"/>
         <CursorPos X="10" Y="100"/>
-        <UsageCount Value="6"/>
-      </Unit35>
-      <Unit36>
+        <UsageCount Value="5"/>
+      </Unit36>
+      <Unit37>
         <Filename Value="C:\lazarus\lcl\include\menu.inc"/>
         <WindowIndex Value="0"/>
         <TopLine Value="72"/>
         <CursorPos X="8" Y="82"/>
-        <UsageCount Value="6"/>
-      </Unit36>
-      <Unit37>
-        <Filename Value="C:\lazarus\fpc\2.6.0\source\rtl\objpas\classes\classesh.inc"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="1653"/>
-        <CursorPos X="15" Y="1664"/>
-        <UsageCount Value="10"/>
+        <UsageCount Value="5"/>
       </Unit37>
       <Unit38>
+        <Filename Value="C:\lazarus\fpc\2.6.0\source\rtl\objpas\classes\classesh.inc"/>
+        <WindowIndex Value="0"/>
+        <TopLine Value="1650"/>
+        <CursorPos X="16" Y="1661"/>
+        <UsageCount Value="10"/>
+      </Unit38>
+      <Unit39>
         <Filename Value="C:\lazarus\lcl\registerlcl.pas"/>
         <UnitName Value="RegisterLCL"/>
         <WindowIndex Value="0"/>
         <TopLine Value="50"/>
         <CursorPos X="1" Y="1"/>
-        <UsageCount Value="6"/>
-      </Unit38>
-      <Unit39>
+        <UsageCount Value="5"/>
+      </Unit39>
+      <Unit40>
         <Filename Value="C:\lazarus\lcl\imglist.pp"/>
         <UnitName Value="ImgList"/>
         <WindowIndex Value="0"/>
         <TopLine Value="47"/>
         <CursorPos X="12" Y="58"/>
-        <UsageCount Value="6"/>
-      </Unit39>
-      <Unit40>
+        <UsageCount Value="5"/>
+      </Unit40>
+      <Unit41>
         <Filename Value="C:\lazarus\lcl\include\custompage.inc"/>
         <WindowIndex Value="0"/>
         <TopLine Value="151"/>
         <CursorPos X="1" Y="166"/>
-        <UsageCount Value="9"/>
-      </Unit40>
-      <Unit41>
+        <UsageCount Value="10"/>
+      </Unit41>
+      <Unit42>
         <Filename Value="C:\lazarus\lcl\lclclasses.pp"/>
         <UnitName Value="LCLClasses"/>
         <WindowIndex Value="0"/>
-        <TopLine Value="137"/>
-        <CursorPos X="1" Y="149"/>
-        <UsageCount Value="9"/>
-      </Unit41>
-      <Unit42>
+        <TopLine Value="116"/>
+        <CursorPos X="3" Y="118"/>
+        <UsageCount Value="10"/>
+      </Unit42>
+      <Unit43>
         <Filename Value="C:\lazarus\lcl\buttonpanel.pas"/>
         <UnitName Value="ButtonPanel"/>
         <WindowIndex Value="0"/>
         <TopLine Value="183"/>
         <CursorPos X="45" Y="194"/>
-        <UsageCount Value="8"/>
-      </Unit42>
-      <Unit43>
+        <UsageCount Value="7"/>
+      </Unit43>
+      <Unit44>
         <Filename Value="..\..\..\ACBr\trunk\Fontes\ACBrSerial\ACBrECF.pas"/>
         <UnitName Value="ACBrECF"/>
         <WindowIndex Value="0"/>
         <TopLine Value="5128"/>
         <CursorPos X="1" Y="5148"/>
-        <UsageCount Value="7"/>
-      </Unit43>
-      <Unit44>
-        <Filename Value="C:\lazarus\lcl\include\wincontrol.inc"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="4516"/>
-        <CursorPos X="3" Y="4521"/>
-        <UsageCount Value="9"/>
+        <UsageCount Value="6"/>
       </Unit44>
       <Unit45>
+        <Filename Value="C:\lazarus\lcl\include\wincontrol.inc"/>
+        <WindowIndex Value="0"/>
+        <TopLine Value="4313"/>
+        <CursorPos X="1" Y="4332"/>
+        <UsageCount Value="11"/>
+      </Unit45>
+      <Unit46>
         <Filename Value="..\..\..\djpdv\djmonitor\DAV.pas"/>
         <ComponentName Value="frDAV"/>
         <HasResources Value="True"/>
@@ -401,91 +419,91 @@
         <WindowIndex Value="0"/>
         <TopLine Value="997"/>
         <CursorPos X="3" Y="999"/>
-        <UsageCount Value="7"/>
-      </Unit45>
-      <Unit46>
-        <Filename Value="C:\lazarus\lcl\include\customform.inc"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="2173"/>
-        <CursorPos X="32" Y="2186"/>
-        <UsageCount Value="10"/>
+        <UsageCount Value="6"/>
       </Unit46>
       <Unit47>
+        <Filename Value="C:\lazarus\lcl\include\customform.inc"/>
+        <WindowIndex Value="0"/>
+        <TopLine Value="199"/>
+        <CursorPos X="1" Y="209"/>
+        <UsageCount Value="12"/>
+      </Unit47>
+      <Unit48>
         <Filename Value="C:\lazarus\lcl\include\screen.inc"/>
         <WindowIndex Value="0"/>
         <TopLine Value="978"/>
         <CursorPos X="1" Y="989"/>
-        <UsageCount Value="9"/>
-      </Unit47>
-      <Unit48>
+        <UsageCount Value="8"/>
+      </Unit48>
+      <Unit49>
         <Filename Value="C:\lazarus\lcl\forms.pp"/>
         <UnitName Value="Forms"/>
         <WindowIndex Value="0"/>
-        <TopLine Value="588"/>
-        <CursorPos X="31" Y="598"/>
+        <TopLine Value="579"/>
+        <CursorPos X="15" Y="590"/>
         <UsageCount Value="18"/>
-      </Unit48>
-      <Unit49>
+      </Unit49>
+      <Unit50>
         <Filename Value="C:\lazarus\lcl\lclmessageglue.pas"/>
         <UnitName Value="LCLMessageGlue"/>
         <WindowIndex Value="0"/>
         <TopLine Value="116"/>
         <CursorPos X="1" Y="128"/>
-        <UsageCount Value="9"/>
-      </Unit49>
-      <Unit50>
+        <UsageCount Value="8"/>
+      </Unit50>
+      <Unit51>
         <Filename Value="C:\lazarus\lcl\interfaces\win32\win32pagecontrol.inc"/>
         <WindowIndex Value="0"/>
         <TopLine Value="254"/>
         <CursorPos X="1" Y="262"/>
-        <UsageCount Value="9"/>
-      </Unit50>
-      <Unit51>
+        <UsageCount Value="8"/>
+      </Unit51>
+      <Unit52>
         <Filename Value="C:\lazarus\lcl\interfaces\win32\win32wsforms.pp"/>
         <UnitName Value="Win32WSForms"/>
         <WindowIndex Value="0"/>
         <TopLine Value="361"/>
         <CursorPos X="1" Y="375"/>
-        <UsageCount Value="7"/>
-      </Unit51>
-      <Unit52>
+        <UsageCount Value="6"/>
+      </Unit52>
+      <Unit53>
         <Filename Value="C:\lazarus\lcl\widgetset\wslclclasses.pp"/>
         <UnitName Value="WSLCLClasses"/>
         <WindowIndex Value="0"/>
         <TopLine Value="421"/>
         <CursorPos X="3" Y="414"/>
-        <UsageCount Value="7"/>
-      </Unit52>
-      <Unit53>
+        <UsageCount Value="6"/>
+      </Unit53>
+      <Unit54>
         <Filename Value="C:\lazarus\lcl\lclproc.pas"/>
         <UnitName Value="LCLProc"/>
         <WindowIndex Value="0"/>
         <TopLine Value="851"/>
         <CursorPos X="40" Y="862"/>
-        <UsageCount Value="10"/>
-      </Unit53>
-      <Unit54>
+        <UsageCount Value="9"/>
+      </Unit54>
+      <Unit55>
         <Filename Value="C:\lazarus\lcl\include\tabsheet.inc"/>
         <WindowIndex Value="0"/>
         <TopLine Value="49"/>
         <CursorPos X="3" Y="69"/>
-        <UsageCount Value="8"/>
-      </Unit54>
-      <Unit55>
+        <UsageCount Value="7"/>
+      </Unit55>
+      <Unit56>
         <Filename Value="C:\lazarus\lcl\include\winapi.inc"/>
         <WindowIndex Value="0"/>
         <TopLine Value="314"/>
         <CursorPos X="30" Y="322"/>
-        <UsageCount Value="9"/>
-      </Unit55>
-      <Unit56>
+        <UsageCount Value="8"/>
+      </Unit56>
+      <Unit57>
         <Filename Value="C:\lazarus\lcl\interfaces\win32\win32callback.inc"/>
         <WindowIndex Value="0"/>
         <TopLine Value="211"/>
         <CursorPos X="14" Y="214"/>
-        <UsageCount Value="9"/>
-      </Unit56>
-      <Unit57>
+        <UsageCount Value="8"/>
+      </Unit57>
+      <Unit58>
         <Filename Value="..\..\..\..\TOOLS\DJ_FormPrincipal.pas"/>
         <ComponentName Value="FormDJ_Main"/>
         <HasResources Value="True"/>
@@ -494,175 +512,119 @@
         <WindowIndex Value="0"/>
         <TopLine Value="388"/>
         <CursorPos X="1" Y="404"/>
-        <UsageCount Value="18"/>
-      </Unit57>
-      <Unit58>
+        <UsageCount Value="17"/>
+      </Unit58>
+      <Unit59>
         <Filename Value="C:\lazarus\fpc\2.6.0\source\rtl\objpas\sysutils\sysstrh.inc"/>
         <WindowIndex Value="0"/>
         <TopLine Value="208"/>
         <CursorPos X="30" Y="219"/>
-        <UsageCount Value="9"/>
-      </Unit58>
-      <Unit59>
+        <UsageCount Value="8"/>
+      </Unit59>
+      <Unit60>
         <Filename Value="C:\lazarus\fpc\2.6.0\source\rtl\objpas\sysutils\sysstr.inc"/>
         <WindowIndex Value="0"/>
         <TopLine Value="1803"/>
         <CursorPos X="3" Y="1806"/>
-        <UsageCount Value="9"/>
-      </Unit59>
-      <Unit60>
+        <UsageCount Value="8"/>
+      </Unit60>
+      <Unit61>
         <Filename Value="C:\lazarus\lcl\include\customcontrol.inc"/>
         <WindowIndex Value="0"/>
         <TopLine Value="79"/>
         <CursorPos X="15" Y="90"/>
-        <UsageCount Value="9"/>
-      </Unit60>
-      <Unit61>
-        <Filename Value="C:\lazarus\fpc\2.6.0\source\rtl\objpas\classes\compon.inc"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="514"/>
-        <CursorPos X="6" Y="519"/>
-        <UsageCount Value="10"/>
+        <UsageCount Value="8"/>
       </Unit61>
       <Unit62>
-        <Filename Value="uform2.pas"/>
-        <IsPartOfProject Value="True"/>
-        <ComponentName Value="Form2"/>
-        <ResourceBaseClass Value="Form"/>
-        <UnitName Value="uForm2"/>
-        <EditorIndex Value="2"/>
+        <Filename Value="C:\lazarus\fpc\2.6.0\source\rtl\objpas\classes\compon.inc"/>
         <WindowIndex Value="0"/>
-        <TopLine Value="47"/>
-        <CursorPos X="18" Y="50"/>
-        <UsageCount Value="22"/>
-        <Loaded Value="True"/>
-        <LoadedDesigner Value="True"/>
+        <TopLine Value="465"/>
+        <CursorPos X="3" Y="469"/>
+        <UsageCount Value="10"/>
       </Unit62>
+      <Unit63>
+        <Filename Value="C:\lazarus\lcl\include\application.inc"/>
+        <WindowIndex Value="0"/>
+        <TopLine Value="1092"/>
+        <CursorPos X="21" Y="1101"/>
+        <UsageCount Value="10"/>
+      </Unit63>
+      <Unit64>
+        <Filename Value="C:\lazarus\fpc\2.6.0\source\rtl\win\wininc\struct.inc"/>
+        <WindowIndex Value="0"/>
+        <TopLine Value="217"/>
+        <CursorPos X="23" Y="228"/>
+        <UsageCount Value="10"/>
+      </Unit64>
     </Units>
     <General>
       <ActiveWindowIndexAtStart Value="0"/>
     </General>
-    <JumpHistory Count="30" HistoryIndex="29">
+    <JumpHistory Count="16" HistoryIndex="15">
       <Position1>
         <Filename Value="..\tdiclass.pas"/>
-        <Caret Line="506" Column="39" TopLine="493"/>
+        <Caret Line="344" Column="1" TopLine="325"/>
       </Position1>
       <Position2>
         <Filename Value="..\tdiclass.pas"/>
-        <Caret Line="1" Column="1" TopLine="1"/>
+        <Caret Line="345" Column="1" TopLine="326"/>
       </Position2>
       <Position3>
         <Filename Value="..\tdiclass.pas"/>
-        <Caret Line="59" Column="15" TopLine="48"/>
+        <Caret Line="271" Column="1" TopLine="260"/>
       </Position3>
       <Position4>
         <Filename Value="..\tdiclass.pas"/>
-        <Caret Line="514" Column="25" TopLine="499"/>
+        <Caret Line="273" Column="1" TopLine="260"/>
       </Position4>
       <Position5>
         <Filename Value="..\tdiclass.pas"/>
-        <Caret Line="519" Column="20" TopLine="499"/>
+        <Caret Line="274" Column="1" TopLine="260"/>
       </Position5>
       <Position6>
-        <Filename Value="uform1.pas"/>
-        <Caret Line="88" Column="1" TopLine="77"/>
+        <Filename Value="..\tdiclass.pas"/>
+        <Caret Line="276" Column="1" TopLine="260"/>
       </Position6>
       <Position7>
-        <Filename Value="uform1.pas"/>
-        <Caret Line="89" Column="1" TopLine="77"/>
+        <Filename Value="..\tdiclass.pas"/>
+        <Caret Line="267" Column="23" TopLine="260"/>
       </Position7>
       <Position8>
         <Filename Value="..\tdiclass.pas"/>
-        <Caret Line="327" Column="1" TopLine="316"/>
+        <Caret Line="315" Column="5" TopLine="304"/>
       </Position8>
       <Position9>
-        <Filename Value="umainform.pas"/>
-        <Caret Line="130" Column="29" TopLine="120"/>
+        <Filename Value="..\tdiclass.pas"/>
+        <Caret Line="877" Column="17" TopLine="881"/>
       </Position9>
       <Position10>
-        <Filename Value="umainform.pas"/>
-        <Caret Line="113" Column="34" TopLine="111"/>
+        <Filename Value="..\tdiclass.pas"/>
+        <Caret Line="269" Column="1" TopLine="258"/>
       </Position10>
       <Position11>
-        <Filename Value="umainform.pas"/>
-        <Caret Line="1" Column="1" TopLine="1"/>
+        <Filename Value="..\tdiclass.pas"/>
+        <Caret Line="889" Column="1" TopLine="878"/>
       </Position11>
       <Position12>
-        <Filename Value="umainform.pas"/>
-        <Caret Line="8" Column="5" TopLine="1"/>
+        <Filename Value="..\tdiclass.pas"/>
+        <Caret Line="269" Column="1" TopLine="258"/>
       </Position12>
       <Position13>
         <Filename Value="umainform.pas"/>
-        <Caret Line="60" Column="20" TopLine="41"/>
+        <Caret Line="93" Column="19" TopLine="93"/>
       </Position13>
       <Position14>
-        <Filename Value="uform2.pas"/>
-        <Caret Line="40" Column="38" TopLine="24"/>
+        <Filename Value="umainform.pas"/>
+        <Caret Line="79" Column="41" TopLine="71"/>
       </Position14>
       <Position15>
-        <Filename Value="uform2.pas"/>
-        <Caret Line="46" Column="63" TopLine="30"/>
+        <Filename Value="umainform.pas"/>
+        <Caret Line="81" Column="30" TopLine="71"/>
       </Position15>
       <Position16>
-        <Filename Value="uform2.pas"/>
-        <Caret Line="52" Column="38" TopLine="36"/>
+        <Filename Value="umainform.pas"/>
+        <Caret Line="80" Column="1" TopLine="71"/>
       </Position16>
-      <Position17>
-        <Filename Value="uform2.pas"/>
-        <Caret Line="63" Column="43" TopLine="42"/>
-      </Position17>
-      <Position18>
-        <Filename Value="uform2.pas"/>
-        <Caret Line="57" Column="14" TopLine="47"/>
-      </Position18>
-      <Position19>
-        <Filename Value="uform2.pas"/>
-        <Caret Line="64" Column="14" TopLine="54"/>
-      </Position19>
-      <Position20>
-        <Filename Value="uform2.pas"/>
-        <Caret Line="50" Column="1" TopLine="46"/>
-      </Position20>
-      <Position21>
-        <Filename Value="umainform.pas"/>
-        <Caret Line="114" Column="13" TopLine="111"/>
-      </Position21>
-      <Position22>
-        <Filename Value="uform2.pas"/>
-        <Caret Line="50" Column="1" TopLine="46"/>
-      </Position22>
-      <Position23>
-        <Filename Value="uform2.pas"/>
-        <Caret Line="55" Column="24" TopLine="49"/>
-      </Position23>
-      <Position24>
-        <Filename Value="uform2.pas"/>
-        <Caret Line="54" Column="24" TopLine="48"/>
-      </Position24>
-      <Position25>
-        <Filename Value="uform2.pas"/>
-        <Caret Line="53" Column="24" TopLine="47"/>
-      </Position25>
-      <Position26>
-        <Filename Value="uform2.pas"/>
-        <Caret Line="51" Column="1" TopLine="38"/>
-      </Position26>
-      <Position27>
-        <Filename Value="umainform.pas"/>
-        <Caret Line="119" Column="19" TopLine="111"/>
-      </Position27>
-      <Position28>
-        <Filename Value="..\tdiclass.pas"/>
-        <Caret Line="125" Column="38" TopLine="117"/>
-      </Position28>
-      <Position29>
-        <Filename Value="umainform.pas"/>
-        <Caret Line="113" Column="32" TopLine="111"/>
-      </Position29>
-      <Position30>
-        <Filename Value="..\tdiclass.pas"/>
-        <Caret Line="248" Column="3" TopLine="245"/>
-      </Position30>
     </JumpHistory>
   </ProjectSession>
   <Debugging>
@@ -671,8 +633,8 @@
         <Kind Value="bpkSource"/>
         <WatchScope Value="wpsLocal"/>
         <WatchKind Value="wpkWrite"/>
-        <Source Value="..\tdiclass.pas"/>
-        <Line Value="248"/>
+        <Source Value="umainform.pas"/>
+        <Line Value="79"/>
       </Item1>
     </BreakPoints>
   </Debugging>
diff --git a/components/tdi/Demo/uform2.lfm b/components/tdi/Demo/uform2.lfm
index d03b0cb56..bf08e93ab 100644
--- a/components/tdi/Demo/uform2.lfm
+++ b/components/tdi/Demo/uform2.lfm
@@ -1,11 +1,11 @@
 object Form2: TForm2
   Left = 709
-  Height = 240
+  Height = 243
   Top = 330
-  Width = 320
+  Width = 307
   Caption = 'Form2'
-  ClientHeight = 240
-  ClientWidth = 320
+  ClientHeight = 243
+  ClientWidth = 307
   OnClose = FormClose
   OnCloseQuery = FormCloseQuery
   OnDestroy = FormDestroy
@@ -13,42 +13,45 @@ object Form2: TForm2
   OnShow = FormShow
   LCLVersion = '1.1'
   object Edit1: TEdit
-    Left = 51
+    Left = 56
     Height = 23
-    Top = 37
-    Width = 80
+    Top = 32
+    Width = 211
+    Anchors = [akTop, akLeft, akRight]
     TabOrder = 0
     Text = 'Edit1'
   end
   object Edit2: TEdit
-    Left = 159
+    Left = 56
     Height = 23
-    Top = 37
-    Width = 80
+    Top = 72
+    Width = 211
+    Anchors = [akTop, akLeft, akRight]
     TabOrder = 1
     Text = 'Edit2'
   end
   object CheckBox1: TCheckBox
-    Left = 51
+    Left = 56
     Height = 19
-    Top = 72
+    Top = 104
     Width = 78
     Caption = 'CheckBox1'
     TabOrder = 2
   end
   object CheckBox2: TCheckBox
-    Left = 51
+    Left = 56
     Height = 19
-    Top = 104
+    Top = 136
     Width = 78
     Caption = 'CheckBox2'
     TabOrder = 3
   end
   object Button1: TButton
-    Left = 208
+    Left = 195
     Height = 25
-    Top = 186
+    Top = 189
     Width = 86
+    Anchors = [akRight, akBottom]
     AutoSize = True
     Caption = 'Close Form'
     OnClick = Button1Click
diff --git a/components/tdi/Demo/uform2.pas b/components/tdi/Demo/uform2.pas
index e8df7c88c..4d1305596 100644
--- a/components/tdi/Demo/uform2.pas
+++ b/components/tdi/Demo/uform2.pas
@@ -47,6 +47,7 @@ end;
 procedure TForm2.Button1Click(Sender : TObject) ;
 begin
   Close;
+  ClientRect;
 end;
 
 procedure TForm2.FormCloseQuery(Sender : TObject ; var CanClose : boolean) ;
diff --git a/components/tdi/Demo/umainform.lfm b/components/tdi/Demo/umainform.lfm
index aa69e33ca..ad3198315 100644
--- a/components/tdi/Demo/umainform.lfm
+++ b/components/tdi/Demo/umainform.lfm
@@ -10,6 +10,7 @@ object fMainForm: TfMainForm
   OnClose = FormClose
   OnCloseQuery = FormCloseQuery
   OnCreate = FormCreate
+  OnDestroy = FormDestroy
   LCLVersion = '1.1'
   object StatusBar1: TStatusBar
     Left = 0
@@ -674,6 +675,10 @@ object fMainForm: TfMainForm
         Caption = 'Show Already Created Form 2'
         OnClick = miForm2Click
       end
+      object MenuItem3: TMenuItem
+        Caption = 'Show Form2'
+        OnClick = MenuItem3Click
+      end
       object MenuItem2: TMenuItem
         Caption = '-'
       end
diff --git a/components/tdi/Demo/umainform.pas b/components/tdi/Demo/umainform.pas
index 30459c32d..913b776bd 100644
--- a/components/tdi/Demo/umainform.pas
+++ b/components/tdi/Demo/umainform.pas
@@ -22,6 +22,7 @@ type
     Label2 : TLabel ;
     Label3 : TLabel ;
     MainMenu1 : TMainMenu ;
+    MenuItem3 : TMenuItem ;
     mEvents : TMemo ;
     MenuItem1 : TMenuItem ;
     MenuItem2 : TMenuItem ;
@@ -39,6 +40,8 @@ type
     procedure FormClose(Sender : TObject ; var CloseAction : TCloseAction) ;
     procedure FormCloseQuery(Sender : TObject ; var CanClose : boolean) ;
     procedure FormCreate(Sender : TObject) ;
+    procedure FormDestroy(Sender : TObject) ;
+    procedure MenuItem3Click(Sender : TObject) ;
     procedure miExitClick(Sender : TObject) ;
     procedure miForm1Click(Sender : TObject) ;
     procedure miForm2Click(Sender : TObject) ;
@@ -71,6 +74,16 @@ begin
   cbxBackgroundCorner.ItemIndex := Integer(TDINoteBook1.BackgroundCorner);
 end;
 
+procedure TfMainForm.FormDestroy(Sender : TObject) ;
+begin
+  mEvents.Lines.Add('fMainForm.Destroy');
+end;
+
+procedure TfMainForm.MenuItem3Click(Sender : TObject) ;
+begin
+  Form2.Show;
+end;
+
 procedure TfMainForm.cbxBackgroundCornerChange(Sender : TObject) ;
 begin
   TDINoteBook1.BackgroundCorner := TTDIBackgroundCorner( cbxBackgroundCorner.ItemIndex );
diff --git a/components/tdi/tdiclass.pas b/components/tdi/tdiclass.pas
index 2b868c822..00912b63d 100644
--- a/components/tdi/tdiclass.pas
+++ b/components/tdi/tdiclass.pas
@@ -49,9 +49,17 @@ type
   TTDIPage = class(TTabSheet)
   private
     fsFormInPage : TForm ;
+    fsFormOldParent: TWinControl;
+    fsFormOldCloseEvent : TCloseEvent;
+    fsFormOldAlign : TAlign;
+    fsFormOldClientRect : TRect;
+    fsFormOldBorderStyle : TFormBorderStyle;
     fsLastActiveControl: TWinControl;
 
     procedure OnResizeTDIPage(Sender : TObject) ;
+    procedure OnFormClose(Sender: TObject; var CloseAction: TCloseAction);
+    procedure SaveFormProperties ;
+    procedure RestoreFormProperties ;
 
     procedure SetFormInPage(AValue : TForm) ;
   protected
@@ -108,6 +116,7 @@ type
 
     procedure TimerRestoreLastFocus( Sender: TObject );
 
+    procedure RemoveInvalidPages ;
   protected
     function CanChange: Boolean; override;
     procedure DoChange; override;
@@ -223,13 +232,19 @@ procedure TTDIPage.SetFormInPage(AValue : TForm) ;
 begin
   fsFormInPage := AValue ;
 
+  // Saving Form Properties //
+  SaveFormProperties ;
+
   // Adjusting Page Caption and Color as the Form //
   Caption := fsFormInPage.Caption;
   //Color := fsFormInPage.Color;
 
+  // HiJacking the Form.OnClose Event, to detect Form Closed from Inside //
+  fsFormInPage.OnClose := @OnFormClose;
+
   // Adjusting AForm Border Style and Align //
   fsFormInPage.BorderStyle := bsNone ;
-  //fsFormInPage.Align     := alClient ;   // This will be done in OnResizeTDIPage
+  fsFormInPage.Align       := alClient ; 
 
   // Change Form Parent to the Page //
   fsFormInPage.Parent := Self;
@@ -247,8 +262,17 @@ procedure TTDIPage.Notification(AComponent : TComponent ; Operation : TOperation
 begin
   inherited Notification(AComponent, Operation) ;
 
+  if ([csDesigning, csDestroying] * ComponentState <> []) then exit ;
+
   if (Operation = opRemove) and (AComponent = fsFormInPage) then
+  begin
+    RestoreFormProperties;
+
     fsFormInPage := nil;
+
+    if Assigned( Parent ) then
+      Parent.RemoveComponent( Self );
+  end ;
 end ;
 
 procedure TTDIPage.CheckFormAlign ;
@@ -257,15 +281,19 @@ begin
 
   { If Form has MaxConstrains and doesn't fill all the Screen, Centralize on
     TabSheet }
-  if (fsFormInPage.Width < Width) and (fsFormInPage.Height < Height) then
+  if (fsFormInPage.Width < Width) or (fsFormInPage.Height < Height) then
   begin
     fsFormInPage.Align := alNone;
 
     if (fsFormInPage.Width < Width) then
-      fsFormInPage.Left  := Trunc( (Width - fsFormInPage.Width) / 2 );
+      fsFormInPage.Left := Trunc( (Width - fsFormInPage.Width) / 2 )
+    else
+      fsFormInPage.Left := 0 ;
 
     if (fsFormInPage.Height < Height) then
-      fsFormInPage.Top   := Trunc( (Height - fsFormInPage.Height) / 2 );
+      fsFormInPage.Top := Trunc( (Height - fsFormInPage.Height) / 2 )
+    else
+      fsFormInPage.Top := 0 ;
   end
   else
     fsFormInPage.Align := alClient;
@@ -276,6 +304,46 @@ begin
   CheckFormAlign;
 end ;
 
+procedure TTDIPage.OnFormClose(Sender : TObject ; var CloseAction : TCloseAction
+  ) ;
+begin
+  if Assigned( fsFormOldCloseEvent ) then
+     fsFormOldCloseEvent( Sender, CloseAction );
+
+  // This will force this page be killed by TTDINoteBook.Notification();
+  if Assigned( fsFormInPage ) then
+    RemoveComponent( fsFormInPage );
+end ;
+
+procedure TTDIPage.SaveFormProperties ;
+begin
+  if not Assigned( fsFormInPage ) then exit ;
+
+  fsFormOldParent            := fsFormInPage.Parent;
+  fsFormOldCloseEvent        := fsFormInPage.OnClose;
+  fsFormOldAlign             := fsFormInPage.Align;
+  fsFormOldBorderStyle       := fsFormInPage.BorderStyle;
+  fsFormOldClientRect.Top    := fsFormInPage.Top;
+  fsFormOldClientRect.Left   := fsFormInPage.Left;
+  fsFormOldClientRect.Right  := fsFormInPage.Width;
+  fsFormOldClientRect.Bottom := fsFormInPage.Height;
+end ;
+
+procedure TTDIPage.RestoreFormProperties ;
+begin
+  if not Assigned( fsFormInPage ) then exit ;
+
+  fsFormInPage.Parent      := fsFormOldParent;
+  fsFormInPage.Visible     := False;
+  fsFormInPage.OnClose     := fsFormOldCloseEvent;
+  fsFormInPage.Align       := fsFormOldAlign;
+  fsFormInPage.BorderStyle := fsFormOldBorderStyle;
+  fsFormInPage.Top         := fsFormOldClientRect.Top;
+  fsFormInPage.Left        := fsFormOldClientRect.Left;
+  fsFormInPage.Width       := fsFormOldClientRect.Right;
+  fsFormInPage.Height      := fsFormOldClientRect.Bottom;
+end ;
+
 { TTDINoteBook }
 
 constructor TTDINoteBook.Create(TheOwner : TComponent) ;
@@ -815,12 +883,10 @@ begin
      if (AComponent = FMainMenu) then
        FMainMenu := nil ;
 
-
      if ([csDesigning, csDestroying] * ComponentState <> []) then exit ;
 
-     if (AComponent is TForm) then
-       if TForm(AComponent).Parent is TTDIPage then
-         RemovePage( TTDIPage(TForm(AComponent).Parent).PageIndex  );
+     if {(AComponent is TForm) or} (AComponent is TTDIPage)  then
+       RemoveInvalidPages;
   end ;
 end ;
 
@@ -868,5 +934,29 @@ begin
   FBackgroundImage.Visible := True ;
 end ;
 
+procedure TTDINoteBook.RemoveInvalidPages ;
+var
+  I : Integer ;
+begin
+  // Remove all TTDIPage with FormInPage not assigned //;
+  I := 0 ;
+  while I < PageCount do
+  begin
+    if Page[I] is TTDIPage then
+    begin
+      with TTDIPage( Page[I] ) do
+      begin
+        if FormInPage = nil then
+        begin
+          RemovePage( I );
+          Dec( I ) ;
+        end ;
+      end ;
+    end ;
+
+    Inc( I ) ;
+  end ;
+end ;
+
 end.