diff --git a/components/richmemo/samples/testsimple/project1.lpi b/components/richmemo/samples/testsimple/project1.lpi
index 908fa2833..a0f25790d 100644
--- a/components/richmemo/samples/testsimple/project1.lpi
+++ b/components/richmemo/samples/testsimple/project1.lpi
@@ -6,7 +6,7 @@
       <MainUnit Value="0"/>
       <TargetFileExt Value=""/>
       <UseXPManifest Value="True"/>
-      <ActiveEditorIndexAtStart Value="1"/>
+      <ActiveEditorIndexAtStart Value="0"/>
     </General>
     <VersionInfo>
       <ProjectVersion Value=""/>
@@ -32,14 +32,14 @@
         <PackageName Value="LCL"/>
       </Item2>
     </RequiredPackages>
-    <Units Count="50">
+    <Units Count="54">
       <Unit0>
         <Filename Value="project1.lpr"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="project1"/>
         <CursorPos X="12" Y="6"/>
         <TopLine Value="6"/>
-        <UsageCount Value="64"/>
+        <UsageCount Value="70"/>
       </Unit0>
       <Unit1>
         <Filename Value="unit1.pas"/>
@@ -47,10 +47,10 @@
         <ComponentName Value="Form1"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="Unit1"/>
-        <CursorPos X="27" Y="57"/>
-        <TopLine Value="49"/>
+        <CursorPos X="29" Y="125"/>
+        <TopLine Value="123"/>
         <EditorIndex Value="0"/>
-        <UsageCount Value="64"/>
+        <UsageCount Value="70"/>
         <Loaded Value="True"/>
       </Unit1>
       <Unit2>
@@ -58,84 +58,84 @@
         <UnitName Value="CarbonRichMemo"/>
         <CursorPos X="31" Y="137"/>
         <TopLine Value="114"/>
-        <UsageCount Value="12"/>
+        <UsageCount Value="11"/>
       </Unit2>
       <Unit3>
         <Filename Value="../RichMemo/win32/win32richmemo.pas"/>
         <UnitName Value="Win32RichMemo"/>
         <CursorPos X="1" Y="32"/>
         <TopLine Value="15"/>
-        <UsageCount Value="6"/>
+        <UsageCount Value="5"/>
       </Unit3>
       <Unit4>
         <Filename Value="../RichMemo/richmemofactory.pas"/>
         <UnitName Value="RichMemoFactory"/>
         <CursorPos X="20" Y="22"/>
         <TopLine Value="1"/>
-        <UsageCount Value="6"/>
+        <UsageCount Value="5"/>
       </Unit4>
       <Unit5>
         <Filename Value="../RichMemo/wsrichmemo.pas"/>
         <UnitName Value="WSRichMemo"/>
         <CursorPos X="32" Y="18"/>
         <TopLine Value="1"/>
-        <UsageCount Value="6"/>
+        <UsageCount Value="5"/>
       </Unit5>
       <Unit6>
         <Filename Value="../lazarus/lcl/widgetset/wsstdctrls.pp"/>
         <UnitName Value="WSStdCtrls"/>
         <CursorPos X="32" Y="140"/>
         <TopLine Value="126"/>
-        <UsageCount Value="6"/>
+        <UsageCount Value="5"/>
       </Unit6>
       <Unit7>
         <Filename Value="../lazarus/lcl/widgetset/wscontrols.pp"/>
         <UnitName Value="WSControls"/>
         <CursorPos X="33" Y="115"/>
         <TopLine Value="100"/>
-        <UsageCount Value="6"/>
+        <UsageCount Value="5"/>
       </Unit7>
       <Unit8>
         <Filename Value="../lazarus/lcl/lcltype.pp"/>
         <UnitName Value="LCLType"/>
         <CursorPos X="3" Y="2330"/>
         <TopLine Value="2316"/>
-        <UsageCount Value="7"/>
+        <UsageCount Value="6"/>
       </Unit8>
       <Unit9>
         <Filename Value="../lazarus/lcl/interfaces/carbon/carbonedits.pp"/>
         <UnitName Value="CarbonEdits"/>
         <CursorPos X="3" Y="140"/>
         <TopLine Value="124"/>
-        <UsageCount Value="12"/>
+        <UsageCount Value="11"/>
       </Unit9>
       <Unit10>
         <Filename Value="../lazarus/lcl/widgetset/wscomctrls.pp"/>
         <UnitName Value="WSComCtrls"/>
         <CursorPos X="1" Y="144"/>
         <TopLine Value="144"/>
-        <UsageCount Value="6"/>
+        <UsageCount Value="5"/>
       </Unit10>
       <Unit11>
         <Filename Value="../lazarus/lcl/interfaces/carbon/carbonwsstdctrls.pp"/>
         <UnitName Value="CarbonWSStdCtrls"/>
         <CursorPos X="20" Y="39"/>
         <TopLine Value="30"/>
-        <UsageCount Value="10"/>
+        <UsageCount Value="9"/>
       </Unit11>
       <Unit12>
         <Filename Value="../fpc/packages/univint/src/MacOSAll.pas"/>
         <UnitName Value="MacOSAll"/>
         <CursorPos X="3" Y="35065"/>
         <TopLine Value="35051"/>
-        <UsageCount Value="11"/>
+        <UsageCount Value="10"/>
       </Unit12>
       <Unit13>
         <Filename Value="../lazarus/lcl/interfaces/carbon/carbongdiobjects.pp"/>
         <UnitName Value="CarbonGDIObjects"/>
         <CursorPos X="3" Y="1109"/>
         <TopLine Value="1100"/>
-        <UsageCount Value="31"/>
+        <UsageCount Value="35"/>
         <Bookmarks Count="1">
           <Item0 X="25" Y="150" ID="1"/>
         </Bookmarks>
@@ -146,7 +146,7 @@
         <UnitName Value="CarbonProc"/>
         <CursorPos X="13" Y="554"/>
         <TopLine Value="538"/>
-        <UsageCount Value="10"/>
+        <UsageCount Value="9"/>
         <Bookmarks Count="2">
           <Item0 X="25" Y="151" ID="1"/>
           <Item1 X="3" Y="536" ID="2"/>
@@ -157,133 +157,129 @@
         <UnitName Value="Controls"/>
         <CursorPos X="3" Y="2457"/>
         <TopLine Value="2448"/>
-        <UsageCount Value="9"/>
+        <UsageCount Value="8"/>
       </Unit15>
       <Unit16>
         <Filename Value="../fpc/rtl/objpas/sysutils/sysutilh.inc"/>
         <CursorPos X="17" Y="34"/>
         <TopLine Value="2"/>
-        <UsageCount Value="7"/>
+        <UsageCount Value="6"/>
       </Unit16>
       <Unit17>
         <Filename Value="../fpc/rtl/bsd/system.pp"/>
         <UnitName Value="System"/>
         <CursorPos X="64" Y="52"/>
         <TopLine Value="29"/>
-        <UsageCount Value="7"/>
+        <UsageCount Value="6"/>
       </Unit17>
       <Unit18>
         <Filename Value="../fpc/rtl/amiga/sysosh.inc"/>
         <CursorPos X="22" Y="18"/>
         <TopLine Value="7"/>
-        <UsageCount Value="7"/>
+        <UsageCount Value="6"/>
       </Unit18>
       <Unit19>
         <Filename Value="../RichMemo/richmemo.pas"/>
         <UnitName Value="RichMemo"/>
         <CursorPos X="15" Y="39"/>
         <TopLine Value="23"/>
-        <UsageCount Value="11"/>
+        <UsageCount Value="10"/>
       </Unit19>
       <Unit20>
         <Filename Value="../lazarus/lcl/interfaces/carbon/carbonprivate.pp"/>
         <UnitName Value="CarbonPrivate"/>
         <CursorPos X="17" Y="649"/>
         <TopLine Value="640"/>
-        <UsageCount Value="30"/>
+        <UsageCount Value="34"/>
         <Loaded Value="True"/>
       </Unit20>
       <Unit21>
         <Filename Value="../lazarus/lcl/interfaces/carbon/carbonprivatecontrol.inc"/>
         <CursorPos X="42" Y="499"/>
         <TopLine Value="495"/>
-        <UsageCount Value="8"/>
+        <UsageCount Value="7"/>
       </Unit21>
       <Unit22>
         <Filename Value="../lazarus/lcl/interfaces/carbon/carbondef.pp"/>
         <UnitName Value="CarbonDef"/>
         <CursorPos X="17" Y="649"/>
         <TopLine Value="640"/>
-        <UsageCount Value="8"/>
+        <UsageCount Value="7"/>
       </Unit22>
       <Unit23>
         <Filename Value="../lazarus/lcl/graphics.pp"/>
         <UnitName Value="Graphics"/>
         <CursorPos X="3" Y="59"/>
         <TopLine Value="45"/>
-        <UsageCount Value="8"/>
+        <UsageCount Value="7"/>
       </Unit23>
       <Unit24>
         <Filename Value="../lazarus/lcl/interfaces/carbon/carbondbgconsts.pp"/>
         <UnitName Value="CarbonDbgConsts"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="7"/>
+        <UsageCount Value="6"/>
       </Unit24>
       <Unit25>
         <Filename Value="Unit1.lrs"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="7"/>
+        <UsageCount Value="6"/>
       </Unit25>
       <Unit26>
         <Filename Value="../../../lazarus/ide/keymapping.pp"/>
         <UnitName Value="KeyMapping"/>
         <CursorPos X="74" Y="1565"/>
         <TopLine Value="1558"/>
-        <UsageCount Value="7"/>
+        <UsageCount Value="6"/>
       </Unit26>
       <Unit27>
         <Filename Value="../../richmemo.pas"/>
         <UnitName Value="RichMemo"/>
-        <CursorPos X="15" Y="55"/>
-        <TopLine Value="42"/>
-        <EditorIndex Value="6"/>
-        <UsageCount Value="27"/>
+        <CursorPos X="1" Y="44"/>
+        <TopLine Value="44"/>
+        <EditorIndex Value="10"/>
+        <UsageCount Value="31"/>
         <Loaded Value="True"/>
       </Unit27>
       <Unit28>
         <Filename Value="../../wsrichmemo.pas"/>
         <UnitName Value="WSRichMemo"/>
-        <CursorPos X="31" Y="47"/>
-        <TopLine Value="32"/>
-        <EditorIndex Value="5"/>
-        <UsageCount Value="27"/>
-        <Loaded Value="True"/>
+        <CursorPos X="1" Y="2"/>
+        <TopLine Value="1"/>
+        <UsageCount Value="25"/>
       </Unit28>
       <Unit29>
         <Filename Value="../../carbon/carbonrichmemo.pas"/>
         <UnitName Value="CarbonRichMemo"/>
-        <CursorPos X="12" Y="281"/>
-        <TopLine Value="268"/>
-        <UsageCount Value="19"/>
+        <CursorPos X="16" Y="2"/>
+        <TopLine Value="1"/>
+        <UsageCount Value="17"/>
       </Unit29>
       <Unit30>
         <Filename Value="../../../fpc/packages/univint/src/MacOSAll.pas"/>
         <UnitName Value="MacOSAll"/>
-        <CursorPos X="1" Y="495"/>
-        <TopLine Value="495"/>
-        <EditorIndex Value="4"/>
-        <UsageCount Value="18"/>
-        <Loaded Value="True"/>
+        <CursorPos X="39" Y="220678"/>
+        <TopLine Value="220670"/>
+        <UsageCount Value="16"/>
       </Unit30>
       <Unit31>
         <Filename Value="../../../fpc/rtl/objpas/sysutils/osutilsh.inc"/>
         <CursorPos X="10" Y="34"/>
         <TopLine Value="20"/>
-        <UsageCount Value="9"/>
+        <UsageCount Value="8"/>
       </Unit31>
       <Unit32>
         <Filename Value="../../../fpc/rtl/objpas/classes/classesh.inc"/>
         <CursorPos X="19" Y="728"/>
         <TopLine Value="714"/>
-        <UsageCount Value="9"/>
+        <UsageCount Value="8"/>
       </Unit32>
       <Unit33>
         <Filename Value="../../../fpc/rtl/objpas/classes/streams.inc"/>
         <CursorPos X="8" Y="147"/>
         <TopLine Value="140"/>
-        <UsageCount Value="9"/>
+        <UsageCount Value="8"/>
       </Unit33>
       <Unit34>
         <Filename Value="../../../../wnlibsvn/CarbonPaste.pas"/>
@@ -291,42 +287,44 @@
         <UnitName Value="CarbonPaste"/>
         <CursorPos X="43" Y="9"/>
         <TopLine Value="1"/>
-        <UsageCount Value="48"/>
+        <UsageCount Value="54"/>
       </Unit34>
       <Unit35>
         <Filename Value="../../../fpc/rtl/objpas/sysutils/sysutilh.inc"/>
         <CursorPos X="13" Y="185"/>
         <TopLine Value="169"/>
-        <UsageCount Value="8"/>
+        <UsageCount Value="7"/>
       </Unit35>
       <Unit36>
         <Filename Value="../../../lazarus/lcl/widgetset/wsstdctrls.pp"/>
         <UnitName Value="WSStdCtrls"/>
-        <CursorPos X="20" Y="144"/>
-        <TopLine Value="131"/>
-        <UsageCount Value="14"/>
+        <CursorPos X="20" Y="145"/>
+        <TopLine Value="138"/>
+        <UsageCount Value="13"/>
       </Unit36>
       <Unit37>
         <Filename Value="../../richmemotypes.pas"/>
         <UnitName Value="RichMemoTypes"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="9"/>
+        <UsageCount Value="8"/>
       </Unit37>
       <Unit38>
         <Filename Value="../../win32/win32richmemo.pas"/>
         <UnitName Value="Win32RichMemo"/>
-        <CursorPos X="15" Y="2"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="16"/>
+        <CursorPos X="11" Y="288"/>
+        <TopLine Value="280"/>
+        <EditorIndex Value="1"/>
+        <UsageCount Value="15"/>
+        <Loaded Value="True"/>
       </Unit38>
       <Unit39>
         <Filename Value="../../win32/win32richmemoproc.pas"/>
         <UnitName Value="Win32RichMemoProc"/>
-        <CursorPos X="35" Y="172"/>
-        <TopLine Value="154"/>
-        <EditorIndex Value="7"/>
-        <UsageCount Value="17"/>
+        <CursorPos X="27" Y="84"/>
+        <TopLine Value="70"/>
+        <EditorIndex Value="11"/>
+        <UsageCount Value="21"/>
         <Bookmarks Count="1">
           <Item0 X="1" Y="121" ID="2"/>
         </Bookmarks>
@@ -337,7 +335,7 @@
         <UnitName Value="richedit"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="12"/>
+        <UsageCount Value="11"/>
         <Bookmarks Count="1">
           <Item0 X="98" Y="366" ID="3"/>
         </Bookmarks>
@@ -346,156 +344,225 @@
         <Filename Value="../../../../../fpc/rtl/win/wininc/base.inc"/>
         <CursorPos X="1" Y="211"/>
         <TopLine Value="211"/>
-        <UsageCount Value="12"/>
+        <UsageCount Value="11"/>
       </Unit41>
       <Unit42>
         <Filename Value="../../../../../fpc/rtl/objpas/classes/classesh.inc"/>
         <CursorPos X="1" Y="791"/>
         <TopLine Value="782"/>
-        <UsageCount Value="10"/>
+        <UsageCount Value="9"/>
       </Unit42>
       <Unit43>
         <Filename Value="../../../../../fpc/rtl/objpas/classes/streams.inc"/>
         <CursorPos X="3" Y="465"/>
         <TopLine Value="462"/>
-        <UsageCount Value="10"/>
+        <UsageCount Value="9"/>
       </Unit43>
       <Unit44>
         <Filename Value="../../../../../fpc/rtl/win/wininc/ascdef.inc"/>
         <CursorPos X="120" Y="182"/>
         <TopLine Value="167"/>
-        <UsageCount Value="10"/>
+        <UsageCount Value="9"/>
       </Unit44>
       <Unit45>
         <Filename Value="../../../../../Lazarus/lcl/stdctrls.pp"/>
         <UnitName Value="StdCtrls"/>
-        <CursorPos X="1" Y="23"/>
-        <TopLine Value="1"/>
+        <CursorPos X="33" Y="677"/>
+        <TopLine Value="662"/>
+        <EditorIndex Value="2"/>
         <UsageCount Value="10"/>
+        <Loaded Value="True"/>
       </Unit45>
       <Unit46>
         <Filename Value="../../../../../Lazarus/lcl/interfaces/win32/win32def.pp"/>
         <UnitName Value="Win32Def"/>
         <CursorPos X="1" Y="10"/>
         <TopLine Value="1"/>
-        <UsageCount Value="10"/>
+        <UsageCount Value="9"/>
       </Unit46>
       <Unit47>
-        <Filename Value="../../../lazarus/lcl/interfaces/carbon/carbonedits.pp"/>
-        <UnitName Value="CarbonEdits"/>
-        <CursorPos X="1" Y="1"/>
-        <TopLine Value="1"/>
-        <EditorIndex Value="1"/>
-        <UsageCount Value="11"/>
-        <Bookmarks Count="1">
-          <Item0 X="1" Y="188" ID="3"/>
-        </Bookmarks>
+        <Filename Value="../../../../../Lazarus/lcl/interfaces/win32/win32wsstdctrls.pp"/>
+        <UnitName Value="Win32WSStdCtrls"/>
+        <CursorPos X="26" Y="83"/>
+        <TopLine Value="67"/>
+        <EditorIndex Value="6"/>
+        <UsageCount Value="10"/>
         <Loaded Value="True"/>
       </Unit47>
       <Unit48>
-        <Filename Value="../../../lazarus/lcl/interfaces/carbon/carbonstrings.pp"/>
-        <UnitName Value="CarbonStrings"/>
-        <CursorPos X="25" Y="5"/>
-        <TopLine Value="1"/>
-        <EditorIndex Value="3"/>
-        <UsageCount Value="11"/>
+        <Filename Value="../../../../../Lazarus/lcl/widgetset/wsstdctrls.pp"/>
+        <UnitName Value="WSStdCtrls"/>
+        <CursorPos X="36" Y="53"/>
+        <TopLine Value="39"/>
+        <EditorIndex Value="8"/>
+        <UsageCount Value="10"/>
         <Loaded Value="True"/>
       </Unit48>
       <Unit49>
-        <Filename Value="../../../lazarus/lcl/interfaces/carbon/carbondef.pp"/>
-        <UnitName Value="CarbonDef"/>
-        <CursorPos X="5" Y="83"/>
-        <TopLine Value="70"/>
-        <EditorIndex Value="2"/>
+        <Filename Value="../../../../../Lazarus/lcl/widgetset/wscontrols.pp"/>
+        <UnitName Value="WSControls"/>
+        <CursorPos X="30" Y="100"/>
+        <TopLine Value="85"/>
+        <EditorIndex Value="9"/>
         <UsageCount Value="10"/>
         <Loaded Value="True"/>
       </Unit49>
+      <Unit50>
+        <Filename Value="../../../../../Lazarus/lcl/interfaces/win32/win32wscontrols.pp"/>
+        <UnitName Value="Win32WSControls"/>
+        <CursorPos X="1" Y="450"/>
+        <TopLine Value="434"/>
+        <EditorIndex Value="7"/>
+        <UsageCount Value="10"/>
+        <Loaded Value="True"/>
+      </Unit50>
+      <Unit51>
+        <Filename Value="../../../../../Lazarus/lcl/include/customlabel.inc"/>
+        <CursorPos X="3" Y="229"/>
+        <TopLine Value="227"/>
+        <EditorIndex Value="5"/>
+        <UsageCount Value="10"/>
+        <Loaded Value="True"/>
+      </Unit51>
+      <Unit52>
+        <Filename Value="../../../../../Lazarus/lcl/controls.pp"/>
+        <UnitName Value="Controls"/>
+        <CursorPos X="24" Y="1784"/>
+        <TopLine Value="1769"/>
+        <EditorIndex Value="3"/>
+        <UsageCount Value="10"/>
+        <Loaded Value="True"/>
+      </Unit52>
+      <Unit53>
+        <Filename Value="../../../../../Lazarus/lcl/include/wincontrol.inc"/>
+        <CursorPos X="5" Y="4342"/>
+        <TopLine Value="4334"/>
+        <EditorIndex Value="4"/>
+        <UsageCount Value="10"/>
+        <Loaded Value="True"/>
+      </Unit53>
     </Units>
-    <JumpHistory Count="21" HistoryIndex="20">
+    <JumpHistory Count="30" HistoryIndex="29">
       <Position1>
-        <Filename Value="../../../lazarus/lcl/interfaces/carbon/carbonedits.pp"/>
-        <Caret Line="1580" Column="5" TopLine="1555"/>
+        <Filename Value="../../../../../Lazarus/lcl/interfaces/win32/win32wscontrols.pp"/>
+        <Caret Line="29" Column="1" TopLine="29"/>
       </Position1>
       <Position2>
-        <Filename Value="../../../lazarus/lcl/interfaces/carbon/carbonedits.pp"/>
-        <Caret Line="1592" Column="1" TopLine="1580"/>
+        <Filename Value="../../../../../Lazarus/lcl/interfaces/win32/win32wscontrols.pp"/>
+        <Caret Line="77" Column="30" TopLine="62"/>
       </Position2>
       <Position3>
-        <Filename Value="../../../lazarus/lcl/interfaces/carbon/carbonedits.pp"/>
-        <Caret Line="1600" Column="1" TopLine="1584"/>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="40" Column="17" TopLine="38"/>
       </Position3>
       <Position4>
-        <Filename Value="../../../lazarus/lcl/interfaces/carbon/carbonedits.pp"/>
-        <Caret Line="1880" Column="1" TopLine="1855"/>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="24" Column="16" TopLine="1"/>
       </Position4>
       <Position5>
-        <Filename Value="../../../lazarus/lcl/interfaces/carbon/carbonedits.pp"/>
-        <Caret Line="27" Column="1" TopLine="27"/>
+        <Filename Value="../../../../../Lazarus/lcl/stdctrls.pp"/>
+        <Caret Line="830" Column="17" TopLine="815"/>
       </Position5>
       <Position6>
-        <Filename Value="../../../lazarus/lcl/interfaces/carbon/carbonedits.pp"/>
-        <Caret Line="1560" Column="5" TopLine="1535"/>
+        <Filename Value="../../../../../Lazarus/lcl/stdctrls.pp"/>
+        <Caret Line="1" Column="1" TopLine="1"/>
       </Position6>
       <Position7>
-        <Filename Value="../../../lazarus/lcl/interfaces/carbon/carbonedits.pp"/>
-        <Caret Line="1557" Column="61" TopLine="1544"/>
+        <Filename Value="../../../../../Lazarus/lcl/stdctrls.pp"/>
+        <Caret Line="38" Column="16" TopLine="23"/>
       </Position7>
       <Position8>
-        <Filename Value="../../../lazarus/lcl/interfaces/carbon/carbonedits.pp"/>
-        <Caret Line="178" Column="61" TopLine="163"/>
+        <Filename Value="../../../../../Lazarus/lcl/stdctrls.pp"/>
+        <Caret Line="790" Column="16" TopLine="775"/>
       </Position8>
       <Position9>
-        <Filename Value="../../../lazarus/lcl/interfaces/carbon/carbonedits.pp"/>
-        <Caret Line="1561" Column="18" TopLine="1556"/>
+        <Filename Value="../../../../../Lazarus/lcl/stdctrls.pp"/>
+        <Caret Line="1363" Column="24" TopLine="1348"/>
       </Position9>
       <Position10>
-        <Filename Value="../../../lazarus/lcl/interfaces/carbon/carbonedits.pp"/>
-        <Caret Line="178" Column="52" TopLine="178"/>
+        <Filename Value="../../../../../Lazarus/lcl/stdctrls.pp"/>
+        <Caret Line="1391" Column="24" TopLine="1376"/>
       </Position10>
       <Position11>
-        <Filename Value="../../../lazarus/lcl/interfaces/carbon/carbonedits.pp"/>
-        <Caret Line="1557" Column="61" TopLine="1557"/>
+        <Filename Value="../../../../../Lazarus/lcl/stdctrls.pp"/>
+        <Caret Line="1" Column="1" TopLine="1"/>
       </Position11>
       <Position12>
-        <Filename Value="../../../lazarus/lcl/interfaces/carbon/carbonedits.pp"/>
-        <Caret Line="1601" Column="1" TopLine="1592"/>
+        <Filename Value="../../../../../Lazarus/lcl/stdctrls.pp"/>
+        <Caret Line="1391" Column="15" TopLine="1376"/>
       </Position12>
       <Position13>
-        <Filename Value="../../../lazarus/lcl/interfaces/carbon/carbonedits.pp"/>
-        <Caret Line="1557" Column="25" TopLine="1544"/>
+        <Filename Value="../../../../../Lazarus/lcl/stdctrls.pp"/>
+        <Caret Line="1" Column="1" TopLine="1"/>
       </Position13>
       <Position14>
-        <Filename Value="../../../lazarus/lcl/interfaces/carbon/carbonedits.pp"/>
-        <Caret Line="178" Column="52" TopLine="178"/>
+        <Filename Value="../../../../../Lazarus/lcl/stdctrls.pp"/>
+        <Caret Line="1391" Column="24" TopLine="1376"/>
       </Position14>
       <Position15>
-        <Filename Value="../../../lazarus/lcl/interfaces/carbon/carbonedits.pp"/>
-        <Caret Line="190" Column="14" TopLine="176"/>
+        <Filename Value="../../../../../Lazarus/lcl/stdctrls.pp"/>
+        <Caret Line="1" Column="1" TopLine="1"/>
       </Position15>
       <Position16>
-        <Filename Value="../../../lazarus/lcl/interfaces/carbon/carbonedits.pp"/>
-        <Caret Line="1560" Column="51" TopLine="1548"/>
+        <Filename Value="../../../../../Lazarus/lcl/stdctrls.pp"/>
+        <Caret Line="1289" Column="24" TopLine="1278"/>
       </Position16>
       <Position17>
-        <Filename Value="../../../lazarus/lcl/interfaces/carbon/carbonedits.pp"/>
-        <Caret Line="1591" Column="19" TopLine="1578"/>
+        <Filename Value="../../../../../Lazarus/lcl/stdctrls.pp"/>
+        <Caret Line="1" Column="1" TopLine="1"/>
       </Position17>
       <Position18>
-        <Filename Value="../../../lazarus/lcl/interfaces/carbon/carbonedits.pp"/>
-        <Caret Line="1606" Column="3" TopLine="1588"/>
+        <Filename Value="../../../../../Lazarus/lcl/stdctrls.pp"/>
+        <Caret Line="778" Column="33" TopLine="761"/>
       </Position18>
       <Position19>
-        <Filename Value="../../../lazarus/lcl/interfaces/carbon/carbonedits.pp"/>
-        <Caret Line="1773" Column="1" TopLine="1763"/>
+        <Filename Value="../../../../../Lazarus/lcl/stdctrls.pp"/>
+        <Caret Line="677" Column="33" TopLine="662"/>
       </Position19>
       <Position20>
-        <Filename Value="../../../lazarus/lcl/interfaces/carbon/carbonedits.pp"/>
-        <Caret Line="1" Column="1" TopLine="1"/>
+        <Filename Value="../../../../../Lazarus/lcl/controls.pp"/>
+        <Caret Line="1576" Column="3" TopLine="1561"/>
       </Position20>
       <Position21>
-        <Filename Value="../../../lazarus/lcl/interfaces/carbon/carbonedits.pp"/>
-        <Caret Line="342" Column="27" TopLine="333"/>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="24" Column="16" TopLine="1"/>
       </Position21>
+      <Position22>
+        <Filename Value="../../win32/win32richmemo.pas"/>
+        <Caret Line="45" Column="90" TopLine="43"/>
+      </Position22>
+      <Position23>
+        <Filename Value="../../win32/win32richmemo.pas"/>
+        <Caret Line="102" Column="1" TopLine="72"/>
+      </Position23>
+      <Position24>
+        <Filename Value="../../win32/win32richmemo.pas"/>
+        <Caret Line="97" Column="32" TopLine="73"/>
+      </Position24>
+      <Position25>
+        <Filename Value="../../win32/win32richmemo.pas"/>
+        <Caret Line="1" Column="1" TopLine="1"/>
+      </Position25>
+      <Position26>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="1" Column="1" TopLine="1"/>
+      </Position26>
+      <Position27>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="7" Column="13" TopLine="29"/>
+      </Position27>
+      <Position28>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="1" Column="1" TopLine="1"/>
+      </Position28>
+      <Position29>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="23" Column="10" TopLine="30"/>
+      </Position29>
+      <Position30>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="22" Column="22" TopLine="22"/>
+      </Position30>
     </JumpHistory>
   </ProjectOptions>
   <CompilerOptions>
@@ -503,13 +570,6 @@
     <SearchPaths>
       <IncludeFiles Value="$(ProjOutDir)/"/>
     </SearchPaths>
-    <Linking>
-      <Options>
-        <Win32>
-          <GraphicApplication Value="True"/>
-        </Win32>
-      </Options>
-    </Linking>
     <Other>
       <CompilerPath Value="$(CompPath)"/>
     </Other>
diff --git a/components/richmemo/samples/testsimple/unit1.lfm b/components/richmemo/samples/testsimple/unit1.lfm
index 8854d23d5..4954267d4 100644
--- a/components/richmemo/samples/testsimple/unit1.lfm
+++ b/components/richmemo/samples/testsimple/unit1.lfm
@@ -4,241 +4,92 @@ object Form1: TForm1
   Top = 181
   Width = 634
   ActiveControl = RichMemo1
-  Align = alNone
-  AllowDropFiles = False
-  AutoScroll = True
-  AutoSize = False
-  BorderIcons = [biSystemMenu, biMinimize, biMaximize]
-  BorderStyle = bsSizeable
-  BorderWidth = 0
   Caption = 'Form1'
   ClientHeight = 457
   ClientWidth = 634
-  DefaultMonitor = dmActiveForm
-  DockSite = False
-  DragKind = dkDrag
-  DragMode = dmManual
-  Enabled = True
-  FormStyle = fsNormal
   OnCreate = FormCreate
-  ParentBiDiMode = True
-  ParentFont = False
-  Position = poDesigned
-  ShowInTaskBar = stDefault
-  UseDockManager = False
   LCLVersion = '0.9.27'
-  WindowState = wsNormal
   object RichMemo1: TRichMemo
     Left = 15
     Height = 358
     Top = 16
     Width = 619
-    Align = alNone
-    Alignment = taLeftJustify
     Anchors = [akTop, akLeft, akRight, akBottom]
-    BorderStyle = bsSingle
-    Color = clWindow
-    DragCursor = crDrag
-    DragKind = dkDrag
-    DragMode = dmManual
-    Enabled = True
     Font.Height = -13
     Font.Name = 'Tahoma'
     HideSelection = False
     Lines.Strings = (
       'RichMemo1'
     )
-    MaxLength = 0
-    ParentBidiMode = True
-    ParentColor = False
     ParentFont = False
-    ParentShowHint = True
-    ReadOnly = False
     ScrollBars = ssVertical
     TabOrder = 0
-    TabStop = True
-    Visible = True
-    WantReturns = True
-    WantTabs = False
   end
   object Button1: TButton
     Left = 24
     Height = 25
     Top = 382
     Width = 160
-    Align = alNone
     Anchors = [akLeft, akBottom]
-    AutoSize = False
-    Cancel = False
     Caption = 'Make Bold and Red'
-    Color = clBtnFace
-    Default = False
-    DragCursor = crDrag
-    DragKind = dkDrag
-    DragMode = dmManual
-    Enabled = True
-    ParentBidiMode = True
-    ModalResult = 0
     OnClick = Button1Click
-    ParentFont = True
-    ParentShowHint = True
     TabOrder = 1
     TabStop = False
-    Visible = True
   end
   object Button2: TButton
     Left = 192
     Height = 25
     Top = 382
     Width = 97
-    Align = alNone
     Anchors = [akLeft, akBottom]
-    AutoSize = False
-    Cancel = False
     Caption = 'Get Attribs'
-    Color = clBtnFace
-    Default = False
-    DragCursor = crDrag
-    DragKind = dkDrag
-    DragMode = dmManual
-    Enabled = True
-    ParentBidiMode = True
-    ModalResult = 0
     OnClick = Button2Click
-    ParentFont = True
-    ParentShowHint = True
     TabOrder = 2
     TabStop = False
-    Visible = True
   end
   object Button3: TButton
     Left = 304
     Height = 25
     Top = 382
     Width = 96
-    Align = alNone
     Anchors = [akLeft, akBottom]
-    AutoSize = False
-    Cancel = False
     Caption = 'Select Font'
-    Color = clBtnFace
-    Default = False
-    DragCursor = crDrag
-    DragKind = dkDrag
-    DragMode = dmManual
-    Enabled = True
-    ParentBidiMode = True
-    ModalResult = 0
     OnClick = Button3Click
-    ParentFont = True
-    ParentShowHint = True
     TabOrder = 3
     TabStop = False
-    Visible = True
   end
   object Button4: TButton
     Left = 528
     Height = 25
     Top = 382
     Width = 75
-    Align = alNone
     Anchors = [akLeft, akBottom]
-    AutoSize = False
-    Cancel = False
     Caption = 'Save RTF'
-    Color = clBtnFace
-    Default = False
-    DragCursor = crDrag
-    DragKind = dkDrag
-    DragMode = dmManual
-    Enabled = True
-    ParentBidiMode = True
-    ModalResult = 0
     OnClick = Button4Click
-    ParentFont = True
-    ParentShowHint = True
     TabOrder = 4
     TabStop = False
-    Visible = True
   end
   object Button5: TButton
     Left = 440
     Height = 25
     Top = 382
     Width = 75
-    Align = alNone
     Anchors = [akLeft, akBottom]
-    AutoSize = False
-    Cancel = False
     Caption = 'Load RTF'
-    Color = clBtnFace
-    Default = False
-    DragCursor = crDrag
-    DragKind = dkDrag
-    DragMode = dmManual
-    Enabled = True
-    ParentBidiMode = True
-    ModalResult = 0
     OnClick = Button5Click
-    ParentFont = True
-    ParentShowHint = True
     TabOrder = 5
     TabStop = False
-    Visible = True
   end
   object Button6: TButton
     Left = 24
     Height = 25
     Top = 415
     Width = 160
-    Align = alNone
     Anchors = [akLeft, akBottom]
-    AutoSize = False
-    Cancel = False
     Caption = 'Next Style Range'
-    Color = clBtnFace
-    Default = False
-    DragCursor = crDrag
-    DragKind = dkDrag
-    DragMode = dmManual
-    Enabled = True
-    ParentBidiMode = True
-    ModalResult = 0
     OnClick = Button6Click
-    ParentFont = True
-    ParentShowHint = True
     TabOrder = 6
     TabStop = False
-    Visible = True
-  end
-  object Edit1: TEdit
-    Left = 216
-    Height = 16
-    Top = 415
-    Width = 320
-    Align = alNone
-    Alignment = taLeftJustify
-    AutoSize = True
-    AutoSelect = False
-    BorderStyle = bsSingle
-    Color = clWindow
-    CharCase = ecNormal
-    DragCursor = crDrag
-    DragKind = dkDrag
-    DragMode = dmManual
-    EchoMode = emNormal
-    Enabled = True
-    MaxLength = 0
-    ParentBidiMode = True
-    ParentColor = False
-    ParentFont = True
-    ParentShowHint = True
-    PasswordChar = #0
-    ReadOnly = False
-    TabStop = True
-    TabOrder = 7
-    Text = 'Edit1'
-    Visible = True
   end
   object FontDialog1: TFontDialog
     MinFontSize = 0
diff --git a/components/richmemo/samples/testsimple/unit1.lrs b/components/richmemo/samples/testsimple/unit1.lrs
index f4c77547f..eb58f889a 100644
--- a/components/richmemo/samples/testsimple/unit1.lrs
+++ b/components/richmemo/samples/testsimple/unit1.lrs
@@ -2,73 +2,34 @@
 
 LazarusResources.Add('TForm1','FORMDATA',[
   'TPF0'#6'TForm1'#5'Form1'#4'Left'#3#196#0#6'Height'#3#201#1#3'Top'#3#181#0#5
-  +'Width'#3'z'#2#13'ActiveControl'#7#9'RichMemo1'#5'Align'#7#6'alNone'#14'Allo'
-  +'wDropFiles'#8#10'AutoScroll'#9#8'AutoSize'#8#11'BorderIcons'#11#12'biSystem'
-  +'Menu'#10'biMinimize'#10'biMaximize'#0#11'BorderStyle'#7#10'bsSizeable'#11'B'
-  +'orderWidth'#2#0#7'Caption'#6#5'Form1'#12'ClientHeight'#3#201#1#11'ClientWid'
-  +'th'#3'z'#2#14'DefaultMonitor'#7#12'dmActiveForm'#8'DockSite'#8#8'DragKind'#7
-  +#6'dkDrag'#8'DragMode'#7#8'dmManual'#7'Enabled'#9#9'FormStyle'#7#8'fsNormal'
-  +#8'OnCreate'#7#10'FormCreate'#14'ParentBiDiMode'#9#10'ParentFont'#8#8'Positi'
-  +'on'#7#10'poDesigned'#13'ShowInTaskBar'#7#9'stDefault'#14'UseDockManager'#8
-  +#10'LCLVersion'#6#6'0.9.27'#11'WindowState'#7#8'wsNormal'#0#9'TRichMemo'#9'R'
-  +'ichMemo1'#4'Left'#2#15#6'Height'#3'f'#1#3'Top'#2#16#5'Width'#3'k'#2#5'Align'
-  +#7#6'alNone'#9'Alignment'#7#13'taLeftJustify'#7'Anchors'#11#5'akTop'#6'akLef'
-  +'t'#7'akRight'#8'akBottom'#0#11'BorderStyle'#7#8'bsSingle'#5'Color'#7#8'clWi'
-  +'ndow'#10'DragCursor'#7#6'crDrag'#8'DragKind'#7#6'dkDrag'#8'DragMode'#7#8'dm'
-  +'Manual'#7'Enabled'#9#11'Font.Height'#2#243#9'Font.Name'#6#6'Tahoma'#13'Hide'
-  +'Selection'#8#13'Lines.Strings'#1#6#9'RichMemo1'#0#9'MaxLength'#2#0#14'Paren'
-  +'tBidiMode'#9#11'ParentColor'#8#10'ParentFont'#8#14'ParentShowHint'#9#8'Read'
-  +'Only'#8#10'ScrollBars'#7#10'ssVertical'#8'TabOrder'#2#0#7'TabStop'#9#7'Visi'
-  +'ble'#9#11'WantReturns'#9#8'WantTabs'#8#0#0#7'TButton'#7'Button1'#4'Left'#2
-  +#24#6'Height'#2#25#3'Top'#3'~'#1#5'Width'#3#160#0#5'Align'#7#6'alNone'#7'Anc'
-  +'hors'#11#6'akLeft'#8'akBottom'#0#8'AutoSize'#8#6'Cancel'#8#7'Caption'#6#17
-  +'Make Bold and Red'#5'Color'#7#9'clBtnFace'#7'Default'#8#10'DragCursor'#7#6
-  +'crDrag'#8'DragKind'#7#6'dkDrag'#8'DragMode'#7#8'dmManual'#7'Enabled'#9#14'P'
-  +'arentBidiMode'#9#11'ModalResult'#2#0#7'OnClick'#7#12'Button1Click'#10'Paren'
-  +'tFont'#9#14'ParentShowHint'#9#8'TabOrder'#2#1#7'TabStop'#8#7'Visible'#9#0#0
-  +#7'TButton'#7'Button2'#4'Left'#3#192#0#6'Height'#2#25#3'Top'#3'~'#1#5'Width'
-  +#2'a'#5'Align'#7#6'alNone'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#8'AutoSize'
-  +#8#6'Cancel'#8#7'Caption'#6#11'Get Attribs'#5'Color'#7#9'clBtnFace'#7'Defaul'
-  +'t'#8#10'DragCursor'#7#6'crDrag'#8'DragKind'#7#6'dkDrag'#8'DragMode'#7#8'dmM'
-  +'anual'#7'Enabled'#9#14'ParentBidiMode'#9#11'ModalResult'#2#0#7'OnClick'#7#12
-  +'Button2Click'#10'ParentFont'#9#14'ParentShowHint'#9#8'TabOrder'#2#2#7'TabSt'
-  +'op'#8#7'Visible'#9#0#0#7'TButton'#7'Button3'#4'Left'#3'0'#1#6'Height'#2#25#3
-  +'Top'#3'~'#1#5'Width'#2'`'#5'Align'#7#6'alNone'#7'Anchors'#11#6'akLeft'#8'ak'
-  +'Bottom'#0#8'AutoSize'#8#6'Cancel'#8#7'Caption'#6#11'Select Font'#5'Color'#7
-  +#9'clBtnFace'#7'Default'#8#10'DragCursor'#7#6'crDrag'#8'DragKind'#7#6'dkDrag'
-  +#8'DragMode'#7#8'dmManual'#7'Enabled'#9#14'ParentBidiMode'#9#11'ModalResult'
-  +#2#0#7'OnClick'#7#12'Button3Click'#10'ParentFont'#9#14'ParentShowHint'#9#8'T'
-  +'abOrder'#2#3#7'TabStop'#8#7'Visible'#9#0#0#7'TButton'#7'Button4'#4'Left'#3
-  +#16#2#6'Height'#2#25#3'Top'#3'~'#1#5'Width'#2'K'#5'Align'#7#6'alNone'#7'Anch'
-  +'ors'#11#6'akLeft'#8'akBottom'#0#8'AutoSize'#8#6'Cancel'#8#7'Caption'#6#8'Sa'
-  +'ve RTF'#5'Color'#7#9'clBtnFace'#7'Default'#8#10'DragCursor'#7#6'crDrag'#8'D'
-  +'ragKind'#7#6'dkDrag'#8'DragMode'#7#8'dmManual'#7'Enabled'#9#14'ParentBidiMo'
-  +'de'#9#11'ModalResult'#2#0#7'OnClick'#7#12'Button4Click'#10'ParentFont'#9#14
-  +'ParentShowHint'#9#8'TabOrder'#2#4#7'TabStop'#8#7'Visible'#9#0#0#7'TButton'#7
-  +'Button5'#4'Left'#3#184#1#6'Height'#2#25#3'Top'#3'~'#1#5'Width'#2'K'#5'Align'
-  +#7#6'alNone'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#8'AutoSize'#8#6'Cancel'#8
-  +#7'Caption'#6#8'Load RTF'#5'Color'#7#9'clBtnFace'#7'Default'#8#10'DragCursor'
-  +#7#6'crDrag'#8'DragKind'#7#6'dkDrag'#8'DragMode'#7#8'dmManual'#7'Enabled'#9
-  +#14'ParentBidiMode'#9#11'ModalResult'#2#0#7'OnClick'#7#12'Button5Click'#10'P'
-  +'arentFont'#9#14'ParentShowHint'#9#8'TabOrder'#2#5#7'TabStop'#8#7'Visible'#9
-  +#0#0#7'TButton'#7'Button6'#4'Left'#2#24#6'Height'#2#25#3'Top'#3#159#1#5'Widt'
-  +'h'#3#160#0#5'Align'#7#6'alNone'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#8'Aut'
-  +'oSize'#8#6'Cancel'#8#7'Caption'#6#16'Next Style Range'#5'Color'#7#9'clBtnFa'
-  +'ce'#7'Default'#8#10'DragCursor'#7#6'crDrag'#8'DragKind'#7#6'dkDrag'#8'DragM'
-  +'ode'#7#8'dmManual'#7'Enabled'#9#14'ParentBidiMode'#9#11'ModalResult'#2#0#7
-  +'OnClick'#7#12'Button6Click'#10'ParentFont'#9#14'ParentShowHint'#9#8'TabOrde'
-  +'r'#2#6#7'TabStop'#8#7'Visible'#9#0#0#5'TEdit'#5'Edit1'#4'Left'#3#216#0#6'He'
-  +'ight'#2#16#3'Top'#3#159#1#5'Width'#3'@'#1#5'Align'#7#6'alNone'#9'Alignment'
-  +#7#13'taLeftJustify'#8'AutoSize'#9#10'AutoSelect'#8#11'BorderStyle'#7#8'bsSi'
-  +'ngle'#5'Color'#7#8'clWindow'#8'CharCase'#7#8'ecNormal'#10'DragCursor'#7#6'c'
-  +'rDrag'#8'DragKind'#7#6'dkDrag'#8'DragMode'#7#8'dmManual'#8'EchoMode'#7#8'em'
-  +'Normal'#7'Enabled'#9#9'MaxLength'#2#0#14'ParentBidiMode'#9#11'ParentColor'#8
-  +#10'ParentFont'#9#14'ParentShowHint'#9#12'PasswordChar'#6#1#0#8'ReadOnly'#8#7
-  +'TabStop'#9#8'TabOrder'#2#7#4'Text'#6#5'Edit1'#7'Visible'#9#0#0#11'TFontDial'
-  ,'og'#11'FontDialog1'#11'MinFontSize'#2#0#11'MaxFontSize'#2#0#4'left'#3'`'#1#3
-  +'top'#3#173#1#0#0#11'TSaveDialog'#11'SaveDialog1'#10'DefaultExt'#6#4'.rtf'#6
-  +'Filter'#6#27'RichText file (*.rtf)|*.rtf'#7'Options'#11#17'ofOverwritePromp'
-  +'t'#14'ofEnableSizing'#12'ofViewDetail'#0#4'left'#3#24#1#3'top'#3#173#1#0#0
-  +#11'TOpenDialog'#11'OpenDialog1'#10'DefaultExt'#6#4'.rtf'#6'Filter'#6#27'Ric'
-  +'hText file (*.rtf)|*.rtf'#4'left'#3#208#0#3'top'#3#173#1#0#0#0
+  +'Width'#3'z'#2#13'ActiveControl'#7#9'RichMemo1'#7'Caption'#6#5'Form1'#12'Cli'
+  +'entHeight'#3#201#1#11'ClientWidth'#3'z'#2#8'OnCreate'#7#10'FormCreate'#10'L'
+  +'CLVersion'#6#6'0.9.27'#0#9'TRichMemo'#9'RichMemo1'#4'Left'#2#15#6'Height'#3
+  +'f'#1#3'Top'#2#16#5'Width'#3'k'#2#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'
+  +#8'akBottom'#0#11'Font.Height'#2#243#9'Font.Name'#6#6'Tahoma'#13'HideSelecti'
+  +'on'#8#13'Lines.Strings'#1#6#9'RichMemo1'#0#10'ParentFont'#8#10'ScrollBars'#7
+  +#10'ssVertical'#8'TabOrder'#2#0#0#0#7'TButton'#7'Button1'#4'Left'#2#24#6'Hei'
+  +'ght'#2#25#3'Top'#3'~'#1#5'Width'#3#160#0#7'Anchors'#11#6'akLeft'#8'akBottom'
+  +#0#7'Caption'#6#17'Make Bold and Red'#7'OnClick'#7#12'Button1Click'#8'TabOrd'
+  +'er'#2#1#7'TabStop'#8#0#0#7'TButton'#7'Button2'#4'Left'#3#192#0#6'Height'#2
+  +#25#3'Top'#3'~'#1#5'Width'#2'a'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#7'Capt'
+  +'ion'#6#11'Get Attribs'#7'OnClick'#7#12'Button2Click'#8'TabOrder'#2#2#7'TabS'
+  +'top'#8#0#0#7'TButton'#7'Button3'#4'Left'#3'0'#1#6'Height'#2#25#3'Top'#3'~'#1
+  +#5'Width'#2'`'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#7'Caption'#6#11'Select '
+  +'Font'#7'OnClick'#7#12'Button3Click'#8'TabOrder'#2#3#7'TabStop'#8#0#0#7'TBut'
+  +'ton'#7'Button4'#4'Left'#3#16#2#6'Height'#2#25#3'Top'#3'~'#1#5'Width'#2'K'#7
+  +'Anchors'#11#6'akLeft'#8'akBottom'#0#7'Caption'#6#8'Save RTF'#7'OnClick'#7#12
+  +'Button4Click'#8'TabOrder'#2#4#7'TabStop'#8#0#0#7'TButton'#7'Button5'#4'Left'
+  +#3#184#1#6'Height'#2#25#3'Top'#3'~'#1#5'Width'#2'K'#7'Anchors'#11#6'akLeft'#8
+  +'akBottom'#0#7'Caption'#6#8'Load RTF'#7'OnClick'#7#12'Button5Click'#8'TabOrd'
+  +'er'#2#5#7'TabStop'#8#0#0#7'TButton'#7'Button6'#4'Left'#2#24#6'Height'#2#25#3
+  +'Top'#3#159#1#5'Width'#3#160#0#7'Anchors'#11#6'akLeft'#8'akBottom'#0#7'Capti'
+  +'on'#6#16'Next Style Range'#7'OnClick'#7#12'Button6Click'#8'TabOrder'#2#6#7
+  +'TabStop'#8#0#0#11'TFontDialog'#11'FontDialog1'#11'MinFontSize'#2#0#11'MaxFo'
+  +'ntSize'#2#0#4'left'#3'`'#1#3'top'#3#173#1#0#0#11'TSaveDialog'#11'SaveDialog'
+  +'1'#10'DefaultExt'#6#4'.rtf'#6'Filter'#6#27'RichText file (*.rtf)|*.rtf'#7'O'
+  +'ptions'#11#17'ofOverwritePrompt'#14'ofEnableSizing'#12'ofViewDetail'#0#4'le'
+  +'ft'#3#24#1#3'top'#3#173#1#0#0#11'TOpenDialog'#11'OpenDialog1'#10'DefaultExt'
+  +#6#4'.rtf'#6'Filter'#6#27'RichText file (*.rtf)|*.rtf'#4'left'#3#208#0#3'top'
+  +#3#173#1#0#0#0
 ]);
diff --git a/components/richmemo/samples/testsimple/unit1.pas b/components/richmemo/samples/testsimple/unit1.pas
index 9b62a2311..453399519 100644
--- a/components/richmemo/samples/testsimple/unit1.pas
+++ b/components/richmemo/samples/testsimple/unit1.pas
@@ -7,7 +7,6 @@ interface
 uses
   Classes, SysUtils, FileUtil, LResources, Forms, Controls, Graphics, Dialogs,
   StdCtrls, ExtCtrls, ComCtrls,
-  CarbonRichMemo,
   RichMemo;
 
 type
@@ -21,7 +20,6 @@ type
     Button4: TButton;
     Button5: TButton;
     Button6: TButton;
-    Edit1: TEdit;
     FontDialog1: TFontDialog;
     OpenDialog1: TOpenDialog;
     RichMemo1: TRichMemo;
@@ -124,7 +122,6 @@ end;
 
 procedure TForm1.FormCreate(Sender: TObject);
 begin
-
 end;
 
 initialization