diff --git a/components/rx/Demos/RxMDI/project1.lpi b/components/rx/Demos/RxMDI/project1.lpi
index a8da1eca8..25e9b31ab 100644
--- a/components/rx/Demos/RxMDI/project1.lpi
+++ b/components/rx/Demos/RxMDI/project1.lpi
@@ -48,6 +48,7 @@
         <Filename Value="unit1.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="Form1"/>
+        <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="Unit1"/>
       </Unit1>
@@ -55,6 +56,7 @@
         <Filename Value="unit2.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="Form2"/>
+        <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="Unit2"/>
       </Unit2>
@@ -62,6 +64,7 @@
         <Filename Value="unit3.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="Form3"/>
+        <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="Unit3"/>
       </Unit3>
@@ -69,6 +72,7 @@
         <Filename Value="unit4.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="Form4"/>
+        <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="Unit4"/>
       </Unit4>
diff --git a/components/rx/Demos/RxMDI/project1.lps b/components/rx/Demos/RxMDI/project1.lps
index 8fa8a3e41..61753a883 100644
--- a/components/rx/Demos/RxMDI/project1.lps
+++ b/components/rx/Demos/RxMDI/project1.lps
@@ -8,20 +8,20 @@
         <Filename Value="project1.lpr"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="project1"/>
-        <UsageCount Value="20"/>
+        <UsageCount Value="22"/>
       </Unit0>
       <Unit1>
         <Filename Value="unit1.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="Form1"/>
+        <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="Unit1"/>
-        <IsVisibleTab Value="True"/>
         <EditorIndex Value="0"/>
         <WindowIndex Value="0"/>
-        <TopLine Value="45"/>
-        <CursorPos X="26" Y="75"/>
-        <UsageCount Value="20"/>
+        <TopLine Value="56"/>
+        <CursorPos X="34" Y="67"/>
+        <UsageCount Value="22"/>
         <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>
       </Unit1>
@@ -29,53 +29,57 @@
         <Filename Value="unit2.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="Form2"/>
+        <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="Unit2"/>
         <EditorIndex Value="3"/>
         <WindowIndex Value="0"/>
         <TopLine Value="7"/>
-        <CursorPos X="6" Y="10"/>
-        <UsageCount Value="20"/>
+        <CursorPos X="6" Y="11"/>
+        <UsageCount Value="22"/>
         <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>
       </Unit2>
       <Unit3>
-        <Filename Value="../../rxmdi.pas"/>
-        <UnitName Value="RxMDI"/>
-        <EditorIndex Value="1"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="294"/>
-        <CursorPos X="3" Y="298"/>
-        <UsageCount Value="10"/>
-        <Loaded Value="True"/>
-      </Unit3>
-      <Unit4>
         <Filename Value="unit3.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="Form3"/>
+        <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="Unit3"/>
         <EditorIndex Value="2"/>
         <WindowIndex Value="0"/>
-        <TopLine Value="9"/>
-        <CursorPos X="14" Y="37"/>
-        <UsageCount Value="20"/>
+        <TopLine Value="1"/>
+        <CursorPos X="1" Y="19"/>
+        <UsageCount Value="22"/>
         <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>
-      </Unit4>
-      <Unit5>
+      </Unit3>
+      <Unit4>
         <Filename Value="unit4.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="Form4"/>
+        <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="Unit4"/>
         <EditorIndex Value="4"/>
         <WindowIndex Value="0"/>
-        <TopLine Value="12"/>
-        <CursorPos X="26" Y="41"/>
-        <UsageCount Value="20"/>
+        <TopLine Value="1"/>
+        <CursorPos X="32" Y="8"/>
+        <UsageCount Value="22"/>
         <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>
+      </Unit4>
+      <Unit5>
+        <Filename Value="../../rxmdi.pas"/>
+        <UnitName Value="RxMDI"/>
+        <IsVisibleTab Value="True"/>
+        <EditorIndex Value="1"/>
+        <WindowIndex Value="0"/>
+        <TopLine Value="295"/>
+        <CursorPos X="10" Y="303"/>
+        <UsageCount Value="11"/>
+        <Loaded Value="True"/>
       </Unit5>
     </Units>
     <General>
@@ -83,126 +87,137 @@
     </General>
     <JumpHistory Count="30" HistoryIndex="29">
       <Position1>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="18" Column="27" TopLine="1"/>
+        <Filename Value="unit4.pas"/>
+        <Caret Line="22" Column="21" TopLine="4"/>
       </Position1>
       <Position2>
         <Filename Value="unit1.pas"/>
-        <Caret Line="20" Column="27" TopLine="1"/>
+        <Caret Line="73" Column="26" TopLine="43"/>
       </Position2>
       <Position3>
         <Filename Value="unit1.pas"/>
-        <Caret Line="21" Column="27" TopLine="1"/>
+        <Caret Line="74" Column="26" TopLine="44"/>
       </Position3>
       <Position4>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="22" Column="27" TopLine="1"/>
+        <Filename Value="unit4.pas"/>
+        <Caret Line="41" Column="26" TopLine="12"/>
       </Position4>
       <Position5>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="23" Column="27" TopLine="1"/>
+        <Filename Value="unit4.pas"/>
+        <Caret Line="43" Column="26" TopLine="13"/>
       </Position5>
       <Position6>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="24" Column="27" TopLine="1"/>
+        <Filename Value="unit4.pas"/>
+        <Caret Line="44" Column="26" TopLine="13"/>
       </Position6>
       <Position7>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="25" Column="27" TopLine="1"/>
+        <Filename Value="unit2.pas"/>
+        <Caret Line="10" Column="6" TopLine="7"/>
       </Position7>
       <Position8>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="27" Column="27" TopLine="1"/>
+        <Filename Value="unit2.pas"/>
+        <Caret Line="11" Column="6" TopLine="7"/>
       </Position8>
       <Position9>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="42" Column="9" TopLine="15"/>
+        <Filename Value="unit3.pas"/>
+        <Caret Line="38" Column="14" TopLine="9"/>
       </Position9>
       <Position10>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="43" Column="9" TopLine="15"/>
+        <Filename Value="../../rxmdi.pas"/>
+        <Caret Line="52" Column="1" TopLine="30"/>
       </Position10>
       <Position11>
-        <Filename Value="unit2.pas"/>
-        <Caret Line="24" Column="22" TopLine="1"/>
+        <Filename Value="../../rxmdi.pas"/>
+        <Caret Line="612" Column="5" TopLine="599"/>
       </Position11>
       <Position12>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="44" Column="9" TopLine="15"/>
+        <Filename Value="../../rxmdi.pas"/>
+        <Caret Line="101" Column="14" TopLine="80"/>
       </Position12>
       <Position13>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="46" Column="9" TopLine="15"/>
+        <Filename Value="../../rxmdi.pas"/>
+        <Caret Line="712" Column="3" TopLine="594"/>
       </Position13>
       <Position14>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="53" Column="47" TopLine="24"/>
+        <Filename Value="../../rxmdi.pas"/>
+        <Caret Line="608" Column="1" TopLine="594"/>
       </Position14>
       <Position15>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="54" Column="47" TopLine="25"/>
+        <Filename Value="../../rxmdi.pas"/>
+        <Caret Line="609" Column="1" TopLine="594"/>
       </Position15>
       <Position16>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="55" Column="47" TopLine="26"/>
+        <Filename Value="../../rxmdi.pas"/>
+        <Caret Line="610" Column="1" TopLine="594"/>
       </Position16>
       <Position17>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="55" Column="1" TopLine="28"/>
+        <Filename Value="../../rxmdi.pas"/>
+        <Caret Line="611" Column="1" TopLine="594"/>
       </Position17>
       <Position18>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="55" Column="1" TopLine="28"/>
+        <Filename Value="../../rxmdi.pas"/>
+        <Caret Line="613" Column="1" TopLine="594"/>
       </Position18>
       <Position19>
-        <Filename Value="unit3.pas"/>
-        <Caret Line="19" Column="22" TopLine="1"/>
+        <Filename Value="../../rxmdi.pas"/>
+        <Caret Line="608" Column="1" TopLine="594"/>
       </Position19>
       <Position20>
-        <Filename Value="unit3.pas"/>
-        <Caret Line="23" Column="22" TopLine="1"/>
+        <Filename Value="../../rxmdi.pas"/>
+        <Caret Line="609" Column="1" TopLine="594"/>
       </Position20>
       <Position21>
-        <Filename Value="unit3.pas"/>
-        <Caret Line="26" Column="22" TopLine="1"/>
+        <Filename Value="../../rxmdi.pas"/>
+        <Caret Line="610" Column="1" TopLine="594"/>
       </Position21>
       <Position22>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="55" Column="1" TopLine="28"/>
+        <Filename Value="../../rxmdi.pas"/>
+        <Caret Line="611" Column="1" TopLine="594"/>
       </Position22>
       <Position23>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="57" Column="1" TopLine="29"/>
+        <Filename Value="../../rxmdi.pas"/>
+        <Caret Line="613" Column="1" TopLine="594"/>
       </Position23>
       <Position24>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="62" Column="47" TopLine="35"/>
+        <Filename Value="unit4.pas"/>
+        <Caret Line="45" Column="26" TopLine="13"/>
       </Position24>
       <Position25>
         <Filename Value="unit4.pas"/>
-        <Caret Line="1" Column="1" TopLine="1"/>
+        <Caret Line="46" Column="26" TopLine="13"/>
       </Position25>
       <Position26>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="63" Column="47" TopLine="36"/>
+        <Filename Value="unit4.pas"/>
+        <Caret Line="45" Column="26" TopLine="13"/>
       </Position26>
       <Position27>
         <Filename Value="unit1.pas"/>
-        <Caret Line="65" Column="26" TopLine="43"/>
+        <Caret Line="75" Column="26" TopLine="45"/>
       </Position27>
       <Position28>
-        <Filename Value="unit4.pas"/>
-        <Caret Line="22" Column="21" TopLine="4"/>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="82" Column="26" TopLine="47"/>
       </Position28>
       <Position29>
         <Filename Value="unit1.pas"/>
-        <Caret Line="73" Column="26" TopLine="43"/>
+        <Caret Line="67" Column="34" TopLine="56"/>
       </Position29>
       <Position30>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="74" Column="26" TopLine="44"/>
+        <Filename Value="../../rxmdi.pas"/>
+        <Caret Line="739" Column="1" TopLine="705"/>
       </Position30>
     </JumpHistory>
   </ProjectSession>
+  <Debugging>
+    <BreakPoints Count="1">
+      <Item1>
+        <Kind Value="bpkSource"/>
+        <WatchScope Value="wpsLocal"/>
+        <WatchKind Value="wpkWrite"/>
+        <Source Value="../../rxmdi.pas"/>
+        <Line Value="711"/>
+      </Item1>
+    </BreakPoints>
+  </Debugging>
   <EditorMacros Count="0"/>
 </CONFIG>
diff --git a/components/rx/Demos/RxMDI/unit1.lfm b/components/rx/Demos/RxMDI/unit1.lfm
index eaef5b4fb..6cf0270b4 100644
--- a/components/rx/Demos/RxMDI/unit1.lfm
+++ b/components/rx/Demos/RxMDI/unit1.lfm
@@ -126,4 +126,10 @@ object Form1: TForm1
       end
     end
   end
+  object Timer1: TTimer
+    Interval = 500
+    OnTimer = Timer1Timer
+    left = 451
+    top = 117
+  end
 end
diff --git a/components/rx/Demos/RxMDI/unit1.pas b/components/rx/Demos/RxMDI/unit1.pas
index c2d9191ba..8e4f225b3 100644
--- a/components/rx/Demos/RxMDI/unit1.pas
+++ b/components/rx/Demos/RxMDI/unit1.pas
@@ -6,7 +6,7 @@ interface
 
 uses
   Classes, SysUtils, FileUtil, rxtoolbar, RxMDI, Forms, Controls, Graphics,
-  Dialogs, ActnList, Menus, ComCtrls;
+  Dialogs, ActnList, Menus, ComCtrls, ExtCtrls;
 
 type
 
@@ -30,11 +30,13 @@ type
     RxMDIPanel1: TRxMDIPanel;
     RxMDITasks1: TRxMDITasks;
     StatusBar1: TStatusBar;
+    Timer1: TTimer;
     ToolPanel1: TToolPanel;
     procedure Action1Execute(Sender: TObject);
     procedure Action2Execute(Sender: TObject);
     procedure Action3Execute(Sender: TObject);
     procedure sysCloseExecute(Sender: TObject);
+    procedure Timer1Timer(Sender: TObject);
   private
     { private declarations }
   public
@@ -57,6 +59,15 @@ begin
   Close;
 end;
 
+procedure TForm1.Timer1Timer(Sender: TObject);
+begin
+  if Assigned(ActiveControl) then
+    StatusBar1.SimpleText:=ActiveControl.Caption
+  else
+    StatusBar1.SimpleText:='<NONE>'
+    ;
+end;
+
 procedure TForm1.Action1Execute(Sender: TObject);
 begin
   RxMDIPanel1.ChildWindowsCreate(Form2, TForm2);
diff --git a/components/rx/Demos/RxMDI/unit2.lfm b/components/rx/Demos/RxMDI/unit2.lfm
index f131d402e..1e7cf2907 100644
--- a/components/rx/Demos/RxMDI/unit2.lfm
+++ b/components/rx/Demos/RxMDI/unit2.lfm
@@ -1,11 +1,11 @@
 object Form2: TForm2
   Left = 502
-  Height = 240
+  Height = 414
   Top = 245
-  Width = 320
+  Width = 478
   Caption = 'MDI form 1'
-  ClientHeight = 240
-  ClientWidth = 320
+  ClientHeight = 414
+  ClientWidth = 478
   Icon.Data = {
     7E04000000000100010010100000010020006804000016000000280000001000
     0000200000000100200000000000000400006400000064000000000000000000
@@ -51,9 +51,33 @@ object Form2: TForm2
     Left = 0
     Height = 50
     Top = 0
-    Width = 320
+    Width = 478
     Align = alTop
     Caption = 'MDI form # 1'
     TabOrder = 0
   end
+  object Edit1: TEdit
+    Left = 21
+    Height = 25
+    Top = 106
+    Width = 80
+    TabOrder = 1
+    Text = 'Edit1'
+  end
+  object Edit2: TEdit
+    Left = 118
+    Height = 25
+    Top = 105
+    Width = 80
+    TabOrder = 2
+    Text = 'Edit2'
+  end
+  object Edit3: TEdit
+    Left = 223
+    Height = 25
+    Top = 103
+    Width = 80
+    TabOrder = 3
+    Text = 'Edit3'
+  end
 end
diff --git a/components/rx/Demos/RxMDI/unit2.pas b/components/rx/Demos/RxMDI/unit2.pas
index 7b3daa92b..44b1c5ad5 100644
--- a/components/rx/Demos/RxMDI/unit2.pas
+++ b/components/rx/Demos/RxMDI/unit2.pas
@@ -5,13 +5,17 @@ unit Unit2;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ExtCtrls;
+  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ExtCtrls,
+  StdCtrls;
 
 type
 
   { TForm2 }
 
   TForm2 = class(TForm)
+    Edit1: TEdit;
+    Edit2: TEdit;
+    Edit3: TEdit;
     Panel1: TPanel;
     procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
   private
diff --git a/components/rx/Demos/RxMDI/unit4.lfm b/components/rx/Demos/RxMDI/unit4.lfm
index b70a3d815..5ccc0ac69 100644
--- a/components/rx/Demos/RxMDI/unit4.lfm
+++ b/components/rx/Demos/RxMDI/unit4.lfm
@@ -57,4 +57,28 @@ object Form4: TForm4
     Caption = 'MDI form # ...'
     TabOrder = 0
   end
+  object Edit1: TEdit
+    Left = 47
+    Height = 25
+    Top = 84
+    Width = 80
+    TabOrder = 1
+    Text = 'Edit1'
+  end
+  object Edit2: TEdit
+    Left = 43
+    Height = 25
+    Top = 154
+    Width = 80
+    TabOrder = 2
+    Text = 'Edit2'
+  end
+  object Edit3: TEdit
+    Left = 45
+    Height = 25
+    Top = 215
+    Width = 80
+    TabOrder = 3
+    Text = 'Edit3'
+  end
 end
diff --git a/components/rx/Demos/RxMDI/unit4.pas b/components/rx/Demos/RxMDI/unit4.pas
index b91cb54e2..31d3c6017 100644
--- a/components/rx/Demos/RxMDI/unit4.pas
+++ b/components/rx/Demos/RxMDI/unit4.pas
@@ -5,13 +5,17 @@ unit Unit4;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ExtCtrls;
+  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs,
+  ExtCtrls, StdCtrls;
 
 type
 
   { TForm4 }
 
   TForm4 = class(TForm)
+    Edit1: TEdit;
+    Edit2: TEdit;
+    Edit3: TEdit;
     Panel1: TPanel;
     procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
     procedure FormCreate(Sender: TObject);