RxFPC:fix demos

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5190 8e941d3f-bd1b-0410-a28a-d453659cc2b4
2016-09-20 10:11:30 +00:00
parent cf3d788bc2
commit f0f4d8b18a
43 changed files with 678 additions and 6639 deletions
--- a/components/rx/trunk/Demos/AutoSort/AutoSortDemo.lpi
+++ b/components/rx/trunk/Demos/AutoSort/AutoSortDemo.lpi
@ -1,17 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
  <ProjectOptions>
    <Version Value="9"/>
    <General>
      <MainUnit Value="0"/>
+      <ResourceType Value="res"/>
      <UseXPManifest Value="True"/>
      <Icon Value="0"/>
-      <ActiveWindowIndexAtStart Value="0"/>
    </General>
    <VersionInfo>
      <Language Value=""/>
      <CharSet Value=""/>
-      <StringTable ProductVersion=""/>
    </VersionInfo>
    <BuildModes Count="1">
      <Item1 Name="default" Default="True"/>
@ -45,61 +44,65 @@
      <Unit0>
        <Filename Value="AutoSortDemo.lpr"/>
        <IsPartOfProject Value="True"/>
-        <UnitName Value="AutoSortDemo"/>
-        <TopLine Value="1"/>
-        <CursorPos X="1" Y="20"/>
+        <CursorPos Y="20"/>
        <UsageCount Value="20"/>
      </Unit0>
      <Unit1>
        <Filename Value="asdmainunit.pas"/>
        <IsPartOfProject Value="True"/>
        <ComponentName Value="Form1"/>
+        <HasResources Value="True"/>
        <ResourceBaseClass Value="Form"/>
        <UnitName Value="asdMainUnit"/>
        <IsVisibleTab Value="True"/>
-        <EditorIndex Value="0"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="22"/>
-        <CursorPos X="20" Y="39"/>
+        <TopLine Value="41"/>
+        <CursorPos X="50" Y="50"/>
        <UsageCount Value="20"/>
        <Loaded Value="True"/>
        <LoadedDesigner Value="True"/>
      </Unit1>
      <Unit2>
-        <Filename Value="/usr/local/share/lazarus/components/rxnew/rxsortmemds.pas"/>
-        <UnitName Value="rxsortmemds"/>
+        <Filename Value="../../rxsortmemds.pas"/>
        <TopLine Value="24"/>
        <CursorPos X="69" Y="52"/>
        <UsageCount Value="10"/>
      </Unit2>
      <Unit3>
-        <Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
-        <UnitName Value="rxdbgrid"/>
-        <TopLine Value="1393"/>
-        <CursorPos X="1" Y="1410"/>
+        <Filename Value="../../rxdbgrid.pas"/>
+        <EditorIndex Value="-1"/>
+        <TopLine Value="953"/>
+        <CursorPos Y="992"/>
        <UsageCount Value="10"/>
      </Unit3>
      <Unit4>
-        <Filename Value="/usr/local/share/lazarus/lcl/dbgrids.pas"/>
+        <Filename Value="../../../../lcl/dbgrids.pas"/>
        <UnitName Value="DBGrids"/>
        <TopLine Value="671"/>
-        <CursorPos X="1" Y="688"/>
+        <CursorPos Y="688"/>
        <UsageCount Value="10"/>
      </Unit4>
      <Unit5>
-        <Filename Value="/usr/local/share/lazarus/components/rxnew/rxmemds.pas"/>
-        <UnitName Value="rxmemds"/>
+        <Filename Value="../../rxmemds.pas"/>
        <TopLine Value="1329"/>
-        <CursorPos X="1" Y="1346"/>
+        <CursorPos Y="1346"/>
        <UsageCount Value="10"/>
      </Unit5>
    </Units>
-    <JumpHistory Count="0" HistoryIndex="-1"/>
+    <JumpHistory Count="1">
+      <Position1>
+        <Filename Value="asdmainunit.pas"/>
+        <Caret Line="39" Column="20" TopLine="22"/>
+      </Position1>
+    </JumpHistory>
  </ProjectOptions>
  <CompilerOptions>
    <Version Value="11"/>
+    <Target>
+      <Filename Value="AutoSortDemo"/>
+    </Target>
    <SearchPaths>
      <IncludeFiles Value="$(ProjOutDir)"/>
+      <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
    </SearchPaths>
    <Parsing>
      <SyntaxOptions>
@ -113,20 +116,8 @@
        </Win32>
      </Options>
    </Linking>
-    <Other>
-      <CompilerPath Value="$(CompPath)"/>
-    </Other>
  </CompilerOptions>
  <Debugging>
-    <BreakPoints Count="1">
-      <Item1>
-        <Kind Value="bpkSource"/>
-        <WatchScope Value="wpsGlobal"/>
-        <WatchKind Value="wpkWrite"/>
-        <Source Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
-        <Line Value="741"/>
-      </Item1>
-    </BreakPoints>
    <Exceptions Count="3">
      <Item1>
        <Name Value="EAbort"/>
--- a/components/rx/trunk/Demos/AutoSort/AutoSortDemo.lpr
+++ b/components/rx/trunk/Demos/AutoSort/AutoSortDemo.lpr
@ -33,6 +33,8 @@ uses

 {$IFDEF WINDOWS}{$R AutoSortDemo.rc}{$ENDIF}

+{$R *.res}
+
 begin
  Application.Initialize;
  Application.CreateForm(TForm1, Form1);
--- a/components/rx/trunk/Demos/AutoSort/AutoSortDemo.manifest
+++ b/components/rx/trunk/Demos/AutoSort/AutoSortDemo.manifest
@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
- <assemblyIdentity version="1.0.0.0" processorArchitecture="*" name="CompanyName.ProductName.YourApp" type="win32"/>
- <description>Your application description here.</description>
- <dependency>
-  <dependentAssembly>
-   <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="*" publicKeyToken="6595b64144ccf1df" language="*"/>
-  </dependentAssembly>
- </dependency>
- <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
-  <security>
-   <requestedPrivileges>
-    <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
-   </requestedPrivileges>
-  </security>
- </trustInfo>
-</assembly>
--- a/components/rx/trunk/Demos/AutoSort/AutoSortDemo.rc
+++ b/components/rx/trunk/Demos/AutoSort/AutoSortDemo.rc
@ -1,7 +0,0 @@
-#define RT_MANIFEST  24
-#define CREATEPROCESS_MANIFEST_RESOURCE_ID 1
-#define ISOLATIONAWARE_MANIFEST_RESOURCE_ID 2
-#define ISOLATIONAWARE_NOSTATICIMPORT_MANIFEST_RESOURCE_ID 3
-
-CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "AutoSortDemo.manifest"
-MAINICON ICON "AutoSortDemo.ico"
--- a/components/rx/trunk/Demos/AutoSort/asdmainunit.lfm
+++ b/components/rx/trunk/Demos/AutoSort/asdmainunit.lfm
@ -1,13 +1,13 @@
 object Form1: TForm1
-  Left = 366
+  Left = 386
  Height = 524
-  Top = 217
+  Top = 218
  Width = 780
  Caption = 'Auto sort demo'
  ClientHeight = 524
  ClientWidth = 780
  OnCreate = FormCreate
-  LCLVersion = '0.9.27'
+  LCLVersion = '1.7'
  object RxDBGrid1: TRxDBGrid
    AnchorSideLeft.Control = Owner
    AnchorSideTop.Control = CheckBox1
@ -17,43 +17,128 @@ object Form1: TForm1
    AnchorSideBottom.Control = Owner
    AnchorSideBottom.Side = asrBottom
    Left = 6
-    Height = 456
-    Top = 62
+    Height = 452
+    Top = 66
    Width = 768
+    ColumnDefValues.BlobText = '(данные)'
    TitleButtons = True
    AutoSort = True
    Columns = <    
      item
        Title.Alignment = taCenter
        Title.Orientation = toHorizontal
+        Title.Caption = 'ID'
        Width = 88
        FieldName = 'ID'
+        EditButtons = <>
+        Filter.IsNull = False
+        Filter.IsAll = True
        Filter.DropDownRows = 0
+        Filter.EmptyValue = '(Пусто)'
+        Filter.AllValue = '(All values)'
+        Filter.EmptyFont.Style = [fsItalic]
        Filter.ItemIndex = -1
+        Footers = <>
      end    
      item
        Title.Alignment = taCenter
        Title.Orientation = toHorizontal
+        Title.Caption = 'NAME'
        Width = 350
        FieldName = 'NAME'
+        EditButtons = <>
+        Filter.IsNull = False
+        Filter.IsAll = True
        Filter.DropDownRows = 0
+        Filter.EmptyValue = '(Пусто)'
+        Filter.AllValue = '(All values)'
+        Filter.EmptyFont.Style = [fsItalic]
        Filter.ItemIndex = -1
+        Footers = <>
      end    
      item
        Title.Alignment = taCenter
        Title.Orientation = toHorizontal
+        Title.Caption = 'DATE_ENTER'
        Width = 100
        FieldName = 'DATE_ENTER'
+        EditButtons = <>
+        Filter.IsNull = False
+        Filter.IsAll = True
        Filter.DropDownRows = 0
+        Filter.EmptyValue = '(Пусто)'
+        Filter.AllValue = '(All values)'
+        Filter.EmptyFont.Style = [fsItalic]
        Filter.ItemIndex = -1
+        Footers = <>
      end>
+    KeyStrokes = <    
+      item
+        Command = rxgcShowFindDlg
+        ShortCut = 16454
+        Enabled = True
+      end    
+      item
+        Command = rxgcShowColumnsDlg
+        ShortCut = 16471
+        Enabled = True
+      end    
+      item
+        Command = rxgcShowFilterDlg
+        ShortCut = 16468
+        Enabled = True
+      end    
+      item
+        Command = rxgcShowSortDlg
+        ShortCut = 16467
+        Enabled = True
+      end    
+      item
+        Command = rxgcShowQuickFilter
+        ShortCut = 16465
+        Enabled = True
+      end    
+      item
+        Command = rxgcHideQuickFilter
+        ShortCut = 16456
+        Enabled = True
+      end    
+      item
+        Command = rxgcSelectAll
+        ShortCut = 16449
+        Enabled = True
+      end    
+      item
+        Command = rxgcDeSelectAll
+        ShortCut = 16429
+        Enabled = True
+      end    
+      item
+        Command = rxgcInvertSelection
+        ShortCut = 16426
+        Enabled = True
+      end    
+      item
+        Command = rxgcOptimizeColumnsWidth
+        ShortCut = 16427
+        Enabled = True
+      end    
+      item
+        Command = rxgcCopyCellValue
+        ShortCut = 16451
+        Enabled = True
+      end>
+    FooterOptions.DrawFullLine = False
    OptionsRx = []
    Anchors = [akTop, akLeft, akRight, akBottom]
    BorderSpacing.Around = 6
+    Color = clWindow
+    DrawFullLine = False
    FocusColor = clRed
    SelectedColor = clHighlight
    GridLineStyle = psSolid
    DataSource = Datasource1
+    Options = [dgEditing, dgTitles, dgIndicator, dgColumnResize, dgColumnMove, dgColLines, dgRowLines, dgAlwaysShowSelection, dgConfirmDelete, dgCancelOnExit, dgHeaderPushedLook]
    ParentColor = False
    TabOrder = 0
    TitleStyle = tsNative
@ -63,9 +148,9 @@ object Form1: TForm1
    AnchorSideTop.Control = CheckBox2
    AnchorSideTop.Side = asrBottom
    Left = 6
-    Height = 22
-    Top = 34
-    Width = 104
+    Height = 24
+    Top = 36
+    Width = 107
    BorderSpacing.Around = 6
    Caption = 'Title buttons'
    OnChange = CheckBox2Change
@ -75,9 +160,9 @@ object Form1: TForm1
    AnchorSideLeft.Control = Owner
    AnchorSideTop.Control = Owner
    Left = 6
-    Height = 22
+    Height = 24
    Top = 6
-    Width = 84
+    Width = 85
    BorderSpacing.Around = 6
    Caption = 'Auto sort'
    OnChange = CheckBox2Change
@ -90,7 +175,6 @@ object Form1: TForm1
        Name = 'ID'
        DataType = ftInteger
        Precision = -1
-        Size = 0
      end    
      item
        Name = 'NAME'
@ -102,8 +186,8 @@ object Form1: TForm1
        Name = 'DATE_ENTER'
        DataType = ftDate
        Precision = -1
-        Size = 0
      end>
+    PacketRecords = 0
    left = 192
    top = 16
    object RxMemoryData1ID: TLongintField
@ -138,7 +222,7 @@ object Form1: TForm1
      Required = False
    end
  end
-  object Datasource1: TDatasource
+  object Datasource1: TDataSource
    DataSet = RxMemoryData1
    left = 152
    top = 16
--- a/components/rx/trunk/Demos/AutoSort/asdmainunit.lrs
+++ b/components/rx/trunk/Demos/AutoSort/asdmainunit.lrs
@ -1,46 +0,0 @@
-{ Это - файл ресурсов, автоматически созданный lazarus }
-
-LazarusResources.Add('TForm1','FORMDATA',[
-  'TPF0'#6'TForm1'#5'Form1'#4'Left'#3'n'#1#6'Height'#3#12#2#3'Top'#3#217#0#5'Wi'
-  +'dth'#3#12#3#7'Caption'#6#14'Auto sort demo'#12'ClientHeight'#3#12#2#11'Clie'
-  +'ntWidth'#3#12#3#8'OnCreate'#7#10'FormCreate'#10'LCLVersion'#6#6'0.9.27'#0#9
-  +'TRxDBGrid'#9'RxDBGrid1'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSide'
-  +'Top.Control'#7#9'CheckBox1'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'Anchor'
-  +'SideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#24'An'
-  +'chorSideBottom.Control'#7#5'Owner'#21'AnchorSideBottom.Side'#7#9'asrBottom'
-  +#4'Left'#2#6#6'Height'#3#200#1#3'Top'#2'>'#5'Width'#3#0#3#12'TitleButtons'#9
-  +#8'AutoSort'#9#7'Columns'#14#1#15'Title.Alignment'#7#8'taCenter'#17'Title.Or'
-  +'ientation'#7#12'toHorizontal'#5'Width'#2'X'#9'FieldName'#6#2'ID'#19'Filter.'
-  +'DropDownRows'#2#0#16'Filter.ItemIndex'#2#255#0#1#15'Title.Alignment'#7#8'ta'
-  +'Center'#17'Title.Orientation'#7#12'toHorizontal'#5'Width'#3'^'#1#9'FieldNam'
-  +'e'#6#4'NAME'#19'Filter.DropDownRows'#2#0#16'Filter.ItemIndex'#2#255#0#1#15
-  +'Title.Alignment'#7#8'taCenter'#17'Title.Orientation'#7#12'toHorizontal'#5'W'
-  +'idth'#2'd'#9'FieldName'#6#10'DATE_ENTER'#19'Filter.DropDownRows'#2#0#16'Fil'
-  +'ter.ItemIndex'#2#255#0#0#9'OptionsRx'#11#0#7'Anchors'#11#5'akTop'#6'akLeft'
-  +#7'akRight'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#10'FocusColor'#7#5'cl'
-  +'Red'#13'SelectedColor'#7#11'clHighlight'#13'GridLineStyle'#7#7'psSolid'#10
-  +'DataSource'#7#11'Datasource1'#11'ParentColor'#8#8'TabOrder'#2#0#10'TitleSty'
-  +'le'#7#8'tsNative'#0#0#9'TCheckBox'#9'CheckBox1'#22'AnchorSideLeft.Control'#7
-  +#5'Owner'#21'AnchorSideTop.Control'#7#9'CheckBox2'#18'AnchorSideTop.Side'#7#9
-  +'asrBottom'#4'Left'#2#6#6'Height'#2#22#3'Top'#2'"'#5'Width'#2'h'#20'BorderSp'
-  +'acing.Around'#2#6#7'Caption'#6#13'Title buttons'#8'OnChange'#7#15'CheckBox2'
-  +'Change'#8'TabOrder'#2#1#0#0#9'TCheckBox'#9'CheckBox2'#22'AnchorSideLeft.Con'
-  +'trol'#7#5'Owner'#21'AnchorSideTop.Control'#7#5'Owner'#4'Left'#2#6#6'Height'
-  +#2#22#3'Top'#2#6#5'Width'#2'T'#20'BorderSpacing.Around'#2#6#7'Caption'#6#9'A'
-  +'uto sort'#8'OnChange'#7#15'CheckBox2Change'#8'TabOrder'#2#2#0#0#13'TRxMemor'
-  +'yData'#13'RxMemoryData1'#14'AutoCalcFields'#8#9'FieldDefs'#14#1#4'Name'#6#2
-  +'ID'#8'DataType'#7#9'ftInteger'#9'Precision'#2#255#4'Size'#2#0#0#1#4'Name'#6
-  +#4'NAME'#8'DataType'#7#8'ftString'#9'Precision'#2#255#4'Size'#2'd'#0#1#4'Nam'
-  +'e'#6#10'DATE_ENTER'#8'DataType'#7#6'ftDate'#9'Precision'#2#255#4'Size'#2#0#0
-  +#0#4'left'#3#192#0#3'top'#2#16#0#13'TLongintField'#15'RxMemoryData1ID'#12'Di'
-  +'splayWidth'#2#10#9'FieldKind'#7#6'fkData'#9'FieldName'#6#2'ID'#5'Index'#2#0
-  +#11'LookupCache'#8#13'ProviderFlags'#11#10'pfInUpdate'#9'pfInWhere'#0#8'Read'
-  +'Only'#8#8'Required'#8#0#0#12'TStringField'#17'RxMemoryData1NAME'#12'Display'
-  +'Width'#2'd'#9'FieldKind'#7#6'fkData'#9'FieldName'#6#4'NAME'#5'Index'#2#1#11
-  +'LookupCache'#8#13'ProviderFlags'#11#10'pfInUpdate'#9'pfInWhere'#0#8'ReadOnl'
-  +'y'#8#8'Required'#8#4'Size'#2'd'#0#0#10'TDateField'#23'RxMemoryData1DATE_ENT'
-  +'ER'#12'DisplayWidth'#2#10#9'FieldKind'#7#6'fkData'#9'FieldName'#6#10'DATE_E'
-  +'NTER'#5'Index'#2#2#11'LookupCache'#8#13'ProviderFlags'#11#10'pfInUpdate'#9
-  +'pfInWhere'#0#8'ReadOnly'#8#8'Required'#8#0#0#0#11'TDatasource'#11'Datasourc'
-  +'e1'#7'DataSet'#7#13'RxMemoryData1'#4'left'#3#152#0#3'top'#2#16#0#0#0
-]);
--- a/components/rx/trunk/Demos/AutoSort/asdmainunit.pas
+++ b/components/rx/trunk/Demos/AutoSort/asdmainunit.pas
@ -54,6 +54,7 @@ var

 implementation

+{$R *.lfm}
 { TForm1 }

 procedure TForm1.FormCreate(Sender: TObject);
@ -75,8 +76,5 @@ begin
  RxDBGrid1.TitleButtons:=CheckBox1.Checked;
 end;

-initialization
-  {$I asdmainunit.lrs}
-
 end.

--- a/components/rx/trunk/Demos/FolderLister/AboutUnit.lfm
+++ b/components/rx/trunk/Demos/FolderLister/AboutUnit.lfm
@ -8,46 +8,66 @@ object AboutForm: TAboutForm
  ClientHeight = 163
  ClientWidth = 274
  Position = poDesktopCenter
-  LCLVersion = '0.9.27'
+  LCLVersion = '1.7'
  object Label1: TLabel
-    Left = 8
-    Height = 18
-    Top = 16
-    Width = 262
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = Owner
+    AnchorSideRight.Control = Owner
+    AnchorSideRight.Side = asrBottom
+    Left = 0
+    Height = 20
+    Top = 12
+    Width = 274
    Alignment = taCenter
    Anchors = [akTop, akLeft, akRight]
+    BorderSpacing.Top = 12
    Caption = 'FolderLister component demo'
    ParentColor = False
  end
  object Label2: TLabel
-    Left = 8
-    Height = 18
-    Top = 56
-    Width = 261
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = Label1
+    AnchorSideTop.Side = asrBottom
+    AnchorSideRight.Control = Owner
+    AnchorSideRight.Side = asrBottom
+    Left = 0
+    Height = 20
+    Top = 32
+    Width = 274
    Alignment = taCenter
    Anchors = [akTop, akLeft, akRight]
-    Caption = '(c) 2005-2009 by Alexs'
+    Caption = '(c) 2005-2016 by Alexs'
    ParentColor = False
  end
  object Label3: TLabel
-    Left = 8
-    Height = 18
-    Top = 84
-    Width = 262
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = Label2
+    AnchorSideTop.Side = asrBottom
+    AnchorSideRight.Control = Owner
+    AnchorSideRight.Side = asrBottom
+    Left = 0
+    Height = 20
+    Top = 52
+    Width = 274
    Alignment = taCenter
    Anchors = [akTop, akLeft, akRight]
    Caption = 'alexs75@hotbox.ru'
    ParentColor = False
  end
  object BitBtn1: TBitBtn
-    Left = 96
-    Height = 34
-    Top = 123
-    Width = 56
+    AnchorSideLeft.Control = Owner
+    AnchorSideLeft.Side = asrCenter
+    AnchorSideBottom.Control = Owner
+    AnchorSideBottom.Side = asrBottom
+    Left = 107
+    Height = 36
+    Top = 121
+    Width = 60
    Anchors = [akLeft, akBottom]
    AutoSize = True
-    Caption = '&'
+    BorderSpacing.Bottom = 6
    Default = True
+    DefaultCaption = True
    Kind = bkOK
    ModalResult = 1
    TabOrder = 0
--- a/components/rx/trunk/Demos/FolderLister/AboutUnit.lrs
+++ b/components/rx/trunk/Demos/FolderLister/AboutUnit.lrs
@ -1,19 +0,0 @@
-{ ��� - ���� ��������, ������������� ��������� lazarus }
-
-LazarusResources.Add('TAboutForm','FORMDATA',[
-  'TPF0'#10'TAboutForm'#9'AboutForm'#4'Left'#3#137#1#6'Height'#3#163#0#3'Top'#3
-  +#130#1#5'Width'#3#18#1#13'ActiveControl'#7#7'BitBtn1'#7'Caption'#6#8'About..'
-  +'.'#12'ClientHeight'#3#163#0#11'ClientWidth'#3#18#1#8'Position'#7#15'poDeskt'
-  +'opCenter'#10'LCLVersion'#6#6'0.9.27'#0#6'TLabel'#6'Label1'#4'Left'#2#8#6'He'
-  +'ight'#2#18#3'Top'#2#16#5'Width'#3#6#1#9'Alignment'#7#8'taCenter'#7'Anchors'
-  +#11#5'akTop'#6'akLeft'#7'akRight'#0#7'Caption'#6#27'FolderLister component d'
-  +'emo'#11'ParentColor'#8#0#0#6'TLabel'#6'Label2'#4'Left'#2#8#6'Height'#2#18#3
-  +'Top'#2'8'#5'Width'#3#5#1#9'Alignment'#7#8'taCenter'#7'Anchors'#11#5'akTop'#6
-  +'akLeft'#7'akRight'#0#7'Caption'#6#22'(c) 2005-2009 by Alexs'#11'ParentColor'
-  +#8#0#0#6'TLabel'#6'Label3'#4'Left'#2#8#6'Height'#2#18#3'Top'#2'T'#5'Width'#3
-  +#6#1#9'Alignment'#7#8'taCenter'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0
-  +#7'Caption'#6#17'alexs75@hotbox.ru'#11'ParentColor'#8#0#0#7'TBitBtn'#7'BitBt'
-  +'n1'#4'Left'#2'`'#6'Height'#2'"'#3'Top'#2'{'#5'Width'#2'8'#7'Anchors'#11#6'a'
-  +'kLeft'#8'akBottom'#0#8'AutoSize'#9#7'Caption'#6#5'&'#208#158#208#154#7'Defa'
-  +'ult'#9#4'Kind'#7#4'bkOK'#11'ModalResult'#2#1#8'TabOrder'#2#0#0#0#0
-]);
--- a/components/rx/trunk/Demos/FolderLister/AboutUnit.pas
+++ b/components/rx/trunk/Demos/FolderLister/AboutUnit.pas
@ -28,8 +28,7 @@ var

 implementation

-initialization
-  {$I AboutUnit.lrs}
+{$R *.lfm}

 end.

--- a/components/rx/trunk/Demos/FolderLister/FolderLister.lpi
+++ b/components/rx/trunk/Demos/FolderLister/FolderLister.lpi
@ -1,17 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
  <ProjectOptions>
+    <Version Value="9"/>
    <PathDelim Value="\"/>
-    <Version Value="7"/>
    <General>
      <Flags>
        <LRSInOutputDirectory Value="False"/>
      </Flags>
      <MainUnit Value="0"/>
-      <TargetFileExt Value=".exe"/>
      <Title Value="FolderLister"/>
-      <ActiveEditorIndexAtStart Value="0"/>
    </General>
+    <BuildModes Count="1">
+      <Item1 Name="default" Default="True"/>
+    </BuildModes>
    <PublishOptions>
      <Version Value="2"/>
      <IgnoreBinaries Value="False"/>
@ -37,114 +38,104 @@
      <Unit0>
        <Filename Value="FolderLister.lpr"/>
        <IsPartOfProject Value="True"/>
-        <UnitName Value="FolderLister"/>
        <CursorPos X="24" Y="2"/>
-        <TopLine Value="1"/>
        <UsageCount Value="23"/>
      </Unit0>
      <Unit1>
        <Filename Value="unit1.pas"/>
-        <ComponentName Value="MainForm"/>
        <IsPartOfProject Value="True"/>
+        <ComponentName Value="MainForm"/>
+        <HasResources Value="True"/>
        <ResourceBaseClass Value="Form"/>
        <UnitName Value="Unit1"/>
-        <CursorPos X="54" Y="78"/>
-        <TopLine Value="59"/>
-        <EditorIndex Value="0"/>
+        <IsVisibleTab Value="True"/>
+        <TopLine Value="10"/>
+        <CursorPos Y="53"/>
        <UsageCount Value="23"/>
        <Loaded Value="True"/>
+        <LoadedDesigner Value="True"/>
      </Unit1>
      <Unit2>
        <Filename Value="C:\lazarus\components\RxNew\FolderLister.pas"/>
-        <UnitName Value="FolderLister"/>
-        <CursorPos X="1" Y="88"/>
        <TopLine Value="70"/>
+        <CursorPos Y="88"/>
        <UsageCount Value="11"/>
      </Unit2>
      <Unit3>
        <Filename Value="c:\lazarus\fpcsrc\rtl\objpas\sysutils\filutilh.inc"/>
-        <CursorPos X="64" Y="123"/>
        <TopLine Value="110"/>
+        <CursorPos X="64" Y="123"/>
        <UsageCount Value="10"/>
      </Unit3>
      <Unit4>
        <Filename Value="C:\lazarus\fpcsrc\rtl\win32\system.pp"/>
        <UnitName Value="System"/>
-        <CursorPos X="52" Y="331"/>
        <TopLine Value="314"/>
+        <CursorPos X="52" Y="331"/>
        <UsageCount Value="10"/>
      </Unit4>
      <Unit5>
        <Filename Value="C:\lazarus\components\RxNew\RxAppUtils.pas"/>
-        <UnitName Value="RxAppUtils"/>
-        <CursorPos X="6" Y="1"/>
-        <TopLine Value="1"/>
+        <CursorPos X="6"/>
        <UsageCount Value="10"/>
      </Unit5>
      <Unit6>
        <Filename Value="AboutUnit.pas"/>
-        <ComponentName Value="AboutForm"/>
        <IsPartOfProject Value="True"/>
+        <ComponentName Value="AboutForm"/>
+        <HasResources Value="True"/>
        <ResourceBaseClass Value="Form"/>
-        <UnitName Value="AboutUnit"/>
-        <CursorPos X="3" Y="15"/>
-        <TopLine Value="1"/>
+        <EditorIndex Value="-1"/>
+        <CursorPos Y="30"/>
        <UsageCount Value="22"/>
      </Unit6>
      <Unit7>
        <Filename Value="C:\lazarus\lcl\include\customform.inc"/>
-        <CursorPos X="43" Y="1700"/>
        <TopLine Value="1695"/>
+        <CursorPos X="43" Y="1700"/>
        <UsageCount Value="10"/>
      </Unit7>
      <Unit8>
        <Filename Value="unit1.lrs"/>
        <CursorPos X="49" Y="2"/>
-        <TopLine Value="1"/>
        <UsageCount Value="10"/>
      </Unit8>
      <Unit9>
        <Filename Value="C:\lazarus\lcl\Forms.pp"/>
-        <UnitName Value="Forms"/>
-        <CursorPos X="37" Y="1169"/>
        <TopLine Value="1166"/>
+        <CursorPos X="37" Y="1169"/>
        <UsageCount Value="10"/>
      </Unit9>
      <Unit10>
        <Filename Value="C:\lazarus\lcl\include\application.inc"/>
-        <CursorPos X="50" Y="146"/>
        <TopLine Value="142"/>
+        <CursorPos X="50" Y="146"/>
        <UsageCount Value="10"/>
      </Unit10>
      <Unit11>
        <Filename Value="C:\lazarus\lcl\Dialogs.pp"/>
-        <UnitName Value="Dialogs"/>
-        <CursorPos X="38" Y="48"/>
        <TopLine Value="37"/>
+        <CursorPos X="38" Y="48"/>
        <UsageCount Value="10"/>
      </Unit11>
      <Unit12>
        <Filename Value="C:\lazarus\lcl\Controls.pp"/>
-        <UnitName Value="Controls"/>
-        <CursorPos X="2" Y="1182"/>
        <TopLine Value="1176"/>
+        <CursorPos X="2" Y="1182"/>
        <UsageCount Value="10"/>
      </Unit12>
      <Unit13>
        <Filename Value="C:\lazarus\components\RxNew\RX.INC"/>
-        <CursorPos X="1" Y="1"/>
-        <TopLine Value="1"/>
        <UsageCount Value="10"/>
      </Unit13>
      <Unit14>
        <Filename Value="C:\lazarus\components\RxNew\RXStrutils.pas"/>
        <UnitName Value="RxStrUtils"/>
-        <CursorPos X="1" Y="15"/>
-        <TopLine Value="1"/>
+        <CursorPos Y="15"/>
        <UsageCount Value="10"/>
      </Unit14>
    </Units>
-    <JumpHistory Count="8" HistoryIndex="7">
+    <JumpHistory Count="9" HistoryIndex="8">
      <Position1>
        <Filename Value="unit1.pas"/>
        <Caret Line="36" Column="5" TopLine="32"/>
@ -177,17 +168,27 @@
        <Filename Value="unit1.pas"/>
        <Caret Line="35" Column="43" TopLine="35"/>
      </Position8>
+      <Position9>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="53" TopLine="25"/>
+      </Position9>
    </JumpHistory>
  </ProjectOptions>
  <CompilerOptions>
-    <Version Value="8"/>
+    <Version Value="11"/>
    <PathDelim Value="\"/>
+    <Target>
+      <Filename Value="FolderLister"/>
+    </Target>
    <SearchPaths>
-      <SrcPath Value="$(LazarusDir)\lcl\;$(LazarusDir)\lcl\interfaces\$(LCLWidgetType)\"/>
+      <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
+      <SrcPath Value="$(LazarusDir)\lcl;$(LazarusDir)\lcl\interfaces\$(LCLWidgetType)"/>
    </SearchPaths>
-    <Other>
-      <CompilerPath Value="$(CompPath)"/>
-    </Other>
+    <Parsing>
+      <SyntaxOptions>
+        <UseAnsiStrings Value="False"/>
+      </SyntaxOptions>
+    </Parsing>
  </CompilerOptions>
  <Debugging>
    <Exceptions Count="2">
--- a/components/rx/trunk/Demos/FolderLister/unit1.lfm
+++ b/components/rx/trunk/Demos/FolderLister/unit1.lfm
@ -5,21 +5,21 @@ object MainForm: TMainForm
  Width = 460
  ActiveControl = Edit1
  Caption = 'Main form'
-  ClientHeight = 275
+  ClientHeight = 272
  ClientWidth = 460
  Menu = MainMenu1
  OnCreate = FormCreate
  Position = poDesktopCenter
  ShowHint = True
-  LCLVersion = '0.9.27'
+  LCLVersion = '1.7'
  object Label1: TLabel
    AnchorSideLeft.Control = Owner
    AnchorSideTop.Control = Edit1
    AnchorSideTop.Side = asrBottom
    Left = 6
-    Height = 18
-    Top = 63
-    Width = 95
+    Height = 20
+    Top = 75
+    Width = 96
    BorderSpacing.Around = 6
    Caption = 'Folder for scan'
    ParentColor = False
@ -28,9 +28,9 @@ object MainForm: TMainForm
    AnchorSideLeft.Control = Owner
    AnchorSideTop.Control = Owner
    Left = 6
-    Height = 18
+    Height = 20
    Top = 6
-    Width = 71
+    Width = 72
    BorderSpacing.Around = 6
    Caption = 'Default ext'
    ParentColor = False
@ -40,9 +40,9 @@ object MainForm: TMainForm
    AnchorSideTop.Control = DirectoryEdit1
    AnchorSideTop.Side = asrBottom
    Left = 6
-    Height = 29
-    Top = 120
-    Width = 44
+    Height = 36
+    Top = 144
+    Width = 47
    Action = sysScan
    AutoSize = True
    BorderSpacing.Around = 6
@ -53,28 +53,28 @@ object MainForm: TMainForm
    AnchorSideTop.Control = Label1
    AnchorSideTop.Side = asrBottom
    Left = 12
-    Height = 27
-    Top = 87
+    Height = 37
+    Top = 101
    Width = 417
    Directory = 'C:\lazarus\components\'
    ShowHidden = False
    ButtonWidth = 23
    NumGlyphs = 1
    Anchors = [akTop, akLeft, akRight]
-    AutoSize = True
    BorderSpacing.Left = 6
    BorderSpacing.Top = 6
+    MaxLength = 0
    TabOrder = 1
+    Text = 'C:\lazarus\components\'
  end
  object Edit1: TEdit
    AnchorSideLeft.Control = Label2
    AnchorSideTop.Control = Label2
    AnchorSideTop.Side = asrBottom
    Left = 12
-    Height = 27
-    Top = 30
+    Height = 37
+    Top = 32
    Width = 80
-    AutoSize = True
    BorderSpacing.Around = 6
    TabOrder = 2
    Text = '.pas'
@ -85,7 +85,6 @@ object MainForm: TMainForm
    object sysExit: TAction
      Category = 'System'
      Caption = 'Exit'
-      DisableIfNoHandler = True
      Enabled = False
      Hint = 'Exit form demo app'
      OnExecute = sysExitExecute
@ -94,14 +93,12 @@ object MainForm: TMainForm
    object hlpAbout: TAction
      Category = 'Help'
      Caption = 'About'
-      DisableIfNoHandler = True
      Hint = 'Information of app'
      OnExecute = hlpAboutExecute
    end
    object sysScan: TAction
      Category = 'System'
      Caption = 'Scan'
-      DisableIfNoHandler = True
      Hint = 'Scan folder'
      OnExecute = sysRescanExecute
    end
--- a/components/rx/trunk/Demos/FolderLister/unit1.lrs
+++ b/components/rx/trunk/Demos/FolderLister/unit1.lrs
@ -1,45 +0,0 @@
-{ ��� - ���� ��������, ������������� ��������� lazarus }
-
-LazarusResources.Add('TMainForm','FORMDATA',[
-  'TPF0'#9'TMainForm'#8'MainForm'#4'Left'#3#171#1#6'Height'#3','#1#3'Top'#3#245
-  +#0#5'Width'#3#204#1#13'ActiveControl'#7#5'Edit1'#7'Caption'#6#9'Main form'#12
-  +'ClientHeight'#3#19#1#11'ClientWidth'#3#204#1#4'Menu'#7#9'MainMenu1'#8'OnCre'
-  +'ate'#7#10'FormCreate'#8'Position'#7#15'poDesktopCenter'#8'ShowHint'#9#10'LC'
-  +'LVersion'#6#6'0.9.27'#0#6'TLabel'#6'Label1'#22'AnchorSideLeft.Control'#7#5
-  +'Owner'#21'AnchorSideTop.Control'#7#5'Edit1'#18'AnchorSideTop.Side'#7#9'asrB'
-  +'ottom'#4'Left'#2#6#6'Height'#2#18#3'Top'#2'?'#5'Width'#2'_'#20'BorderSpacin'
-  +'g.Around'#2#6#7'Caption'#6#15'Folder for scan'#11'ParentColor'#8#0#0#6'TLab'
-  +'el'#6'Label2'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Contro'
-  +'l'#7#5'Owner'#4'Left'#2#6#6'Height'#2#18#3'Top'#2#6#5'Width'#2'G'#20'Border'
-  +'Spacing.Around'#2#6#7'Caption'#6#11'Default ext'#11'ParentColor'#8#0#0#7'TB'
-  +'utton'#7'Button1'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Co'
-  +'ntrol'#7#14'DirectoryEdit1'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2
-  +#6#6'Height'#2#29#3'Top'#2'x'#5'Width'#2','#6'Action'#7#7'sysScan'#8'AutoSiz'
-  +'e'#9#20'BorderSpacing.Around'#2#6#8'TabOrder'#2#0#0#0#14'TDirectoryEdit'#14
-  +'DirectoryEdit1'#22'AnchorSideLeft.Control'#7#6'Label1'#21'AnchorSideTop.Con'
-  +'trol'#7#6'Label1'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#12#6'Heig'
-  +'ht'#2#27#3'Top'#2'W'#5'Width'#3#161#1#9'Directory'#6#22'C:\lazarus\componen'
-  +'ts\'#10'ShowHidden'#8#11'ButtonWidth'#2#23#9'NumGlyphs'#2#1#7'Anchors'#11#5
-  +'akTop'#6'akLeft'#7'akRight'#0#8'AutoSize'#9#18'BorderSpacing.Left'#2#6#17'B'
-  +'orderSpacing.Top'#2#6#8'TabOrder'#2#1#0#0#5'TEdit'#5'Edit1'#22'AnchorSideLe'
-  +'ft.Control'#7#6'Label2'#21'AnchorSideTop.Control'#7#6'Label2'#18'AnchorSide'
-  +'Top.Side'#7#9'asrBottom'#4'Left'#2#12#6'Height'#2#27#3'Top'#2#30#5'Width'#2
-  +'P'#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#8'TabOrder'#2#2#4'Text'#6#4'.'
-  +'pas'#0#0#11'TActionList'#11'ActionList1'#4'left'#3#144#0#3'top'#2'p'#0#7'TA'
-  +'ction'#7'sysExit'#8'Category'#6#6'System'#7'Caption'#6#4'Exit'#18'DisableIf'
-  +'NoHandler'#9#7'Enabled'#8#4'Hint'#6#18'Exit form demo app'#9'OnExecute'#7#14
-  +'sysExitExecute'#8'ShortCut'#4'X'#128#0#0#0#0#7'TAction'#8'hlpAbout'#8'Categ'
-  +'ory'#6#4'Help'#7'Caption'#6#5'About'#18'DisableIfNoHandler'#9#4'Hint'#6#18
-  +'Information of app'#9'OnExecute'#7#15'hlpAboutExecute'#0#0#7'TAction'#7'sys'
-  +'Scan'#8'Category'#6#6'System'#7'Caption'#6#4'Scan'#18'DisableIfNoHandler'#9
-  +#4'Hint'#6#11'Scan folder'#9'OnExecute'#7#16'sysRescanExecute'#0#0#0#9'TMain'
-  +'Menu'#9'MainMenu1'#4'left'#3#144#0#3'top'#2'0'#0#9'TMenuItem'#11'SystemItem'
-  +'s'#7'Caption'#6#6'System'#0#9'TMenuItem'#9'MenuItem3'#6'Action'#7#7'sysScan'
-  +#7'OnClick'#7#16'sysRescanExecute'#0#0#9'TMenuItem'#9'MenuItem4'#7'Caption'#6
-  +#1'-'#0#0#9'TMenuItem'#9'MenuItem2'#6'Action'#7#7'sysExit'#0#0#0#9'TMenuItem'
-  +#11'FolderItems'#7'Caption'#6#6'Folder'#0#0#9'TMenuItem'#9'HelpItems'#7'Capt'
-  +'ion'#6#4'Help'#0#9'TMenuItem'#9'MenuItem1'#6'Action'#7#8'hlpAbout'#7'OnClic'
-  +'k'#7#15'hlpAboutExecute'#0#0#0#0#13'TFolderLister'#13'FolderLister1'#10'Def'
-  +'aultExt'#6#4'.pas'#13'OnExecuteItem'#7#24'FolderLister1ExecuteItem'#8'MenuI'
-  +'tem'#7#11'FolderItems'#4'left'#3#144#0#3'top'#2#12#0#0#0
-]);
--- a/components/rx/trunk/Demos/FolderLister/unit1.pas
+++ b/components/rx/trunk/Demos/FolderLister/unit1.pas
@ -48,6 +48,8 @@ var
 implementation
 uses AboutUnit;

+{$R *.lfm}
+
 { TMainForm }

 procedure TMainForm.hlpAboutExecute(Sender: TObject);
@ -85,8 +87,5 @@ begin
  FolderLister1.Execute;
 end;

-initialization
-  {$I unit1.lrs}
-
 end.

--- a/components/rx/trunk/Demos/PhoneBookDemo/PhoneBookDemo.lpi
+++ b/components/rx/trunk/Demos/PhoneBookDemo/PhoneBookDemo.lpi
@ -15,7 +15,6 @@
        <DpiAware Value="True"/>
      </XPManifest>
      <Icon Value="0"/>
-      <ActiveWindowIndexAtStart Value="0"/>
    </General>
    <i18n>
      <EnableI18N Value="True"/>
@ -26,7 +25,6 @@
      <AutoIncrementBuild Value="True"/>
      <Language Value=""/>
      <CharSet Value=""/>
-      <StringTable ProductVersion=""/>
    </VersionInfo>
    <BuildModes Count="1">
      <Item1 Name="default" Default="True"/>
@ -64,11 +62,11 @@
      <Unit0>
        <Filename Value="PhoneBookDemo.lpr"/>
        <IsPartOfProject Value="True"/>
-        <UnitName Value="PhoneBookDemo"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="1"/>
+        <IsVisibleTab Value="True"/>
+        <EditorIndex Value="2"/>
        <CursorPos X="3" Y="12"/>
        <UsageCount Value="27"/>
+        <Loaded Value="True"/>
      </Unit0>
      <Unit1>
        <Filename Value="pbmainunit.pas"/>
@ -77,10 +75,8 @@
        <HasResources Value="True"/>
        <ResourceBaseClass Value="Form"/>
        <UnitName Value="pbMainUnit"/>
-        <EditorIndex Value="0"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="23"/>
-        <CursorPos X="52" Y="23"/>
+        <TopLine Value="70"/>
+        <CursorPos X="137" Y="84"/>
        <UsageCount Value="27"/>
        <Loaded Value="True"/>
        <LoadedDesigner Value="True"/>
@ -91,15 +87,11 @@
        <HasResources Value="True"/>
        <ResourceBaseClass Value="Form"/>
        <UnitName Value="pbMainUnit"/>
-        <TopLine Value="1"/>
        <CursorPos X="5" Y="9"/>
        <UsageCount Value="10"/>
      </Unit2>
      <Unit3>
        <Filename Value="usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
-        <UnitName Value="rxdbgrid"/>
-        <TopLine Value="1"/>
-        <CursorPos X="1" Y="1"/>
        <UsageCount Value="10"/>
      </Unit3>
      <Unit4>
@ -109,42 +101,35 @@
        <HasResources Value="True"/>
        <ResourceBaseClass Value="Form"/>
        <UnitName Value="pbEditDataUnit"/>
-        <IsVisibleTab Value="True"/>
        <EditorIndex Value="1"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="11"/>
+        <TopLine Value="5"/>
        <CursorPos X="3" Y="42"/>
        <UsageCount Value="25"/>
        <Loaded Value="True"/>
-        <LoadedDesigner Value="True"/>
      </Unit4>
      <Unit5>
        <Filename Value="../../rxcloseformvalidator.pas"/>
        <UnitName Value="RxCloseFormValidator"/>
-        <WindowIndex Value="0"/>
        <TopLine Value="195"/>
-        <CursorPos X="1" Y="211"/>
+        <CursorPos Y="211"/>
        <UsageCount Value="10"/>
      </Unit5>
      <Unit6>
        <Filename Value="../../../../lcl/dialogs.pp"/>
        <UnitName Value="Dialogs"/>
-        <WindowIndex Value="0"/>
        <TopLine Value="27"/>
        <CursorPos X="13" Y="45"/>
        <UsageCount Value="10"/>
      </Unit6>
      <Unit7>
        <Filename Value="../../../../lcl/include/promptdialog.inc"/>
-        <WindowIndex Value="0"/>
        <TopLine Value="868"/>
-        <CursorPos X="1" Y="886"/>
+        <CursorPos Y="886"/>
        <UsageCount Value="10"/>
      </Unit7>
      <Unit8>
        <Filename Value="../../../../lcl/lcltype.pp"/>
        <UnitName Value="LCLType"/>
-        <WindowIndex Value="0"/>
        <TopLine Value="716"/>
        <CursorPos X="3" Y="723"/>
        <UsageCount Value="10"/>
@ -152,28 +137,24 @@
      <Unit9>
        <Filename Value="../../rxaboutdialog.pas"/>
        <UnitName Value="RxAboutDialog"/>
-        <WindowIndex Value="0"/>
        <TopLine Value="96"/>
        <CursorPos X="18" Y="103"/>
        <UsageCount Value="10"/>
      </Unit9>
      <Unit10>
        <Filename Value="../../rxconst.pas"/>
-        <UnitName Value="rxconst"/>
-        <WindowIndex Value="0"/>
        <TopLine Value="88"/>
        <CursorPos X="3" Y="113"/>
        <UsageCount Value="10"/>
      </Unit10>
      <Unit11>
        <Filename Value="/home/alexs/install/source/fpcsrc/rtl/objpas/classes/classesh.inc"/>
-        <WindowIndex Value="0"/>
        <TopLine Value="471"/>
-        <CursorPos X="1" Y="503"/>
+        <CursorPos Y="503"/>
        <UsageCount Value="10"/>
      </Unit11>
    </Units>
-    <JumpHistory Count="24" HistoryIndex="23">
+    <JumpHistory Count="18" HistoryIndex="17">
      <Position1>
        <Filename Value="pbmainunit.pas"/>
        <Caret Line="82" Column="5" TopLine="55"/>
@ -207,69 +188,45 @@
        <Caret Line="91" Column="29" TopLine="79"/>
      </Position8>
      <Position9>
-        <Filename Value="pbeditdataunit.pas"/>
-        <Caret Line="15" Column="3" TopLine="3"/>
+        <Filename Value="pbmainunit.pas"/>
+        <Caret Line="101" Column="74" TopLine="79"/>
      </Position9>
      <Position10>
        <Filename Value="pbmainunit.pas"/>
-        <Caret Line="101" Column="74" TopLine="79"/>
+        <Caret Line="75" Column="15" TopLine="41"/>
      </Position10>
      <Position11>
        <Filename Value="pbmainunit.pas"/>
-        <Caret Line="75" Column="15" TopLine="41"/>
+        <Caret Line="74" Column="39" TopLine="40"/>
      </Position11>
      <Position12>
        <Filename Value="pbmainunit.pas"/>
-        <Caret Line="74" Column="39" TopLine="40"/>
+        <Caret Line="101" Column="72" TopLine="81"/>
      </Position12>
      <Position13>
        <Filename Value="pbmainunit.pas"/>
-        <Caret Line="101" Column="72" TopLine="81"/>
+        <Caret Line="106" TopLine="81"/>
      </Position13>
      <Position14>
        <Filename Value="pbmainunit.pas"/>
-        <Caret Line="106" Column="1" TopLine="81"/>
+        <Caret Line="102" TopLine="80"/>
      </Position14>
      <Position15>
        <Filename Value="pbmainunit.pas"/>
-        <Caret Line="102" Column="1" TopLine="80"/>
+        <Caret Line="101" TopLine="79"/>
      </Position15>
      <Position16>
        <Filename Value="pbmainunit.pas"/>
-        <Caret Line="101" Column="1" TopLine="79"/>
+        <Caret Line="103" TopLine="81"/>
      </Position16>
      <Position17>
        <Filename Value="pbmainunit.pas"/>
-        <Caret Line="103" Column="1" TopLine="81"/>
+        <Caret Line="108" Column="13" TopLine="86"/>
      </Position17>
      <Position18>
-        <Filename Value="pbeditdataunit.pas"/>
-        <Caret Line="15" Column="3" TopLine="3"/>
-      </Position18>
-      <Position19>
-        <Filename Value="pbmainunit.pas"/>
-        <Caret Line="108" Column="13" TopLine="86"/>
-      </Position19>
-      <Position20>
        <Filename Value="pbmainunit.pas"/>
        <Caret Line="36" Column="28" TopLine="18"/>
-      </Position20>
-      <Position21>
-        <Filename Value="pbeditdataunit.pas"/>
-        <Caret Line="15" Column="3" TopLine="11"/>
-      </Position21>
-      <Position22>
-        <Filename Value="pbeditdataunit.pas"/>
-        <Caret Line="54" Column="3" TopLine="23"/>
-      </Position22>
-      <Position23>
-        <Filename Value="pbeditdataunit.pas"/>
-        <Caret Line="52" Column="58" TopLine="1"/>
-      </Position23>
-      <Position24>
-        <Filename Value="pbeditdataunit.pas"/>
-        <Caret Line="55" Column="58" TopLine="23"/>
-      </Position24>
+      </Position18>
    </JumpHistory>
  </ProjectOptions>
  <CompilerOptions>
@ -288,12 +245,6 @@
        </Win32>
      </Options>
    </Linking>
-    <Other>
-      <CompilerMessages>
-        <UseMsgFile Value="True"/>
-      </CompilerMessages>
-      <CompilerPath Value="$(CompPath)"/>
-    </Other>
  </CompilerOptions>
  <Debugging>
    <Watches Count="1">
@ -302,5 +253,4 @@
      </Item1>
    </Watches>
  </Debugging>
-  <EditorMacros Count="0"/>
 </CONFIG>
--- a/components/rx/trunk/Demos/PhoneBookDemo/pbeditdataunit.lrt
+++ b/components/rx/trunk/Demos/PhoneBookDemo/pbeditdataunit.lrt
@ -1,7 +0,0 @@
-TPBEDITDATAFORM.CAPTION=Phone book data
-TPBEDITDATAFORM.LABEL1.CAPTION=Patronymic
-TPBEDITDATAFORM.LABEL2.CAPTION=Name
-TPBEDITDATAFORM.LABEL3.CAPTION=Surname
-TPBEDITDATAFORM.LABEL4.CAPTION=Phone
-TPBEDITDATAFORM.LABEL5.CAPTION=ICQ
-TPBEDITDATAFORM.LABEL6.CAPTION=Memo
--- a/components/rx/trunk/Demos/PhoneBookDemo/pbmainunit.lrt
+++ b/components/rx/trunk/Demos/PhoneBookDemo/pbmainunit.lrt
@ -1,22 +0,0 @@
-TPBMAINFORM.CAPTION=Phone book
-TPBMAINFORM.RXDBGRID1.COLUMNS[0].TITLE.CAPTION=ID
-TPBMAINFORM.RXDBGRID1.COLUMNS[1].TITLE.CAPTION=PATRONYMIC
-TPBMAINFORM.RXDBGRID1.COLUMNS[2].TITLE.CAPTION=NAME
-TPBMAINFORM.RXDBGRID1.COLUMNS[3].TITLE.CAPTION=SURNAME
-TPBMAINFORM.RXDBGRID1.COLUMNS[4].TITLE.CAPTION=PHONE
-TPBMAINFORM.RXDBGRID1.COLUMNS[5].TITLE.CAPTION=ICQ
-TPBMAINFORM.RXDBGRID1.COLUMNS[6].TITLE.CAPTION=MEMO
-TPBMAINFORM.EDTNEW.CAPTION=New
-TPBMAINFORM.EDTEDIT.CAPTION=Edit
-TPBMAINFORM.EDTDELETE.CAPTION=Delete
-TPBMAINFORM.EDTPRINT.CAPTION=Print
-TPBMAINFORM.EDTFIND.CAPTION=Find
-TPBMAINFORM.SYSEXIT.CAPTION=Exit
-TPBMAINFORM.HLPABOUT.CAPTION=About
-TPBMAINFORM.MENUITEM1.CAPTION=System
-TPBMAINFORM.MENUITEM3.CAPTION=Edit
-TPBMAINFORM.MENUITEM7.CAPTION=-
-TPBMAINFORM.MENUITEM10.CAPTION=-
-TPBMAINFORM.MENUITEM18.CAPTION=Help
-TPBMAINFORM.MENUITEM14.CAPTION=-
-TPBMAINFORM.MENUITEM16.CAPTION=-
--- a/components/rx/trunk/Demos/RxDBColorBox/project1.res
+++ b/components/rx/trunk/Demos/RxDBColorBox/project1.res
--- a/components/rx/trunk/Demos/RxDBGrid/RxDBGridDemo.lpi
+++ b/components/rx/trunk/Demos/RxDBGrid/RxDBGridDemo.lpi
@ -70,6 +70,7 @@
        <HasResources Value="True"/>
        <ResourceBaseClass Value="Form"/>
        <UnitName Value="RxDBGridMainUnit"/>
+        <IsVisibleTab Value="True"/>
        <TopLine Value="152"/>
        <CursorPos X="33" Y="171"/>
        <UsageCount Value="116"/>
@ -101,71 +102,62 @@
      <Unit5>
        <Filename Value="../../rxautopanel.pas"/>
        <UnitName Value="RxAutoPanel"/>
-        <EditorIndex Value="1"/>
+        <EditorIndex Value="-1"/>
        <TopLine Value="32"/>
        <CursorPos X="74" Y="56"/>
        <UsageCount Value="10"/>
-        <Loaded Value="True"/>
      </Unit5>
      <Unit6>
        <Filename Value="../../registerrx.pas"/>
-        <EditorIndex Value="2"/>
+        <EditorIndex Value="-1"/>
        <TopLine Value="26"/>
        <CursorPos X="72" Y="59"/>
        <UsageCount Value="10"/>
-        <Loaded Value="True"/>
      </Unit6>
      <Unit7>
        <Filename Value="../../rxpickdate.pas"/>
-        <EditorIndex Value="8"/>
+        <EditorIndex Value="-1"/>
        <CursorPos X="16" Y="32"/>
        <UsageCount Value="10"/>
-        <Loaded Value="True"/>
      </Unit7>
      <Unit8>
        <Filename Value="../../tooledit.pas"/>
-        <EditorIndex Value="3"/>
+        <EditorIndex Value="-1"/>
        <TopLine Value="19"/>
        <CursorPos X="25" Y="40"/>
        <UsageCount Value="10"/>
-        <Loaded Value="True"/>
      </Unit8>
      <Unit9>
        <Filename Value="../../rxdateutil.pas"/>
-        <EditorIndex Value="4"/>
+        <EditorIndex Value="-1"/>
        <TopLine Value="16"/>
        <CursorPos X="16" Y="32"/>
        <UsageCount Value="10"/>
-        <Loaded Value="True"/>
      </Unit9>
      <Unit10>
        <Filename Value="../../dbdateedit.pas"/>
-        <EditorIndex Value="5"/>
+        <EditorIndex Value="-1"/>
        <TopLine Value="97"/>
        <CursorPos X="16" Y="117"/>
        <UsageCount Value="10"/>
-        <Loaded Value="True"/>
      </Unit10>
      <Unit11>
        <Filename Value="../../dbutils.pas"/>
-        <EditorIndex Value="6"/>
+        <EditorIndex Value="-1"/>
        <TopLine Value="145"/>
        <CursorPos X="53" Y="168"/>
        <UsageCount Value="10"/>
-        <Loaded Value="True"/>
      </Unit11>
      <Unit12>
        <Filename Value="../../rxdaterangeeditunit.pas"/>
        <UnitName Value="rxDateRangeEditUnit"/>
-        <IsVisibleTab Value="True"/>
-        <EditorIndex Value="7"/>
+        <EditorIndex Value="-1"/>
        <TopLine Value="133"/>
        <CursorPos X="8" Y="150"/>
        <UsageCount Value="10"/>
-        <Loaded Value="True"/>
      </Unit12>
    </Units>
-    <JumpHistory Count="9" HistoryIndex="8">
+    <JumpHistory Count="2" HistoryIndex="1">
      <Position1>
        <Filename Value="rxdbgridmainunit.pas"/>
        <Caret Line="14" Column="134"/>
@ -174,33 +166,6 @@
        <Filename Value="rxdbgridmainunit.pas"/>
        <Caret Line="172" Column="21" TopLine="158"/>
      </Position2>
-      <Position3>
-        <Filename Value="../../registerrx.pas"/>
-        <Caret Line="58" Column="59" TopLine="38"/>
-      </Position3>
-      <Position4>
-        <Filename Value="../../registerrx.pas"/>
-        <Caret Line="119" Column="24" TopLine="86"/>
-      </Position4>
-      <Position5>
-        <Filename Value="../../registerrx.pas"/>
-        <Caret Line="120" Column="45" TopLine="88"/>
-      </Position5>
-      <Position6>
-        <Filename Value="../../registerrx.pas"/>
-        <Caret Line="191" Column="19" TopLine="158"/>
-      </Position6>
-      <Position7>
-        <Filename Value="../../registerrx.pas"/>
-        <Caret Line="123" Column="11" TopLine="103"/>
-      </Position7>
-      <Position8>
-        <Filename Value="../../registerrx.pas"/>
-      </Position8>
-      <Position9>
-        <Filename Value="../../rxdateutil.pas"/>
-        <Caret Line="32" Column="16" TopLine="16"/>
-      </Position9>
    </JumpHistory>
  </ProjectOptions>
  <CompilerOptions>
--- a/components/rx/trunk/Demos/RxDBGrid_ExportSpreadsheet/project1.lps
+++ b/components/rx/trunk/Demos/RxDBGrid_ExportSpreadsheet/project1.lps
@ -19,7 +19,7 @@
        <ResourceBaseClass Value="Form"/>
        <UnitName Value="Unit1"/>
        <IsVisibleTab Value="True"/>
-        <TopLine Value="57"/>
+        <TopLine Value="48"/>
        <CursorPos X="9" Y="73"/>
        <UsageCount Value="32"/>
        <Loaded Value="True"/>
@ -53,7 +53,7 @@
      </Unit4>
      <Unit5>
        <Filename Value="../../rxdbgrid.pas"/>
-        <EditorIndex Value="1"/>
+        <EditorIndex Value="-1"/>
        <TopLine Value="4701"/>
        <CursorPos Y="4725"/>
        <UsageCount Value="15"/>
@ -61,7 +61,6 @@
          <Item0 X="14" Y="822" ID="1"/>
          <Item1 X="48" Y="622" ID="2"/>
        </Bookmarks>
-        <Loaded Value="True"/>
      </Unit5>
      <Unit6>
        <Filename Value="../../../fpspreadsheet/fpsstrings.pas"/>
@ -90,143 +89,33 @@
      </Unit8>
      <Unit9>
        <Filename Value="../../../../lcl/include/control.inc"/>
-        <EditorIndex Value="3"/>
+        <EditorIndex Value="-1"/>
        <TopLine Value="1075"/>
        <CursorPos Y="1091"/>
        <UsageCount Value="10"/>
-        <Loaded Value="True"/>
      </Unit9>
      <Unit10>
        <Filename Value="../../../../lcl/controls.pp"/>
        <UnitName Value="Controls"/>
-        <EditorIndex Value="2"/>
+        <EditorIndex Value="-1"/>
        <TopLine Value="316"/>
        <CursorPos X="5" Y="330"/>
        <UsageCount Value="10"/>
-        <Loaded Value="True"/>
      </Unit10>
    </Units>
-    <JumpHistory Count="30" HistoryIndex="29">
+    <JumpHistory Count="3" HistoryIndex="2">
      <Position1>
-        <Filename Value="../../rxdbgrid.pas"/>
-        <Caret Line="4727" TopLine="4689"/>
-      </Position1>
-      <Position2>
-        <Filename Value="../../rxdbgrid.pas"/>
-        <Caret Line="4698" TopLine="4689"/>
-      </Position2>
-      <Position3>
-        <Filename Value="../../rxdbgrid.pas"/>
-        <Caret Line="4700" TopLine="4689"/>
-      </Position3>
-      <Position4>
-        <Filename Value="../../rxdbgrid.pas"/>
-        <Caret Line="4702" TopLine="4689"/>
-      </Position4>
-      <Position5>
-        <Filename Value="../../rxdbgrid.pas"/>
-        <Caret Line="4703" TopLine="4689"/>
-      </Position5>
-      <Position6>
-        <Filename Value="../../rxdbgrid.pas"/>
-        <Caret Line="4704" TopLine="4689"/>
-      </Position6>
-      <Position7>
-        <Filename Value="../../rxdbgrid.pas"/>
-        <Caret Line="4712" TopLine="4689"/>
-      </Position7>
-      <Position8>
-        <Filename Value="../../rxdbgrid.pas"/>
-        <Caret Line="4713" TopLine="4689"/>
-      </Position8>
-      <Position9>
-        <Filename Value="../../rxdbgrid.pas"/>
-        <Caret Line="4714" TopLine="4691"/>
-      </Position9>
-      <Position10>
-        <Filename Value="../../rxdbgrid.pas"/>
-        <Caret Line="4716" TopLine="4692"/>
-      </Position10>
-      <Position11>
-        <Filename Value="../../rxdbgrid.pas"/>
-        <Caret Line="4717" TopLine="4693"/>
-      </Position11>
-      <Position12>
-        <Filename Value="../../rxdbgrid.pas"/>
-        <Caret Line="4718" TopLine="4697"/>
-      </Position12>
-      <Position13>
-        <Filename Value="../../rxdbgrid.pas"/>
-        <Caret Line="4719" TopLine="4697"/>
-      </Position13>
-      <Position14>
-        <Filename Value="../../rxdbgrid.pas"/>
-        <Caret Line="4721" TopLine="4703"/>
-      </Position14>
-      <Position15>
-        <Filename Value="../../rxdbgrid.pas"/>
-        <Caret Line="4723" TopLine="4703"/>
-      </Position15>
-      <Position16>
-        <Filename Value="../../rxdbgrid.pas"/>
-        <Caret Line="4724" TopLine="4703"/>
-      </Position16>
-      <Position17>
        <Filename Value="unit1.pas"/>
        <Caret Line="73" TopLine="57"/>
-      </Position17>
-      <Position18>
+      </Position1>
+      <Position2>
        <Filename Value="unit1.pas"/>
        <Caret Line="78" TopLine="57"/>
-      </Position18>
-      <Position19>
-        <Filename Value="../../rxdbgrid.pas"/>
-        <Caret Line="4725" TopLine="4703"/>
-      </Position19>
-      <Position20>
-        <Filename Value="../../rxdbgrid.pas"/>
-        <Caret Line="4731" TopLine="4707"/>
-      </Position20>
-      <Position21>
-        <Filename Value="../../../../lcl/include/control.inc"/>
-        <Caret Line="1090" TopLine="1075"/>
-      </Position21>
-      <Position22>
-        <Filename Value="../../rxdbgrid.pas"/>
-        <Caret Line="4708" Column="16" TopLine="4688"/>
-      </Position22>
-      <Position23>
-        <Filename Value="../../rxdbgrid.pas"/>
-        <Caret Line="4726" Column="20" TopLine="4707"/>
-      </Position23>
-      <Position24>
+      </Position2>
+      <Position3>
        <Filename Value="unit1.pas"/>
        <Caret Line="78" TopLine="57"/>
-      </Position24>
-      <Position25>
-        <Filename Value="../../rxdbgrid.pas"/>
-        <Caret Line="4719" Column="49" TopLine="4699"/>
-      </Position25>
-      <Position26>
-        <Filename Value="../../rxdbgrid.pas"/>
-        <Caret Line="4718" TopLine="4699"/>
-      </Position26>
-      <Position27>
-        <Filename Value="../../rxdbgrid.pas"/>
-        <Caret Line="4719" TopLine="4699"/>
-      </Position27>
-      <Position28>
-        <Filename Value="../../rxdbgrid.pas"/>
-        <Caret Line="4721" TopLine="4699"/>
-      </Position28>
-      <Position29>
-        <Filename Value="../../rxdbgrid.pas"/>
-        <Caret Line="4723" TopLine="4699"/>
-      </Position29>
-      <Position30>
-        <Filename Value="../../rxdbgrid.pas"/>
-        <Caret Line="4724" TopLine="4700"/>
-      </Position30>
+      </Position3>
    </JumpHistory>
  </ProjectSession>
  <Debugging>
--- a/components/rx/trunk/Demos/RxDateEdit/project1.lpi
+++ b/components/rx/trunk/Demos/RxDateEdit/project1.lpi
@ -7,12 +7,10 @@
      <ResourceType Value="res"/>
      <UseXPManifest Value="True"/>
      <Icon Value="0"/>
-      <ActiveWindowIndexAtStart Value="0"/>
    </General>
    <VersionInfo>
      <Language Value=""/>
      <CharSet Value=""/>
-      <StringTable ProductVersion=""/>
    </VersionInfo>
    <BuildModes Count="1">
      <Item1 Name="default" Default="True"/>
@ -46,10 +44,7 @@
      <Unit0>
        <Filename Value="project1.lpr"/>
        <IsPartOfProject Value="True"/>
-        <UnitName Value="project1"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="1"/>
-        <CursorPos X="1" Y="14"/>
+        <CursorPos Y="14"/>
        <UsageCount Value="20"/>
      </Unit0>
      <Unit1>
@ -59,35 +54,27 @@
        <HasResources Value="True"/>
        <ResourceBaseClass Value="Form"/>
        <UnitName Value="Unit1"/>
-        <EditorIndex Value="0"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="6"/>
-        <CursorPos X="26" Y="13"/>
+        <IsVisibleTab Value="True"/>
+        <CursorPos X="34" Y="17"/>
        <UsageCount Value="20"/>
        <Loaded Value="True"/>
        <LoadedDesigner Value="True"/>
      </Unit1>
      <Unit2>
        <Filename Value="../../curredit.pas"/>
-        <UnitName Value="curredit"/>
-        <WindowIndex Value="0"/>
        <TopLine Value="469"/>
-        <CursorPos X="1" Y="485"/>
+        <CursorPos Y="485"/>
        <UsageCount Value="10"/>
      </Unit2>
      <Unit3>
        <Filename Value="../../tooledit.pas"/>
-        <UnitName Value="tooledit"/>
-        <EditorIndex Value="3"/>
-        <WindowIndex Value="0"/>
+        <EditorIndex Value="-1"/>
        <TopLine Value="794"/>
        <CursorPos X="5" Y="797"/>
        <UsageCount Value="10"/>
-        <Loaded Value="True"/>
      </Unit3>
      <Unit4>
        <Filename Value="../../rx.inc"/>
-        <TopLine Value="1"/>
        <CursorPos X="20" Y="11"/>
        <UsageCount Value="10"/>
      </Unit4>
@ -115,7 +102,7 @@
      <Unit8>
        <Filename Value="../../../../lcl/include/wincontrol.inc"/>
        <TopLine Value="4997"/>
-        <CursorPos X="1" Y="5013"/>
+        <CursorPos Y="5013"/>
        <UsageCount Value="10"/>
      </Unit8>
      <Unit9>
@ -141,51 +128,48 @@
      <Unit12>
        <Filename Value="../../../../lcl/include/canvas.inc"/>
        <TopLine Value="1057"/>
-        <CursorPos X="1" Y="1073"/>
+        <CursorPos Y="1073"/>
        <UsageCount Value="10"/>
      </Unit12>
      <Unit13>
        <Filename Value="../../../../lcl/include/control.inc"/>
        <TopLine Value="1615"/>
-        <CursorPos X="1" Y="1631"/>
+        <CursorPos Y="1631"/>
        <UsageCount Value="10"/>
      </Unit13>
      <Unit14>
        <Filename Value="../../../../lcl/lclmessageglue.pas"/>
        <UnitName Value="LCLMessageGlue"/>
        <TopLine Value="105"/>
-        <CursorPos X="1" Y="121"/>
+        <CursorPos Y="121"/>
        <UsageCount Value="10"/>
      </Unit14>
      <Unit15>
        <Filename Value="../../../../lcl/interfaces/gtk/gtkproc.inc"/>
        <TopLine Value="3696"/>
-        <CursorPos X="1" Y="3712"/>
+        <CursorPos Y="3712"/>
        <UsageCount Value="10"/>
      </Unit15>
      <Unit16>
        <Filename Value="../../../../lcl/interfaces/gtk/gtkcallback.inc"/>
        <TopLine Value="660"/>
-        <CursorPos X="1" Y="676"/>
+        <CursorPos Y="676"/>
        <UsageCount Value="10"/>
      </Unit16>
      <Unit17>
        <Filename Value="../../../../lcl/interfaces/gtk/gtkwidgetset.inc"/>
        <TopLine Value="1200"/>
-        <CursorPos X="1" Y="1226"/>
+        <CursorPos Y="1226"/>
        <UsageCount Value="10"/>
      </Unit17>
      <Unit18>
        <Filename Value="../../dbdateedit.pas"/>
-        <UnitName Value="dbdateedit"/>
-        <WindowIndex Value="0"/>
        <TopLine Value="211"/>
-        <CursorPos X="1" Y="227"/>
+        <CursorPos Y="227"/>
        <UsageCount Value="10"/>
      </Unit18>
      <Unit19>
        <Filename Value="/home/alexs/install/fpcsrc/rtl/objpas/sysutils/sysinth.inc"/>
-        <WindowIndex Value="0"/>
        <TopLine Value="77"/>
        <CursorPos X="37" Y="93"/>
        <UsageCount Value="10"/>
@ -193,39 +177,31 @@
      <Unit20>
        <Filename Value="../../../../lcl/editbtn.pas"/>
        <UnitName Value="EditBtn"/>
-        <EditorIndex Value="4"/>
-        <WindowIndex Value="0"/>
+        <EditorIndex Value="-1"/>
        <TopLine Value="774"/>
-        <CursorPos X="1" Y="792"/>
+        <CursorPos Y="792"/>
        <UsageCount Value="10"/>
-        <Loaded Value="True"/>
      </Unit20>
      <Unit21>
        <Filename Value="../../../rxnet/registerrxnet.pas"/>
        <UnitName Value="RegisterRxNet"/>
-        <IsVisibleTab Value="True"/>
-        <EditorIndex Value="1"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="1"/>
+        <EditorIndex Value="-1"/>
        <CursorPos X="34" Y="19"/>
        <UsageCount Value="10"/>
-        <Loaded Value="True"/>
      </Unit21>
      <Unit22>
        <Filename Value="../../registerrxtools.pas"/>
        <UnitName Value="RegisterRxTools"/>
-        <EditorIndex Value="2"/>
-        <WindowIndex Value="0"/>
+        <EditorIndex Value="-1"/>
        <TopLine Value="22"/>
-        <CursorPos X="1" Y="48"/>
+        <CursorPos Y="48"/>
        <UsageCount Value="10"/>
-        <Loaded Value="True"/>
      </Unit22>
    </Units>
-    <JumpHistory Count="21" HistoryIndex="20">
+    <JumpHistory Count="19" HistoryIndex="18">
      <Position1>
        <Filename Value="unit1.pas"/>
-        <Caret Line="46" Column="1" TopLine="28"/>
+        <Caret Line="46" TopLine="28"/>
      </Position1>
      <Position2>
        <Filename Value="unit1.pas"/>
@ -233,11 +209,11 @@
      </Position2>
      <Position3>
        <Filename Value="unit1.pas"/>
-        <Caret Line="46" Column="1" TopLine="28"/>
+        <Caret Line="46" TopLine="28"/>
      </Position3>
      <Position4>
        <Filename Value="unit1.pas"/>
-        <Caret Line="47" Column="1" TopLine="28"/>
+        <Caret Line="47" TopLine="28"/>
      </Position4>
      <Position5>
        <Filename Value="unit1.pas"/>
@ -257,11 +233,11 @@
      </Position8>
      <Position9>
        <Filename Value="unit1.pas"/>
-        <Caret Line="39" Column="1" TopLine="22"/>
+        <Caret Line="39" TopLine="22"/>
      </Position9>
      <Position10>
        <Filename Value="unit1.pas"/>
-        <Caret Line="38" Column="1" TopLine="22"/>
+        <Caret Line="38" TopLine="22"/>
      </Position10>
      <Position11>
        <Filename Value="unit1.pas"/>
@ -284,29 +260,21 @@
        <Caret Line="18" Column="15" TopLine="6"/>
      </Position15>
      <Position16>
-        <Filename Value="../../tooledit.pas"/>
-        <Caret Line="161" Column="50" TopLine="142"/>
-      </Position16>
-      <Position17>
-        <Filename Value="../../tooledit.pas"/>
-        <Caret Line="897" Column="1" TopLine="868"/>
-      </Position17>
-      <Position18>
-        <Filename Value="../../../../lcl/editbtn.pas"/>
-        <Caret Line="249" Column="3" TopLine="234"/>
-      </Position18>
-      <Position19>
-        <Filename Value="../../tooledit.pas"/>
-        <Caret Line="223" Column="1" TopLine="203"/>
-      </Position19>
-      <Position20>
-        <Filename Value="../../tooledit.pas"/>
-        <Caret Line="900" Column="1" TopLine="870"/>
-      </Position20>
-      <Position21>
        <Filename Value="unit1.pas"/>
        <Caret Line="18" Column="15" TopLine="6"/>
-      </Position21>
+      </Position16>
+      <Position17>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="13" Column="26" TopLine="6"/>
+      </Position17>
+      <Position18>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="18" Column="18"/>
+      </Position18>
+      <Position19>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="17" Column="34"/>
+      </Position19>
    </JumpHistory>
  </ProjectOptions>
  <CompilerOptions>
@ -330,9 +298,6 @@
        </Win32>
      </Options>
    </Linking>
-    <Other>
-      <CompilerPath Value="$(CompPath)"/>
-    </Other>
  </CompilerOptions>
  <Debugging>
    <Exceptions Count="3">
@ -347,5 +312,4 @@
      </Item3>
    </Exceptions>
  </Debugging>
-  <EditorMacros Count="0"/>
 </CONFIG>
--- a/components/rx/trunk/Demos/RxDateEdit/unit1.lfm
+++ b/components/rx/trunk/Demos/RxDateEdit/unit1.lfm
@ -7,14 +7,14 @@ object Form1: TForm1
  ClientHeight = 300
  ClientWidth = 400
  OnCreate = FormCreate
-  LCLVersion = '1.3'
+  LCLVersion = '1.7'
  object Label1: TLabel
    AnchorSideLeft.Control = Owner
    AnchorSideTop.Control = Owner
    Left = 6
-    Height = 15
+    Height = 20
    Top = 6
-    Width = 43
+    Width = 42
    BorderSpacing.Left = 6
    BorderSpacing.Top = 6
    Caption = 'Label1'
@ -22,11 +22,11 @@ object Form1: TForm1
  end
  object Label2: TLabel
    AnchorSideLeft.Control = Owner
-    AnchorSideTop.Control = DBDateEdit1
+    AnchorSideTop.Control = RxDBDateEdit1
    AnchorSideTop.Side = asrBottom
    Left = 6
-    Height = 15
-    Top = 58
+    Height = 20
+    Top = 75
    Width = 87
    BorderSpacing.Around = 6
    Caption = 'Currency edit'
@ -37,8 +37,8 @@ object Form1: TForm1
    AnchorSideTop.Control = Label2
    AnchorSideTop.Side = asrBottom
    Left = 12
-    Height = 25
-    Top = 79
+    Height = 37
+    Top = 101
    Width = 148
    Alignment = taCenter
    BorderSpacing.Around = 6
@ -49,7 +49,7 @@ object Form1: TForm1
  end
  object Button1: TButton
    Left = 248
-    Height = 27
+    Height = 36
    Top = 80
    Width = 77
    AutoSize = True
@ -59,35 +59,34 @@ object Form1: TForm1
  end
  object RxDateEdit1: TRxDateEdit
    Left = 12
-    Height = 25
-    Top = 135
+    Height = 37
+    Top = 160
    Width = 80
    ButtonWidth = 23
-    CharCase = ecNormal
    MaxLength = 10
    NumGlyphs = 2
+    PasswordChar = #0
    PopupColor = clWindow
    TabOrder = 2
    Text = '  .  .    '
  end
-  object DBDateEdit1: TDBDateEdit
+  object RxDBDateEdit1: TRxDBDateEdit
    AnchorSideLeft.Control = Label1
    AnchorSideTop.Control = Label1
    AnchorSideTop.Side = asrBottom
    Left = 12
-    Height = 25
-    Top = 27
-    Width = 139
-    BorderSpacing.Left = 6
-    BorderSpacing.Top = 6
+    Height = 37
+    Top = 32
+    Width = 151
+    BorderSpacing.Around = 6
    ButtonWidth = 23
-    CharCase = ecNormal
    Enabled = False
    MaxLength = 10
    NumGlyphs = 2
+    PasswordChar = #0
    PopupColor = clWindow
    TabOrder = 3
-    Text = '  .  .    '
+    Text = 't1.  .    '
    DataField = 'DOC_DATE'
    DataSource = dsData
  end
@ -101,8 +100,6 @@ object Form1: TForm1
      item
        Name = 'DOC_DATE'
        DataType = ftDate
-        Precision = 0
-        Size = 0
      end>
    PacketRecords = 0
    left = 304
--- a/components/rx/trunk/Demos/RxDateEdit/unit1.pas
+++ b/components/rx/trunk/Demos/RxDateEdit/unit1.pas
@ -15,13 +15,13 @@ type
  TForm1 = class(TForm)
    Button1: TButton;
    CurrencyEdit1: TCurrencyEdit;
-    DBDateEdit1: TDBDateEdit;
    dsData: TDatasource;
    Label1: TLabel;
    Label2: TLabel;
    rxData: TRxMemoryData;
    rxDataDOC_DATE: TDateField;
    RxDateEdit1: TRxDateEdit;
+    RxDBDateEdit1: TRxDBDateEdit;
    procedure Button1Click(Sender: TObject);
    procedure FormCreate(Sender: TObject);
  private
--- a/components/rx/trunk/Demos/RxHistoryNavigator/project1.res
+++ b/components/rx/trunk/Demos/RxHistoryNavigator/project1.res
--- a/components/rx/trunk/Demos/RxLookup/project1.lpi
+++ b/components/rx/trunk/Demos/RxLookup/project1.lpi
@ -1,19 +1,20 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
  <ProjectOptions>
-    <Version Value="7"/>
+    <Version Value="9"/>
    <General>
      <MainUnit Value="0"/>
-      <TargetFileExt Value=""/>
-      <Icon Value="0"/>
      <UseXPManifest Value="True"/>
-      <ActiveEditorIndexAtStart Value="0"/>
+      <Icon Value="0"/>
    </General>
    <VersionInfo>
-      <ProjectVersion Value=""/>
      <Language Value=""/>
      <CharSet Value=""/>
+      <StringTable ProductVersion=""/>
    </VersionInfo>
+    <BuildModes Count="1">
+      <Item1 Name="default" Default="True"/>
+    </BuildModes>
    <PublishOptions>
      <Version Value="2"/>
      <IgnoreBinaries Value="False"/>
@ -43,214 +44,220 @@
      <Unit0>
        <Filename Value="project1.lpr"/>
        <IsPartOfProject Value="True"/>
-        <UnitName Value="project1"/>
        <UsageCount Value="22"/>
      </Unit0>
      <Unit1>
        <Filename Value="unit1.pas"/>
        <IsPartOfProject Value="True"/>
        <ComponentName Value="Form1"/>
+        <HasResources Value="True"/>
        <ResourceBaseClass Value="Form"/>
        <UnitName Value="Unit1"/>
-        <CursorPos X="3" Y="54"/>
-        <TopLine Value="25"/>
-        <EditorIndex Value="0"/>
+        <IsVisibleTab Value="True"/>
+        <TopLine Value="34"/>
+        <CursorPos Y="47"/>
        <UsageCount Value="22"/>
        <Loaded Value="True"/>
+        <LoadedDesigner Value="True"/>
      </Unit1>
      <Unit2>
-        <Filename Value="../../../../../../../../usr/local/share/lazarus/components/rxnew/rxlookup.pas"/>
-        <UnitName Value="rxlookup"/>
-        <CursorPos X="19" Y="646"/>
-        <TopLine Value="645"/>
+        <Filename Value="../../rxlookup.pas"/>
        <EditorIndex Value="1"/>
+        <TopLine Value="645"/>
+        <CursorPos X="19" Y="646"/>
        <UsageCount Value="11"/>
        <Bookmarks Count="1">
-          <Item0 X="1" Y="1315" ID="1"/>
+          <Item0 Y="1315" ID="1"/>
        </Bookmarks>
        <Loaded Value="True"/>
      </Unit2>
      <Unit3>
-        <Filename Value="../../../../../../../../usr/local/share/lazarus/lcl/controls.pp"/>
+        <Filename Value="../../../../lcl/controls.pp"/>
        <UnitName Value="Controls"/>
-        <CursorPos X="1" Y="1152"/>
-        <TopLine Value="1135"/>
        <EditorIndex Value="5"/>
+        <TopLine Value="1135"/>
+        <CursorPos Y="1152"/>
        <UsageCount Value="11"/>
        <Loaded Value="True"/>
      </Unit3>
      <Unit4>
-        <Filename Value="../../../../../../../../usr/local/share/lazarus/lcl/include/control.inc"/>
-        <CursorPos X="1" Y="4129"/>
-        <TopLine Value="4113"/>
+        <Filename Value="../../../../lcl/include/control.inc"/>
        <EditorIndex Value="6"/>
+        <TopLine Value="4113"/>
+        <CursorPos Y="4129"/>
        <UsageCount Value="11"/>
        <Loaded Value="True"/>
      </Unit4>
      <Unit5>
-        <Filename Value="../../../../../../../../usr/local/share/lazarus/components/rxnew/rxpopupunit.pas"/>
-        <UnitName Value="rxpopupunit"/>
-        <CursorPos X="1" Y="785"/>
-        <TopLine Value="770"/>
+        <Filename Value="../../rxpopupunit.pas"/>
        <EditorIndex Value="4"/>
+        <TopLine Value="770"/>
+        <CursorPos Y="785"/>
        <UsageCount Value="11"/>
        <Loaded Value="True"/>
      </Unit5>
      <Unit6>
-        <Filename Value="../../../../../../../../usr/local/share/lazarus/components/rxnew/rxdconst.pas"/>
-        <UnitName Value="rxdconst"/>
-        <CursorPos X="3" Y="68"/>
-        <TopLine Value="77"/>
+        <Filename Value="../../rxdconst.pas"/>
        <EditorIndex Value="3"/>
+        <TopLine Value="77"/>
+        <CursorPos X="3" Y="68"/>
        <UsageCount Value="11"/>
        <Loaded Value="True"/>
      </Unit6>
      <Unit7>
-        <Filename Value="../../../../../../../../usr/local/share/lazarus/lcl/include/wincontrol.inc"/>
-        <CursorPos X="1" Y="7579"/>
-        <TopLine Value="7563"/>
+        <Filename Value="../../../../lcl/include/wincontrol.inc"/>
        <EditorIndex Value="7"/>
+        <TopLine Value="7563"/>
+        <CursorPos Y="7579"/>
        <UsageCount Value="11"/>
        <Loaded Value="True"/>
      </Unit7>
      <Unit8>
-        <Filename Value="../../../../../../../../usr/local/share/lazarus/components/rxnew/dbutils.pas"/>
-        <UnitName Value="dbutils"/>
-        <CursorPos X="1" Y="326"/>
-        <TopLine Value="310"/>
+        <Filename Value="../../dbutils.pas"/>
        <EditorIndex Value="2"/>
+        <TopLine Value="310"/>
+        <CursorPos Y="326"/>
        <UsageCount Value="10"/>
        <Loaded Value="True"/>
      </Unit8>
    </Units>
    <JumpHistory Count="30" HistoryIndex="29">
      <Position1>
-        <Filename Value="../../../../../../../../usr/local/share/lazarus/components/rxnew/dbutils.pas"/>
-        <Caret Line="225" Column="1" TopLine="209"/>
+        <Filename Value="../../dbutils.pas"/>
+        <Caret Line="225" TopLine="209"/>
      </Position1>
      <Position2>
-        <Filename Value="../../../../../../../../usr/local/share/lazarus/components/rxnew/dbutils.pas"/>
-        <Caret Line="227" Column="1" TopLine="211"/>
+        <Filename Value="../../dbutils.pas"/>
+        <Caret Line="227" TopLine="211"/>
      </Position2>
      <Position3>
-        <Filename Value="../../../../../../../../usr/local/share/lazarus/components/rxnew/dbutils.pas"/>
-        <Caret Line="340" Column="1" TopLine="324"/>
+        <Filename Value="../../dbutils.pas"/>
+        <Caret Line="340" TopLine="324"/>
      </Position3>
      <Position4>
-        <Filename Value="../../../../../../../../usr/local/share/lazarus/components/rxnew/dbutils.pas"/>
-        <Caret Line="341" Column="1" TopLine="325"/>
+        <Filename Value="../../dbutils.pas"/>
+        <Caret Line="341" TopLine="325"/>
      </Position4>
      <Position5>
-        <Filename Value="../../../../../../../../usr/local/share/lazarus/components/rxnew/dbutils.pas"/>
-        <Caret Line="342" Column="1" TopLine="326"/>
+        <Filename Value="../../dbutils.pas"/>
+        <Caret Line="342" TopLine="326"/>
      </Position5>
      <Position6>
-        <Filename Value="../../../../../../../../usr/local/share/lazarus/components/rxnew/dbutils.pas"/>
-        <Caret Line="344" Column="1" TopLine="328"/>
+        <Filename Value="../../dbutils.pas"/>
+        <Caret Line="344" TopLine="328"/>
      </Position6>
      <Position7>
-        <Filename Value="../../../../../../../../usr/local/share/lazarus/components/rxnew/dbutils.pas"/>
-        <Caret Line="345" Column="1" TopLine="329"/>
+        <Filename Value="../../dbutils.pas"/>
+        <Caret Line="345" TopLine="329"/>
      </Position7>
      <Position8>
-        <Filename Value="../../../../../../../../usr/local/share/lazarus/components/rxnew/dbutils.pas"/>
-        <Caret Line="346" Column="1" TopLine="330"/>
+        <Filename Value="../../dbutils.pas"/>
+        <Caret Line="346" TopLine="330"/>
      </Position8>
      <Position9>
-        <Filename Value="../../../../../../../../usr/local/share/lazarus/components/rxnew/dbutils.pas"/>
-        <Caret Line="232" Column="1" TopLine="216"/>
+        <Filename Value="../../dbutils.pas"/>
+        <Caret Line="232" TopLine="216"/>
      </Position9>
      <Position10>
-        <Filename Value="../../../../../../../../usr/local/share/lazarus/components/rxnew/dbutils.pas"/>
-        <Caret Line="227" Column="1" TopLine="211"/>
+        <Filename Value="../../dbutils.pas"/>
+        <Caret Line="227" TopLine="211"/>
      </Position10>
      <Position11>
-        <Filename Value="../../../../../../../../usr/local/share/lazarus/components/rxnew/dbutils.pas"/>
-        <Caret Line="229" Column="1" TopLine="213"/>
+        <Filename Value="../../dbutils.pas"/>
+        <Caret Line="229" TopLine="213"/>
      </Position11>
      <Position12>
-        <Filename Value="../../../../../../../../usr/local/share/lazarus/components/rxnew/dbutils.pas"/>
-        <Caret Line="230" Column="1" TopLine="214"/>
+        <Filename Value="../../dbutils.pas"/>
+        <Caret Line="230" TopLine="214"/>
      </Position12>
      <Position13>
-        <Filename Value="../../../../../../../../usr/local/share/lazarus/components/rxnew/dbutils.pas"/>
-        <Caret Line="235" Column="1" TopLine="219"/>
+        <Filename Value="../../dbutils.pas"/>
+        <Caret Line="235" TopLine="219"/>
      </Position13>
      <Position14>
-        <Filename Value="../../../../../../../../usr/local/share/lazarus/components/rxnew/dbutils.pas"/>
-        <Caret Line="315" Column="1" TopLine="299"/>
+        <Filename Value="../../dbutils.pas"/>
+        <Caret Line="315" TopLine="299"/>
      </Position14>
      <Position15>
-        <Filename Value="../../../../../../../../usr/local/share/lazarus/components/rxnew/dbutils.pas"/>
-        <Caret Line="318" Column="1" TopLine="302"/>
+        <Filename Value="../../dbutils.pas"/>
+        <Caret Line="318" TopLine="302"/>
      </Position15>
      <Position16>
-        <Filename Value="../../../../../../../../usr/local/share/lazarus/components/rxnew/dbutils.pas"/>
-        <Caret Line="321" Column="1" TopLine="305"/>
+        <Filename Value="../../dbutils.pas"/>
+        <Caret Line="321" TopLine="305"/>
      </Position16>
      <Position17>
-        <Filename Value="../../../../../../../../usr/local/share/lazarus/components/rxnew/dbutils.pas"/>
-        <Caret Line="322" Column="1" TopLine="306"/>
+        <Filename Value="../../dbutils.pas"/>
+        <Caret Line="322" TopLine="306"/>
      </Position17>
      <Position18>
-        <Filename Value="../../../../../../../../usr/local/share/lazarus/components/rxnew/dbutils.pas"/>
-        <Caret Line="323" Column="1" TopLine="307"/>
+        <Filename Value="../../dbutils.pas"/>
+        <Caret Line="323" TopLine="307"/>
      </Position18>
      <Position19>
-        <Filename Value="../../../../../../../../usr/local/share/lazarus/components/rxnew/dbutils.pas"/>
-        <Caret Line="324" Column="1" TopLine="308"/>
+        <Filename Value="../../dbutils.pas"/>
+        <Caret Line="324" TopLine="308"/>
      </Position19>
      <Position20>
-        <Filename Value="../../../../../../../../usr/local/share/lazarus/components/rxnew/dbutils.pas"/>
-        <Caret Line="326" Column="1" TopLine="310"/>
+        <Filename Value="../../dbutils.pas"/>
+        <Caret Line="326" TopLine="310"/>
      </Position20>
      <Position21>
-        <Filename Value="../../../../../../../../usr/local/share/lazarus/components/rxnew/rxlookup.pas"/>
-        <Caret Line="1331" Column="1" TopLine="1315"/>
+        <Filename Value="../../rxlookup.pas"/>
+        <Caret Line="1331" TopLine="1315"/>
      </Position21>
      <Position22>
-        <Filename Value="../../../../../../../../usr/local/share/lazarus/components/rxnew/rxlookup.pas"/>
-        <Caret Line="1332" Column="1" TopLine="1316"/>
+        <Filename Value="../../rxlookup.pas"/>
+        <Caret Line="1332" TopLine="1316"/>
      </Position22>
      <Position23>
-        <Filename Value="../../../../../../../../usr/local/share/lazarus/components/rxnew/rxlookup.pas"/>
-        <Caret Line="1445" Column="1" TopLine="1429"/>
+        <Filename Value="../../rxlookup.pas"/>
+        <Caret Line="1445" TopLine="1429"/>
      </Position23>
      <Position24>
-        <Filename Value="../../../../../../../../usr/local/share/lazarus/components/rxnew/rxlookup.pas"/>
-        <Caret Line="1447" Column="1" TopLine="1431"/>
+        <Filename Value="../../rxlookup.pas"/>
+        <Caret Line="1447" TopLine="1431"/>
      </Position24>
      <Position25>
-        <Filename Value="../../../../../../../../usr/local/share/lazarus/components/rxnew/rxlookup.pas"/>
-        <Caret Line="1448" Column="1" TopLine="1432"/>
+        <Filename Value="../../rxlookup.pas"/>
+        <Caret Line="1448" TopLine="1432"/>
      </Position25>
      <Position26>
-        <Filename Value="../../../../../../../../usr/local/share/lazarus/components/rxnew/rxlookup.pas"/>
-        <Caret Line="1451" Column="1" TopLine="1435"/>
+        <Filename Value="../../rxlookup.pas"/>
+        <Caret Line="1451" TopLine="1435"/>
      </Position26>
      <Position27>
-        <Filename Value="../../../../../../../../usr/local/share/lazarus/components/rxnew/rxlookup.pas"/>
-        <Caret Line="1454" Column="1" TopLine="1438"/>
+        <Filename Value="../../rxlookup.pas"/>
+        <Caret Line="1454" TopLine="1438"/>
      </Position27>
      <Position28>
-        <Filename Value="../../../../../../../../usr/local/share/lazarus/components/rxnew/rxlookup.pas"/>
-        <Caret Line="1333" Column="1" TopLine="1317"/>
+        <Filename Value="../../rxlookup.pas"/>
+        <Caret Line="1333" TopLine="1317"/>
      </Position28>
      <Position29>
-        <Filename Value="../../../../../../../../usr/local/share/lazarus/components/rxnew/rxlookup.pas"/>
-        <Caret Line="1059" Column="1" TopLine="1043"/>
+        <Filename Value="../../rxlookup.pas"/>
+        <Caret Line="1059" TopLine="1043"/>
      </Position29>
      <Position30>
-        <Filename Value="../../../../../../../../usr/local/share/lazarus/components/rxnew/rxlookup.pas"/>
-        <Caret Line="1060" Column="1" TopLine="1044"/>
+        <Filename Value="../../rxlookup.pas"/>
+        <Caret Line="1060" TopLine="1044"/>
      </Position30>
    </JumpHistory>
  </ProjectOptions>
  <CompilerOptions>
-    <Version Value="8"/>
+    <Version Value="11"/>
+    <Target>
+      <Filename Value="project1"/>
+    </Target>
    <SearchPaths>
-      <IncludeFiles Value="$(ProjOutDir)/"/>
+      <IncludeFiles Value="$(ProjOutDir)"/>
+      <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
    </SearchPaths>
+    <Parsing>
+      <SyntaxOptions>
+        <UseAnsiStrings Value="False"/>
+      </SyntaxOptions>
+    </Parsing>
    <Linking>
      <Options>
        <Win32>
@ -258,9 +265,6 @@
        </Win32>
      </Options>
    </Linking>
-    <Other>
-      <CompilerPath Value="$(CompPath)"/>
-    </Other>
  </CompilerOptions>
  <Debugging>
    <Exceptions Count="3">
--- a/components/rx/trunk/Demos/RxLookup/project1.lrs
+++ b/components/rx/trunk/Demos/RxLookup/project1.lrs
--- a/components/rx/trunk/Demos/RxLookup/project1.manifest
+++ b/components/rx/trunk/Demos/RxLookup/project1.manifest
@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
- <assemblyIdentity version="1.0.0.0" processorArchitecture="*" name="CompanyName.ProductName.YourApp" type="win32"/>
- <description>Your application description here.</description>
- <dependency>
-  <dependentAssembly>
-   <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="*" publicKeyToken="6595b64144ccf1df" language="*"/>
-  </dependentAssembly>
- </dependency>
- <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
-  <security>
-   <requestedPrivileges>
-    <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
-   </requestedPrivileges>
-  </security>
- </trustInfo>
-</assembly>
--- a/components/rx/trunk/Demos/RxLookup/project1.rc
+++ b/components/rx/trunk/Demos/RxLookup/project1.rc
@ -1,7 +0,0 @@
-#define RT_MANIFEST  24
-#define CREATEPROCESS_MANIFEST_RESOURCE_ID 1
-#define ISOLATIONAWARE_MANIFEST_RESOURCE_ID 2
-#define ISOLATIONAWARE_NOSTATICIMPORT_MANIFEST_RESOURCE_ID 3
-
-CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "project1.manifest"
-MAINICON ICON "project1.ico"
--- a/components/rx/trunk/Demos/RxLookup/unit1.lfm
+++ b/components/rx/trunk/Demos/RxLookup/unit1.lfm
@ -8,14 +8,14 @@ object Form1: TForm1
  ClientHeight = 368
  ClientWidth = 498
  OnCreate = FormCreate
-  LCLVersion = '0.9.29'
+  LCLVersion = '1.7'
  object Label1: TLabel
    AnchorSideLeft.Control = Owner
    AnchorSideTop.Control = Owner
    Left = 6
-    Height = 18
+    Height = 20
    Top = 6
-    Width = 90
+    Width = 85
    BorderSpacing.Around = 6
    Caption = 'Select item...'
    ParentColor = False
@ -25,10 +25,10 @@ object Form1: TForm1
    AnchorSideLeft.Side = asrBottom
    AnchorSideTop.Control = Button1
    AnchorSideTop.Side = asrCenter
-    Left = 108
-    Height = 18
-    Top = 70
-    Width = 46
+    Left = 106
+    Height = 20
+    Top = 78
+    Width = 42
    BorderSpacing.Around = 6
    Caption = 'Label2'
    ParentColor = False
@ -40,14 +40,15 @@ object Form1: TForm1
    AnchorSideRight.Control = Owner
    AnchorSideRight.Side = asrBottom
    Left = 12
-    Height = 29
-    Top = 30
+    Height = 32
+    Top = 32
    Width = 480
    AutoSize = True
    Anchors = [akTop, akLeft, akRight]
    BorderSpacing.Around = 6
    ButtonOnlyWhenFocused = False
    ButtonWidth = 15
+    Color = clWindow
    DataField = 'ID'
    DataSource = dsData1
    PopUpFormOptions.Columns = <>
@ -74,9 +75,9 @@ object Form1: TForm1
    AnchorSideTop.Control = RxDBLookupCombo1
    AnchorSideTop.Side = asrBottom
    Left = 6
-    Height = 29
-    Top = 65
-    Width = 96
+    Height = 36
+    Top = 70
+    Width = 94
    AutoSize = True
    BorderSpacing.Around = 6
    Caption = 'Test caption'
@ -88,10 +89,10 @@ object Form1: TForm1
    AnchorSideTop.Side = asrBottom
    AnchorSideRight.Control = Owner
    AnchorSideRight.Side = asrBottom
-    Left = 427
-    Height = 29
-    Top = 100
-    Width = 65
+    Left = 424
+    Height = 36
+    Top = 112
+    Width = 68
    Anchors = [akTop, akRight]
    AutoSize = True
    BorderSpacing.Around = 6
@ -105,9 +106,9 @@ object Form1: TForm1
    AnchorSideTop.Side = asrBottom
    AnchorSideRight.Control = Button2
    Left = 6
-    Height = 27
-    Top = 100
-    Width = 415
+    Height = 37
+    Top = 112
+    Width = 412
    Anchors = [akTop, akLeft, akRight]
    BorderSpacing.Around = 6
    TabOrder = 3
@ -119,6 +120,8 @@ object Form1: TForm1
    Top = 160
    Width = 498
    Align = alBottom
+    Color = clWindow
+    Columns = <>
    DataSource = dsLookUpData
    TabOrder = 4
  end
@ -127,9 +130,8 @@ object Form1: TForm1
      item
        Name = 'ID'
        DataType = ftInteger
-        Precision = 0
-        Size = 0
      end>
+    PacketRecords = 0
    left = 320
    top = 8
    object rxData1ID: TLongintField
@ -148,21 +150,17 @@ object Form1: TForm1
      item
        Name = 'ID'
        DataType = ftInteger
-        Precision = 0
-        Size = 0
      end    
      item
        Name = 'Caption'
        DataType = ftString
-        Precision = 0
        Size = 100
      end    
      item
        Name = 'Price'
        DataType = ftCurrency
-        Precision = 0
-        Size = 0
      end>
+    PacketRecords = 0
    left = 208
    top = 56
    object rxLookUpDataID: TLongintField
@ -200,12 +198,12 @@ object Form1: TForm1
      Precision = 2
    end
  end
-  object dsData1: TDatasource
+  object dsData1: TDataSource
    DataSet = rxData1
    left = 288
    top = 8
  end
-  object dsLookUpData: TDatasource
+  object dsLookUpData: TDataSource
    DataSet = rxLookUpData
    left = 176
    top = 56
--- a/components/rx/trunk/Demos/RxLookup/unit1.lrs
+++ b/components/rx/trunk/Demos/RxLookup/unit1.lrs
@ -1,64 +0,0 @@
-LazarusResources.Add('TForm1','FORMDATA',[
-  'TPF0'#6'TForm1'#5'Form1'#4'Left'#3#22#2#6'Height'#3'p'#1#3'Top'#3#234#0#5'Wi'
-  +'dth'#3#242#1#13'ActiveControl'#7#16'RxDBLookupCombo1'#7'Caption'#6#20'RxDBL'
-  +'ookupCombo test'#12'ClientHeight'#3'p'#1#11'ClientWidth'#3#242#1#8'OnCreate'
-  +#7#10'FormCreate'#10'LCLVersion'#6#6'0.9.29'#0#6'TLabel'#6'Label1'#22'Anchor'
-  +'SideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#5'Owner'#4'Left'#2
-  +#6#6'Height'#2#18#3'Top'#2#6#5'Width'#2'Z'#20'BorderSpacing.Around'#2#6#7'Ca'
-  +'ption'#6#14'Select item...'#11'ParentColor'#8#0#0#6'TLabel'#6'Label2'#22'An'
-  +'chorSideLeft.Control'#7#7'Button1'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21
-  +'AnchorSideTop.Control'#7#7'Button1'#18'AnchorSideTop.Side'#7#9'asrCenter'#4
-  +'Left'#2'l'#6'Height'#2#18#3'Top'#2'F'#5'Width'#2'.'#20'BorderSpacing.Around'
-  +#2#6#7'Caption'#6#6'Label2'#11'ParentColor'#8#0#0#16'TRxDBLookupCombo'#16'Rx'
-  +'DBLookupCombo1'#22'AnchorSideLeft.Control'#7#6'Label1'#21'AnchorSideTop.Con'
-  +'trol'#7#6'Label1'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.'
-  +'Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#12#6
-  +'Height'#2#29#3'Top'#2#30#5'Width'#3#224#1#8'AutoSize'#9#7'Anchors'#11#5'akT'
-  +'op'#6'akLeft'#7'akRight'#0#20'BorderSpacing.Around'#2#6#21'ButtonOnlyWhenFo'
-  +'cused'#8#11'ButtonWidth'#2#15#9'DataField'#6#2'ID'#10'DataSource'#7#7'dsDat'
-  +'a1'#24'PopUpFormOptions.Columns'#14#0#4'Flat'#8#10'Glyph.Data'#10'v'#0#0#0
-  +'r'#0#0#0'BMr'#0#0#0#0#0#0#0'6'#0#0#0'('#0#0#0#5#0#0#0#3#0#0#0#1#0' '#0#0#0#0
-  +#0'<'#0#0#0'd'#0#0#0'd'#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#255#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#255#0#0#0#255#0#0#0#255#0#0#0#0#0#0#0#255#0#0#0#255
-  +#0#0#0#255#0#0#0#255#0#0#0#255#9'NumGlyphs'#2#1#11'ParentColor'#8#8'ReadOnly'
-  +#8#8'TabOrder'#2#0#7'TabStop'#9#16'DisplayAllFields'#9#13'LookupDisplay'#6#16
-  +'ID;Price;Caption'#18'LookupDisplayIndex'#2#2#11'LookupField'#6#2'ID'#12'Loo'
-  +'kupSource'#7#12'dsLookUpData'#0#0#7'TButton'#7'Button1'#22'AnchorSideLeft.C'
-  +'ontrol'#7#5'Owner'#21'AnchorSideTop.Control'#7#16'RxDBLookupCombo1'#18'Anch'
-  +'orSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#29#3'Top'#2'A'#5'Wid'
-  +'th'#2'`'#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#12'Test ca'
-  +'ption'#7'OnClick'#7#12'Button1Click'#8'TabOrder'#2#1#0#0#7'TButton'#7'Butto'
-  +'n2'#21'AnchorSideTop.Control'#7#7'Button1'#18'AnchorSideTop.Side'#7#9'asrBo'
-  +'ttom'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'a'
-  +'srBottom'#4'Left'#3#171#1#6'Height'#2#29#3'Top'#2'd'#5'Width'#2'A'#7'Anchor'
-  +'s'#11#5'akTop'#7'akRight'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Ca'
-  +'ption'#6#8'Set text'#7'OnClick'#7#12'Button2Click'#8'TabOrder'#2#2#0#0#5'TE'
-  +'dit'#5'Edit1'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Contro'
-  +'l'#7#7'Button1'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Co'
-  +'ntrol'#7#7'Button2'#4'Left'#2#6#6'Height'#2#27#3'Top'#2'd'#5'Width'#3#159#1
-  +#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#20'BorderSpacing.Around'#2#6#8
-  +'TabOrder'#2#3#4'Text'#6#5'Edit1'#0#0#7'TDBGrid'#7'DBGrid1'#4'Left'#2#0#6'He'
-  +'ight'#3#208#0#3'Top'#3#160#0#5'Width'#3#242#1#5'Align'#7#8'alBottom'#10'Dat'
-  +'aSource'#7#12'dsLookUpData'#8'TabOrder'#2#4#0#0#13'TRxMemoryData'#7'rxData1'
-  +#9'FieldDefs'#14#1#4'Name'#6#2'ID'#8'DataType'#7#9'ftInteger'#9'Precision'#2
-  +#0#4'Size'#2#0#0#0#4'left'#3'@'#1#3'top'#2#8#0#13'TLongintField'#9'rxData1ID'
-  +#12'DisplayWidth'#2#10#9'FieldKind'#7#6'fkData'#9'FieldName'#6#2'ID'#5'Index'
-  +#2#0#11'LookupCache'#8#13'ProviderFlags'#11#10'pfInUpdate'#9'pfInWhere'#0#8
-  +'ReadOnly'#8#8'Required'#8#0#0#0#13'TRxMemoryData'#12'rxLookUpData'#9'FieldD'
-  +'efs'#14#1#4'Name'#6#2'ID'#8'DataType'#7#9'ftInteger'#9'Precision'#2#0#4'Siz'
-  +'e'#2#0#0#1#4'Name'#6#7'Caption'#8'DataType'#7#8'ftString'#9'Precision'#2#0#4
-  +'Size'#2'd'#0#1#4'Name'#6#5'Price'#8'DataType'#7#10'ftCurrency'#9'Precision'
-  +#2#0#4'Size'#2#0#0#0#4'left'#3#208#0#3'top'#2'8'#0#13'TLongintField'#14'rxLo'
-  +'okUpDataID'#12'DisplayWidth'#2#10#9'FieldKind'#7#6'fkData'#9'FieldName'#6#2
-  +'ID'#5'Index'#2#0#11'LookupCache'#8#13'ProviderFlags'#11#10'pfInUpdate'#9'pf'
-  +'InWhere'#0#8'ReadOnly'#8#8'Required'#8#0#0#12'TStringField'#19'rxLookUpData'
-  +'Caption'#12'DisplayWidth'#2'd'#9'FieldKind'#7#6'fkData'#9'FieldName'#6#7'Ca'
-  +'ption'#5'Index'#2#1#11'LookupCache'#8#13'ProviderFlags'#11#10'pfInUpdate'#9
-  +'pfInWhere'#0#8'ReadOnly'#8#8'Required'#8#4'Size'#2'd'#0#0#14'TCurrencyField'
-  +#17'rxLookUpDataPrice'#12'DisplayWidth'#2#10#9'FieldKind'#7#6'fkData'#9'Fiel'
-  +'dName'#6#5'Price'#5'Index'#2#2#11'LookupCache'#8#13'ProviderFlags'#11#10'pf'
-  +'InUpdate'#9'pfInWhere'#0#8'ReadOnly'#8#8'Required'#8#8'MaxValue'#2#0#8'MinV'
-  +'alue'#2#0#9'Precision'#2#2#0#0#0#11'TDatasource'#7'dsData1'#7'DataSet'#7#7
-  +'rxData1'#4'left'#3' '#1#3'top'#2#8#0#0#11'TDatasource'#12'dsLookUpData'#7'D'
-  +'ataSet'#7#12'rxLookUpData'#4'left'#3#176#0#3'top'#2'8'#0#0#0
-]);
--- a/components/rx/trunk/Demos/RxLookup/unit1.pas
+++ b/components/rx/trunk/Demos/RxLookup/unit1.pas
@ -42,6 +42,8 @@ var

 implementation

+{$R *.lfm}
+
 { TForm1 }

 procedure TForm1.Button1Click(Sender: TObject);
@ -69,8 +71,5 @@ begin
  Label2.Caption:='';
 end;

-initialization
-  {$I unit1.lrs}
-
 end.

--- a/components/rx/trunk/Demos/RxMDI/project1.lpi
+++ b/components/rx/trunk/Demos/RxMDI/project1.lpi
@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
  <ProjectOptions>
    <Version Value="9"/>
@ -14,9 +14,6 @@
    <i18n>
      <EnableI18N LFM="False"/>
    </i18n>
-    <VersionInfo>
-      <StringTable ProductVersion=""/>
-    </VersionInfo>
    <BuildModes Count="1">
      <Item1 Name="Default" Default="True"/>
    </BuildModes>
@ -42,7 +39,6 @@
      <Unit0>
        <Filename Value="project1.lpr"/>
        <IsPartOfProject Value="True"/>
-        <UnitName Value="project1"/>
      </Unit0>
      <Unit1>
        <Filename Value="unit1.pas"/>
@ -94,12 +90,6 @@
        </Win32>
      </Options>
    </Linking>
-    <Other>
-      <CompilerMessages>
-        <MsgFileName Value=""/>
-      </CompilerMessages>
-      <CompilerPath Value="$(CompPath)"/>
-    </Other>
  </CompilerOptions>
  <Debugging>
    <Exceptions Count="3">
--- a/components/rx/trunk/Demos/RxMDI/project1.lps
+++ b/components/rx/trunk/Demos/RxMDI/project1.lps
@ -7,6 +7,8 @@
      <Unit0>
        <Filename Value="project1.lpr"/>
        <IsPartOfProject Value="True"/>
+        <EditorIndex Value="-1"/>
+        <CursorPos X="43" Y="10"/>
        <UsageCount Value="22"/>
      </Unit0>
      <Unit1>
@ -17,7 +19,7 @@
        <ResourceBaseClass Value="Form"/>
        <UnitName Value="Unit1"/>
        <IsVisibleTab Value="True"/>
-        <TopLine Value="56"/>
+        <TopLine Value="41"/>
        <CursorPos X="34" Y="67"/>
        <UsageCount Value="22"/>
        <Loaded Value="True"/>
@ -30,12 +32,10 @@
        <HasResources Value="True"/>
        <ResourceBaseClass Value="Form"/>
        <UnitName Value="Unit2"/>
-        <EditorIndex Value="3"/>
-        <TopLine Value="7"/>
+        <EditorIndex Value="-1"/>
+        <TopLine Value="3"/>
        <CursorPos X="6" Y="11"/>
        <UsageCount Value="22"/>
-        <Loaded Value="True"/>
-        <LoadedDesigner Value="True"/>
      </Unit2>
      <Unit3>
        <Filename Value="unit3.pas"/>
@ -44,11 +44,9 @@
        <HasResources Value="True"/>
        <ResourceBaseClass Value="Form"/>
        <UnitName Value="Unit3"/>
-        <EditorIndex Value="2"/>
+        <EditorIndex Value="-1"/>
        <CursorPos Y="19"/>
        <UsageCount Value="22"/>
-        <Loaded Value="True"/>
-        <LoadedDesigner Value="True"/>
      </Unit3>
      <Unit4>
        <Filename Value="unit4.pas"/>
@ -57,154 +55,36 @@
        <HasResources Value="True"/>
        <ResourceBaseClass Value="Form"/>
        <UnitName Value="Unit4"/>
-        <EditorIndex Value="4"/>
+        <EditorIndex 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"/>
-        <EditorIndex Value="1"/>
-        <TopLine Value="295"/>
-        <CursorPos X="10" Y="303"/>
+        <EditorIndex Value="-1"/>
+        <TopLine Value="691"/>
+        <CursorPos Y="711"/>
        <UsageCount Value="11"/>
-        <Loaded Value="True"/>
      </Unit5>
    </Units>
-    <JumpHistory Count="30" HistoryIndex="29">
+    <JumpHistory Count="4" HistoryIndex="3">
      <Position1>
-        <Filename Value="unit4.pas"/>
-        <Caret Line="22" Column="21" TopLine="4"/>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="74" Column="26" TopLine="44"/>
      </Position1>
      <Position2>
        <Filename Value="unit1.pas"/>
-        <Caret Line="73" Column="26" TopLine="43"/>
+        <Caret Line="75" Column="26" TopLine="45"/>
      </Position2>
      <Position3>
        <Filename Value="unit1.pas"/>
-        <Caret Line="74" Column="26" TopLine="44"/>
+        <Caret Line="82" Column="26" TopLine="47"/>
      </Position3>
      <Position4>
-        <Filename Value="unit4.pas"/>
-        <Caret Line="41" Column="26" TopLine="12"/>
-      </Position4>
-      <Position5>
-        <Filename Value="unit4.pas"/>
-        <Caret Line="43" Column="26" TopLine="13"/>
-      </Position5>
-      <Position6>
-        <Filename Value="unit4.pas"/>
-        <Caret Line="44" Column="26" TopLine="13"/>
-      </Position6>
-      <Position7>
-        <Filename Value="unit2.pas"/>
-        <Caret Line="10" Column="6" TopLine="7"/>
-      </Position7>
-      <Position8>
-        <Filename Value="unit2.pas"/>
-        <Caret Line="11" Column="6" TopLine="7"/>
-      </Position8>
-      <Position9>
-        <Filename Value="unit3.pas"/>
-        <Caret Line="38" Column="14" TopLine="9"/>
-      </Position9>
-      <Position10>
-        <Filename Value="../../rxmdi.pas"/>
-        <Caret Line="52" TopLine="30"/>
-      </Position10>
-      <Position11>
-        <Filename Value="../../rxmdi.pas"/>
-        <Caret Line="612" Column="5" TopLine="599"/>
-      </Position11>
-      <Position12>
-        <Filename Value="../../rxmdi.pas"/>
-        <Caret Line="101" Column="14" TopLine="80"/>
-      </Position12>
-      <Position13>
-        <Filename Value="../../rxmdi.pas"/>
-        <Caret Line="712" Column="3" TopLine="594"/>
-      </Position13>
-      <Position14>
-        <Filename Value="../../rxmdi.pas"/>
-        <Caret Line="608" TopLine="594"/>
-      </Position14>
-      <Position15>
-        <Filename Value="../../rxmdi.pas"/>
-        <Caret Line="609" TopLine="594"/>
-      </Position15>
-      <Position16>
-        <Filename Value="../../rxmdi.pas"/>
-        <Caret Line="610" TopLine="594"/>
-      </Position16>
-      <Position17>
-        <Filename Value="../../rxmdi.pas"/>
-        <Caret Line="611" TopLine="594"/>
-      </Position17>
-      <Position18>
-        <Filename Value="../../rxmdi.pas"/>
-        <Caret Line="613" TopLine="594"/>
-      </Position18>
-      <Position19>
-        <Filename Value="../../rxmdi.pas"/>
-        <Caret Line="608" TopLine="594"/>
-      </Position19>
-      <Position20>
-        <Filename Value="../../rxmdi.pas"/>
-        <Caret Line="609" TopLine="594"/>
-      </Position20>
-      <Position21>
-        <Filename Value="../../rxmdi.pas"/>
-        <Caret Line="610" TopLine="594"/>
-      </Position21>
-      <Position22>
-        <Filename Value="../../rxmdi.pas"/>
-        <Caret Line="611" TopLine="594"/>
-      </Position22>
-      <Position23>
-        <Filename Value="../../rxmdi.pas"/>
-        <Caret Line="613" TopLine="594"/>
-      </Position23>
-      <Position24>
-        <Filename Value="unit4.pas"/>
-        <Caret Line="45" Column="26" TopLine="13"/>
-      </Position24>
-      <Position25>
-        <Filename Value="unit4.pas"/>
-        <Caret Line="46" Column="26" TopLine="13"/>
-      </Position25>
-      <Position26>
-        <Filename Value="unit4.pas"/>
-        <Caret Line="45" Column="26" TopLine="13"/>
-      </Position26>
-      <Position27>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="75" Column="26" TopLine="45"/>
-      </Position27>
-      <Position28>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="82" Column="26" TopLine="47"/>
-      </Position28>
-      <Position29>
        <Filename Value="unit1.pas"/>
        <Caret Line="67" Column="34" TopLine="56"/>
-      </Position29>
-      <Position30>
-        <Filename Value="../../rxmdi.pas"/>
-        <Caret Line="739" TopLine="705"/>
-      </Position30>
+      </Position4>
    </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>
 </CONFIG>
--- a/components/rx/trunk/Demos/RxMemDSFilter/project1.lps
+++ b/components/rx/trunk/Demos/RxMemDSFilter/project1.lps
@ -21,7 +21,7 @@
        <ResourceBaseClass Value="Form"/>
        <UnitName Value="Unit1"/>
        <IsVisibleTab Value="True"/>
-        <TopLine Value="64"/>
+        <TopLine Value="52"/>
        <CursorPos X="29" Y="102"/>
        <UsageCount Value="26"/>
        <Loaded Value="True"/>
@ -29,59 +29,53 @@
      </Unit1>
      <Unit2>
        <Filename Value="../../rxdbgrid.pas"/>
-        <EditorIndex Value="1"/>
+        <EditorIndex Value="-1"/>
        <TopLine Value="4622"/>
        <CursorPos X="52" Y="4655"/>
        <UsageCount Value="13"/>
        <Bookmarks Count="1">
          <Item0 Y="5132" ID="1"/>
        </Bookmarks>
-        <Loaded Value="True"/>
      </Unit2>
      <Unit3>
        <Filename Value="../../rxdconst.pas"/>
-        <EditorIndex Value="6"/>
+        <EditorIndex Value="-1"/>
        <TopLine Value="102"/>
        <CursorPos X="73" Y="118"/>
        <UsageCount Value="13"/>
-        <Loaded Value="True"/>
      </Unit3>
      <Unit4>
        <Filename Value="../../dbutils.pas"/>
-        <EditorIndex Value="4"/>
+        <EditorIndex Value="-1"/>
        <TopLine Value="381"/>
        <CursorPos X="30" Y="386"/>
        <UsageCount Value="13"/>
-        <Loaded Value="True"/>
      </Unit4>
      <Unit5>
        <Filename Value="/home/install/source/fpcsrc/packages/fcl-db/src/base/db.pas"/>
-        <EditorIndex Value="5"/>
+        <EditorIndex Value="-1"/>
        <TopLine Value="1358"/>
        <CursorPos X="51" Y="1372"/>
        <UsageCount Value="13"/>
-        <Loaded Value="True"/>
      </Unit5>
      <Unit6>
        <Filename Value="../../../../lcl/grids.pas"/>
        <UnitName Value="Grids"/>
-        <EditorIndex Value="3"/>
+        <EditorIndex Value="-1"/>
        <TopLine Value="8595"/>
        <CursorPos X="41" Y="8597"/>
        <UsageCount Value="12"/>
        <Bookmarks Count="1">
          <Item0 X="3" Y="8601" ID="2"/>
        </Bookmarks>
-        <Loaded Value="True"/>
      </Unit6>
      <Unit7>
        <Filename Value="../../../../lcl/dbgrids.pas"/>
        <UnitName Value="DBGrids"/>
-        <EditorIndex Value="2"/>
+        <EditorIndex Value="-1"/>
        <TopLine Value="41"/>
        <CursorPos X="23" Y="58"/>
        <UsageCount Value="11"/>
-        <Loaded Value="True"/>
      </Unit7>
      <Unit8>
        <Filename Value="../../../../lcl/controls.pp"/>
@ -99,121 +93,51 @@
        <UsageCount Value="10"/>
      </Unit9>
    </Units>
-    <JumpHistory Count="29" HistoryIndex="28">
+    <JumpHistory Count="11" HistoryIndex="10">
      <Position1>
-        <Filename Value="../../../../lcl/grids.pas"/>
-        <Caret Line="1127" Column="14" TopLine="1115"/>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="91" Column="22" TopLine="63"/>
      </Position1>
      <Position2>
-        <Filename Value="../../../../lcl/grids.pas"/>
-        <Caret Line="895" Column="15" TopLine="881"/>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="92" TopLine="63"/>
      </Position2>
      <Position3>
-        <Filename Value="../../../../lcl/grids.pas"/>
-        <Caret Line="1127" Column="58" TopLine="1103"/>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="68" TopLine="63"/>
      </Position3>
      <Position4>
-        <Filename Value="../../rxdbgrid.pas"/>
-        <Caret Line="854" Column="14" TopLine="841"/>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="69" TopLine="64"/>
      </Position4>
      <Position5>
-        <Filename Value="../../../../lcl/grids.pas"/>
-        <Caret Line="1127" Column="14" TopLine="1115"/>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="94" TopLine="64"/>
      </Position5>
      <Position6>
-        <Filename Value="../../../../lcl/grids.pas"/>
-        <Caret Line="858" Column="15" TopLine="845"/>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="93" TopLine="67"/>
      </Position6>
      <Position7>
-        <Filename Value="../../../../lcl/grids.pas"/>
-        <Caret Line="1127" Column="58" TopLine="1103"/>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="98" Column="57" TopLine="72"/>
      </Position7>
      <Position8>
-        <Filename Value="../../rxdbgrid.pas"/>
-        <Caret Line="854" Column="14" TopLine="841"/>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="53" Column="43" TopLine="38"/>
      </Position8>
      <Position9>
-        <Filename Value="../../../../lcl/grids.pas"/>
-        <Caret Line="1127" Column="14" TopLine="1115"/>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="46" Column="42" TopLine="31"/>
      </Position9>
      <Position10>
-        <Filename Value="../../../../lcl/grids.pas"/>
-        <Caret Line="858" Column="15" TopLine="844"/>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="103" TopLine="73"/>
      </Position10>
      <Position11>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="91" Column="22" TopLine="63"/>
-      </Position11>
-      <Position12>
-        <Filename Value="../../rxdbgrid.pas"/>
-        <Caret Line="870" Column="14" TopLine="856"/>
-      </Position12>
-      <Position13>
-        <Filename Value="../../../../lcl/dbgrids.pas"/>
-        <Caret Line="475" Column="14" TopLine="463"/>
-      </Position13>
-      <Position14>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="92" TopLine="63"/>
-      </Position14>
-      <Position15>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="68" TopLine="63"/>
-      </Position15>
-      <Position16>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="69" TopLine="64"/>
-      </Position16>
-      <Position17>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="94" TopLine="64"/>
-      </Position17>
-      <Position18>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="93" TopLine="67"/>
-      </Position18>
-      <Position19>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="98" Column="57" TopLine="72"/>
-      </Position19>
-      <Position20>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="53" Column="43" TopLine="38"/>
-      </Position20>
-      <Position21>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="46" Column="42" TopLine="31"/>
-      </Position21>
-      <Position22>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="103" TopLine="73"/>
-      </Position22>
-      <Position23>
        <Filename Value="unit1.pas"/>
        <Caret Line="99" Column="60" TopLine="73"/>
-      </Position23>
-      <Position24>
-        <Filename Value="../../rxdbgrid.pas"/>
-        <Caret Line="870" Column="14" TopLine="856"/>
-      </Position24>
-      <Position25>
-        <Filename Value="../../rxdbgrid.pas"/>
-      </Position25>
-      <Position26>
-        <Filename Value="../../rxdbgrid.pas"/>
-        <Caret Line="83" Column="5" TopLine="58"/>
-      </Position26>
-      <Position27>
-        <Filename Value="../../rxdbgrid.pas"/>
-      </Position27>
-      <Position28>
-        <Filename Value="../../rxdbgrid.pas"/>
-        <Caret Line="83" Column="14" TopLine="58"/>
-      </Position28>
-      <Position29>
-        <Filename Value="../../rxdbgrid.pas"/>
-        <Caret Line="433" Column="79" TopLine="417"/>
-      </Position29>
+      </Position11>
    </JumpHistory>
  </ProjectSession>
 </CONFIG>
--- a/components/rx/trunk/Demos/RxVersionInfo/project1.res
+++ b/components/rx/trunk/Demos/RxVersionInfo/project1.res
--- a/components/rx/trunk/Demos/RxViewsPanel/project1.lpi
+++ b/components/rx/trunk/Demos/RxViewsPanel/project1.lpi
@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
  <ProjectOptions>
    <Version Value="9"/>
@ -7,14 +7,10 @@
      <Title Value="RxViewsPanel demo"/>
      <UseXPManifest Value="True"/>
      <Icon Value="0"/>
-      <ActiveWindowIndexAtStart Value="0"/>
    </General>
    <i18n>
      <EnableI18N LFM="False"/>
    </i18n>
-    <VersionInfo>
-      <StringTable ProductVersion=""/>
-    </VersionInfo>
    <BuildModes Count="1">
      <Item1 Name="default" Default="True"/>
    </BuildModes>
@ -41,264 +37,221 @@
        <PackageName Value="LCL"/>
      </Item3>
    </RequiredPackages>
-    <Units Count="15">
+    <Units Count="14">
      <Unit0>
        <Filename Value="project1.lpr"/>
        <IsPartOfProject Value="True"/>
-        <UnitName Value="project1"/>
-        <EditorIndex Value="2"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="1"/>
-        <CursorPos X="1" Y="15"/>
+        <EditorIndex Value="-1"/>
+        <CursorPos Y="15"/>
        <UsageCount Value="23"/>
-        <Loaded Value="True"/>
      </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="16"/>
+        <TopLine Value="15"/>
        <CursorPos X="7" Y="34"/>
        <UsageCount Value="23"/>
        <Loaded Value="True"/>
        <LoadedDesigner Value="True"/>
      </Unit1>
      <Unit2>
-        <Filename Value="/usr/local/share/lazarus/components/rxnew/rxviewspanel.pas"/>
+        <Filename Value="../../rxviewspanel.pas"/>
        <UnitName Value="RxViewsPanel"/>
-        <EditorIndex Value="1"/>
-        <WindowIndex Value="0"/>
+        <EditorIndex Value="-1"/>
        <TopLine Value="167"/>
        <CursorPos X="36" Y="201"/>
        <UsageCount Value="11"/>
        <Bookmarks Count="2">
-          <Item0 X="1" Y="295" ID="1"/>
+          <Item0 Y="295" ID="1"/>
          <Item1 X="3" Y="330" ID="2"/>
        </Bookmarks>
-        <Loaded Value="True"/>
      </Unit2>
      <Unit3>
-        <Filename Value="/usr/local/share/lazarus/components/rxnew/registerrx.pas"/>
-        <UnitName Value="registerrx"/>
-        <WindowIndex Value="0"/>
+        <Filename Value="../../registerrx.pas"/>
        <TopLine Value="40"/>
        <CursorPos X="30" Y="50"/>
        <UsageCount Value="11"/>
      </Unit3>
      <Unit4>
-        <Filename Value="/usr/local/share/lazarus/components/rxnew/rxtoolbar.pas"/>
-        <UnitName Value="rxtoolbar"/>
-        <WindowIndex Value="0"/>
+        <Filename Value="../../rxtoolbar.pas"/>
        <TopLine Value="1113"/>
        <CursorPos X="45" Y="1143"/>
        <UsageCount Value="11"/>
      </Unit4>
      <Unit5>
-        <Filename Value="/usr/local/share/lazarus/components/rxnew/rxaboutdialog.pas"/>
+        <Filename Value="../../rxaboutdialog.pas"/>
        <UnitName Value="RxAboutDialog"/>
-        <WindowIndex Value="0"/>
        <TopLine Value="27"/>
        <CursorPos X="3" Y="46"/>
        <UsageCount Value="10"/>
      </Unit5>
      <Unit6>
-        <Filename Value="/usr/local/share/lazarus/lcl/extctrls.pp"/>
+        <Filename Value="../../../../lcl/extctrls.pp"/>
        <UnitName Value="ExtCtrls"/>
-        <WindowIndex Value="0"/>
        <TopLine Value="1147"/>
        <CursorPos X="13" Y="1179"/>
        <UsageCount Value="10"/>
      </Unit6>
      <Unit7>
-        <Filename Value="/usr/local/share/lazarus/lcl/buttons.pp"/>
+        <Filename Value="../../../../lcl/buttons.pp"/>
        <UnitName Value="Buttons"/>
-        <WindowIndex Value="0"/>
        <TopLine Value="331"/>
        <CursorPos X="17" Y="350"/>
        <UsageCount Value="10"/>
      </Unit7>
      <Unit8>
-        <Filename Value="/usr/local/share/lazarus/lcl/stdctrls.pp"/>
+        <Filename Value="../../../../lcl/stdctrls.pp"/>
        <UnitName Value="StdCtrls"/>
-        <WindowIndex Value="0"/>
        <TopLine Value="1420"/>
        <CursorPos X="3" Y="1439"/>
        <UsageCount Value="11"/>
      </Unit8>
      <Unit9>
        <Filename Value="../../../install/fpcsrc/rtl/objpas/classes/classesh.inc"/>
-        <WindowIndex Value="0"/>
        <TopLine Value="411"/>
        <CursorPos X="24" Y="435"/>
        <UsageCount Value="10"/>
      </Unit9>
      <Unit10>
        <Filename Value="../../../install/fpcsrc/rtl/objpas/classes/collect.inc"/>
-        <WindowIndex Value="0"/>
        <TopLine Value="18"/>
        <CursorPos X="3" Y="21"/>
        <UsageCount Value="10"/>
      </Unit10>
      <Unit11>
-        <Filename Value="/usr/local/share/lazarus/lcl/controls.pp"/>
+        <Filename Value="../../../../lcl/controls.pp"/>
        <UnitName Value="Controls"/>
-        <WindowIndex Value="0"/>
        <TopLine Value="1265"/>
        <CursorPos X="15" Y="1280"/>
        <UsageCount Value="10"/>
      </Unit11>
      <Unit12>
-        <Filename Value="/usr/local/share/lazarus/lcl/include/control.inc"/>
-        <WindowIndex Value="0"/>
+        <Filename Value="../../../../lcl/include/control.inc"/>
        <TopLine Value="3131"/>
-        <CursorPos X="1" Y="3151"/>
+        <CursorPos Y="3151"/>
        <UsageCount Value="10"/>
      </Unit12>
      <Unit13>
-        <Filename Value="/usr/local/share/lazarus/components/rxnew/Demos/RxViewsPanel/unit1.pas"/>
-        <ComponentName Value="Form1"/>
-        <HasResources Value="True"/>
-        <ResourceBaseClass Value="Form"/>
-        <UnitName Value="Unit1"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="32"/>
-        <CursorPos X="1" Y="58"/>
-        <UsageCount Value="10"/>
-      </Unit13>
-      <Unit14>
-        <Filename Value="/usr/local/share/lazarus/lcl/include/untabbednotebook.inc"/>
-        <WindowIndex Value="0"/>
+        <Filename Value="../../../../lcl/include/untabbednotebook.inc"/>
        <TopLine Value="176"/>
        <CursorPos X="17" Y="204"/>
        <UsageCount Value="10"/>
-      </Unit14>
+      </Unit13>
    </Units>
-    <JumpHistory Count="30" HistoryIndex="29">
+    <JumpHistory Count="27" HistoryIndex="26">
      <Position1>
        <Filename Value="unit1.pas"/>
-        <Caret Line="18" Column="29" TopLine="1"/>
+        <Caret Line="18" Column="29"/>
      </Position1>
      <Position2>
-        <Filename Value="/usr/local/share/lazarus/components/rxnew/rxviewspanel.pas"/>
-        <Caret Line="121" Column="98" TopLine="99"/>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="18" Column="29"/>
      </Position2>
      <Position3>
        <Filename Value="unit1.pas"/>
-        <Caret Line="18" Column="29" TopLine="1"/>
+        <Caret Line="40" Column="3" TopLine="15"/>
      </Position3>
      <Position4>
        <Filename Value="unit1.pas"/>
-        <Caret Line="40" Column="3" TopLine="15"/>
+        <Caret Line="41" Column="3" TopLine="15"/>
      </Position4>
      <Position5>
        <Filename Value="unit1.pas"/>
-        <Caret Line="41" Column="3" TopLine="15"/>
+        <Caret Line="42" Column="3" TopLine="15"/>
      </Position5>
      <Position6>
        <Filename Value="unit1.pas"/>
-        <Caret Line="42" Column="3" TopLine="15"/>
+        <Caret Line="43" Column="3" TopLine="15"/>
      </Position6>
      <Position7>
        <Filename Value="unit1.pas"/>
-        <Caret Line="43" Column="3" TopLine="15"/>
+        <Caret Line="42" Column="3" TopLine="15"/>
      </Position7>
      <Position8>
        <Filename Value="unit1.pas"/>
-        <Caret Line="42" Column="3" TopLine="15"/>
+        <Caret Line="36" Column="3" TopLine="7"/>
      </Position8>
      <Position9>
        <Filename Value="unit1.pas"/>
-        <Caret Line="36" Column="3" TopLine="7"/>
+        <Caret Line="42" Column="41" TopLine="17"/>
      </Position9>
      <Position10>
        <Filename Value="unit1.pas"/>
-        <Caret Line="42" Column="41" TopLine="17"/>
+        <Caret Line="43" Column="41" TopLine="17"/>
      </Position10>
      <Position11>
        <Filename Value="unit1.pas"/>
-        <Caret Line="43" Column="41" TopLine="17"/>
+        <Caret Line="44" Column="41" TopLine="17"/>
      </Position11>
      <Position12>
        <Filename Value="unit1.pas"/>
-        <Caret Line="44" Column="41" TopLine="17"/>
+        <Caret Line="45" Column="41" TopLine="17"/>
      </Position12>
      <Position13>
        <Filename Value="unit1.pas"/>
-        <Caret Line="45" Column="41" TopLine="17"/>
+        <Caret Line="46" Column="41" TopLine="17"/>
      </Position13>
      <Position14>
        <Filename Value="unit1.pas"/>
-        <Caret Line="46" Column="41" TopLine="17"/>
+        <Caret Line="47" Column="41" TopLine="18"/>
      </Position14>
      <Position15>
        <Filename Value="unit1.pas"/>
-        <Caret Line="47" Column="41" TopLine="18"/>
+        <Caret Line="48" Column="41" TopLine="19"/>
      </Position15>
      <Position16>
        <Filename Value="unit1.pas"/>
-        <Caret Line="48" Column="41" TopLine="19"/>
+        <Caret Line="49" Column="41" TopLine="20"/>
      </Position16>
      <Position17>
        <Filename Value="unit1.pas"/>
-        <Caret Line="49" Column="41" TopLine="20"/>
+        <Caret Line="50" Column="41" TopLine="21"/>
      </Position17>
      <Position18>
        <Filename Value="unit1.pas"/>
-        <Caret Line="50" Column="41" TopLine="21"/>
+        <Caret Line="51" Column="41" TopLine="22"/>
      </Position18>
      <Position19>
        <Filename Value="unit1.pas"/>
-        <Caret Line="51" Column="41" TopLine="22"/>
+        <Caret Line="52" Column="41" TopLine="27"/>
      </Position19>
      <Position20>
        <Filename Value="unit1.pas"/>
-        <Caret Line="52" Column="41" TopLine="27"/>
+        <Caret Line="58" Column="29" TopLine="33"/>
      </Position20>
      <Position21>
-        <Filename Value="/usr/local/share/lazarus/components/rxnew/rxviewspanel.pas"/>
-        <Caret Line="156" Column="25" TopLine="151"/>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="58" Column="29" TopLine="9"/>
      </Position21>
      <Position22>
        <Filename Value="unit1.pas"/>
-        <Caret Line="58" Column="29" TopLine="33"/>
+        <Caret Line="53" Column="3" TopLine="50"/>
      </Position22>
      <Position23>
-        <Filename Value="/usr/local/share/lazarus/components/rxnew/rxviewspanel.pas"/>
-        <Caret Line="201" Column="36" TopLine="194"/>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="54" Column="3" TopLine="51"/>
      </Position23>
      <Position24>
        <Filename Value="unit1.pas"/>
-        <Caret Line="58" Column="29" TopLine="9"/>
+        <Caret Line="55" Column="3" TopLine="13"/>
      </Position24>
      <Position25>
        <Filename Value="unit1.pas"/>
-        <Caret Line="53" Column="3" TopLine="50"/>
+        <Caret Line="56" Column="3" TopLine="24"/>
      </Position25>
      <Position26>
        <Filename Value="unit1.pas"/>
-        <Caret Line="54" Column="3" TopLine="51"/>
+        <Caret Line="57" Column="3" TopLine="25"/>
      </Position26>
      <Position27>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="55" Column="3" TopLine="13"/>
-      </Position27>
-      <Position28>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="56" Column="3" TopLine="24"/>
-      </Position28>
-      <Position29>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="57" Column="3" TopLine="25"/>
-      </Position29>
-      <Position30>
        <Filename Value="unit1.pas"/>
        <Caret Line="33" Column="7" TopLine="16"/>
-      </Position30>
+      </Position27>
    </JumpHistory>
  </ProjectOptions>
  <CompilerOptions>
@ -317,12 +270,6 @@
        </Win32>
      </Options>
    </Linking>
-    <Other>
-      <CompilerMessages>
-        <UseMsgFile Value="True"/>
-      </CompilerMessages>
-      <CompilerPath Value="$(CompPath)"/>
-    </Other>
  </CompilerOptions>
  <Debugging>
    <Exceptions Count="3">
--- a/components/rx/trunk/Demos/RxViewsPanel/project1.res
+++ b/components/rx/trunk/Demos/RxViewsPanel/project1.res
--- a/components/rx/trunk/Demos/TestRXMemDSLoad/rx_ext_test_harness.lpi
+++ b/components/rx/trunk/Demos/TestRXMemDSLoad/rx_ext_test_harness.lpi
@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
  <ProjectOptions>
    <Version Value="9"/>
@ -6,14 +6,10 @@
      <MainUnit Value="0"/>
      <ResourceType Value="res"/>
      <UseXPManifest Value="True"/>
-      <ActiveWindowIndexAtStart Value="0"/>
    </General>
    <i18n>
      <EnableI18N LFM="False"/>
    </i18n>
-    <VersionInfo>
-      <StringTable ProductVersion=""/>
-    </VersionInfo>
    <BuildModes Count="1" Active="Default">
      <Item1 Name="Default" Default="True"/>
    </BuildModes>
@ -25,7 +21,6 @@
    <RunParams>
      <local>
        <FormatVersion Value="1"/>
-        <LaunchingApplication PathPlusParams="/usr/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
      </local>
    </RunParams>
    <RequiredPackages Count="4">
@ -46,35 +41,24 @@
      <Unit0>
        <Filename Value="rx_ext_test_harness.lpr"/>
        <IsPartOfProject Value="True"/>
-        <UnitName Value="rx_ext_test_harness"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="1"/>
        <CursorPos X="35" Y="9"/>
        <UsageCount Value="27"/>
      </Unit0>
      <Unit1>
        <Filename Value="rx_ext_test_case_1.pas"/>
        <IsPartOfProject Value="True"/>
-        <UnitName Value="rx_ext_test_case_1"/>
-        <EditorIndex Value="0"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="1"/>
+        <IsVisibleTab Value="True"/>
+        <TopLine Value="66"/>
        <CursorPos X="33" Y="120"/>
        <UsageCount Value="27"/>
        <Loaded Value="True"/>
      </Unit1>
      <Unit2>
-        <Filename Value="/usr/local/src/fpc-2.4.2/packages/fcl-fpcunit/src/testregistry.pp"/>
-        <UnitName Value="testregistry"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="1"/>
-        <CursorPos X="1" Y="1"/>
+        <Filename Value="../../../../../../src/fpc-2.4.2/packages/fcl-fpcunit/src/testregistry.pp"/>
        <UsageCount Value="12"/>
      </Unit2>
      <Unit3>
        <Filename Value="../../../lazarus/components/rxnew/rx/rxmemds.pas"/>
-        <UnitName Value="rxmemds"/>
-        <WindowIndex Value="0"/>
        <TopLine Value="18"/>
        <CursorPos X="14" Y="41"/>
        <UsageCount Value="13"/>
@ -82,133 +66,98 @@
      <Unit4>
        <Filename Value="../../../lazarus/components/fpcunit/guitestrunner.pas"/>
        <UnitName Value="GuiTestRunner"/>
-        <EditorIndex Value="2"/>
-        <WindowIndex Value="0"/>
+        <EditorIndex Value="-1"/>
        <TopLine Value="207"/>
-        <CursorPos X="1" Y="247"/>
+        <CursorPos Y="247"/>
        <UsageCount Value="13"/>
-        <Loaded Value="True"/>
      </Unit4>
      <Unit5>
-        <Filename Value="/usr/local/src/fpc-2.4.2/packages/fcl-fpcunit/src/fpcunit.pp"/>
-        <UnitName Value="fpcunit"/>
-        <WindowIndex Value="0"/>
+        <Filename Value="../../../../../../src/fpc-2.4.2/packages/fcl-fpcunit/src/fpcunit.pp"/>
        <TopLine Value="1226"/>
        <CursorPos X="10" Y="908"/>
        <UsageCount Value="12"/>
      </Unit5>
      <Unit6>
        <Filename Value="../../../lazarus/components/rxnew/rx/ex_rx_datapacket.pas"/>
-        <UnitName Value="ex_rx_datapacket"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="1"/>
-        <CursorPos X="1" Y="1"/>
        <UsageCount Value="11"/>
      </Unit6>
      <Unit7>
        <Filename Value="../../../lazarus/components/rxnew/rx/ex_rx_xml_datapacket.pas"/>
-        <UnitName Value="ex_rx_xml_datapacket"/>
-        <WindowIndex Value="0"/>
        <TopLine Value="329"/>
        <CursorPos X="30" Y="342"/>
        <UsageCount Value="11"/>
      </Unit7>
      <Unit8>
-        <Filename Value="/usr/local/src/fpc-2.4.2/packages/fcl-db/src/base/db.pas"/>
-        <UnitName Value="db"/>
-        <WindowIndex Value="0"/>
+        <Filename Value="../../../../../../src/fpc-2.4.2/packages/fcl-db/src/base/db.pas"/>
        <TopLine Value="238"/>
        <CursorPos X="17" Y="255"/>
        <UsageCount Value="11"/>
      </Unit8>
      <Unit9>
-        <Filename Value="/usr/local/src/fpc-2.4.2/rtl/objpas/sysutils/datih.inc"/>
-        <WindowIndex Value="0"/>
+        <Filename Value="../../../../../../src/fpc-2.4.2/rtl/objpas/sysutils/datih.inc"/>
        <TopLine Value="100"/>
        <CursorPos X="10" Y="109"/>
        <UsageCount Value="11"/>
      </Unit9>
      <Unit10>
-        <Filename Value="/usr/local/src/fpc-2.4.2/rtl/objpas/sysutils/dati.inc"/>
-        <WindowIndex Value="0"/>
+        <Filename Value="../../../../../../src/fpc-2.4.2/rtl/objpas/sysutils/dati.inc"/>
        <TopLine Value="1101"/>
        <CursorPos X="3" Y="1108"/>
        <UsageCount Value="11"/>
      </Unit10>
      <Unit11>
-        <Filename Value="/usr/local/src/fpc-2.4.2/rtl/objpas/sysutils/syspchh.inc"/>
-        <WindowIndex Value="0"/>
+        <Filename Value="../../../../../../src/fpc-2.4.2/rtl/objpas/sysutils/syspchh.inc"/>
        <TopLine Value="12"/>
        <CursorPos X="10" Y="29"/>
        <UsageCount Value="11"/>
      </Unit11>
      <Unit12>
-        <Filename Value="/usr/local/src/fpc-2.4.2/rtl/inc/genstr.inc"/>
-        <WindowIndex Value="0"/>
+        <Filename Value="../../../../../../src/fpc-2.4.2/rtl/inc/genstr.inc"/>
        <TopLine Value="243"/>
        <CursorPos X="9" Y="248"/>
        <UsageCount Value="11"/>
      </Unit12>
      <Unit13>
-        <Filename Value="/usr/local/share/lazarus/components/rxnew/rxmemds.pas"/>
-        <UnitName Value="rxmemds"/>
-        <IsVisibleTab Value="True"/>
-        <EditorIndex Value="1"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="1"/>
+        <Filename Value="../../rxmemds.pas"/>
+        <EditorIndex Value="-1"/>
        <CursorPos X="45" Y="40"/>
        <UsageCount Value="10"/>
-        <Loaded Value="True"/>
      </Unit13>
      <Unit14>
-        <Filename Value="/usr/local/share/lazarus/components/rxnew/ex_rx_bin_datapacket.pas"/>
-        <UnitName Value="ex_rx_bin_datapacket"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="1"/>
-        <CursorPos X="1" Y="1"/>
+        <Filename Value="../../ex_rx_bin_datapacket.pas"/>
        <UsageCount Value="10"/>
      </Unit14>
      <Unit15>
-        <Filename Value="/usr/local/share/lazarus/components/rxnew/ex_rx_datapacket.pas"/>
-        <UnitName Value="ex_rx_datapacket"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="1"/>
-        <CursorPos X="1" Y="1"/>
+        <Filename Value="../../ex_rx_datapacket.pas"/>
        <UsageCount Value="10"/>
      </Unit15>
      <Unit16>
-        <Filename Value="/usr/local/share/lazarus/components/rxnew/ex_rx_xml_datapacket.pas"/>
-        <UnitName Value="ex_rx_xml_datapacket"/>
-        <WindowIndex Value="0"/>
+        <Filename Value="../../ex_rx_xml_datapacket.pas"/>
        <TopLine Value="323"/>
        <CursorPos X="80" Y="343"/>
        <UsageCount Value="10"/>
      </Unit16>
      <Unit17>
        <Filename Value="../rx/rxmemds.pas"/>
-        <UnitName Value="rxmemds"/>
-        <WindowIndex Value="0"/>
        <TopLine Value="3"/>
        <CursorPos X="3" Y="41"/>
        <UsageCount Value="10"/>
      </Unit17>
      <Unit18>
        <Filename Value="../../../../install/fpcsrc/packages/fcl-db/src/base/db.pas"/>
-        <UnitName Value="db"/>
-        <WindowIndex Value="0"/>
        <TopLine Value="1367"/>
        <CursorPos X="3" Y="1339"/>
        <UsageCount Value="10"/>
      </Unit18>
    </Units>
-    <JumpHistory Count="20" HistoryIndex="19">
+    <JumpHistory Count="17" HistoryIndex="16">
      <Position1>
        <Filename Value="rx_ext_test_case_1.pas"/>
-        <Caret Line="134" Column="1" TopLine="111"/>
+        <Caret Line="134" TopLine="111"/>
      </Position1>
      <Position2>
        <Filename Value="rx_ext_test_case_1.pas"/>
-        <Caret Line="135" Column="1" TopLine="111"/>
+        <Caret Line="135" TopLine="111"/>
      </Position2>
      <Position3>
        <Filename Value="rx_ext_test_case_1.pas"/>
@ -216,15 +165,15 @@
      </Position3>
      <Position4>
        <Filename Value="rx_ext_test_case_1.pas"/>
-        <Caret Line="101" Column="1" TopLine="81"/>
+        <Caret Line="101" TopLine="81"/>
      </Position4>
      <Position5>
        <Filename Value="rx_ext_test_case_1.pas"/>
-        <Caret Line="123" Column="1" TopLine="93"/>
+        <Caret Line="123" TopLine="93"/>
      </Position5>
      <Position6>
        <Filename Value="rx_ext_test_case_1.pas"/>
-        <Caret Line="116" Column="1" TopLine="93"/>
+        <Caret Line="116" TopLine="93"/>
      </Position6>
      <Position7>
        <Filename Value="rx_ext_test_case_1.pas"/>
@ -268,20 +217,8 @@
      </Position16>
      <Position17>
        <Filename Value="rx_ext_test_case_1.pas"/>
-        <Caret Line="120" Column="33" TopLine="1"/>
+        <Caret Line="120" Column="33"/>
      </Position17>
-      <Position18>
-        <Filename Value="/usr/local/share/lazarus/components/rxnew/rxmemds.pas"/>
-        <Caret Line="207" Column="5" TopLine="268"/>
-      </Position18>
-      <Position19>
-        <Filename Value="/usr/local/share/lazarus/components/rxnew/rxmemds.pas"/>
-        <Caret Line="1689" Column="1" TopLine="1690"/>
-      </Position19>
-      <Position20>
-        <Filename Value="/usr/local/share/lazarus/components/rxnew/rxmemds.pas"/>
-        <Caret Line="73" Column="42" TopLine="53"/>
-      </Position20>
    </JumpHistory>
  </ProjectOptions>
  <CompilerOptions>
@ -289,9 +226,6 @@
    <SearchPaths>
      <IncludeFiles Value="$(ProjOutDir)"/>
    </SearchPaths>
-    <Other>
-      <CompilerPath Value="$(CompPath)"/>
-    </Other>
  </CompilerOptions>
  <Debugging>
    <Exceptions Count="3">
--- a/components/rx/trunk/Demos/TestRXMemDSLoad/rx_ext_test_harness.res
+++ b/components/rx/trunk/Demos/TestRXMemDSLoad/rx_ext_test_harness.res
--- a/components/rx/trunk/Demos/Text90/project1.lpi
+++ b/components/rx/trunk/Demos/Text90/project1.lpi
@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
  <ProjectOptions>
    <Version Value="9"/>
@ -8,7 +8,6 @@
        <LRSInOutputDirectory Value="False"/>
      </Flags>
      <MainUnit Value="0"/>
-      <ActiveWindowIndexAtStart Value="0"/>
    </General>
    <BuildModes Count="1">
      <Item1 Name="default" Default="True"/>
@ -38,23 +37,22 @@
        <MinVersion Major="1" Valid="True"/>
      </Item3>
    </RequiredPackages>
-    <Units Count="27">
+    <Units Count="26">
      <Unit0>
        <Filename Value="project1.lpr"/>
        <IsPartOfProject Value="True"/>
-        <UnitName Value="project1"/>
        <UsageCount Value="26"/>
      </Unit0>
      <Unit1>
        <Filename Value="unit1.pas"/>
        <IsPartOfProject Value="True"/>
        <ComponentName Value="Form1"/>
+        <HasResources Value="True"/>
        <ResourceBaseClass Value="Form"/>
        <UnitName Value="Unit1"/>
-        <EditorIndex Value="0"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="51"/>
-        <CursorPos X="52" Y="71"/>
+        <IsVisibleTab Value="True"/>
+        <TopLine Value="49"/>
+        <CursorPos Y="40"/>
        <UsageCount Value="26"/>
        <Loaded Value="True"/>
        <LoadedDesigner Value="True"/>
@ -152,36 +150,30 @@
        <Filename Value="C:\lazarus\components\lazreport\source\LR_BarC.pas"/>
        <ComponentName Value="frBarCodeForm"/>
        <HasResources Value="True"/>
-        <UnitName Value="LR_BarC"/>
        <TopLine Value="400"/>
        <CursorPos X="57" Y="405"/>
        <UsageCount Value="10"/>
      </Unit16>
      <Unit17>
        <Filename Value="C:\lazarus\components\lazreport\source\Barcode.pas"/>
-        <UnitName Value="Barcode"/>
        <TopLine Value="149"/>
        <CursorPos X="38" Y="150"/>
        <UsageCount Value="10"/>
      </Unit17>
      <Unit18>
        <Filename Value="C:\lazarus\components\lazreport\source\LR_Class.pas"/>
-        <UnitName Value="LR_Class"/>
        <TopLine Value="210"/>
-        <CursorPos X="1" Y="228"/>
+        <CursorPos Y="228"/>
        <UsageCount Value="10"/>
      </Unit18>
      <Unit19>
        <Filename Value="C:\lazarus\components\rxnew\rxdbgrid.pas"/>
-        <UnitName Value="rxdbgrid"/>
        <TopLine Value="931"/>
        <CursorPos X="46" Y="954"/>
        <UsageCount Value="11"/>
      </Unit19>
      <Unit20>
        <Filename Value="C:\lazarus\components\rxnew\vclutils.pas"/>
-        <UnitName Value="vclutils"/>
-        <TopLine Value="1"/>
        <CursorPos X="22" Y="27"/>
        <UsageCount Value="11"/>
      </Unit20>
@ -201,41 +193,26 @@
      </Unit22>
      <Unit23>
        <Filename Value="..\..\vclutils.pas"/>
-        <UnitName Value="vclutils"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="228"/>
-        <CursorPos X="1" Y="258"/>
+        <EditorIndex Value="-1"/>
+        <TopLine Value="286"/>
+        <CursorPos X="30" Y="289"/>
        <UsageCount Value="10"/>
      </Unit23>
      <Unit24>
        <Filename Value="..\..\rxdbgrid.pas"/>
-        <UnitName Value="rxdbgrid"/>
        <TopLine Value="1105"/>
        <CursorPos X="75" Y="1122"/>
        <UsageCount Value="10"/>
      </Unit24>
      <Unit25>
-        <Filename Value="..\..\..\..\..\..\..\..\usr\local\share\lazarus\components\rxnew\vclutils.pas"/>
-        <UnitName Value="vclutils"/>
-        <IsVisibleTab Value="True"/>
-        <EditorIndex Value="1"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="633"/>
-        <CursorPos X="5" Y="34"/>
+        <Filename Value="..\..\rx.inc"/>
+        <EditorIndex Value="-1"/>
+        <TopLine Value="18"/>
+        <CursorPos Y="52"/>
        <UsageCount Value="10"/>
-        <Loaded Value="True"/>
      </Unit25>
-      <Unit26>
-        <Filename Value="..\..\..\..\..\..\..\..\usr\local\share\lazarus\components\rxnew\rx.inc"/>
-        <EditorIndex Value="2"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="25"/>
-        <CursorPos X="1" Y="52"/>
-        <UsageCount Value="10"/>
-        <Loaded Value="True"/>
-      </Unit26>
    </Units>
-    <JumpHistory Count="7" HistoryIndex="6">
+    <JumpHistory Count="5" HistoryIndex="4">
      <Position1>
        <Filename Value="unit1.pas"/>
        <Caret Line="46" Column="47" TopLine="27"/>
@ -249,27 +226,23 @@
        <Caret Line="71" Column="52" TopLine="51"/>
      </Position3>
      <Position4>
-        <Filename Value="..\..\..\..\..\..\..\..\usr\local\share\lazarus\components\rxnew\vclutils.pas"/>
-        <Caret Line="332" Column="3" TopLine="302"/>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="71" Column="52" TopLine="29"/>
      </Position4>
      <Position5>
-        <Filename Value="..\..\..\..\..\..\..\..\usr\local\share\lazarus\components\rxnew\vclutils.pas"/>
-        <Caret Line="232" Column="9" TopLine="222"/>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="40" TopLine="28"/>
      </Position5>
-      <Position6>
-        <Filename Value="..\..\..\..\..\..\..\..\usr\local\share\lazarus\components\rxnew\rx.inc"/>
-        <Caret Line="17" Column="1" TopLine="17"/>
-      </Position6>
-      <Position7>
-        <Filename Value="..\..\..\..\..\..\..\..\usr\local\share\lazarus\components\rxnew\rx.inc"/>
-        <Caret Line="1" Column="1" TopLine="1"/>
-      </Position7>
    </JumpHistory>
  </ProjectOptions>
  <CompilerOptions>
    <Version Value="11"/>
    <PathDelim Value="\"/>
+    <Target>
+      <Filename Value="project1"/>
+    </Target>
    <SearchPaths>
+      <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
      <SrcPath Value="$(LazarusDir)\lcl;$(LazarusDir)\lcl\interfaces\$(LCLWidgetType)"/>
    </SearchPaths>
    <Parsing>
@ -284,9 +257,6 @@
        </Win32>
      </Options>
    </Linking>
-    <Other>
-      <CompilerPath Value="$(CompPath)"/>
-    </Other>
  </CompilerOptions>
  <Debugging>
    <Exceptions Count="2">
--- a/components/rx/trunk/Demos/Text90/unit1.lfm
+++ b/components/rx/trunk/Demos/Text90/unit1.lfm
@ -9,7 +9,7 @@ object Form1: TForm1
  ClientWidth = 536
  OnCreate = FormCreate
  SessionProperties = 'Edit1.Text'
-  LCLVersion = '0.9.27'
+  LCLVersion = '1.7'
  object PaintBox1: TPaintBox
    Left = 16
    Height = 129
@ -19,19 +19,18 @@ object Form1: TForm1
  end
  object Edit1: TEdit
    Left = 8
-    Height = 27
+    Height = 37
    Top = 152
    Width = 192
-    AutoSize = True
    OnChange = Edit1Change
    TabOrder = 0
    Text = 'Edit1'
  end
  object RadioGroup1: TRadioGroup
    Left = 208
-    Height = 136
+    Height = 153
    Top = 8
-    Width = 79
+    Width = 78
    AutoFill = True
    AutoSize = True
    Caption = 'Direction'
@ -43,8 +42,8 @@ object Form1: TForm1
    ChildSizing.ShrinkVertical = crsScaleChilds
    ChildSizing.Layout = cclLeftToRightThenTopToBottom
    ChildSizing.ControlsPerLine = 1
-    ClientHeight = 117
-    ClientWidth = 75
+    ClientHeight = 132
+    ClientWidth = 76
    ItemIndex = 4
    Items.Strings = (
      '0 %'
@ -61,23 +60,92 @@ object Form1: TForm1
    Height = 308
    Top = 192
    Width = 536
+    ColumnDefValues.BlobText = '(данные)'
    TitleButtons = False
    AutoSort = False
    Columns = <    
      item
        Title.Alignment = taCenter
        Title.Orientation = toHorizontal
+        Title.Caption = 'DEMO_1'
        FieldName = 'DEMO_1'
+        EditButtons = <>
+        Filter.IsNull = False
+        Filter.IsAll = True
        Filter.DropDownRows = 0
+        Filter.EmptyValue = '(Пусто)'
+        Filter.AllValue = '(All values)'
+        Filter.EmptyFont.Style = [fsItalic]
        Filter.ItemIndex = -1
+        Footers = <>
      end>
+    KeyStrokes = <    
+      item
+        Command = rxgcShowFindDlg
+        ShortCut = 16454
+        Enabled = True
+      end    
+      item
+        Command = rxgcShowColumnsDlg
+        ShortCut = 16471
+        Enabled = True
+      end    
+      item
+        Command = rxgcShowFilterDlg
+        ShortCut = 16468
+        Enabled = True
+      end    
+      item
+        Command = rxgcShowSortDlg
+        ShortCut = 16467
+        Enabled = True
+      end    
+      item
+        Command = rxgcShowQuickFilter
+        ShortCut = 16465
+        Enabled = True
+      end    
+      item
+        Command = rxgcHideQuickFilter
+        ShortCut = 16456
+        Enabled = True
+      end    
+      item
+        Command = rxgcSelectAll
+        ShortCut = 16449
+        Enabled = True
+      end    
+      item
+        Command = rxgcDeSelectAll
+        ShortCut = 16429
+        Enabled = True
+      end    
+      item
+        Command = rxgcInvertSelection
+        ShortCut = 16426
+        Enabled = True
+      end    
+      item
+        Command = rxgcOptimizeColumnsWidth
+        ShortCut = 16427
+        Enabled = True
+      end    
+      item
+        Command = rxgcCopyCellValue
+        ShortCut = 16451
+        Enabled = True
+      end>
+    FooterOptions.DrawFullLine = False
    OptionsRx = []
    Align = alBottom
    Anchors = [akTop, akLeft, akRight, akBottom]
+    Color = clWindow
+    DrawFullLine = False
    FocusColor = clRed
    SelectedColor = clHighlight
    GridLineStyle = psSolid
    DataSource = Datasource1
+    Options = [dgEditing, dgTitles, dgIndicator, dgColumnResize, dgColumnMove, dgColLines, dgRowLines, dgAlwaysShowSelection, dgConfirmDelete, dgCancelOnExit]
    ParentColor = False
    TabOrder = 2
    TitleStyle = tsNative
@ -89,7 +157,6 @@ object Form1: TForm1
        Name = 'DEMO_1'
        DataType = ftInteger
        Precision = -1
-        Size = 0
      end    
      item
        Name = 'Demo2'
@ -97,6 +164,7 @@ object Form1: TForm1
        Precision = -1
        Size = 40
      end>
+    PacketRecords = 0
    left = 312
    top = 64
    object RxMemoryData1DEMO_11: TLongintField
@ -121,7 +189,7 @@ object Form1: TForm1
      Size = 40
    end
  end
-  object Datasource1: TDatasource
+  object Datasource1: TDataSource
    DataSet = RxMemoryData1
    left = 312
    top = 32
--- a/components/rx/trunk/Demos/Text90/unit1.lrs
+++ b/components/rx/trunk/Demos/Text90/unit1.lrs
@ -1,42 +0,0 @@
-{ ��� - ���� ��������, ������������� ��������� lazarus }
-
-LazarusResources.Add('TForm1','FORMDATA',[
-  'TPF0'#6'TForm1'#5'Form1'#4'Left'#3'q'#1#6'Height'#3#244#1#3'Top'#3#228#0#5'W'
-  +'idth'#3#24#2#13'ActiveControl'#7#24'RadioGroup1.RadioButton4'#7'Caption'#6#5
-  +'Form1'#12'ClientHeight'#3#244#1#11'ClientWidth'#3#24#2#8'OnCreate'#7#10'For'
-  +'mCreate'#17'SessionProperties'#6#10'Edit1.Text'#10'LCLVersion'#6#6'0.9.27'#0
-  +#9'TPaintBox'#9'PaintBox1'#4'Left'#2#16#6'Height'#3#129#0#3'Top'#2#16#5'Widt'
-  +'h'#3#184#0#7'OnPaint'#7#14'PaintBox1Paint'#0#0#5'TEdit'#5'Edit1'#4'Left'#2#8
-  +#6'Height'#2#27#3'Top'#3#152#0#5'Width'#3#192#0#8'AutoSize'#9#8'OnChange'#7
-  +#11'Edit1Change'#8'TabOrder'#2#0#4'Text'#6#5'Edit1'#0#0#11'TRadioGroup'#11'R'
-  +'adioGroup1'#4'Left'#3#208#0#6'Height'#3#136#0#3'Top'#2#8#5'Width'#2'O'#8'Au'
-  +'toFill'#9#8'AutoSize'#9#7'Caption'#6#9'Direction'#28'ChildSizing.LeftRightS'
-  +'pacing'#2#6#28'ChildSizing.TopBottomSpacing'#2#6#29'ChildSizing.EnlargeHori'
-  +'zontal'#7#24'crsHomogenousChildResize'#27'ChildSizing.EnlargeVertical'#7#24
-  +'crsHomogenousChildResize'#28'ChildSizing.ShrinkHorizontal'#7#14'crsScaleChi'
-  +'lds'#26'ChildSizing.ShrinkVertical'#7#14'crsScaleChilds'#18'ChildSizing.Lay'
-  +'out'#7#29'cclLeftToRightThenTopToBottom'#27'ChildSizing.ControlsPerLine'#2#1
-  +#12'ClientHeight'#2'u'#11'ClientWidth'#2'K'#9'ItemIndex'#2#4#13'Items.String'
-  +'s'#1#6#3'0 %'#6#4'90 %'#6#5'180 %'#6#5'270 %'#6#5'360 %'#0#7'OnClick'#7#15
-  +'CheckBox1Change'#8'TabOrder'#2#1#0#0#9'TRxDBGrid'#9'RxDBGrid1'#4'Left'#2#0#6
-  +'Height'#3'4'#1#3'Top'#3#192#0#5'Width'#3#24#2#12'TitleButtons'#8#8'AutoSort'
-  +#8#7'Columns'#14#1#15'Title.Alignment'#7#8'taCenter'#17'Title.Orientation'#7
-  +#12'toHorizontal'#9'FieldName'#6#6'DEMO_1'#19'Filter.DropDownRows'#2#0#16'Fi'
-  +'lter.ItemIndex'#2#255#0#0#9'OptionsRx'#11#0#5'Align'#7#8'alBottom'#7'Anchor'
-  +'s'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#10'FocusColor'#7#5'clRed'
-  +#13'SelectedColor'#7#11'clHighlight'#13'GridLineStyle'#7#7'psSolid'#10'DataS'
-  +'ource'#7#11'Datasource1'#11'ParentColor'#8#8'TabOrder'#2#2#10'TitleStyle'#7
-  +#8'tsNative'#0#0#13'TRxMemoryData'#13'RxMemoryData1'#14'AutoCalcFields'#8#9
-  +'FieldDefs'#14#1#4'Name'#6#6'DEMO_1'#8'DataType'#7#9'ftInteger'#9'Precision'
-  +#2#255#4'Size'#2#0#0#1#4'Name'#6#5'Demo2'#8'DataType'#7#8'ftString'#9'Precis'
-  +'ion'#2#255#4'Size'#2'('#0#0#4'left'#3'8'#1#3'top'#2'@'#0#13'TLongintField'
-  +#20'RxMemoryData1DEMO_11'#12'DisplayWidth'#2#10#9'FieldKind'#7#6'fkData'#9'F'
-  +'ieldName'#6#6'DEMO_1'#5'Index'#2#0#11'LookupCache'#8#13'ProviderFlags'#11#10
-  +'pfInUpdate'#9'pfInWhere'#0#8'ReadOnly'#8#8'Required'#8#0#0#12'TStringField'
-  +#19'RxMemoryData1Demo21'#12'DisplayWidth'#2'('#9'FieldKind'#7#6'fkData'#9'Fi'
-  +'eldName'#6#5'Demo2'#5'Index'#2#1#11'LookupCache'#8#13'ProviderFlags'#11#10
-  +'pfInUpdate'#9'pfInWhere'#0#8'ReadOnly'#8#8'Required'#8#4'Size'#2'('#0#0#0#11
-  +'TDatasource'#11'Datasource1'#7'DataSet'#7#13'RxMemoryData1'#4'left'#3'8'#1#3
-  +'top'#2' '#0#0#15'TIniPropStorage'#15'IniPropStorage1'#12'StoredValues'#14#0
-  +#4'left'#3#191#1#3'top'#2#19#0#0#0
-]);
--- a/components/rx/trunk/Demos/Text90/unit1.pas
+++ b/components/rx/trunk/Demos/Text90/unit1.pas
@ -37,6 +37,8 @@ var

 implementation

+{$R *.lfm}
+
 { TForm1 }

 procedure TForm1.PaintBox1Paint(Sender: TObject);
@ -82,8 +84,5 @@ begin
  RxMemoryData1.Open;
 end;

-initialization
-  {$I unit1.lrs}
-
 end.