diff --git a/components/rx/Demos/AutoSort/AutoSortDemo.lpi b/components/rx/Demos/AutoSort/AutoSortDemo.lpi
index 37d0f263d..19e068f15 100644
--- a/components/rx/Demos/AutoSort/AutoSortDemo.lpi
+++ b/components/rx/Demos/AutoSort/AutoSortDemo.lpi
@@ -1,19 +1,21 @@
 <?xml version="1.0"?>
 <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"/>
+      <ActiveWindowIndexAtStart 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"/>
@@ -44,58 +46,66 @@
         <Filename Value="AutoSortDemo.lpr"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="AutoSortDemo"/>
-        <CursorPos X="1" Y="20"/>
         <TopLine Value="1"/>
+        <CursorPos X="1" Y="20"/>
         <UsageCount Value="20"/>
       </Unit0>
       <Unit1>
         <Filename Value="asdmainunit.pas"/>
-        <ComponentName Value="Form1"/>
         <IsPartOfProject Value="True"/>
+        <ComponentName Value="Form1"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="asdMainUnit"/>
-        <CursorPos X="20" Y="39"/>
-        <TopLine Value="22"/>
+        <IsVisibleTab Value="True"/>
         <EditorIndex Value="0"/>
+        <WindowIndex Value="0"/>
+        <TopLine Value="22"/>
+        <CursorPos X="20" Y="39"/>
         <UsageCount Value="20"/>
         <Loaded Value="True"/>
+        <LoadedDesigner Value="True"/>
       </Unit1>
       <Unit2>
-        <Filename Value="../../../../../../../../usr/local/share/lazarus/components/rxnew/rxsortmemds.pas"/>
+        <Filename Value="/usr/local/share/lazarus/components/rxnew/rxsortmemds.pas"/>
         <UnitName Value="rxsortmemds"/>
-        <CursorPos X="69" Y="52"/>
         <TopLine Value="24"/>
+        <CursorPos X="69" Y="52"/>
         <UsageCount Value="10"/>
       </Unit2>
       <Unit3>
-        <Filename Value="../../../../../../../../usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
+        <Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
         <UnitName Value="rxdbgrid"/>
-        <CursorPos X="1" Y="1410"/>
         <TopLine Value="1393"/>
+        <CursorPos X="1" Y="1410"/>
         <UsageCount Value="10"/>
       </Unit3>
       <Unit4>
-        <Filename Value="../../../../../../../../usr/local/share/lazarus/lcl/dbgrids.pas"/>
+        <Filename Value="/usr/local/share/lazarus/lcl/dbgrids.pas"/>
         <UnitName Value="DBGrids"/>
-        <CursorPos X="1" Y="688"/>
         <TopLine Value="671"/>
+        <CursorPos X="1" Y="688"/>
         <UsageCount Value="10"/>
       </Unit4>
       <Unit5>
-        <Filename Value="../../../../../../../../usr/local/share/lazarus/components/rxnew/rxmemds.pas"/>
+        <Filename Value="/usr/local/share/lazarus/components/rxnew/rxmemds.pas"/>
         <UnitName Value="rxmemds"/>
-        <CursorPos X="1" Y="1346"/>
         <TopLine Value="1329"/>
+        <CursorPos X="1" Y="1346"/>
         <UsageCount Value="10"/>
       </Unit5>
     </Units>
     <JumpHistory Count="0" HistoryIndex="-1"/>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="8"/>
+    <Version Value="11"/>
     <SearchPaths>
-      <IncludeFiles Value="$(ProjOutDir)/"/>
+      <IncludeFiles Value="$(ProjOutDir)"/>
     </SearchPaths>
+    <Parsing>
+      <SyntaxOptions>
+        <UseAnsiStrings Value="False"/>
+      </SyntaxOptions>
+    </Parsing>
     <Linking>
       <Options>
         <Win32>
@@ -110,7 +120,10 @@
   <Debugging>
     <BreakPoints Count="1">
       <Item1>
-        <Source Value="../../../../../../../../usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
+        <Kind Value="bpkSource"/>
+        <WatchScope Value="wpsGlobal"/>
+        <WatchKind Value="wpkWrite"/>
+        <Source Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
         <Line Value="741"/>
       </Item1>
     </BreakPoints>
diff --git a/components/rx/Demos/PhoneBookDemo/PhoneBookDemo.lpi b/components/rx/Demos/PhoneBookDemo/PhoneBookDemo.lpi
index 01f19948b..9dfb58b14 100644
--- a/components/rx/Demos/PhoneBookDemo/PhoneBookDemo.lpi
+++ b/components/rx/Demos/PhoneBookDemo/PhoneBookDemo.lpi
@@ -50,11 +50,11 @@
       </Item1>
       <Item2>
         <PackageName Value="DBFLaz"/>
-        <MinVersion Minor="1" Valid="True" Release="1"/>
+        <MinVersion Minor="1" Release="1" Valid="True"/>
       </Item2>
       <Item3>
         <PackageName Value="rxnew"/>
-        <MinVersion Build="93" Major="1" Minor="1" Valid="True" Release="4"/>
+        <MinVersion Major="1" Minor="1" Release="4" Build="93" Valid="True"/>
       </Item3>
       <Item4>
         <PackageName Value="LCL"/>
@@ -65,10 +65,13 @@
         <Filename Value="PhoneBookDemo.lpr"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="PhoneBookDemo"/>
+        <IsVisibleTab Value="True"/>
+        <EditorIndex Value="1"/>
         <WindowIndex Value="0"/>
         <TopLine Value="1"/>
         <CursorPos X="3" Y="12"/>
         <UsageCount Value="27"/>
+        <Loaded Value="True"/>
       </Unit0>
       <Unit1>
         <Filename Value="pbmainunit.pas"/>
@@ -76,10 +79,9 @@
         <ComponentName Value="pbMainForm"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="pbMainUnit"/>
-        <IsVisibleTab Value="True"/>
         <EditorIndex Value="0"/>
         <WindowIndex Value="0"/>
-        <TopLine Value="34"/>
+        <TopLine Value="59"/>
         <CursorPos X="52" Y="23"/>
         <UsageCount Value="27"/>
         <Loaded Value="True"/>
@@ -108,9 +110,9 @@
         <ComponentName Value="pbEditDataForm"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="pbEditDataUnit"/>
-        <EditorIndex Value="1"/>
+        <EditorIndex Value="2"/>
         <WindowIndex Value="0"/>
-        <TopLine Value="3"/>
+        <TopLine Value="15"/>
         <CursorPos X="3" Y="15"/>
         <UsageCount Value="25"/>
         <Loaded Value="True"/>
@@ -276,7 +278,7 @@
     </JumpHistory>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="10"/>
+    <Version Value="11"/>
     <PathDelim Value="\"/>
     <Target>
       <Filename Value="PhoneBookDemo"/>
@@ -285,10 +287,6 @@
       <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Linking>
-      <Debugging>
-        <GenerateDebugInfo Value="True"/>
-        <DebugInfoType Value="dsAuto"/>
-      </Debugging>
       <Options>
         <Win32>
           <GraphicApplication Value="True"/>
diff --git a/components/rx/Demos/PhoneBookDemo/languages/PhoneBookDemo.po b/components/rx/Demos/PhoneBookDemo/languages/PhoneBookDemo.po
index 052262e0e..3cc416a33 100644
--- a/components/rx/Demos/PhoneBookDemo/languages/PhoneBookDemo.po
+++ b/components/rx/Demos/PhoneBookDemo/languages/PhoneBookDemo.po
@@ -1,127 +1,127 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=UTF-8"
 
-#: TPBEDITDATAFORM.CAPTION
+#: tpbeditdataform.caption
 msgid "Phone book data"
 msgstr ""
 
-#: TPBEDITDATAFORM.LABEL1.CAPTION
+#: tpbeditdataform.label1.caption
 msgid "Patronymic"
 msgstr ""
 
-#: TPBEDITDATAFORM.LABEL2.CAPTION
+#: tpbeditdataform.label2.caption
 msgid "Name"
 msgstr ""
 
-#: TPBEDITDATAFORM.LABEL3.CAPTION
+#: tpbeditdataform.label3.caption
 msgid "Surname"
 msgstr ""
 
-#: TPBEDITDATAFORM.LABEL4.CAPTION
+#: tpbeditdataform.label4.caption
 msgid "Phone"
 msgstr ""
 
-#: TPBEDITDATAFORM.LABEL5.CAPTION
+#: tpbeditdataform.label5.caption
 msgctxt "TPBEDITDATAFORM.LABEL5.CAPTION"
 msgid "ICQ"
 msgstr ""
 
-#: TPBEDITDATAFORM.LABEL6.CAPTION
+#: tpbeditdataform.label6.caption
 msgid "Memo"
 msgstr ""
 
-#: TPBMAINFORM.CAPTION
+#: tpbmainform.caption
 msgid "Phone book"
 msgstr ""
 
-#: TPBMAINFORM.EDTDELETE.CAPTION
+#: tpbmainform.edtdelete.caption
 msgid "Delete"
 msgstr ""
 
-#: TPBMAINFORM.EDTEDIT.CAPTION
+#: tpbmainform.edtedit.caption
 msgctxt "TPBMAINFORM.EDTEDIT.CAPTION"
 msgid "Edit"
 msgstr ""
 
-#: TPBMAINFORM.EDTFIND.CAPTION
+#: tpbmainform.edtfind.caption
 msgid "Find"
 msgstr ""
 
-#: TPBMAINFORM.EDTNEW.CAPTION
+#: tpbmainform.edtnew.caption
 msgid "New"
 msgstr ""
 
-#: TPBMAINFORM.EDTPRINT.CAPTION
+#: tpbmainform.edtprint.caption
 msgid "Print"
 msgstr ""
 
-#: TPBMAINFORM.HLPABOUT.CAPTION
+#: tpbmainform.hlpabout.caption
 msgid "About"
 msgstr ""
 
-#: TPBMAINFORM.MENUITEM1.CAPTION
+#: tpbmainform.menuitem1.caption
 msgid "System"
 msgstr ""
 
-#: TPBMAINFORM.MENUITEM10.CAPTION
+#: tpbmainform.menuitem10.caption
 msgctxt "TPBMAINFORM.MENUITEM10.CAPTION"
 msgid "-"
 msgstr ""
 
-#: TPBMAINFORM.MENUITEM14.CAPTION
+#: tpbmainform.menuitem14.caption
 msgctxt "TPBMAINFORM.MENUITEM14.CAPTION"
 msgid "-"
 msgstr ""
 
-#: TPBMAINFORM.MENUITEM16.CAPTION
+#: tpbmainform.menuitem16.caption
 msgctxt "TPBMAINFORM.MENUITEM16.CAPTION"
 msgid "-"
 msgstr ""
 
-#: TPBMAINFORM.MENUITEM18.CAPTION
+#: tpbmainform.menuitem18.caption
 msgid "Help"
 msgstr ""
 
-#: TPBMAINFORM.MENUITEM3.CAPTION
+#: tpbmainform.menuitem3.caption
 msgctxt "TPBMAINFORM.MENUITEM3.CAPTION"
 msgid "Edit"
 msgstr ""
 
-#: TPBMAINFORM.MENUITEM7.CAPTION
+#: tpbmainform.menuitem7.caption
 msgctxt "TPBMAINFORM.MENUITEM7.CAPTION"
 msgid "-"
 msgstr ""
 
-#: TPBMAINFORM.RXDBGRID1.COLUMNS[0].TITLE.CAPTION
+#: tpbmainform.rxdbgrid1.columns[0].title.caption
 msgid "ID"
 msgstr ""
 
-#: TPBMAINFORM.RXDBGRID1.COLUMNS[1].TITLE.CAPTION
+#: tpbmainform.rxdbgrid1.columns[1].title.caption
 msgid "PATRONYMIC"
 msgstr ""
 
-#: TPBMAINFORM.RXDBGRID1.COLUMNS[2].TITLE.CAPTION
+#: tpbmainform.rxdbgrid1.columns[2].title.caption
 msgid "NAME"
 msgstr ""
 
-#: TPBMAINFORM.RXDBGRID1.COLUMNS[3].TITLE.CAPTION
+#: tpbmainform.rxdbgrid1.columns[3].title.caption
 msgid "SURNAME"
 msgstr ""
 
-#: TPBMAINFORM.RXDBGRID1.COLUMNS[4].TITLE.CAPTION
+#: tpbmainform.rxdbgrid1.columns[4].title.caption
 msgid "PHONE"
 msgstr ""
 
-#: TPBMAINFORM.RXDBGRID1.COLUMNS[5].TITLE.CAPTION
+#: tpbmainform.rxdbgrid1.columns[5].title.caption
 msgctxt "TPBMAINFORM.RXDBGRID1.COLUMNS[5].TITLE.CAPTION"
 msgid "ICQ"
 msgstr ""
 
-#: TPBMAINFORM.RXDBGRID1.COLUMNS[6].TITLE.CAPTION
+#: tpbmainform.rxdbgrid1.columns[6].title.caption
 msgid "MEMO"
 msgstr ""
 
-#: TPBMAINFORM.SYSEXIT.CAPTION
+#: tpbmainform.sysexit.caption
 msgid "Exit"
 msgstr ""
 
diff --git a/components/rx/Demos/RxDBGrid/RxDBGridDemo.lpi b/components/rx/Demos/RxDBGrid/RxDBGridDemo.lpi
index 45798e3c3..acb7cb195 100644
--- a/components/rx/Demos/RxDBGrid/RxDBGridDemo.lpi
+++ b/components/rx/Demos/RxDBGrid/RxDBGridDemo.lpi
@@ -51,7 +51,7 @@
       </Item3>
       <Item4>
         <PackageName Value="rxnew"/>
-        <MinVersion Build="56" Major="1" Valid="True" Release="18"/>
+        <MinVersion Major="1" Release="18" Build="56" Valid="True"/>
       </Item4>
     </RequiredPackages>
     <Units Count="58">
@@ -59,10 +59,12 @@
         <Filename Value="RxDBGridDemo.lpr"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="RxDBGridDemo"/>
+        <EditorIndex Value="1"/>
         <WindowIndex Value="0"/>
         <TopLine Value="1"/>
         <CursorPos X="9" Y="16"/>
         <UsageCount Value="54"/>
+        <Loaded Value="True"/>
       </Unit0>
       <Unit1>
         <Filename Value="rxdbgridmainunit.pas"/>
@@ -73,7 +75,7 @@
         <IsVisibleTab Value="True"/>
         <EditorIndex Value="0"/>
         <WindowIndex Value="0"/>
-        <TopLine Value="93"/>
+        <TopLine Value="105"/>
         <CursorPos X="3" Y="97"/>
         <UsageCount Value="54"/>
         <Loaded Value="True"/>
@@ -501,7 +503,7 @@
         <UsageCount Value="10"/>
       </Unit57>
     </Units>
-    <JumpHistory Count="3" HistoryIndex="2">
+    <JumpHistory Count="4" HistoryIndex="3">
       <Position1>
         <Filename Value="rxdbgridmainunit.pas"/>
         <Caret Line="9" Column="11" TopLine="1"/>
@@ -514,10 +516,14 @@
         <Filename Value="rxdbgridmainunit.pas"/>
         <Caret Line="96" Column="3" TopLine="92"/>
       </Position3>
+      <Position4>
+        <Filename Value="RxDBGridDemo.lpr"/>
+        <Caret Line="16" Column="9" TopLine="1"/>
+      </Position4>
     </JumpHistory>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="10"/>
+    <Version Value="11"/>
     <Target>
       <Filename Value="RxDBGridDemo"/>
     </Target>
@@ -531,10 +537,6 @@
       </SyntaxOptions>
     </Parsing>
     <Linking>
-      <Debugging>
-        <GenerateDebugInfo Value="True"/>
-        <DebugInfoType Value="dsAuto"/>
-      </Debugging>
       <Options>
         <Win32>
           <GraphicApplication Value="True"/>
diff --git a/components/rx/Demos/RxDBGrid/rxdbgridmainunit.lfm b/components/rx/Demos/RxDBGrid/rxdbgridmainunit.lfm
index 79db7f3f8..5d38dad5b 100644
--- a/components/rx/Demos/RxDBGrid/rxdbgridmainunit.lfm
+++ b/components/rx/Demos/RxDBGrid/rxdbgridmainunit.lfm
@@ -1,11 +1,11 @@
 object RxDBGridMainForm: TRxDBGridMainForm
-  Left = 232
+  Left = 151
   Height = 786
-  Top = 47
+  Top = 48
   Width = 1187
   ActiveControl = Panel1
   Caption = 'RxDBGrid Demo'
-  ClientHeight = 764
+  ClientHeight = 763
   ClientWidth = 1187
   Menu = MainMenu1
   OnCreate = FormCreate
@@ -13,8 +13,8 @@ object RxDBGridMainForm: TRxDBGridMainForm
   LCLVersion = '0.9.31'
   object RxDBGrid1: TRxDBGrid
     Left = 0
-    Height = 698
-    Top = 66
+    Height = 699
+    Top = 64
     Width = 1187
     TitleButtons = True
     AutoSort = True
@@ -22,7 +22,6 @@ object RxDBGridMainForm: TRxDBGridMainForm
       item
         Title.Alignment = taCenter
         Title.Caption = '...'
-        Title.PrefixOption = poNone
         Title.Orientation = toHorizontal
         Title.Hint = 'DEVELOPER'
         Title.ShowHint = True
@@ -43,7 +42,6 @@ object RxDBGridMainForm: TRxDBGridMainForm
       item
         Title.Alignment = taCenter
         Title.Caption = 'Code'
-        Title.PrefixOption = poNone
         Title.Orientation = toHorizontal
         Title.Hint = 'Code - ID'
         Title.ShowHint = True
@@ -62,7 +60,6 @@ object RxDBGridMainForm: TRxDBGridMainForm
       item
         Title.Alignment = taCenter
         Title.Caption = 'Developer'
-        Title.PrefixOption = poNone
         Title.Orientation = toHorizontal
         Title.Hint = 'Developer full name'
         Title.ShowHint = True
@@ -78,7 +75,6 @@ object RxDBGridMainForm: TRxDBGridMainForm
       item
         Title.Alignment = taCenter
         Title.Caption = 'Computer software (all info) - Программное обеспечение|Name'
-        Title.PrefixOption = poNone
         Title.Orientation = toHorizontal
         Title.Hint = 'Product name'
         Title.ShowHint = True
@@ -94,7 +90,6 @@ object RxDBGridMainForm: TRxDBGridMainForm
       item
         Title.Alignment = taCenter
         Title.Caption = 'Computer software (all info) - Программное обеспечение|Cost'
-        Title.PrefixOption = poNone
         Title.Orientation = toHorizontal
         Title.Hint = 'Product price'
         Title.ShowHint = True
@@ -115,7 +110,6 @@ object RxDBGridMainForm: TRxDBGridMainForm
       item
         Title.Alignment = taCenter
         Title.Caption = 'Computer software (all info) - Программное обеспечение|Date Present'
-        Title.PrefixOption = poNone
         Title.Orientation = toHorizontal
         Title.Hint = 'Soft date present...'
         Title.ShowHint = True
@@ -130,7 +124,6 @@ object RxDBGridMainForm: TRxDBGridMainForm
       item
         Title.Alignment = taCenter
         Title.Caption = 'DEVELOPER_ID'
-        Title.PrefixOption = poNone
         Title.Orientation = toHorizontal
         Title.Hint = 'DEVELOPER'
         Title.ShowHint = True
@@ -151,7 +144,6 @@ object RxDBGridMainForm: TRxDBGridMainForm
         )
         Title.Alignment = taCenter
         Title.Caption = 'Rait'
-        Title.PrefixOption = poNone
         Title.Orientation = toHorizontal
         FieldName = 'RAIT'
         Filter.Font.Style = [fsItalic]
@@ -192,6 +184,9 @@ object RxDBGridMainForm: TRxDBGridMainForm
         ShortCut = 16456
         Enabled = True
       end>
+    FooterOptions.Active = True
+    FooterOptions.Color = clYellow
+    FooterOptions.RowCount = 1
     PropertyStorage = XMLPropStorage1
     Version = 1
     OptionsRx = [rdgAllowColumnsForm, rdgAllowDialogFind, rdgHighlightFocusCol, rdgHighlightFocusRow, rdgDblClickOptimizeColWidth, rdgFooterRows, rdgXORColSizing, rdgMultiTitleLines, rdgAllowQuickSearch, rdgAllowQuickFilter, rdgAllowFilterForm, rdgAllowSortForm, rdgAllowToolMenu]
@@ -215,22 +210,22 @@ object RxDBGridMainForm: TRxDBGridMainForm
   end
   object Panel1: TPanel
     Left = 0
-    Height = 66
+    Height = 64
     Top = 0
     Width = 1187
     Align = alTop
     AutoSize = True
-    ClientHeight = 66
+    ClientHeight = 64
     ClientWidth = 1187
     TabOrder = 1
     object Label1: TLabel
       AnchorSideLeft.Control = Button2
       AnchorSideLeft.Side = asrBottom
       AnchorSideTop.Control = Panel1
-      Left = 279
-      Height = 14
+      Left = 270
+      Height = 16
       Top = 7
-      Width = 29
+      Width = 36
       BorderSpacing.Around = 6
       Caption = 'Mode'
       ParentColor = False
@@ -239,9 +234,9 @@ object RxDBGridMainForm: TRxDBGridMainForm
       AnchorSideLeft.Control = Panel1
       AnchorSideTop.Control = Panel1
       Left = 7
-      Height = 29
+      Height = 27
       Top = 7
-      Width = 93
+      Width = 86
       Action = actCalcTotal
       AutoSize = True
       BorderSpacing.Around = 6
@@ -251,10 +246,10 @@ object RxDBGridMainForm: TRxDBGridMainForm
       AnchorSideLeft.Control = Button1
       AnchorSideLeft.Side = asrBottom
       AnchorSideTop.Control = Panel1
-      Left = 106
-      Height = 29
+      Left = 99
+      Height = 27
       Top = 7
-      Width = 167
+      Width = 165
       Action = actOptimizeColumnsWidthAll
       AutoSize = True
       BorderSpacing.Around = 6
@@ -265,11 +260,11 @@ object RxDBGridMainForm: TRxDBGridMainForm
       AnchorSideLeft.Side = asrBottom
       AnchorSideTop.Control = CheckBox2
       AnchorSideTop.Side = asrBottom
-      Left = 508
-      Height = 23
+      Left = 499
+      Height = 22
       Hint = 'Use filter line'
-      Top = 36
-      Width = 79
+      Top = 35
+      Width = 83
       BorderSpacing.Left = 6
       Caption = 'Use filter'
       OnChange = CheckBox1Change
@@ -279,12 +274,12 @@ object RxDBGridMainForm: TRxDBGridMainForm
       AnchorSideLeft.Control = Label1
       AnchorSideTop.Control = Label1
       AnchorSideTop.Side = asrBottom
-      Left = 285
-      Height = 27
-      Top = 27
+      Left = 276
+      Height = 25
+      Top = 29
       Width = 217
       BorderSpacing.Around = 6
-      ItemHeight = 19
+      ItemHeight = 0
       ItemIndex = 0
       Items.Strings = (
         'Edit mode'
@@ -299,11 +294,11 @@ object RxDBGridMainForm: TRxDBGridMainForm
       AnchorSideLeft.Control = ComboBox1
       AnchorSideLeft.Side = asrBottom
       AnchorSideTop.Control = Panel1
-      Left = 508
-      Height = 23
+      Left = 499
+      Height = 22
       Hint = 'Auto fill column width'
       Top = 7
-      Width = 128
+      Width = 133
       BorderSpacing.Around = 6
       Caption = 'Auto fill columns'
       OnChange = CheckBox2Change
@@ -313,10 +308,10 @@ object RxDBGridMainForm: TRxDBGridMainForm
       AnchorSideLeft.Control = CheckBox2
       AnchorSideLeft.Side = asrBottom
       AnchorSideTop.Control = Panel1
-      Left = 642
-      Height = 23
+      Left = 638
+      Height = 22
       Top = 7
-      Width = 116
+      Width = 120
       BorderSpacing.Around = 6
       Caption = 'Show indicator'
       Checked = True
@@ -329,10 +324,10 @@ object RxDBGridMainForm: TRxDBGridMainForm
       AnchorSideLeft.Side = asrBottom
       AnchorSideTop.Control = CheckBox3
       AnchorSideTop.Side = asrBottom
-      Left = 642
-      Height = 23
-      Top = 36
-      Width = 110
+      Left = 638
+      Height = 22
+      Top = 35
+      Width = 115
       BorderSpacing.Around = 6
       Caption = 'Show headers'
       Checked = True
diff --git a/components/rx/Demos/RxDateEdit/project1.lpi b/components/rx/Demos/RxDateEdit/project1.lpi
index 00737c78d..80ebe5aa9 100644
--- a/components/rx/Demos/RxDateEdit/project1.lpi
+++ b/components/rx/Demos/RxDateEdit/project1.lpi
@@ -1,19 +1,21 @@
 <?xml version="1.0"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="7"/>
+    <Version Value="9"/>
     <General>
       <MainUnit Value="0"/>
-      <TargetFileExt Value=""/>
-      <Icon Value="0"/>
       <UseXPManifest Value="True"/>
-      <ActiveEditorIndexAtStart Value="1"/>
+      <Icon Value="0"/>
+      <ActiveWindowIndexAtStart 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"/>
@@ -44,11 +46,13 @@
         <Filename Value="project1.lpr"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="project1"/>
-        <CursorPos X="22" Y="21"/>
-        <TopLine Value="1"/>
         <EditorIndex Value="1"/>
+        <WindowIndex Value="0"/>
+        <TopLine Value="1"/>
+        <CursorPos X="22" Y="21"/>
         <UsageCount Value="20"/>
         <Loaded Value="True"/>
+        <LoadedDesigner Value="True"/>
       </Unit0>
       <Unit1>
         <Filename Value="unit1.pas"/>
@@ -56,200 +60,206 @@
         <ComponentName Value="Form1"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="Unit1"/>
-        <CursorPos X="22" Y="9"/>
-        <TopLine Value="1"/>
+        <IsVisibleTab Value="True"/>
         <EditorIndex Value="0"/>
+        <WindowIndex Value="0"/>
+        <TopLine Value="22"/>
+        <CursorPos X="22" Y="9"/>
         <UsageCount Value="20"/>
         <Loaded Value="True"/>
+        <LoadedDesigner Value="True"/>
       </Unit1>
       <Unit2>
-        <Filename Value="../../../../../../../../usr/local/share/lazarus/components/rxnew/curredit.pas"/>
+        <Filename Value="/usr/local/share/lazarus/components/rxnew/curredit.pas"/>
         <UnitName Value="curredit"/>
-        <CursorPos X="1" Y="485"/>
-        <TopLine Value="469"/>
         <EditorIndex Value="3"/>
+        <WindowIndex Value="0"/>
+        <TopLine Value="469"/>
+        <CursorPos X="1" Y="485"/>
         <UsageCount Value="10"/>
         <Loaded Value="True"/>
       </Unit2>
       <Unit3>
-        <Filename Value="../../../../../../../../usr/local/share/lazarus/components/rxnew/tooledit.pas"/>
+        <Filename Value="/usr/local/share/lazarus/components/rxnew/tooledit.pas"/>
         <UnitName Value="tooledit"/>
-        <CursorPos X="1" Y="303"/>
         <TopLine Value="287"/>
+        <CursorPos X="1" Y="303"/>
         <UsageCount Value="10"/>
       </Unit3>
       <Unit4>
-        <Filename Value="../../../../../../../../usr/local/share/lazarus/components/rxnew/rx.inc"/>
-        <CursorPos X="20" Y="11"/>
+        <Filename Value="/usr/local/share/lazarus/components/rxnew/rx.inc"/>
         <TopLine Value="1"/>
+        <CursorPos X="20" Y="11"/>
         <UsageCount Value="10"/>
       </Unit4>
       <Unit5>
-        <Filename Value="../../../../../../../../usr/local/share/lazarus/lcl/maskedit.pp"/>
+        <Filename Value="/usr/local/share/lazarus/lcl/maskedit.pp"/>
         <UnitName Value="MaskEdit"/>
-        <CursorPos X="30" Y="145"/>
         <TopLine Value="149"/>
+        <CursorPos X="30" Y="145"/>
         <UsageCount Value="10"/>
       </Unit5>
       <Unit6>
-        <Filename Value="../../../../../../../../usr/local/share/lazarus/lcl/stdctrls.pp"/>
+        <Filename Value="/usr/local/share/lazarus/lcl/stdctrls.pp"/>
         <UnitName Value="StdCtrls"/>
-        <CursorPos X="3" Y="693"/>
         <TopLine Value="677"/>
+        <CursorPos X="3" Y="693"/>
         <UsageCount Value="10"/>
       </Unit6>
       <Unit7>
-        <Filename Value="../../../../../../../../usr/local/share/lazarus/lcl/controls.pp"/>
+        <Filename Value="/usr/local/share/lazarus/lcl/controls.pp"/>
         <UnitName Value="Controls"/>
-        <CursorPos X="15" Y="1736"/>
         <TopLine Value="1720"/>
+        <CursorPos X="15" Y="1736"/>
         <UsageCount Value="10"/>
       </Unit7>
       <Unit8>
-        <Filename Value="../../../../../../../../usr/local/share/lazarus/lcl/include/wincontrol.inc"/>
-        <CursorPos X="1" Y="5013"/>
+        <Filename Value="/usr/local/share/lazarus/lcl/include/wincontrol.inc"/>
         <TopLine Value="4997"/>
+        <CursorPos X="1" Y="5013"/>
         <UsageCount Value="10"/>
       </Unit8>
       <Unit9>
-        <Filename Value="../../../../../../../../usr/local/share/lazarus/lcl/dbctrls.pp"/>
+        <Filename Value="/usr/local/share/lazarus/lcl/dbctrls.pp"/>
         <UnitName Value="DbCtrls"/>
-        <CursorPos X="15" Y="212"/>
         <TopLine Value="196"/>
+        <CursorPos X="15" Y="212"/>
         <UsageCount Value="10"/>
       </Unit9>
       <Unit10>
-        <Filename Value="../../../../../../../../usr/local/share/lazarus/lcl/include/dbedit.inc"/>
-        <CursorPos X="3" Y="265"/>
+        <Filename Value="/usr/local/share/lazarus/lcl/include/dbedit.inc"/>
         <TopLine Value="263"/>
+        <CursorPos X="3" Y="265"/>
         <UsageCount Value="10"/>
       </Unit10>
       <Unit11>
-        <Filename Value="../../../../../../../../usr/local/share/lazarus/lcl/graphics.pp"/>
+        <Filename Value="/usr/local/share/lazarus/lcl/graphics.pp"/>
         <UnitName Value="Graphics"/>
-        <CursorPos X="15" Y="1115"/>
         <TopLine Value="1099"/>
+        <CursorPos X="15" Y="1115"/>
         <UsageCount Value="10"/>
       </Unit11>
       <Unit12>
-        <Filename Value="../../../../../../../../usr/local/share/lazarus/lcl/include/canvas.inc"/>
-        <CursorPos X="1" Y="1073"/>
+        <Filename Value="/usr/local/share/lazarus/lcl/include/canvas.inc"/>
         <TopLine Value="1057"/>
+        <CursorPos X="1" Y="1073"/>
         <UsageCount Value="10"/>
       </Unit12>
       <Unit13>
-        <Filename Value="../../../../../../../../usr/local/share/lazarus/lcl/include/control.inc"/>
-        <CursorPos X="1" Y="1631"/>
+        <Filename Value="/usr/local/share/lazarus/lcl/include/control.inc"/>
         <TopLine Value="1615"/>
+        <CursorPos X="1" Y="1631"/>
         <UsageCount Value="10"/>
       </Unit13>
       <Unit14>
-        <Filename Value="../../../../../../../../usr/local/share/lazarus/lcl/lclmessageglue.pas"/>
+        <Filename Value="/usr/local/share/lazarus/lcl/lclmessageglue.pas"/>
         <UnitName Value="LCLMessageGlue"/>
-        <CursorPos X="1" Y="121"/>
         <TopLine Value="105"/>
+        <CursorPos X="1" Y="121"/>
         <UsageCount Value="10"/>
       </Unit14>
       <Unit15>
-        <Filename Value="../../../../../../../../usr/local/share/lazarus/lcl/interfaces/gtk/gtkproc.inc"/>
-        <CursorPos X="1" Y="3712"/>
+        <Filename Value="/usr/local/share/lazarus/lcl/interfaces/gtk/gtkproc.inc"/>
         <TopLine Value="3696"/>
+        <CursorPos X="1" Y="3712"/>
         <UsageCount Value="10"/>
       </Unit15>
       <Unit16>
-        <Filename Value="../../../../../../../../usr/local/share/lazarus/lcl/interfaces/gtk/gtkcallback.inc"/>
-        <CursorPos X="1" Y="676"/>
+        <Filename Value="/usr/local/share/lazarus/lcl/interfaces/gtk/gtkcallback.inc"/>
         <TopLine Value="660"/>
+        <CursorPos X="1" Y="676"/>
         <UsageCount Value="10"/>
       </Unit16>
       <Unit17>
-        <Filename Value="../../../../../../../../usr/local/share/lazarus/lcl/interfaces/gtk/gtkwidgetset.inc"/>
-        <CursorPos X="1" Y="1226"/>
+        <Filename Value="/usr/local/share/lazarus/lcl/interfaces/gtk/gtkwidgetset.inc"/>
         <TopLine Value="1200"/>
+        <CursorPos X="1" Y="1226"/>
         <UsageCount Value="10"/>
       </Unit17>
       <Unit18>
-        <Filename Value="../../../../../../../../usr/local/share/lazarus/components/rxnew/dbdateedit.pas"/>
+        <Filename Value="/usr/local/share/lazarus/components/rxnew/dbdateedit.pas"/>
         <UnitName Value="dbdateedit"/>
-        <CursorPos X="1" Y="227"/>
-        <TopLine Value="211"/>
         <EditorIndex Value="2"/>
+        <WindowIndex Value="0"/>
+        <TopLine Value="211"/>
+        <CursorPos X="1" Y="227"/>
         <UsageCount Value="10"/>
         <Loaded Value="True"/>
       </Unit18>
     </Units>
-    <JumpHistory Count="16" HistoryIndex="15">
+    <JumpHistory Count="15" HistoryIndex="14">
       <Position1>
-        <Filename Value="../../../../../../../../usr/local/share/lazarus/components/rxnew/curredit.pas"/>
+        <Filename Value="/usr/local/share/lazarus/components/rxnew/curredit.pas"/>
         <Caret Line="485" Column="1" TopLine="469"/>
       </Position1>
       <Position2>
         <Filename Value="unit1.pas"/>
-        <Caret Line="19" Column="19" TopLine="28"/>
+        <Caret Line="46" Column="1" TopLine="28"/>
       </Position2>
       <Position3>
         <Filename Value="unit1.pas"/>
-        <Caret Line="46" Column="1" TopLine="28"/>
+        <Caret Line="18" Column="22" TopLine="8"/>
       </Position3>
       <Position4>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="18" Column="22" TopLine="8"/>
+        <Filename Value="/usr/local/share/lazarus/components/rxnew/dbdateedit.pas"/>
+        <Caret Line="224" Column="3" TopLine="222"/>
       </Position4>
       <Position5>
-        <Filename Value="../../../../../../../../usr/local/share/lazarus/components/rxnew/dbdateedit.pas"/>
-        <Caret Line="224" Column="3" TopLine="222"/>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="46" Column="1" TopLine="28"/>
       </Position5>
       <Position6>
         <Filename Value="unit1.pas"/>
-        <Caret Line="46" Column="1" TopLine="28"/>
+        <Caret Line="47" Column="1" TopLine="28"/>
       </Position6>
       <Position7>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="47" Column="1" TopLine="28"/>
+        <Filename Value="/usr/local/share/lazarus/components/rxnew/dbdateedit.pas"/>
+        <Caret Line="227" Column="1" TopLine="211"/>
       </Position7>
       <Position8>
-        <Filename Value="../../../../../../../../usr/local/share/lazarus/components/rxnew/dbdateedit.pas"/>
-        <Caret Line="227" Column="1" TopLine="211"/>
+        <Filename Value="/usr/local/share/lazarus/components/rxnew/dbdateedit.pas"/>
+        <Caret Line="228" Column="1" TopLine="212"/>
       </Position8>
       <Position9>
-        <Filename Value="../../../../../../../../usr/local/share/lazarus/components/rxnew/dbdateedit.pas"/>
-        <Caret Line="228" Column="1" TopLine="212"/>
+        <Filename Value="/usr/local/share/lazarus/components/rxnew/dbdateedit.pas"/>
+        <Caret Line="233" Column="1" TopLine="217"/>
       </Position9>
       <Position10>
-        <Filename Value="../../../../../../../../usr/local/share/lazarus/components/rxnew/dbdateedit.pas"/>
-        <Caret Line="233" Column="1" TopLine="217"/>
+        <Filename Value="/usr/local/share/lazarus/components/rxnew/dbdateedit.pas"/>
+        <Caret Line="227" Column="1" TopLine="211"/>
       </Position10>
       <Position11>
-        <Filename Value="../../../../../../../../usr/local/share/lazarus/components/rxnew/dbdateedit.pas"/>
-        <Caret Line="227" Column="1" TopLine="211"/>
+        <Filename Value="/usr/local/share/lazarus/components/rxnew/dbdateedit.pas"/>
+        <Caret Line="228" Column="1" TopLine="212"/>
       </Position11>
       <Position12>
-        <Filename Value="../../../../../../../../usr/local/share/lazarus/components/rxnew/dbdateedit.pas"/>
-        <Caret Line="228" Column="1" TopLine="212"/>
+        <Filename Value="/usr/local/share/lazarus/components/rxnew/dbdateedit.pas"/>
+        <Caret Line="233" Column="1" TopLine="217"/>
       </Position12>
       <Position13>
-        <Filename Value="../../../../../../../../usr/local/share/lazarus/components/rxnew/dbdateedit.pas"/>
-        <Caret Line="233" Column="1" TopLine="217"/>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="46" Column="26" TopLine="28"/>
       </Position13>
       <Position14>
         <Filename Value="unit1.pas"/>
-        <Caret Line="46" Column="26" TopLine="28"/>
+        <Caret Line="20" Column="25" TopLine="20"/>
       </Position14>
       <Position15>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="20" Column="25" TopLine="20"/>
-      </Position15>
-      <Position16>
         <Filename Value="unit1.pas"/>
         <Caret Line="22" Column="20" TopLine="20"/>
-      </Position16>
+      </Position15>
     </JumpHistory>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="8"/>
+    <Version Value="11"/>
     <SearchPaths>
-      <IncludeFiles Value="$(ProjOutDir)/"/>
+      <IncludeFiles Value="$(ProjOutDir)"/>
     </SearchPaths>
+    <Parsing>
+      <SyntaxOptions>
+        <UseAnsiStrings Value="False"/>
+      </SyntaxOptions>
+    </Parsing>
     <Linking>
       <Options>
         <Win32>
diff --git a/components/rx/Demos/Text90/project1.lpi b/components/rx/Demos/Text90/project1.lpi
index 0396e71ba..1afc647c0 100644
--- a/components/rx/Demos/Text90/project1.lpi
+++ b/components/rx/Demos/Text90/project1.lpi
@@ -1,16 +1,18 @@
 <?xml version="1.0"?>
 <CONFIG>
   <ProjectOptions>
+    <Version Value="9"/>
     <PathDelim Value="\"/>
-    <Version Value="7"/>
     <General>
       <Flags>
         <LRSInOutputDirectory Value="False"/>
       </Flags>
       <MainUnit Value="0"/>
-      <TargetFileExt Value=".exe"/>
-      <ActiveEditorIndexAtStart Value="0"/>
+      <ActiveWindowIndexAtStart Value="0"/>
     </General>
+    <BuildModes Count="1">
+      <Item1 Name="default" Default="True"/>
+    </BuildModes>
     <PublishOptions>
       <Version Value="2"/>
       <IgnoreBinaries Value="False"/>
@@ -36,7 +38,7 @@
         <MinVersion Major="1" Valid="True"/>
       </Item3>
     </RequiredPackages>
-    <Units Count="25">
+    <Units Count="27">
       <Unit0>
         <Filename Value="project1.lpr"/>
         <IsPartOfProject Value="True"/>
@@ -45,103 +47,105 @@
       </Unit0>
       <Unit1>
         <Filename Value="unit1.pas"/>
-        <ComponentName Value="Form1"/>
         <IsPartOfProject Value="True"/>
+        <ComponentName Value="Form1"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="Unit1"/>
-        <CursorPos X="52" Y="71"/>
-        <TopLine Value="39"/>
         <EditorIndex Value="0"/>
+        <WindowIndex Value="0"/>
+        <TopLine Value="51"/>
+        <CursorPos X="52" Y="71"/>
         <UsageCount Value="26"/>
         <Loaded Value="True"/>
+        <LoadedDesigner Value="True"/>
       </Unit1>
       <Unit2>
         <Filename Value="C:\lazarus\lcl\extctrls.pp"/>
         <UnitName Value="ExtCtrls"/>
-        <CursorPos X="83" Y="456"/>
         <TopLine Value="451"/>
+        <CursorPos X="83" Y="456"/>
         <UsageCount Value="10"/>
       </Unit2>
       <Unit3>
         <Filename Value="C:\lazarus\lcl\controls.pp"/>
         <UnitName Value="Controls"/>
-        <CursorPos X="26" Y="228"/>
         <TopLine Value="224"/>
+        <CursorPos X="26" Y="228"/>
         <UsageCount Value="10"/>
       </Unit3>
       <Unit4>
         <Filename Value="C:\lazarus\lcl\graphics.pp"/>
         <UnitName Value="Graphics"/>
-        <CursorPos X="102" Y="589"/>
         <TopLine Value="586"/>
+        <CursorPos X="102" Y="589"/>
         <UsageCount Value="10"/>
       </Unit4>
       <Unit5>
         <Filename Value="C:\lazarus\lcl\lclproc.pas"/>
         <UnitName Value="LCLProc"/>
-        <CursorPos X="70" Y="578"/>
         <TopLine Value="577"/>
+        <CursorPos X="70" Y="578"/>
         <UsageCount Value="10"/>
       </Unit5>
       <Unit6>
         <Filename Value="C:\lazarus\lcl\include\canvas.inc"/>
-        <CursorPos X="58" Y="776"/>
         <TopLine Value="771"/>
+        <CursorPos X="58" Y="776"/>
         <UsageCount Value="10"/>
       </Unit6>
       <Unit7>
         <Filename Value="C:\lazarus\lcl\include\paintbox.inc"/>
-        <CursorPos X="81" Y="18"/>
         <TopLine Value="16"/>
+        <CursorPos X="81" Y="18"/>
         <UsageCount Value="10"/>
       </Unit7>
       <Unit8>
         <Filename Value="C:\lazarus\lcl\include\graphiccontrol.inc"/>
-        <CursorPos X="101" Y="26"/>
         <TopLine Value="21"/>
+        <CursorPos X="101" Y="26"/>
         <UsageCount Value="10"/>
       </Unit8>
       <Unit9>
         <Filename Value="C:\lazarus\lcl\include\controlcanvas.inc"/>
-        <CursorPos X="59" Y="43"/>
         <TopLine Value="36"/>
+        <CursorPos X="59" Y="43"/>
         <UsageCount Value="10"/>
       </Unit9>
       <Unit10>
         <Filename Value="C:\lazarus\lcl\include\bitmap.inc"/>
-        <CursorPos X="29" Y="141"/>
         <TopLine Value="138"/>
+        <CursorPos X="29" Y="141"/>
         <UsageCount Value="10"/>
       </Unit10>
       <Unit11>
         <Filename Value="C:\lazarus\fpcsrc\rtl\objpas\classes\classes.inc"/>
-        <CursorPos X="69" Y="241"/>
         <TopLine Value="238"/>
+        <CursorPos X="69" Y="241"/>
         <UsageCount Value="10"/>
       </Unit11>
       <Unit12>
         <Filename Value="C:\lazarus\lcl\include\brush.inc"/>
-        <CursorPos X="56" Y="181"/>
         <TopLine Value="178"/>
+        <CursorPos X="56" Y="181"/>
         <UsageCount Value="10"/>
       </Unit12>
       <Unit13>
         <Filename Value="C:\lazarus\lcl\include\winapi.inc"/>
-        <CursorPos X="52" Y="228"/>
         <TopLine Value="226"/>
+        <CursorPos X="52" Y="228"/>
         <UsageCount Value="10"/>
       </Unit13>
       <Unit14>
         <Filename Value="C:\lazarus\lcl\interfaces\win32\win32winapi.inc"/>
-        <CursorPos X="67" Y="1319"/>
         <TopLine Value="1316"/>
+        <CursorPos X="67" Y="1319"/>
         <UsageCount Value="10"/>
       </Unit14>
       <Unit15>
         <Filename Value="C:\lazarus\fpcsrc\fcl\image\fpcanvas.pp"/>
         <UnitName Value="FPCanvas"/>
-        <CursorPos X="101" Y="117"/>
         <TopLine Value="117"/>
+        <CursorPos X="101" Y="117"/>
         <UsageCount Value="10"/>
       </Unit15>
       <Unit16>
@@ -149,68 +153,89 @@
         <ComponentName Value="frBarCodeForm"/>
         <HasResources Value="True"/>
         <UnitName Value="LR_BarC"/>
-        <CursorPos X="57" Y="405"/>
         <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"/>
-        <CursorPos X="38" Y="150"/>
         <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"/>
-        <CursorPos X="1" Y="228"/>
         <TopLine Value="210"/>
+        <CursorPos X="1" Y="228"/>
         <UsageCount Value="10"/>
       </Unit18>
       <Unit19>
         <Filename Value="C:\lazarus\components\rxnew\rxdbgrid.pas"/>
         <UnitName Value="rxdbgrid"/>
-        <CursorPos X="46" Y="954"/>
         <TopLine Value="931"/>
+        <CursorPos X="46" Y="954"/>
         <UsageCount Value="11"/>
       </Unit19>
       <Unit20>
         <Filename Value="C:\lazarus\components\rxnew\vclutils.pas"/>
         <UnitName Value="vclutils"/>
-        <CursorPos X="22" Y="27"/>
         <TopLine Value="1"/>
+        <CursorPos X="22" Y="27"/>
         <UsageCount Value="11"/>
       </Unit20>
       <Unit21>
         <Filename Value="C:\lazarus\lcl\dbgrids.pas"/>
         <UnitName Value="DBGrids"/>
-        <CursorPos X="23" Y="152"/>
         <TopLine Value="151"/>
+        <CursorPos X="23" Y="152"/>
         <UsageCount Value="11"/>
       </Unit21>
       <Unit22>
         <Filename Value="C:\lazarus\lcl\grids.pas"/>
         <UnitName Value="Grids"/>
-        <CursorPos X="3" Y="3719"/>
         <TopLine Value="3715"/>
+        <CursorPos X="3" Y="3719"/>
         <UsageCount Value="11"/>
       </Unit22>
       <Unit23>
         <Filename Value="..\..\vclutils.pas"/>
         <UnitName Value="vclutils"/>
-        <CursorPos X="11" Y="286"/>
-        <TopLine Value="257"/>
+        <WindowIndex Value="0"/>
+        <TopLine Value="228"/>
+        <CursorPos X="1" Y="258"/>
         <UsageCount Value="10"/>
       </Unit23>
       <Unit24>
         <Filename Value="..\..\rxdbgrid.pas"/>
         <UnitName Value="rxdbgrid"/>
-        <CursorPos X="75" Y="1122"/>
         <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"/>
+        <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="3" HistoryIndex="2">
+    <JumpHistory Count="7" HistoryIndex="6">
       <Position1>
         <Filename Value="unit1.pas"/>
         <Caret Line="46" Column="47" TopLine="27"/>
@@ -221,16 +246,37 @@
       </Position2>
       <Position3>
         <Filename Value="unit1.pas"/>
-        <Caret Line="71" Column="52" TopLine="39"/>
+        <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"/>
+      </Position4>
+      <Position5>
+        <Filename Value="..\..\..\..\..\..\..\..\usr\local\share\lazarus\components\rxnew\vclutils.pas"/>
+        <Caret Line="232" Column="9" TopLine="222"/>
+      </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="8"/>
+    <Version Value="11"/>
     <PathDelim Value="\"/>
     <SearchPaths>
-      <SrcPath Value="$(LazarusDir)\lcl\;$(LazarusDir)\lcl\interfaces\$(LCLWidgetType)\"/>
+      <SrcPath Value="$(LazarusDir)\lcl;$(LazarusDir)\lcl\interfaces\$(LCLWidgetType)"/>
     </SearchPaths>
+    <Parsing>
+      <SyntaxOptions>
+        <UseAnsiStrings Value="False"/>
+      </SyntaxOptions>
+    </Parsing>
     <Linking>
       <Options>
         <Win32>
diff --git a/components/rx/rx.inc b/components/rx/rx.inc
index ee9bae42d..f91b7308f 100644
--- a/components/rx/rx.inc
+++ b/components/rx/rx.inc
@@ -49,4 +49,4 @@
 
 //
 {.$DEFINE DBDateEdit_OLD}
-{.$DEFINE OLD_STYLE_TEXT_ROTATE}
+
diff --git a/components/rx/vclutils.pas b/components/rx/vclutils.pas
index fd7ce802b..ffd83ed1a 100644
--- a/components/rx/vclutils.pas
+++ b/components/rx/vclutils.pas
@@ -219,25 +219,8 @@ end;
 
 procedure RotateLabel(Canvas: TCanvas; x, y: Integer; const St: String; RotDegree: Integer);
 var
-{  OldFont, NewFont: HFONT;
-  LogRec: TLOGFONT;
-  DC: HDC;}
   L:integer;
 begin
-{  with Canvas do
-  begin
-    Brush.Style := bsClear;
-    GetObject(Font.Handle, SizeOf(LogRec), @LogRec);
-    LogRec.lfEscapement   := RotDegree * 10;
-    LogRec.lfOrientation  := 0;
-    LogRec.lfOutPrecision := OUT_TT_ONLY_PRECIS;
-    NewFont := CreateFontIndirect(LogRec);
-    DC := Handle;
-  end;
-  OldFont := SelectObject(DC, NewFont);
-  TextOut(DC, X, Y, @St[1], Length(St));
-  DeleteObject(SelectObject(DC, OldFont));}
-
   L:=Canvas.Font.Orientation;
   Canvas.Font.Orientation:=RotDegree * 10;
   Canvas.TextOut(X, Y, St);