diff --git a/components/orpheus/OrphStatus.html b/components/orpheus/OrphStatus.html
index 7e9b72714..ea91a2e5c 100644
--- a/components/orpheus/OrphStatus.html
+++ b/components/orpheus/OrphStatus.html
@@ -33,6 +33,15 @@
 <A name="Whats_New"></A><H3>What's New</H3>
 
 <UL>
+<LI>20070704 release (0.1.6):
+  <UL>
+  <LI>3 new example programs have been added for demonstrating TOvcSpinner,
+      TOvcSimpleField, TOvcTCSimpleField and TO32TCSimpleField. Note that the
+      TestSimpField and TestTblEdits examples are intended primarily for
+      Windows at this time since TOvcSimpleField and TOvcTCSimpleField are not 
+      yet working on other widgetsets (see table below).
+  <LI>Fix improves functionality of TO32TCFlexEdit validation.<P>
+  </UL>
 <LI>20070630 release (0.1.5):
   <UL>
   <LI>Most of the Orpheus controls now work with the Lazarus Carbon widgetset.<P>
@@ -213,7 +222,11 @@ headers, row labels, string, memo, check box, combo box, bitmap).
 <LI>TestRLbl - demos TOvcRotatedLabel
 <LI>TestLabel - demos TOvcLabel
 <LI>TestVLB - demos TOvcVirtualListBox
-<LI>TestFlexEdit - demos TO32FlexEdit
+<LI>TestSpinner - demos TOvcSpinner
+<LI>TestFlexEdit - demos TO32FlexEdit validation
+<LI>TestSimpField - demos TOvcSimpleField validation (Windows only for now)
+<LI>TestTblEdits - demos TOvcTCString, TOvcTCSimpleField validation and TO32TCFlexEdit
+validation (Windows only for now)
 </UL>
 
 To see the TOvcSpinner control in action, try out the table's Rows and Columns
@@ -273,10 +286,10 @@ tell the added comments by their context (near IFDEF's, for example).
 the Orpheus unit to the uses section of your main source file (.lpr). 
 This pulls in a great deal of code that you don't need. Delete the Orpheus unit
 from the uses section to reduce the size of your executable file.<P>
-<LI>Several of the ported controls are not supported by the GTK widgetset
-(see table below). Don't use these controls in cross-platform applications.
-Just opening a form that has a TOvcSimpleField or TOvcTCSimpleField control
-on it will likely crash the Lazarus IDE with GTK. Use the 
+<LI>The TOvcSimpleField and TOvcTCSimpleField controls do not work on non-Windows
+widgetsets (see table below). For now, don't use these controls in cross-platform 
+applications. Just opening a form that has a TOvcSimpleField or TOvcTCSimpleField 
+control on it may crash non-Windows versions of Lazarus. Use the 
 TO32FlexEdit and TO32TCFlexEdit controls in place of TOvcSimpleField and 
 TOvcTCSimpleField controls in cross-platform applications.<P>
 <LI>To display the TOvcLabel's Style Manager property editor in the Lazarus 
@@ -302,11 +315,11 @@ is all that's needed to enable the button code.<P>
 <LI>Widgetsets generally implement LCL controls by creating native controls
 that correspond to the LCL controls (text edit, check box, etc.). However,
 Orpheus builds its TOvcSimpleField control from TCustomControl, rather than
-descending from an existing edit control such as TCustomEdit. This sort of
-edit control does not appear to be supported by the GTK widgetset.<P>
-<LI>The GTK and Carbon widgetsets do not support TOvcRotatedLabel, apparently
-because the GetTextMetrics function is not fully implemented on those
-widgetsets. 
+descending from an existing edit control such as TCustomEdit. Currently
+TOvcSimpleField and TOvcTCSimpleField do not work on non-Windows widgetsets.<P>
+<LI>The GTK widgetset does not support TOvcRotatedLabel, apparently
+because the GetTextMetrics function is not fully implemented on that
+widgetset. 
 </OL>
 
 <HR>
@@ -462,10 +475,10 @@ widgetsets.
 <TD>TOvcTCSimpleField<BR><IMG SRC="TOVCTCSIMPLEFIELD.bmp"></TD>
 <TD>TComponent<BR>(edits with TOvcSimpleField)</TD>
 <TD>Table cell for editing strings, with validation</TD>
-<TD>gtk doesn't support</TD>
+<TD>&nbsp;</TD>
 <TD>Working</TD>
-<TD>Crashes</TD>
-<TD>Crashes</TD>
+<TD>Not working</TD>
+<TD>Not working</TD>
 <TD>Not working</TD>
 <TD>?</TD>
 </TR>
@@ -550,7 +563,7 @@ widgetsets.
 <TD>Working</TD>
 <TD>Working</TD>
 <TD>Working</TD>
-<TD>?</TD>
+<TD>Working</TD>
 <TD>?</TD>
 </TR>
 
@@ -623,8 +636,15 @@ However, TO32FlexEdit doesn't need TOvcController.<P>
   </UL>
 <LI>TO32TCFlexEdit
   <UL>
-  <LI>Need a way of setting OnValidationError handler (an apparent 
-  omission since TO32FlexEdit has it).
+  <LI>Need a way of setting OnValidationError handler (an apparent omission 
+  since TO32FlexEdit has it). For now, you can display error message in
+  OnUserValidation handler.
+  </UL>
+<LI>TOvcSimpleField and TOvcTCSimpleField
+  <UL>
+  <LI>Recent improvements in GTK and Carbon widgetsets mean these controls no
+  longer crash programs when they're used. However, they don't yet work as edit 
+  controls. Determine whether this means more improvement in widgetsets is needed.
   </UL>
 <LI>TOvcController
   <UL>
@@ -647,7 +667,7 @@ OS X tips for Lazarus:<P>
 
 <P>
 <HR>
-Last updated: July 1, 2007
+Last updated: July 4, 2007
 <P>
 
 </BODY>
diff --git a/components/orpheus/o32tcflx.pas b/components/orpheus/o32tcflx.pas
index fbe39fcea..0c6e96048 100644
--- a/components/orpheus/o32tcflx.pas
+++ b/components/orpheus/o32tcflx.pas
@@ -396,16 +396,6 @@ begin
   inherited WMKillFocus(Msg);
 {$ENDIF}
 
-// Apparent TurboPower bug: change of focus with tab or mouse doesn't
-//  trigger validation, so do it here and don't change focus if invalid.
-  if not TO32TCCustomFlexEdit(CellOwner).ValidateEntry then //These lines added
-    begin
-{$IFNDEF LCL}
-    SetFocus;
-{$ENDIF}    
-    Exit;
-    end;
-
   CellOwner.PostMessageToTable(ctim_KillFocus, Msg.FocusedWnd, 0);
 end;
 {=====}
diff --git a/components/orpheus/orpheus.lpk b/components/orpheus/orpheus.lpk
index 07ca99e21..007376bd3 100644
--- a/components/orpheus/orpheus.lpk
+++ b/components/orpheus/orpheus.lpk
@@ -31,7 +31,7 @@
 "/>
     <License Value="MPL 1.1
 "/>
-    <Version Minor="1" Release="5"/>
+    <Version Minor="1" Release="6"/>
     <Files Count="1">
       <Item1>
         <Filename Value="myovcreg.pas"/>
diff --git a/components/orpheus/ovcef.pas b/components/orpheus/ovcef.pas
index 4ee28bd34..66e05bfc6 100644
--- a/components/orpheus/ovcef.pas
+++ b/components/orpheus/ovcef.pas
@@ -1541,6 +1541,15 @@ function TOvcBaseEntryField.efGetTextExtent(S : PChar; Len : Integer) : Word;
 var
   Size : TSize;
 begin
+// Apparent TurboPower bug: sometimes Len is 1 when string is blank.
+//  Probably meaningless width returned in that case.
+//  Could also return width of "x" if a non-zero width is assumed
+//  by calling code.
+  if Length(S) = 0 then
+    begin
+    Result := 0;
+    Exit;
+    end;
   GetTextExtentPoint32(Canvas.Handle, S, Len, Size);
   Result := Size.cX;
 end;
diff --git a/components/orpheus/tests/TestFlexEdit/unit1.lfm b/components/orpheus/tests/TestFlexEdit/unit1.lfm
index f895c4544..5b003952a 100644
--- a/components/orpheus/tests/TestFlexEdit/unit1.lfm
+++ b/components/orpheus/tests/TestFlexEdit/unit1.lfm
@@ -8,7 +8,6 @@ object Form1: TForm1
   Font.Charset = DEFAULT_CHARSET
   Font.Color = clWindowText
   Font.Height = -11
-  Font.Name = 'MS Sans Serif'
   Font.Style = []
   PixelsPerInch = 96
   TextHeight = 13
diff --git a/components/orpheus/tests/TestFlexEdit/unit1.lrs b/components/orpheus/tests/TestFlexEdit/unit1.lrs
index 2d1e33bb3..b35200892 100644
--- a/components/orpheus/tests/TestFlexEdit/unit1.lrs
+++ b/components/orpheus/tests/TestFlexEdit/unit1.lrs
@@ -2,31 +2,30 @@ LazarusResources.Add('TForm1','FORMDATA',[
   'TPF0'#6'TForm1'#5'Form1'#4'Left'#3#192#0#3'Top'#2'r'#5'Width'#3#159#1#6'Heig'
   +'ht'#3'!'#1#7'Caption'#6#5'Form1'#5'Color'#7#9'clBtnFace'#12'Font.Charset'#7
   +#15'DEFAULT_CHARSET'#10'Font.Color'#7#12'clWindowText'#11'Font.Height'#2#245
-  +#9'Font.Name'#6#13'MS Sans Serif'#10'Font.Style'#11#0#13'PixelsPerInch'#2'`'
-  +#10'TextHeight'#2#13#0#6'TLabel'#6'Label1'#4'Left'#2#16#3'Top'#2#24#5'Width'
-  +#3#129#1#6'Height'#2'!'#9'Alignment'#7#8'taCenter'#8'AutoSize'#8#7'Caption'#6
-  +'@Enter a positive integer, then move to next control to validate.'#8'WordWr'
-  +'ap'#9#0#0#6'TLabel'#6'Label2'#4'Left'#2#16#3'Top'#2'h'#5'Width'#3#129#1#6'H'
-  +'eight'#2'!'#9'Alignment'#7#8'taCenter'#8'AutoSize'#8#7'Caption'#6'DEnter a '
-  +'positive real number, then move to next control to validate.'#8'WordWrap'#9
-  +#0#0#12'TO32FlexEdit'#12'O32FlexEdit1'#4'Left'#3#168#0#3'Top'#2'8'#5'Width'#2
-  +'Q'#6'Height'#2#21#27'EfColors.Disabled.BackColor'#7#8'clWindow'#27'EfColors'
-  +'.Disabled.TextColor'#7#10'clGrayText'#24'EfColors.Error.BackColor'#7#5'clRe'
-  +'d'#24'EfColors.Error.TextColor'#7#7'clBlack'#28'EfColors.Highlight.BackColo'
-  +'r'#7#11'clHighlight'#28'EfColors.Highlight.TextColor'#7#15'clHighlightText'
-  +#8'TabOrder'#2#0#22'Validation.BeepOnError'#9#25'Validation.SoftValidation'#8
-  +#26'Validation.ValidationEvent'#7#8'veOnExit'#24'Validation.ValidatorType'#6
-  +#4'None'#25'Validation.ValidationType'#7#6'vtUser'#24'Validation.InputRequir'
-  +'ed'#8#16'OnUserValidation'#7#26'O32FlexEdit1UserValidation'#17'OnValidation'
-  +'Error'#7#26'O32FlexEditValidationError'#0#0#12'TO32FlexEdit'#12'O32FlexEdit'
-  +'2'#4'Left'#3#168#0#3'Top'#3#136#0#5'Width'#2'Q'#6'Height'#2#21#27'EfColors.'
-  +'Disabled.BackColor'#7#8'clWindow'#27'EfColors.Disabled.TextColor'#7#10'clGr'
-  +'ayText'#24'EfColors.Error.BackColor'#7#5'clRed'#24'EfColors.Error.TextColor'
-  +#7#7'clBlack'#28'EfColors.Highlight.BackColor'#7#11'clHighlight'#28'EfColors'
-  +'.Highlight.TextColor'#7#15'clHighlightText'#8'TabOrder'#2#1#22'Validation.B'
-  +'eepOnError'#9#25'Validation.SoftValidation'#8#26'Validation.ValidationEvent'
-  +#7#8'veOnExit'#24'Validation.ValidatorType'#6#4'None'#25'Validation.Validati'
-  +'onType'#7#6'vtUser'#24'Validation.InputRequired'#8#16'OnUserValidation'#7#26
-  +'O32FlexEdit2UserValidation'#17'OnValidationError'#7#26'O32FlexEditValidatio'
-  +'nError'#0#0#0
+  +#10'Font.Style'#11#0#13'PixelsPerInch'#2'`'#10'TextHeight'#2#13#0#6'TLabel'#6
+  +'Label1'#4'Left'#2#16#3'Top'#2#24#5'Width'#3#129#1#6'Height'#2'!'#9'Alignmen'
+  +'t'#7#8'taCenter'#8'AutoSize'#8#7'Caption'#6'@Enter a positive integer, then'
+  +' move to next control to validate.'#8'WordWrap'#9#0#0#6'TLabel'#6'Label2'#4
+  +'Left'#2#16#3'Top'#2'h'#5'Width'#3#129#1#6'Height'#2'!'#9'Alignment'#7#8'taC'
+  +'enter'#8'AutoSize'#8#7'Caption'#6'DEnter a positive real number, then move '
+  +'to next control to validate.'#8'WordWrap'#9#0#0#12'TO32FlexEdit'#12'O32Flex'
+  +'Edit1'#4'Left'#3#168#0#3'Top'#2'8'#5'Width'#2'Q'#6'Height'#2#21#27'EfColors'
+  +'.Disabled.BackColor'#7#8'clWindow'#27'EfColors.Disabled.TextColor'#7#10'clG'
+  +'rayText'#24'EfColors.Error.BackColor'#7#5'clRed'#24'EfColors.Error.TextColo'
+  +'r'#7#7'clBlack'#28'EfColors.Highlight.BackColor'#7#11'clHighlight'#28'EfCol'
+  +'ors.Highlight.TextColor'#7#15'clHighlightText'#8'TabOrder'#2#0#22'Validatio'
+  +'n.BeepOnError'#9#25'Validation.SoftValidation'#8#26'Validation.ValidationEv'
+  +'ent'#7#8'veOnExit'#24'Validation.ValidatorType'#6#4'None'#25'Validation.Val'
+  +'idationType'#7#6'vtUser'#24'Validation.InputRequired'#8#16'OnUserValidation'
+  +#7#26'O32FlexEdit1UserValidation'#17'OnValidationError'#7#26'O32FlexEditVali'
+  +'dationError'#0#0#12'TO32FlexEdit'#12'O32FlexEdit2'#4'Left'#3#168#0#3'Top'#3
+  +#136#0#5'Width'#2'Q'#6'Height'#2#21#27'EfColors.Disabled.BackColor'#7#8'clWi'
+  +'ndow'#27'EfColors.Disabled.TextColor'#7#10'clGrayText'#24'EfColors.Error.Ba'
+  +'ckColor'#7#5'clRed'#24'EfColors.Error.TextColor'#7#7'clBlack'#28'EfColors.H'
+  +'ighlight.BackColor'#7#11'clHighlight'#28'EfColors.Highlight.TextColor'#7#15
+  +'clHighlightText'#8'TabOrder'#2#1#22'Validation.BeepOnError'#9#25'Validation'
+  +'.SoftValidation'#8#26'Validation.ValidationEvent'#7#8'veOnExit'#24'Validati'
+  +'on.ValidatorType'#6#4'None'#25'Validation.ValidationType'#7#6'vtUser'#24'Va'
+  +'lidation.InputRequired'#8#16'OnUserValidation'#7#26'O32FlexEdit2UserValidat'
+  +'ion'#17'OnValidationError'#7#26'O32FlexEditValidationError'#0#0#0
 ]);
diff --git a/components/orpheus/tests/TestSimpField/project1.bdsproj b/components/orpheus/tests/TestSimpField/project1.bdsproj
new file mode 100644
index 000000000..21fa37665
--- /dev/null
+++ b/components/orpheus/tests/TestSimpField/project1.bdsproj
@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="utf-8"?>
+<BorlandProject>
+  <PersonalityInfo>
+    <Option>
+      <Option Name="Personality">Delphi.Personality</Option>
+      <Option Name="ProjectType">VCLApplication</Option>
+      <Option Name="Version">1.0</Option>
+      <Option Name="GUID">{CD069137-4C4C-40B2-AAA5-777E14CC0753}</Option>
+    </Option>
+  </PersonalityInfo>
+  <Delphi.Personality>
+    <Source>
+      <Source Name="MainSource">project1.dpr</Source>
+    </Source>
+    <FileVersion>
+      <FileVersion Name="Version">7.0</FileVersion>
+    </FileVersion>
+    <Compiler>
+      <Compiler Name="A">8</Compiler>
+      <Compiler Name="B">0</Compiler>
+      <Compiler Name="C">1</Compiler>
+      <Compiler Name="D">1</Compiler>
+      <Compiler Name="E">0</Compiler>
+      <Compiler Name="F">0</Compiler>
+      <Compiler Name="G">1</Compiler>
+      <Compiler Name="H">1</Compiler>
+      <Compiler Name="I">1</Compiler>
+      <Compiler Name="J">0</Compiler>
+      <Compiler Name="K">0</Compiler>
+      <Compiler Name="L">1</Compiler>
+      <Compiler Name="M">0</Compiler>
+      <Compiler Name="N">1</Compiler>
+      <Compiler Name="O">1</Compiler>
+      <Compiler Name="P">1</Compiler>
+      <Compiler Name="Q">1</Compiler>
+      <Compiler Name="R">1</Compiler>
+      <Compiler Name="S">0</Compiler>
+      <Compiler Name="T">1</Compiler>
+      <Compiler Name="U">0</Compiler>
+      <Compiler Name="V">1</Compiler>
+      <Compiler Name="W">0</Compiler>
+      <Compiler Name="X">1</Compiler>
+      <Compiler Name="Y">1</Compiler>
+      <Compiler Name="Z">1</Compiler>
+      <Compiler Name="ShowHints">True</Compiler>
+      <Compiler Name="ShowWarnings">True</Compiler>
+      <Compiler Name="UnitAliases">WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;</Compiler>
+      <Compiler Name="NamespacePrefix"></Compiler>
+      <Compiler Name="GenerateDocumentation">False</Compiler>
+      <Compiler Name="DefaultNamespace"></Compiler>
+      <Compiler Name="SymbolDeprecated">True</Compiler>
+      <Compiler Name="SymbolLibrary">True</Compiler>
+      <Compiler Name="SymbolPlatform">True</Compiler>
+      <Compiler Name="SymbolExperimental">True</Compiler>
+      <Compiler Name="UnitLibrary">True</Compiler>
+      <Compiler Name="UnitPlatform">True</Compiler>
+      <Compiler Name="UnitDeprecated">True</Compiler>
+      <Compiler Name="UnitExperimental">True</Compiler>
+      <Compiler Name="HResultCompat">True</Compiler>
+      <Compiler Name="HidingMember">True</Compiler>
+      <Compiler Name="HiddenVirtual">True</Compiler>
+      <Compiler Name="Garbage">True</Compiler>
+      <Compiler Name="BoundsError">True</Compiler>
+      <Compiler Name="ZeroNilCompat">True</Compiler>
+      <Compiler Name="StringConstTruncated">True</Compiler>
+      <Compiler Name="ForLoopVarVarPar">True</Compiler>
+      <Compiler Name="TypedConstVarPar">True</Compiler>
+      <Compiler Name="AsgToTypedConst">True</Compiler>
+      <Compiler Name="CaseLabelRange">True</Compiler>
+      <Compiler Name="ForVariable">True</Compiler>
+      <Compiler Name="ConstructingAbstract">True</Compiler>
+      <Compiler Name="ComparisonFalse">True</Compiler>
+      <Compiler Name="ComparisonTrue">True</Compiler>
+      <Compiler Name="ComparingSignedUnsigned">True</Compiler>
+      <Compiler Name="CombiningSignedUnsigned">True</Compiler>
+      <Compiler Name="UnsupportedConstruct">True</Compiler>
+      <Compiler Name="FileOpen">True</Compiler>
+      <Compiler Name="FileOpenUnitSrc">True</Compiler>
+      <Compiler Name="BadGlobalSymbol">True</Compiler>
+      <Compiler Name="DuplicateConstructorDestructor">True</Compiler>
+      <Compiler Name="InvalidDirective">True</Compiler>
+      <Compiler Name="PackageNoLink">True</Compiler>
+      <Compiler Name="PackageThreadVar">True</Compiler>
+      <Compiler Name="ImplicitImport">True</Compiler>
+      <Compiler Name="HPPEMITIgnored">True</Compiler>
+      <Compiler Name="NoRetVal">True</Compiler>
+      <Compiler Name="UseBeforeDef">True</Compiler>
+      <Compiler Name="ForLoopVarUndef">True</Compiler>
+      <Compiler Name="UnitNameMismatch">True</Compiler>
+      <Compiler Name="NoCFGFileFound">True</Compiler>
+      <Compiler Name="ImplicitVariants">True</Compiler>
+      <Compiler Name="UnicodeToLocale">True</Compiler>
+      <Compiler Name="LocaleToUnicode">True</Compiler>
+      <Compiler Name="ImagebaseMultiple">True</Compiler>
+      <Compiler Name="SuspiciousTypecast">True</Compiler>
+      <Compiler Name="PrivatePropAccessor">True</Compiler>
+      <Compiler Name="UnsafeType">False</Compiler>
+      <Compiler Name="UnsafeCode">False</Compiler>
+      <Compiler Name="UnsafeCast">False</Compiler>
+      <Compiler Name="OptionTruncated">True</Compiler>
+      <Compiler Name="WideCharReduced">True</Compiler>
+      <Compiler Name="DuplicatesIgnored">True</Compiler>
+      <Compiler Name="UnitInitSeq">True</Compiler>
+      <Compiler Name="LocalPInvoke">True</Compiler>
+      <Compiler Name="MessageDirective">True</Compiler>
+      <Compiler Name="CodePage"></Compiler>
+    </Compiler>
+    <Linker>
+      <Linker Name="MapFile">0</Linker>
+      <Linker Name="OutputObjs">0</Linker>
+      <Linker Name="GenerateHpps">False</Linker>
+      <Linker Name="ConsoleApp">1</Linker>
+      <Linker Name="DebugInfo">False</Linker>
+      <Linker Name="RemoteSymbols">False</Linker>
+      <Linker Name="GenerateDRC">False</Linker>
+      <Linker Name="MinStackSize">16384</Linker>
+      <Linker Name="MaxStackSize">1048576</Linker>
+      <Linker Name="ImageBase">4194304</Linker>
+      <Linker Name="ExeDescription"></Linker>
+    </Linker>
+    <Directories>
+      <Directories Name="OutputDir"></Directories>
+      <Directories Name="UnitOutputDir"></Directories>
+      <Directories Name="PackageDLLOutputDir"></Directories>
+      <Directories Name="PackageDCPOutputDir"></Directories>
+      <Directories Name="SearchPath">C:\Orpheus4\FPC</Directories>
+      <Directories Name="Packages">vcl;rtl;vclx;indy;vclie;xmlrtl;inetdbbde;inet;inetdbxpress;dbrtl;soaprtl;dsnap;VclSmp;dbexpress;vcldb;dbxcds;inetdb;bdertl;vcldbx;adortl;teeui;teedb;tee;ibxpress;visualclx;visualdbclx;vclactnband;vclshlctrls;IntrawebDB_50_70;Intraweb_50_70;Rave50CLX;Rave50VCL;dclOffice2k</Directories>
+      <Directories Name="Conditionals"></Directories>
+      <Directories Name="DebugSourceDirs"></Directories>
+      <Directories Name="UsePackages">False</Directories>
+    </Directories>
+    <Parameters>
+      <Parameters Name="RunParams"></Parameters>
+      <Parameters Name="HostApplication"></Parameters>
+      <Parameters Name="Launcher"></Parameters>
+      <Parameters Name="UseLauncher">False</Parameters>
+      <Parameters Name="DebugCWD"></Parameters>
+      <Parameters Name="Debug Symbols Search Path"></Parameters>
+      <Parameters Name="LoadAllSymbols">True</Parameters>
+      <Parameters Name="LoadUnspecifiedSymbols">False</Parameters>
+    </Parameters>
+    <Language>
+      <Language Name="ActiveLang"></Language>
+      <Language Name="ProjectLang">$00000000</Language>
+      <Language Name="RootDir"></Language>
+    </Language>
+    <VersionInfo>
+      <VersionInfo Name="IncludeVerInfo">False</VersionInfo>
+      <VersionInfo Name="AutoIncBuild">False</VersionInfo>
+      <VersionInfo Name="MajorVer">1</VersionInfo>
+      <VersionInfo Name="MinorVer">0</VersionInfo>
+      <VersionInfo Name="Release">0</VersionInfo>
+      <VersionInfo Name="Build">0</VersionInfo>
+      <VersionInfo Name="Debug">False</VersionInfo>
+      <VersionInfo Name="PreRelease">False</VersionInfo>
+      <VersionInfo Name="Special">False</VersionInfo>
+      <VersionInfo Name="Private">False</VersionInfo>
+      <VersionInfo Name="DLL">False</VersionInfo>
+      <VersionInfo Name="Locale">1033</VersionInfo>
+      <VersionInfo Name="CodePage">1252</VersionInfo>
+    </VersionInfo>
+    <VersionInfoKeys>
+      <VersionInfoKeys Name="CompanyName"></VersionInfoKeys>
+      <VersionInfoKeys Name="FileDescription"></VersionInfoKeys>
+      <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys>
+      <VersionInfoKeys Name="InternalName"></VersionInfoKeys>
+      <VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys>
+      <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys>
+      <VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys>
+      <VersionInfoKeys Name="ProductName"></VersionInfoKeys>
+      <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>
+      <VersionInfoKeys Name="Comments"></VersionInfoKeys>
+    </VersionInfoKeys>
+  </Delphi.Personality>
+</BorlandProject>
diff --git a/components/orpheus/tests/TestSimpField/project1.cfg b/components/orpheus/tests/TestSimpField/project1.cfg
new file mode 100644
index 000000000..45be3be19
--- /dev/null
+++ b/components/orpheus/tests/TestSimpField/project1.cfg
@@ -0,0 +1,38 @@
+-$A8
+-$B-
+-$C+
+-$D+
+-$E-
+-$F-
+-$G+
+-$H+
+-$I+
+-$J-
+-$K-
+-$L+
+-$M-
+-$N+
+-$O+
+-$P+
+-$Q+
+-$R+
+-$S-
+-$T+
+-$U-
+-$V+
+-$W-
+-$X+
+-$YD
+-$Z1
+-cg
+-AWinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
+-H+
+-W+
+-M
+-$M16384,1048576
+-K$00400000
+-LE"c:\delphi7\Projects\Bpl"
+-LN"c:\delphi7\Projects\Bpl"
+-w-UNSAFE_TYPE
+-w-UNSAFE_CODE
+-w-UNSAFE_CAST
diff --git a/components/orpheus/tests/TestSimpField/project1.dof b/components/orpheus/tests/TestSimpField/project1.dof
new file mode 100644
index 000000000..a964abf67
--- /dev/null
+++ b/components/orpheus/tests/TestSimpField/project1.dof
@@ -0,0 +1,136 @@
+[FileVersion]
+Version=7.0
+[Compiler]
+A=8
+B=0
+C=1
+D=1
+E=0
+F=0
+G=1
+H=1
+I=1
+J=0
+K=0
+L=1
+M=0
+N=1
+O=1
+P=1
+Q=1
+R=1
+S=0
+T=1
+U=0
+V=1
+W=0
+X=1
+Y=1
+Z=1
+ShowHints=1
+ShowWarnings=1
+UnitAliases=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
+NamespacePrefix=
+SymbolDeprecated=1
+SymbolLibrary=1
+SymbolPlatform=1
+UnitLibrary=1
+UnitPlatform=1
+UnitDeprecated=1
+HResultCompat=1
+HidingMember=1
+HiddenVirtual=1
+Garbage=1
+BoundsError=1
+ZeroNilCompat=1
+StringConstTruncated=1
+ForLoopVarVarPar=1
+TypedConstVarPar=1
+AsgToTypedConst=1
+CaseLabelRange=1
+ForVariable=1
+ConstructingAbstract=1
+ComparisonFalse=1
+ComparisonTrue=1
+ComparingSignedUnsigned=1
+CombiningSignedUnsigned=1
+UnsupportedConstruct=1
+FileOpen=1
+FileOpenUnitSrc=1
+BadGlobalSymbol=1
+DuplicateConstructorDestructor=1
+InvalidDirective=1
+PackageNoLink=1
+PackageThreadVar=1
+ImplicitImport=1
+HPPEMITIgnored=1
+NoRetVal=1
+UseBeforeDef=1
+ForLoopVarUndef=1
+UnitNameMismatch=1
+NoCFGFileFound=1
+MessageDirective=1
+ImplicitVariants=1
+UnicodeToLocale=1
+LocaleToUnicode=1
+ImagebaseMultiple=1
+SuspiciousTypecast=1
+PrivatePropAccessor=1
+UnsafeType=0
+UnsafeCode=0
+UnsafeCast=0
+[Linker]
+MapFile=0
+OutputObjs=0
+ConsoleApp=1
+DebugInfo=0
+RemoteSymbols=0
+MinStackSize=16384
+MaxStackSize=1048576
+ImageBase=4194304
+ExeDescription=
+[Directories]
+OutputDir=
+UnitOutputDir=
+PackageDLLOutputDir=
+PackageDCPOutputDir=
+SearchPath=
+Packages=vcl;rtl;vclx;indy;vclie;xmlrtl;inetdbbde;inet;inetdbxpress;dbrtl;soaprtl;dsnap;VclSmp;dbexpress;vcldb;dbxcds;inetdb;bdertl;vcldbx;adortl;teeui;teedb;tee;ibxpress;visualclx;visualdbclx;vclactnband;vclshlctrls;IntrawebDB_50_70;Intraweb_50_70;Rave50CLX;Rave50VCL;dclOffice2k
+Conditionals=
+DebugSourceDirs=
+UsePackages=0
+[Parameters]
+RunParams=
+HostApplication=
+Launcher=
+UseLauncher=0
+DebugCWD=
+[Language]
+ActiveLang=
+ProjectLang=
+RootDir=
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+[Version Info Keys]
+CompanyName=
+FileDescription=
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
diff --git a/components/orpheus/tests/TestSimpField/project1.dpr b/components/orpheus/tests/TestSimpField/project1.dpr
new file mode 100644
index 000000000..7e1743163
--- /dev/null
+++ b/components/orpheus/tests/TestSimpField/project1.dpr
@@ -0,0 +1,18 @@
+program Project1;
+
+uses
+{$IFDEF LCL}
+  Interfaces,
+{$ENDIF}
+  Forms,
+  Unit1 in 'unit1.pas' {Form1};
+
+{$IFDEF MSWINDOWS}
+{$R *.res}
+{$ENDIF}
+
+begin
+  Application.Initialize;
+  Application.CreateForm(TForm1, Form1);
+  Application.Run;
+end.
diff --git a/components/orpheus/tests/TestSimpField/project1.lpi b/components/orpheus/tests/TestSimpField/project1.lpi
new file mode 100644
index 000000000..aac4d2625
--- /dev/null
+++ b/components/orpheus/tests/TestSimpField/project1.lpi
@@ -0,0 +1,110 @@
+<?xml version="1.0"?>
+<CONFIG>
+  <ProjectOptions>
+    <PathDelim Value="\"/>
+    <Version Value="5"/>
+    <General>
+      <MainUnit Value="0"/>
+      <IconPath Value="./"/>
+      <TargetFileExt Value=".exe"/>
+      <ActiveEditorIndexAtStart Value="1"/>
+    </General>
+    <VersionInfo>
+      <ProjectVersion Value=""/>
+      <Language Value=""/>
+      <CharSet Value=""/>
+    </VersionInfo>
+    <PublishOptions>
+      <Version Value="2"/>
+      <IgnoreBinaries Value="False"/>
+      <IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/>
+      <ExcludeFileFilter Value="*.(bak|ppu|ppw|o|so);*~;backup"/>
+    </PublishOptions>
+    <RunParams>
+      <local>
+        <FormatVersion Value="1"/>
+        <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
+      </local>
+    </RunParams>
+    <RequiredPackages Count="2">
+      <Item1>
+        <PackageName Value="Orpheus"/>
+      </Item1>
+      <Item2>
+        <PackageName Value="LCL"/>
+      </Item2>
+    </RequiredPackages>
+    <Units Count="2">
+      <Unit0>
+        <Filename Value="project1.dpr"/>
+        <IsPartOfProject Value="True"/>
+        <CursorPos X="31" Y="8"/>
+        <TopLine Value="1"/>
+        <EditorIndex Value="0"/>
+        <UsageCount Value="20"/>
+        <Loaded Value="True"/>
+      </Unit0>
+      <Unit1>
+        <Filename Value="unit1.pas"/>
+        <ComponentName Value="Form1"/>
+        <HasResources Value="True"/>
+        <IsPartOfProject Value="True"/>
+        <ResourceFilename Value="unit1.lrs"/>
+        <UnitName Value="Unit1"/>
+        <CursorPos X="1" Y="1"/>
+        <TopLine Value="1"/>
+        <EditorIndex Value="1"/>
+        <UsageCount Value="20"/>
+        <Loaded Value="True"/>
+      </Unit1>
+    </Units>
+    <JumpHistory Count="0" HistoryIndex="-1"/>
+  </ProjectOptions>
+  <CompilerOptions>
+    <Version Value="5"/>
+    <PathDelim Value="\"/>
+    <SearchPaths>
+      <SrcPath Value="$(LazarusDir)\lcl\;$(LazarusDir)\lcl\interfaces\$(LCLWidgetType)\"/>
+    </SearchPaths>
+    <Parsing>
+      <SyntaxOptions>
+        <D2Extensions Value="False"/>
+        <CStyleOperator Value="False"/>
+        <AllowLabel Value="False"/>
+        <CPPInline Value="False"/>
+        <DelphiCompat Value="True"/>
+      </SyntaxOptions>
+    </Parsing>
+    <CodeGeneration>
+      <Checks>
+        <IOChecks Value="True"/>
+        <RangeChecks Value="True"/>
+        <OverflowChecks Value="True"/>
+        <StackChecks Value="True"/>
+      </Checks>
+    </CodeGeneration>
+    <Linking>
+      <Options>
+        <Win32>
+          <GraphicApplication Value="True"/>
+        </Win32>
+      </Options>
+    </Linking>
+    <Other>
+      <Verbosity>
+        <ShowExecInfo Value="True"/>
+      </Verbosity>
+      <CompilerPath Value="$(CompPath)"/>
+    </Other>
+  </CompilerOptions>
+  <Debugging>
+    <Exceptions Count="2">
+      <Item1>
+        <Name Value="ECodetoolError"/>
+      </Item1>
+      <Item2>
+        <Name Value="EFOpenError"/>
+      </Item2>
+    </Exceptions>
+  </Debugging>
+</CONFIG>
diff --git a/components/orpheus/tests/TestSimpField/project1.res b/components/orpheus/tests/TestSimpField/project1.res
new file mode 100644
index 000000000..3adc0361f
Binary files /dev/null and b/components/orpheus/tests/TestSimpField/project1.res differ
diff --git a/components/orpheus/tests/TestSimpField/unit1.dfm b/components/orpheus/tests/TestSimpField/unit1.dfm
new file mode 100644
index 000000000..950c035ee
--- /dev/null
+++ b/components/orpheus/tests/TestSimpField/unit1.dfm
@@ -0,0 +1,80 @@
+object Form1: TForm1
+  Left = 192
+  Top = 114
+  Width = 423
+  Height = 323
+  Caption = 'Form1'
+  Color = clBtnFace
+  Font.Charset = DEFAULT_CHARSET
+  Font.Color = clWindowText
+  Font.Height = -11
+  Font.Name = 'MS Sans Serif'
+  Font.Style = []
+  OldCreateOrder = False
+  PixelsPerInch = 96
+  TextHeight = 13
+  object Label1: TLabel
+    Left = 16
+    Top = 24
+    Width = 385
+    Height = 33
+    Alignment = taCenter
+    AutoSize = False
+    Caption = 'Enter a positive integer, then move to next control to validate.'
+    WordWrap = True
+  end
+  object Label2: TLabel
+    Left = 16
+    Top = 104
+    Width = 385
+    Height = 33
+    Alignment = taCenter
+    AutoSize = False
+    Caption = 
+      'Enter a positive real number, then move to next control to valid' +
+      'ate.'
+    WordWrap = True
+  end
+  object OvcSimpleField1: TOvcSimpleField
+    Left = 168
+    Top = 56
+    Width = 81
+    Height = 21
+    Cursor = crIBeam
+    DataType = sftString
+    CaretOvr.Shape = csBlock
+    ControlCharColor = clRed
+    DecimalPlaces = 0
+    EFColors.Disabled.BackColor = clWindow
+    EFColors.Disabled.TextColor = clGrayText
+    EFColors.Error.BackColor = clRed
+    EFColors.Error.TextColor = clBlack
+    EFColors.Highlight.BackColor = clHighlight
+    EFColors.Highlight.TextColor = clHighlightText
+    PictureMask = 'X'
+    TabOrder = 0
+    OnError = OvcSimpleFieldError
+    OnUserValidation = OvcSimpleField1UserValidation
+  end
+  object OvcSimpleField2: TOvcSimpleField
+    Left = 168
+    Top = 136
+    Width = 81
+    Height = 21
+    Cursor = crIBeam
+    DataType = sftString
+    CaretOvr.Shape = csBlock
+    ControlCharColor = clRed
+    DecimalPlaces = 0
+    EFColors.Disabled.BackColor = clWindow
+    EFColors.Disabled.TextColor = clGrayText
+    EFColors.Error.BackColor = clRed
+    EFColors.Error.TextColor = clBlack
+    EFColors.Highlight.BackColor = clHighlight
+    EFColors.Highlight.TextColor = clHighlightText
+    PictureMask = 'X'
+    TabOrder = 1
+    OnError = OvcSimpleFieldError
+    OnUserValidation = OvcSimpleField2UserValidation
+  end
+end
diff --git a/components/orpheus/tests/TestSimpField/unit1.lfm b/components/orpheus/tests/TestSimpField/unit1.lfm
new file mode 100644
index 000000000..660f80e10
--- /dev/null
+++ b/components/orpheus/tests/TestSimpField/unit1.lfm
@@ -0,0 +1,78 @@
+object Form1: TForm1
+  Left = 192
+  Top = 114
+  Width = 415
+  Height = 289
+  Caption = 'Form1'
+  Color = clBtnFace
+  Font.Charset = DEFAULT_CHARSET
+  Font.Color = clWindowText
+  Font.Height = -11
+  Font.Style = []
+  PixelsPerInch = 96
+  TextHeight = 13
+  object Label1: TLabel
+    Left = 16
+    Top = 24
+    Width = 385
+    Height = 33
+    Alignment = taCenter
+    AutoSize = False
+    Caption = 'Enter a positive integer, then move to next control to validate.'
+    WordWrap = True
+  end
+  object Label2: TLabel
+    Left = 16
+    Top = 104
+    Width = 385
+    Height = 33
+    Alignment = taCenter
+    AutoSize = False
+    Caption = 
+      'Enter a positive real number, then move to next control to valid' +
+      'ate.'
+    WordWrap = True
+  end
+  object OvcSimpleField1: TOvcSimpleField
+    Left = 168
+    Top = 56
+    Width = 81
+    Height = 21
+    Cursor = crIBeam
+    DataType = sftString
+    CaretOvr.Shape = csBlock
+    ControlCharColor = clRed
+    DecimalPlaces = 0
+    EFColors.Disabled.BackColor = clWindow
+    EFColors.Disabled.TextColor = clGrayText
+    EFColors.Error.BackColor = clRed
+    EFColors.Error.TextColor = clBlack
+    EFColors.Highlight.BackColor = clHighlight
+    EFColors.Highlight.TextColor = clHighlightText
+    PictureMask = 'X'
+    TabOrder = 0
+    OnError = OvcSimpleFieldError
+    OnUserValidation = OvcSimpleField1UserValidation
+  end
+  object OvcSimpleField2: TOvcSimpleField
+    Left = 168
+    Top = 136
+    Width = 81
+    Height = 21
+    Cursor = crIBeam
+    DataType = sftString
+    CaretOvr.Shape = csBlock
+    ControlCharColor = clRed
+    DecimalPlaces = 0
+    EFColors.Disabled.BackColor = clWindow
+    EFColors.Disabled.TextColor = clGrayText
+    EFColors.Error.BackColor = clRed
+    EFColors.Error.TextColor = clBlack
+    EFColors.Highlight.BackColor = clHighlight
+    EFColors.Highlight.TextColor = clHighlightText
+    PictureMask = 'X'
+    TabOrder = 1
+    OnError = OvcSimpleFieldError
+    OnUserValidation = OvcSimpleField2UserValidation
+  end
+end
diff --git a/components/orpheus/tests/TestSimpField/unit1.lrs b/components/orpheus/tests/TestSimpField/unit1.lrs
new file mode 100644
index 000000000..4f89c07f5
--- /dev/null
+++ b/components/orpheus/tests/TestSimpField/unit1.lrs
@@ -0,0 +1,29 @@
+LazarusResources.Add('TForm1','FORMDATA',[
+  'TPF0'#6'TForm1'#5'Form1'#4'Left'#3#192#0#3'Top'#2'r'#5'Width'#3#159#1#6'Heig'
+  +'ht'#3'!'#1#7'Caption'#6#5'Form1'#5'Color'#7#9'clBtnFace'#12'Font.Charset'#7
+  +#15'DEFAULT_CHARSET'#10'Font.Color'#7#12'clWindowText'#11'Font.Height'#2#245
+  +#10'Font.Style'#11#0#13'PixelsPerInch'#2'`'#10'TextHeight'#2#13#0#6'TLabel'#6
+  +'Label1'#4'Left'#2#16#3'Top'#2#24#5'Width'#3#129#1#6'Height'#2'!'#9'Alignmen'
+  +'t'#7#8'taCenter'#8'AutoSize'#8#7'Caption'#6'@Enter a positive integer, then'
+  +' move to next control to validate.'#8'WordWrap'#9#0#0#6'TLabel'#6'Label2'#4
+  +'Left'#2#16#3'Top'#2'h'#5'Width'#3#129#1#6'Height'#2'!'#9'Alignment'#7#8'taC'
+  +'enter'#8'AutoSize'#8#7'Caption'#6'DEnter a positive real number, then move '
+  +'to next control to validate.'#8'WordWrap'#9#0#0#15'TOvcSimpleField'#15'OvcS'
+  +'impleField1'#4'Left'#3#168#0#3'Top'#2'8'#5'Width'#2'Q'#6'Height'#2#21#6'Cur'
+  +'sor'#7#7'crIBeam'#8'DataType'#7#9'sftString'#14'CaretOvr.Shape'#7#7'csBlock'
+  +#16'ControlCharColor'#7#5'clRed'#13'DecimalPlaces'#2#0#27'EFColors.Disabled.'
+  +'BackColor'#7#8'clWindow'#27'EFColors.Disabled.TextColor'#7#10'clGrayText'#24
+  +'EFColors.Error.BackColor'#7#5'clRed'#24'EFColors.Error.TextColor'#7#7'clBla'
+  +'ck'#28'EFColors.Highlight.BackColor'#7#11'clHighlight'#28'EFColors.Highligh'
+  +'t.TextColor'#7#15'clHighlightText'#11'PictureMask'#6#1'X'#8'TabOrder'#2#0#7
+  +'OnError'#7#19'OvcSimpleFieldError'#16'OnUserValidation'#7#29'OvcSimpleField'
+  +'1UserValidation'#0#0#15'TOvcSimpleField'#15'OvcSimpleField2'#4'Left'#3#168#0
+  +#3'Top'#3#136#0#5'Width'#2'Q'#6'Height'#2#21#6'Cursor'#7#7'crIBeam'#8'DataTy'
+  +'pe'#7#9'sftString'#14'CaretOvr.Shape'#7#7'csBlock'#16'ControlCharColor'#7#5
+  +'clRed'#13'DecimalPlaces'#2#0#27'EFColors.Disabled.BackColor'#7#8'clWindow'
+  +#27'EFColors.Disabled.TextColor'#7#10'clGrayText'#24'EFColors.Error.BackColo'
+  +'r'#7#5'clRed'#24'EFColors.Error.TextColor'#7#7'clBlack'#28'EFColors.Highlig'
+  +'ht.BackColor'#7#11'clHighlight'#28'EFColors.Highlight.TextColor'#7#15'clHig'
+  +'hlightText'#11'PictureMask'#6#1'X'#8'TabOrder'#2#1#7'OnError'#7#19'OvcSimpl'
+  +'eFieldError'#16'OnUserValidation'#7#29'OvcSimpleField2UserValidation'#0#0#0
+]);
diff --git a/components/orpheus/tests/TestSimpField/unit1.pas b/components/orpheus/tests/TestSimpField/unit1.pas
new file mode 100644
index 000000000..59f4de7df
--- /dev/null
+++ b/components/orpheus/tests/TestSimpField/unit1.pas
@@ -0,0 +1,67 @@
+unit Unit1;
+
+interface
+
+uses
+  {$IFNDEF LCL} Windows, Messages, {$ELSE} LclIntf, LMessages, LclType, LResources, {$ENDIF}
+  SysUtils, Variants, Classes, Graphics, Controls, Forms,
+  Dialogs, StdCtrls, ovcbase, ovcdata, ovcef, ovcsf;
+
+type
+  TForm1 = class(TForm)
+    Label1: TLabel;
+    OvcSimpleField1: TOvcSimpleField;
+    Label2: TLabel;
+    OvcSimpleField2: TOvcSimpleField;
+    procedure OvcSimpleField1UserValidation(Sender: TObject;
+      var ErrorCode: Word);
+    procedure OvcSimpleFieldError(Sender: TObject; ErrorCode: Word;
+      ErrorMsg: String);
+    procedure OvcSimpleField2UserValidation(Sender: TObject;
+      var ErrorCode: Word);
+  private
+    { Private declarations }
+  public
+    { Public declarations }
+  end;
+
+var
+  Form1: TForm1;
+
+implementation
+
+{$IFNDEF LCL}
+{$R *.dfm}
+{$ENDIF}
+
+
+procedure TForm1.OvcSimpleField1UserValidation(Sender: TObject;
+  var ErrorCode: Word);
+begin
+  ErrorCode := 0;
+  if (TOvcSimpleField(Sender).Text <> '') and
+     (StrToIntDef(TOvcSimpleField(Sender).Text, 0) <= 0) then
+    ErrorCode := oeInvalidNumber;
+end;
+
+procedure TForm1.OvcSimpleFieldError(Sender: TObject; ErrorCode: Word;
+  ErrorMsg: String);
+begin
+  MessageDlg(ErrorMsg + #13#10 + 'Press Ctrl+Z to undo.', mtError, [mbOK], 0);
+end;
+
+procedure TForm1.OvcSimpleField2UserValidation(Sender: TObject;
+  var ErrorCode: Word);
+begin
+  ErrorCode := 0;
+  if (TOvcSimpleField(Sender).Text <> '') and
+     (StrToFloatDef(TOvcSimpleField(Sender).Text, 0) <= 0) then
+    ErrorCode := oeInvalidNumber;
+end;
+
+initialization
+{$IFDEF LCL}
+{$I unit1.lrs}  {Include form's resource file}
+{$ENDIF}
+
+end.
diff --git a/components/orpheus/tests/TestSpinner/project1.bdsproj b/components/orpheus/tests/TestSpinner/project1.bdsproj
new file mode 100644
index 000000000..21fa37665
--- /dev/null
+++ b/components/orpheus/tests/TestSpinner/project1.bdsproj
@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="utf-8"?>
+<BorlandProject>
+  <PersonalityInfo>
+    <Option>
+      <Option Name="Personality">Delphi.Personality</Option>
+      <Option Name="ProjectType">VCLApplication</Option>
+      <Option Name="Version">1.0</Option>
+      <Option Name="GUID">{CD069137-4C4C-40B2-AAA5-777E14CC0753}</Option>
+    </Option>
+  </PersonalityInfo>
+  <Delphi.Personality>
+    <Source>
+      <Source Name="MainSource">project1.dpr</Source>
+    </Source>
+    <FileVersion>
+      <FileVersion Name="Version">7.0</FileVersion>
+    </FileVersion>
+    <Compiler>
+      <Compiler Name="A">8</Compiler>
+      <Compiler Name="B">0</Compiler>
+      <Compiler Name="C">1</Compiler>
+      <Compiler Name="D">1</Compiler>
+      <Compiler Name="E">0</Compiler>
+      <Compiler Name="F">0</Compiler>
+      <Compiler Name="G">1</Compiler>
+      <Compiler Name="H">1</Compiler>
+      <Compiler Name="I">1</Compiler>
+      <Compiler Name="J">0</Compiler>
+      <Compiler Name="K">0</Compiler>
+      <Compiler Name="L">1</Compiler>
+      <Compiler Name="M">0</Compiler>
+      <Compiler Name="N">1</Compiler>
+      <Compiler Name="O">1</Compiler>
+      <Compiler Name="P">1</Compiler>
+      <Compiler Name="Q">1</Compiler>
+      <Compiler Name="R">1</Compiler>
+      <Compiler Name="S">0</Compiler>
+      <Compiler Name="T">1</Compiler>
+      <Compiler Name="U">0</Compiler>
+      <Compiler Name="V">1</Compiler>
+      <Compiler Name="W">0</Compiler>
+      <Compiler Name="X">1</Compiler>
+      <Compiler Name="Y">1</Compiler>
+      <Compiler Name="Z">1</Compiler>
+      <Compiler Name="ShowHints">True</Compiler>
+      <Compiler Name="ShowWarnings">True</Compiler>
+      <Compiler Name="UnitAliases">WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;</Compiler>
+      <Compiler Name="NamespacePrefix"></Compiler>
+      <Compiler Name="GenerateDocumentation">False</Compiler>
+      <Compiler Name="DefaultNamespace"></Compiler>
+      <Compiler Name="SymbolDeprecated">True</Compiler>
+      <Compiler Name="SymbolLibrary">True</Compiler>
+      <Compiler Name="SymbolPlatform">True</Compiler>
+      <Compiler Name="SymbolExperimental">True</Compiler>
+      <Compiler Name="UnitLibrary">True</Compiler>
+      <Compiler Name="UnitPlatform">True</Compiler>
+      <Compiler Name="UnitDeprecated">True</Compiler>
+      <Compiler Name="UnitExperimental">True</Compiler>
+      <Compiler Name="HResultCompat">True</Compiler>
+      <Compiler Name="HidingMember">True</Compiler>
+      <Compiler Name="HiddenVirtual">True</Compiler>
+      <Compiler Name="Garbage">True</Compiler>
+      <Compiler Name="BoundsError">True</Compiler>
+      <Compiler Name="ZeroNilCompat">True</Compiler>
+      <Compiler Name="StringConstTruncated">True</Compiler>
+      <Compiler Name="ForLoopVarVarPar">True</Compiler>
+      <Compiler Name="TypedConstVarPar">True</Compiler>
+      <Compiler Name="AsgToTypedConst">True</Compiler>
+      <Compiler Name="CaseLabelRange">True</Compiler>
+      <Compiler Name="ForVariable">True</Compiler>
+      <Compiler Name="ConstructingAbstract">True</Compiler>
+      <Compiler Name="ComparisonFalse">True</Compiler>
+      <Compiler Name="ComparisonTrue">True</Compiler>
+      <Compiler Name="ComparingSignedUnsigned">True</Compiler>
+      <Compiler Name="CombiningSignedUnsigned">True</Compiler>
+      <Compiler Name="UnsupportedConstruct">True</Compiler>
+      <Compiler Name="FileOpen">True</Compiler>
+      <Compiler Name="FileOpenUnitSrc">True</Compiler>
+      <Compiler Name="BadGlobalSymbol">True</Compiler>
+      <Compiler Name="DuplicateConstructorDestructor">True</Compiler>
+      <Compiler Name="InvalidDirective">True</Compiler>
+      <Compiler Name="PackageNoLink">True</Compiler>
+      <Compiler Name="PackageThreadVar">True</Compiler>
+      <Compiler Name="ImplicitImport">True</Compiler>
+      <Compiler Name="HPPEMITIgnored">True</Compiler>
+      <Compiler Name="NoRetVal">True</Compiler>
+      <Compiler Name="UseBeforeDef">True</Compiler>
+      <Compiler Name="ForLoopVarUndef">True</Compiler>
+      <Compiler Name="UnitNameMismatch">True</Compiler>
+      <Compiler Name="NoCFGFileFound">True</Compiler>
+      <Compiler Name="ImplicitVariants">True</Compiler>
+      <Compiler Name="UnicodeToLocale">True</Compiler>
+      <Compiler Name="LocaleToUnicode">True</Compiler>
+      <Compiler Name="ImagebaseMultiple">True</Compiler>
+      <Compiler Name="SuspiciousTypecast">True</Compiler>
+      <Compiler Name="PrivatePropAccessor">True</Compiler>
+      <Compiler Name="UnsafeType">False</Compiler>
+      <Compiler Name="UnsafeCode">False</Compiler>
+      <Compiler Name="UnsafeCast">False</Compiler>
+      <Compiler Name="OptionTruncated">True</Compiler>
+      <Compiler Name="WideCharReduced">True</Compiler>
+      <Compiler Name="DuplicatesIgnored">True</Compiler>
+      <Compiler Name="UnitInitSeq">True</Compiler>
+      <Compiler Name="LocalPInvoke">True</Compiler>
+      <Compiler Name="MessageDirective">True</Compiler>
+      <Compiler Name="CodePage"></Compiler>
+    </Compiler>
+    <Linker>
+      <Linker Name="MapFile">0</Linker>
+      <Linker Name="OutputObjs">0</Linker>
+      <Linker Name="GenerateHpps">False</Linker>
+      <Linker Name="ConsoleApp">1</Linker>
+      <Linker Name="DebugInfo">False</Linker>
+      <Linker Name="RemoteSymbols">False</Linker>
+      <Linker Name="GenerateDRC">False</Linker>
+      <Linker Name="MinStackSize">16384</Linker>
+      <Linker Name="MaxStackSize">1048576</Linker>
+      <Linker Name="ImageBase">4194304</Linker>
+      <Linker Name="ExeDescription"></Linker>
+    </Linker>
+    <Directories>
+      <Directories Name="OutputDir"></Directories>
+      <Directories Name="UnitOutputDir"></Directories>
+      <Directories Name="PackageDLLOutputDir"></Directories>
+      <Directories Name="PackageDCPOutputDir"></Directories>
+      <Directories Name="SearchPath">C:\Orpheus4\FPC</Directories>
+      <Directories Name="Packages">vcl;rtl;vclx;indy;vclie;xmlrtl;inetdbbde;inet;inetdbxpress;dbrtl;soaprtl;dsnap;VclSmp;dbexpress;vcldb;dbxcds;inetdb;bdertl;vcldbx;adortl;teeui;teedb;tee;ibxpress;visualclx;visualdbclx;vclactnband;vclshlctrls;IntrawebDB_50_70;Intraweb_50_70;Rave50CLX;Rave50VCL;dclOffice2k</Directories>
+      <Directories Name="Conditionals"></Directories>
+      <Directories Name="DebugSourceDirs"></Directories>
+      <Directories Name="UsePackages">False</Directories>
+    </Directories>
+    <Parameters>
+      <Parameters Name="RunParams"></Parameters>
+      <Parameters Name="HostApplication"></Parameters>
+      <Parameters Name="Launcher"></Parameters>
+      <Parameters Name="UseLauncher">False</Parameters>
+      <Parameters Name="DebugCWD"></Parameters>
+      <Parameters Name="Debug Symbols Search Path"></Parameters>
+      <Parameters Name="LoadAllSymbols">True</Parameters>
+      <Parameters Name="LoadUnspecifiedSymbols">False</Parameters>
+    </Parameters>
+    <Language>
+      <Language Name="ActiveLang"></Language>
+      <Language Name="ProjectLang">$00000000</Language>
+      <Language Name="RootDir"></Language>
+    </Language>
+    <VersionInfo>
+      <VersionInfo Name="IncludeVerInfo">False</VersionInfo>
+      <VersionInfo Name="AutoIncBuild">False</VersionInfo>
+      <VersionInfo Name="MajorVer">1</VersionInfo>
+      <VersionInfo Name="MinorVer">0</VersionInfo>
+      <VersionInfo Name="Release">0</VersionInfo>
+      <VersionInfo Name="Build">0</VersionInfo>
+      <VersionInfo Name="Debug">False</VersionInfo>
+      <VersionInfo Name="PreRelease">False</VersionInfo>
+      <VersionInfo Name="Special">False</VersionInfo>
+      <VersionInfo Name="Private">False</VersionInfo>
+      <VersionInfo Name="DLL">False</VersionInfo>
+      <VersionInfo Name="Locale">1033</VersionInfo>
+      <VersionInfo Name="CodePage">1252</VersionInfo>
+    </VersionInfo>
+    <VersionInfoKeys>
+      <VersionInfoKeys Name="CompanyName"></VersionInfoKeys>
+      <VersionInfoKeys Name="FileDescription"></VersionInfoKeys>
+      <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys>
+      <VersionInfoKeys Name="InternalName"></VersionInfoKeys>
+      <VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys>
+      <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys>
+      <VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys>
+      <VersionInfoKeys Name="ProductName"></VersionInfoKeys>
+      <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>
+      <VersionInfoKeys Name="Comments"></VersionInfoKeys>
+    </VersionInfoKeys>
+  </Delphi.Personality>
+</BorlandProject>
diff --git a/components/orpheus/tests/TestSpinner/project1.cfg b/components/orpheus/tests/TestSpinner/project1.cfg
new file mode 100644
index 000000000..45be3be19
--- /dev/null
+++ b/components/orpheus/tests/TestSpinner/project1.cfg
@@ -0,0 +1,38 @@
+-$A8
+-$B-
+-$C+
+-$D+
+-$E-
+-$F-
+-$G+
+-$H+
+-$I+
+-$J-
+-$K-
+-$L+
+-$M-
+-$N+
+-$O+
+-$P+
+-$Q+
+-$R+
+-$S-
+-$T+
+-$U-
+-$V+
+-$W-
+-$X+
+-$YD
+-$Z1
+-cg
+-AWinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
+-H+
+-W+
+-M
+-$M16384,1048576
+-K$00400000
+-LE"c:\delphi7\Projects\Bpl"
+-LN"c:\delphi7\Projects\Bpl"
+-w-UNSAFE_TYPE
+-w-UNSAFE_CODE
+-w-UNSAFE_CAST
diff --git a/components/orpheus/tests/TestSpinner/project1.dof b/components/orpheus/tests/TestSpinner/project1.dof
new file mode 100644
index 000000000..a964abf67
--- /dev/null
+++ b/components/orpheus/tests/TestSpinner/project1.dof
@@ -0,0 +1,136 @@
+[FileVersion]
+Version=7.0
+[Compiler]
+A=8
+B=0
+C=1
+D=1
+E=0
+F=0
+G=1
+H=1
+I=1
+J=0
+K=0
+L=1
+M=0
+N=1
+O=1
+P=1
+Q=1
+R=1
+S=0
+T=1
+U=0
+V=1
+W=0
+X=1
+Y=1
+Z=1
+ShowHints=1
+ShowWarnings=1
+UnitAliases=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
+NamespacePrefix=
+SymbolDeprecated=1
+SymbolLibrary=1
+SymbolPlatform=1
+UnitLibrary=1
+UnitPlatform=1
+UnitDeprecated=1
+HResultCompat=1
+HidingMember=1
+HiddenVirtual=1
+Garbage=1
+BoundsError=1
+ZeroNilCompat=1
+StringConstTruncated=1
+ForLoopVarVarPar=1
+TypedConstVarPar=1
+AsgToTypedConst=1
+CaseLabelRange=1
+ForVariable=1
+ConstructingAbstract=1
+ComparisonFalse=1
+ComparisonTrue=1
+ComparingSignedUnsigned=1
+CombiningSignedUnsigned=1
+UnsupportedConstruct=1
+FileOpen=1
+FileOpenUnitSrc=1
+BadGlobalSymbol=1
+DuplicateConstructorDestructor=1
+InvalidDirective=1
+PackageNoLink=1
+PackageThreadVar=1
+ImplicitImport=1
+HPPEMITIgnored=1
+NoRetVal=1
+UseBeforeDef=1
+ForLoopVarUndef=1
+UnitNameMismatch=1
+NoCFGFileFound=1
+MessageDirective=1
+ImplicitVariants=1
+UnicodeToLocale=1
+LocaleToUnicode=1
+ImagebaseMultiple=1
+SuspiciousTypecast=1
+PrivatePropAccessor=1
+UnsafeType=0
+UnsafeCode=0
+UnsafeCast=0
+[Linker]
+MapFile=0
+OutputObjs=0
+ConsoleApp=1
+DebugInfo=0
+RemoteSymbols=0
+MinStackSize=16384
+MaxStackSize=1048576
+ImageBase=4194304
+ExeDescription=
+[Directories]
+OutputDir=
+UnitOutputDir=
+PackageDLLOutputDir=
+PackageDCPOutputDir=
+SearchPath=
+Packages=vcl;rtl;vclx;indy;vclie;xmlrtl;inetdbbde;inet;inetdbxpress;dbrtl;soaprtl;dsnap;VclSmp;dbexpress;vcldb;dbxcds;inetdb;bdertl;vcldbx;adortl;teeui;teedb;tee;ibxpress;visualclx;visualdbclx;vclactnband;vclshlctrls;IntrawebDB_50_70;Intraweb_50_70;Rave50CLX;Rave50VCL;dclOffice2k
+Conditionals=
+DebugSourceDirs=
+UsePackages=0
+[Parameters]
+RunParams=
+HostApplication=
+Launcher=
+UseLauncher=0
+DebugCWD=
+[Language]
+ActiveLang=
+ProjectLang=
+RootDir=
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+[Version Info Keys]
+CompanyName=
+FileDescription=
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
diff --git a/components/orpheus/tests/TestSpinner/project1.dpr b/components/orpheus/tests/TestSpinner/project1.dpr
new file mode 100644
index 000000000..7e1743163
--- /dev/null
+++ b/components/orpheus/tests/TestSpinner/project1.dpr
@@ -0,0 +1,18 @@
+program Project1;
+
+uses
+{$IFDEF LCL}
+  Interfaces,
+{$ENDIF}
+  Forms,
+  Unit1 in 'unit1.pas' {Form1};
+
+{$IFDEF MSWINDOWS}
+{$R *.res}
+{$ENDIF}
+
+begin
+  Application.Initialize;
+  Application.CreateForm(TForm1, Form1);
+  Application.Run;
+end.
diff --git a/components/orpheus/tests/TestSpinner/project1.lpi b/components/orpheus/tests/TestSpinner/project1.lpi
new file mode 100644
index 000000000..aac4d2625
--- /dev/null
+++ b/components/orpheus/tests/TestSpinner/project1.lpi
@@ -0,0 +1,110 @@
+<?xml version="1.0"?>
+<CONFIG>
+  <ProjectOptions>
+    <PathDelim Value="\"/>
+    <Version Value="5"/>
+    <General>
+      <MainUnit Value="0"/>
+      <IconPath Value="./"/>
+      <TargetFileExt Value=".exe"/>
+      <ActiveEditorIndexAtStart Value="1"/>
+    </General>
+    <VersionInfo>
+      <ProjectVersion Value=""/>
+      <Language Value=""/>
+      <CharSet Value=""/>
+    </VersionInfo>
+    <PublishOptions>
+      <Version Value="2"/>
+      <IgnoreBinaries Value="False"/>
+      <IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/>
+      <ExcludeFileFilter Value="*.(bak|ppu|ppw|o|so);*~;backup"/>
+    </PublishOptions>
+    <RunParams>
+      <local>
+        <FormatVersion Value="1"/>
+        <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
+      </local>
+    </RunParams>
+    <RequiredPackages Count="2">
+      <Item1>
+        <PackageName Value="Orpheus"/>
+      </Item1>
+      <Item2>
+        <PackageName Value="LCL"/>
+      </Item2>
+    </RequiredPackages>
+    <Units Count="2">
+      <Unit0>
+        <Filename Value="project1.dpr"/>
+        <IsPartOfProject Value="True"/>
+        <CursorPos X="31" Y="8"/>
+        <TopLine Value="1"/>
+        <EditorIndex Value="0"/>
+        <UsageCount Value="20"/>
+        <Loaded Value="True"/>
+      </Unit0>
+      <Unit1>
+        <Filename Value="unit1.pas"/>
+        <ComponentName Value="Form1"/>
+        <HasResources Value="True"/>
+        <IsPartOfProject Value="True"/>
+        <ResourceFilename Value="unit1.lrs"/>
+        <UnitName Value="Unit1"/>
+        <CursorPos X="1" Y="1"/>
+        <TopLine Value="1"/>
+        <EditorIndex Value="1"/>
+        <UsageCount Value="20"/>
+        <Loaded Value="True"/>
+      </Unit1>
+    </Units>
+    <JumpHistory Count="0" HistoryIndex="-1"/>
+  </ProjectOptions>
+  <CompilerOptions>
+    <Version Value="5"/>
+    <PathDelim Value="\"/>
+    <SearchPaths>
+      <SrcPath Value="$(LazarusDir)\lcl\;$(LazarusDir)\lcl\interfaces\$(LCLWidgetType)\"/>
+    </SearchPaths>
+    <Parsing>
+      <SyntaxOptions>
+        <D2Extensions Value="False"/>
+        <CStyleOperator Value="False"/>
+        <AllowLabel Value="False"/>
+        <CPPInline Value="False"/>
+        <DelphiCompat Value="True"/>
+      </SyntaxOptions>
+    </Parsing>
+    <CodeGeneration>
+      <Checks>
+        <IOChecks Value="True"/>
+        <RangeChecks Value="True"/>
+        <OverflowChecks Value="True"/>
+        <StackChecks Value="True"/>
+      </Checks>
+    </CodeGeneration>
+    <Linking>
+      <Options>
+        <Win32>
+          <GraphicApplication Value="True"/>
+        </Win32>
+      </Options>
+    </Linking>
+    <Other>
+      <Verbosity>
+        <ShowExecInfo Value="True"/>
+      </Verbosity>
+      <CompilerPath Value="$(CompPath)"/>
+    </Other>
+  </CompilerOptions>
+  <Debugging>
+    <Exceptions Count="2">
+      <Item1>
+        <Name Value="ECodetoolError"/>
+      </Item1>
+      <Item2>
+        <Name Value="EFOpenError"/>
+      </Item2>
+    </Exceptions>
+  </Debugging>
+</CONFIG>
diff --git a/components/orpheus/tests/TestSpinner/project1.res b/components/orpheus/tests/TestSpinner/project1.res
new file mode 100644
index 000000000..3adc0361f
Binary files /dev/null and b/components/orpheus/tests/TestSpinner/project1.res differ
diff --git a/components/orpheus/tests/TestSpinner/unit1.dfm b/components/orpheus/tests/TestSpinner/unit1.dfm
new file mode 100644
index 000000000..adf4d98e9
--- /dev/null
+++ b/components/orpheus/tests/TestSpinner/unit1.dfm
@@ -0,0 +1,33 @@
+object Form1: TForm1
+  Left = 192
+  Top = 114
+  Width = 423
+  Height = 323
+  Caption = 'Form1'
+  Color = clBtnFace
+  Font.Charset = DEFAULT_CHARSET
+  Font.Color = clWindowText
+  Font.Height = -11
+  Font.Name = 'MS Sans Serif'
+  Font.Style = []
+  OldCreateOrder = False
+  PixelsPerInch = 96
+  TextHeight = 13
+  object OvcSpinner1: TOvcSpinner
+    Left = 144
+    Top = 88
+    Width = 49
+    Height = 65
+    AutoRepeat = True
+    Delta = 1.000000000000000000
+    FocusedControl = Edit1
+  end
+  object Edit1: TEdit
+    Left = 208
+    Top = 112
+    Width = 57
+    Height = 21
+    TabOrder = 1
+    Text = '0'
+  end
+end
diff --git a/components/orpheus/tests/TestSpinner/unit1.lfm b/components/orpheus/tests/TestSpinner/unit1.lfm
new file mode 100644
index 000000000..19f0675e6
--- /dev/null
+++ b/components/orpheus/tests/TestSpinner/unit1.lfm
@@ -0,0 +1,31 @@
+object Form1: TForm1
+  Left = 192
+  Top = 114
+  Width = 415
+  Height = 289
+  Caption = 'Form1'
+  Color = clBtnFace
+  Font.Charset = DEFAULT_CHARSET
+  Font.Color = clWindowText
+  Font.Height = -11
+  Font.Style = []
+  PixelsPerInch = 96
+  TextHeight = 13
+  object OvcSpinner1: TOvcSpinner
+    Left = 144
+    Top = 88
+    Width = 49
+    Height = 65
+    AutoRepeat = True
+    Delta = 1.000000000000000000
+    FocusedControl = Edit1
+  end
+  object Edit1: TEdit
+    Left = 208
+    Top = 112
+    Width = 57
+    Height = 21
+    TabOrder = 1
+    Text = '0'
+  end
+end
diff --git a/components/orpheus/tests/TestSpinner/unit1.lrs b/components/orpheus/tests/TestSpinner/unit1.lrs
new file mode 100644
index 000000000..aa952cf33
--- /dev/null
+++ b/components/orpheus/tests/TestSpinner/unit1.lrs
@@ -0,0 +1,10 @@
+LazarusResources.Add('TForm1','FORMDATA',[
+  'TPF0'#6'TForm1'#5'Form1'#4'Left'#3#192#0#3'Top'#2'r'#5'Width'#3#159#1#6'Heig'
+  +'ht'#3'!'#1#7'Caption'#6#5'Form1'#5'Color'#7#9'clBtnFace'#12'Font.Charset'#7
+  +#15'DEFAULT_CHARSET'#10'Font.Color'#7#12'clWindowText'#11'Font.Height'#2#245
+  +#10'Font.Style'#11#0#13'PixelsPerInch'#2'`'#10'TextHeight'#2#13#0#11'TOvcSpi'
+  +'nner'#11'OvcSpinner1'#4'Left'#3#144#0#3'Top'#2'X'#5'Width'#2'1'#6'Height'#2
+  +'A'#10'AutoRepeat'#9#5'Delta'#5#0#0#0#0#0#0#0#128#255'?'#14'FocusedControl'#7
+  +#5'Edit1'#0#0#5'TEdit'#5'Edit1'#4'Left'#3#208#0#3'Top'#2'p'#5'Width'#2'9'#6
+  +'Height'#2#21#8'TabOrder'#2#1#4'Text'#6#1'0'#0#0#0
+]);
diff --git a/components/orpheus/tests/TestSpinner/unit1.pas b/components/orpheus/tests/TestSpinner/unit1.pas
new file mode 100644
index 000000000..51af3684d
--- /dev/null
+++ b/components/orpheus/tests/TestSpinner/unit1.pas
@@ -0,0 +1,35 @@
+unit Unit1;
+
+interface
+
+uses
+  {$IFNDEF LCL} Windows, Messages, {$ELSE} LclIntf, LMessages, LclType, LResources, {$ENDIF}
+  SysUtils, Variants, Classes, Graphics, Controls, Forms,
+  Dialogs, StdCtrls, ovcsc, ovcbase;
+
+type
+  TForm1 = class(TForm)
+    OvcSpinner1: TOvcSpinner;
+    Edit1: TEdit;
+  private
+    { Private declarations }
+  public
+    { Public declarations }
+  end;
+
+var
+  Form1: TForm1;
+
+implementation
+
+{$IFNDEF LCL}
+{$R *.dfm}
+{$ENDIF}
+
+
+initialization
+{$IFDEF LCL}
+{$I unit1.lrs}  {Include form's resource file}
+{$ENDIF}
+
+end.
diff --git a/components/orpheus/tests/TestTblEdits/manifest.rc b/components/orpheus/tests/TestTblEdits/manifest.rc
new file mode 100644
index 000000000..f2751735a
--- /dev/null
+++ b/components/orpheus/tests/TestTblEdits/manifest.rc
@@ -0,0 +1 @@
+1	24	project1.exe.manifest
diff --git a/components/orpheus/tests/TestTblEdits/manifest.res b/components/orpheus/tests/TestTblEdits/manifest.res
new file mode 100644
index 000000000..76d7a3174
Binary files /dev/null and b/components/orpheus/tests/TestTblEdits/manifest.res differ
diff --git a/components/orpheus/tests/TestTblEdits/project1.bdsproj b/components/orpheus/tests/TestTblEdits/project1.bdsproj
new file mode 100644
index 000000000..21fa37665
--- /dev/null
+++ b/components/orpheus/tests/TestTblEdits/project1.bdsproj
@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="utf-8"?>
+<BorlandProject>
+  <PersonalityInfo>
+    <Option>
+      <Option Name="Personality">Delphi.Personality</Option>
+      <Option Name="ProjectType">VCLApplication</Option>
+      <Option Name="Version">1.0</Option>
+      <Option Name="GUID">{CD069137-4C4C-40B2-AAA5-777E14CC0753}</Option>
+    </Option>
+  </PersonalityInfo>
+  <Delphi.Personality>
+    <Source>
+      <Source Name="MainSource">project1.dpr</Source>
+    </Source>
+    <FileVersion>
+      <FileVersion Name="Version">7.0</FileVersion>
+    </FileVersion>
+    <Compiler>
+      <Compiler Name="A">8</Compiler>
+      <Compiler Name="B">0</Compiler>
+      <Compiler Name="C">1</Compiler>
+      <Compiler Name="D">1</Compiler>
+      <Compiler Name="E">0</Compiler>
+      <Compiler Name="F">0</Compiler>
+      <Compiler Name="G">1</Compiler>
+      <Compiler Name="H">1</Compiler>
+      <Compiler Name="I">1</Compiler>
+      <Compiler Name="J">0</Compiler>
+      <Compiler Name="K">0</Compiler>
+      <Compiler Name="L">1</Compiler>
+      <Compiler Name="M">0</Compiler>
+      <Compiler Name="N">1</Compiler>
+      <Compiler Name="O">1</Compiler>
+      <Compiler Name="P">1</Compiler>
+      <Compiler Name="Q">1</Compiler>
+      <Compiler Name="R">1</Compiler>
+      <Compiler Name="S">0</Compiler>
+      <Compiler Name="T">1</Compiler>
+      <Compiler Name="U">0</Compiler>
+      <Compiler Name="V">1</Compiler>
+      <Compiler Name="W">0</Compiler>
+      <Compiler Name="X">1</Compiler>
+      <Compiler Name="Y">1</Compiler>
+      <Compiler Name="Z">1</Compiler>
+      <Compiler Name="ShowHints">True</Compiler>
+      <Compiler Name="ShowWarnings">True</Compiler>
+      <Compiler Name="UnitAliases">WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;</Compiler>
+      <Compiler Name="NamespacePrefix"></Compiler>
+      <Compiler Name="GenerateDocumentation">False</Compiler>
+      <Compiler Name="DefaultNamespace"></Compiler>
+      <Compiler Name="SymbolDeprecated">True</Compiler>
+      <Compiler Name="SymbolLibrary">True</Compiler>
+      <Compiler Name="SymbolPlatform">True</Compiler>
+      <Compiler Name="SymbolExperimental">True</Compiler>
+      <Compiler Name="UnitLibrary">True</Compiler>
+      <Compiler Name="UnitPlatform">True</Compiler>
+      <Compiler Name="UnitDeprecated">True</Compiler>
+      <Compiler Name="UnitExperimental">True</Compiler>
+      <Compiler Name="HResultCompat">True</Compiler>
+      <Compiler Name="HidingMember">True</Compiler>
+      <Compiler Name="HiddenVirtual">True</Compiler>
+      <Compiler Name="Garbage">True</Compiler>
+      <Compiler Name="BoundsError">True</Compiler>
+      <Compiler Name="ZeroNilCompat">True</Compiler>
+      <Compiler Name="StringConstTruncated">True</Compiler>
+      <Compiler Name="ForLoopVarVarPar">True</Compiler>
+      <Compiler Name="TypedConstVarPar">True</Compiler>
+      <Compiler Name="AsgToTypedConst">True</Compiler>
+      <Compiler Name="CaseLabelRange">True</Compiler>
+      <Compiler Name="ForVariable">True</Compiler>
+      <Compiler Name="ConstructingAbstract">True</Compiler>
+      <Compiler Name="ComparisonFalse">True</Compiler>
+      <Compiler Name="ComparisonTrue">True</Compiler>
+      <Compiler Name="ComparingSignedUnsigned">True</Compiler>
+      <Compiler Name="CombiningSignedUnsigned">True</Compiler>
+      <Compiler Name="UnsupportedConstruct">True</Compiler>
+      <Compiler Name="FileOpen">True</Compiler>
+      <Compiler Name="FileOpenUnitSrc">True</Compiler>
+      <Compiler Name="BadGlobalSymbol">True</Compiler>
+      <Compiler Name="DuplicateConstructorDestructor">True</Compiler>
+      <Compiler Name="InvalidDirective">True</Compiler>
+      <Compiler Name="PackageNoLink">True</Compiler>
+      <Compiler Name="PackageThreadVar">True</Compiler>
+      <Compiler Name="ImplicitImport">True</Compiler>
+      <Compiler Name="HPPEMITIgnored">True</Compiler>
+      <Compiler Name="NoRetVal">True</Compiler>
+      <Compiler Name="UseBeforeDef">True</Compiler>
+      <Compiler Name="ForLoopVarUndef">True</Compiler>
+      <Compiler Name="UnitNameMismatch">True</Compiler>
+      <Compiler Name="NoCFGFileFound">True</Compiler>
+      <Compiler Name="ImplicitVariants">True</Compiler>
+      <Compiler Name="UnicodeToLocale">True</Compiler>
+      <Compiler Name="LocaleToUnicode">True</Compiler>
+      <Compiler Name="ImagebaseMultiple">True</Compiler>
+      <Compiler Name="SuspiciousTypecast">True</Compiler>
+      <Compiler Name="PrivatePropAccessor">True</Compiler>
+      <Compiler Name="UnsafeType">False</Compiler>
+      <Compiler Name="UnsafeCode">False</Compiler>
+      <Compiler Name="UnsafeCast">False</Compiler>
+      <Compiler Name="OptionTruncated">True</Compiler>
+      <Compiler Name="WideCharReduced">True</Compiler>
+      <Compiler Name="DuplicatesIgnored">True</Compiler>
+      <Compiler Name="UnitInitSeq">True</Compiler>
+      <Compiler Name="LocalPInvoke">True</Compiler>
+      <Compiler Name="MessageDirective">True</Compiler>
+      <Compiler Name="CodePage"></Compiler>
+    </Compiler>
+    <Linker>
+      <Linker Name="MapFile">0</Linker>
+      <Linker Name="OutputObjs">0</Linker>
+      <Linker Name="GenerateHpps">False</Linker>
+      <Linker Name="ConsoleApp">1</Linker>
+      <Linker Name="DebugInfo">False</Linker>
+      <Linker Name="RemoteSymbols">False</Linker>
+      <Linker Name="GenerateDRC">False</Linker>
+      <Linker Name="MinStackSize">16384</Linker>
+      <Linker Name="MaxStackSize">1048576</Linker>
+      <Linker Name="ImageBase">4194304</Linker>
+      <Linker Name="ExeDescription"></Linker>
+    </Linker>
+    <Directories>
+      <Directories Name="OutputDir"></Directories>
+      <Directories Name="UnitOutputDir"></Directories>
+      <Directories Name="PackageDLLOutputDir"></Directories>
+      <Directories Name="PackageDCPOutputDir"></Directories>
+      <Directories Name="SearchPath">C:\Orpheus4\FPC</Directories>
+      <Directories Name="Packages">vcl;rtl;vclx;indy;vclie;xmlrtl;inetdbbde;inet;inetdbxpress;dbrtl;soaprtl;dsnap;VclSmp;dbexpress;vcldb;dbxcds;inetdb;bdertl;vcldbx;adortl;teeui;teedb;tee;ibxpress;visualclx;visualdbclx;vclactnband;vclshlctrls;IntrawebDB_50_70;Intraweb_50_70;Rave50CLX;Rave50VCL;dclOffice2k</Directories>
+      <Directories Name="Conditionals"></Directories>
+      <Directories Name="DebugSourceDirs"></Directories>
+      <Directories Name="UsePackages">False</Directories>
+    </Directories>
+    <Parameters>
+      <Parameters Name="RunParams"></Parameters>
+      <Parameters Name="HostApplication"></Parameters>
+      <Parameters Name="Launcher"></Parameters>
+      <Parameters Name="UseLauncher">False</Parameters>
+      <Parameters Name="DebugCWD"></Parameters>
+      <Parameters Name="Debug Symbols Search Path"></Parameters>
+      <Parameters Name="LoadAllSymbols">True</Parameters>
+      <Parameters Name="LoadUnspecifiedSymbols">False</Parameters>
+    </Parameters>
+    <Language>
+      <Language Name="ActiveLang"></Language>
+      <Language Name="ProjectLang">$00000000</Language>
+      <Language Name="RootDir"></Language>
+    </Language>
+    <VersionInfo>
+      <VersionInfo Name="IncludeVerInfo">False</VersionInfo>
+      <VersionInfo Name="AutoIncBuild">False</VersionInfo>
+      <VersionInfo Name="MajorVer">1</VersionInfo>
+      <VersionInfo Name="MinorVer">0</VersionInfo>
+      <VersionInfo Name="Release">0</VersionInfo>
+      <VersionInfo Name="Build">0</VersionInfo>
+      <VersionInfo Name="Debug">False</VersionInfo>
+      <VersionInfo Name="PreRelease">False</VersionInfo>
+      <VersionInfo Name="Special">False</VersionInfo>
+      <VersionInfo Name="Private">False</VersionInfo>
+      <VersionInfo Name="DLL">False</VersionInfo>
+      <VersionInfo Name="Locale">1033</VersionInfo>
+      <VersionInfo Name="CodePage">1252</VersionInfo>
+    </VersionInfo>
+    <VersionInfoKeys>
+      <VersionInfoKeys Name="CompanyName"></VersionInfoKeys>
+      <VersionInfoKeys Name="FileDescription"></VersionInfoKeys>
+      <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys>
+      <VersionInfoKeys Name="InternalName"></VersionInfoKeys>
+      <VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys>
+      <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys>
+      <VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys>
+      <VersionInfoKeys Name="ProductName"></VersionInfoKeys>
+      <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>
+      <VersionInfoKeys Name="Comments"></VersionInfoKeys>
+    </VersionInfoKeys>
+  </Delphi.Personality>
+</BorlandProject>
diff --git a/components/orpheus/tests/TestTblEdits/project1.cfg b/components/orpheus/tests/TestTblEdits/project1.cfg
new file mode 100644
index 000000000..45be3be19
--- /dev/null
+++ b/components/orpheus/tests/TestTblEdits/project1.cfg
@@ -0,0 +1,38 @@
+-$A8
+-$B-
+-$C+
+-$D+
+-$E-
+-$F-
+-$G+
+-$H+
+-$I+
+-$J-
+-$K-
+-$L+
+-$M-
+-$N+
+-$O+
+-$P+
+-$Q+
+-$R+
+-$S-
+-$T+
+-$U-
+-$V+
+-$W-
+-$X+
+-$YD
+-$Z1
+-cg
+-AWinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
+-H+
+-W+
+-M
+-$M16384,1048576
+-K$00400000
+-LE"c:\delphi7\Projects\Bpl"
+-LN"c:\delphi7\Projects\Bpl"
+-w-UNSAFE_TYPE
+-w-UNSAFE_CODE
+-w-UNSAFE_CAST
diff --git a/components/orpheus/tests/TestTblEdits/project1.dof b/components/orpheus/tests/TestTblEdits/project1.dof
new file mode 100644
index 000000000..a964abf67
--- /dev/null
+++ b/components/orpheus/tests/TestTblEdits/project1.dof
@@ -0,0 +1,136 @@
+[FileVersion]
+Version=7.0
+[Compiler]
+A=8
+B=0
+C=1
+D=1
+E=0
+F=0
+G=1
+H=1
+I=1
+J=0
+K=0
+L=1
+M=0
+N=1
+O=1
+P=1
+Q=1
+R=1
+S=0
+T=1
+U=0
+V=1
+W=0
+X=1
+Y=1
+Z=1
+ShowHints=1
+ShowWarnings=1
+UnitAliases=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
+NamespacePrefix=
+SymbolDeprecated=1
+SymbolLibrary=1
+SymbolPlatform=1
+UnitLibrary=1
+UnitPlatform=1
+UnitDeprecated=1
+HResultCompat=1
+HidingMember=1
+HiddenVirtual=1
+Garbage=1
+BoundsError=1
+ZeroNilCompat=1
+StringConstTruncated=1
+ForLoopVarVarPar=1
+TypedConstVarPar=1
+AsgToTypedConst=1
+CaseLabelRange=1
+ForVariable=1
+ConstructingAbstract=1
+ComparisonFalse=1
+ComparisonTrue=1
+ComparingSignedUnsigned=1
+CombiningSignedUnsigned=1
+UnsupportedConstruct=1
+FileOpen=1
+FileOpenUnitSrc=1
+BadGlobalSymbol=1
+DuplicateConstructorDestructor=1
+InvalidDirective=1
+PackageNoLink=1
+PackageThreadVar=1
+ImplicitImport=1
+HPPEMITIgnored=1
+NoRetVal=1
+UseBeforeDef=1
+ForLoopVarUndef=1
+UnitNameMismatch=1
+NoCFGFileFound=1
+MessageDirective=1
+ImplicitVariants=1
+UnicodeToLocale=1
+LocaleToUnicode=1
+ImagebaseMultiple=1
+SuspiciousTypecast=1
+PrivatePropAccessor=1
+UnsafeType=0
+UnsafeCode=0
+UnsafeCast=0
+[Linker]
+MapFile=0
+OutputObjs=0
+ConsoleApp=1
+DebugInfo=0
+RemoteSymbols=0
+MinStackSize=16384
+MaxStackSize=1048576
+ImageBase=4194304
+ExeDescription=
+[Directories]
+OutputDir=
+UnitOutputDir=
+PackageDLLOutputDir=
+PackageDCPOutputDir=
+SearchPath=
+Packages=vcl;rtl;vclx;indy;vclie;xmlrtl;inetdbbde;inet;inetdbxpress;dbrtl;soaprtl;dsnap;VclSmp;dbexpress;vcldb;dbxcds;inetdb;bdertl;vcldbx;adortl;teeui;teedb;tee;ibxpress;visualclx;visualdbclx;vclactnband;vclshlctrls;IntrawebDB_50_70;Intraweb_50_70;Rave50CLX;Rave50VCL;dclOffice2k
+Conditionals=
+DebugSourceDirs=
+UsePackages=0
+[Parameters]
+RunParams=
+HostApplication=
+Launcher=
+UseLauncher=0
+DebugCWD=
+[Language]
+ActiveLang=
+ProjectLang=
+RootDir=
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+[Version Info Keys]
+CompanyName=
+FileDescription=
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
diff --git a/components/orpheus/tests/TestTblEdits/project1.dpr b/components/orpheus/tests/TestTblEdits/project1.dpr
new file mode 100644
index 000000000..bd55dc21a
--- /dev/null
+++ b/components/orpheus/tests/TestTblEdits/project1.dpr
@@ -0,0 +1,22 @@
+program Project1;
+
+uses
+{$IFDEF LCL}
+  Interfaces,
+{$ENDIF}
+  Forms,
+  Unit1 in 'Unit1.pas' {Form1};
+
+{$IFDEF MSWINDOWS}
+{$R *.res}  {Include program's icon resource file}
+{$ENDIF}
+
+{$IFNDEF FPC}  //With FPC, assume .exe can find .manifest file at runtime
+{$R manifest.res}  {Include program's manifest in .exe for XP theme support}
+{$ENDIF}
+
+begin
+  Application.Initialize;
+  Application.CreateForm(TForm1, Form1);
+  Application.Run;
+end.
diff --git a/components/orpheus/tests/TestTblEdits/project1.exe.manifest b/components/orpheus/tests/TestTblEdits/project1.exe.manifest
new file mode 100644
index 000000000..3a04c4188
--- /dev/null
+++ b/components/orpheus/tests/TestTblEdits/project1.exe.manifest
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+  <assemblyIdentity
+    type="win32"
+    name="project1"
+    version="1.0.0.0" 
+    processorArchitecture="*"/>
+
+  <description>project1</description>
+
+  <dependency>
+    <dependentAssembly>
+      <assemblyIdentity
+        type="win32"
+        name="Microsoft.Windows.Common-Controls"
+        version="6.0.0.0"
+        publicKeyToken="6595b64144ccf1df"
+        language="*"
+        processorArchitecture="*"/>
+    </dependentAssembly>
+  </dependency>
+</assembly>
diff --git a/components/orpheus/tests/TestTblEdits/project1.lpi b/components/orpheus/tests/TestTblEdits/project1.lpi
new file mode 100644
index 000000000..fc9c97397
--- /dev/null
+++ b/components/orpheus/tests/TestTblEdits/project1.lpi
@@ -0,0 +1,108 @@
+<?xml version="1.0"?>
+<CONFIG>
+  <ProjectOptions>
+    <PathDelim Value="\"/>
+    <Version Value="5"/>
+    <General>
+      <MainUnit Value="0"/>
+      <IconPath Value="./"/>
+      <TargetFileExt Value=".exe"/>
+      <ActiveEditorIndexAtStart Value="1"/>
+    </General>
+    <VersionInfo>
+      <ProjectVersion Value=""/>
+      <Language Value=""/>
+      <CharSet Value=""/>
+    </VersionInfo>
+    <PublishOptions>
+      <Version Value="2"/>
+      <IgnoreBinaries Value="False"/>
+      <IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/>
+      <ExcludeFileFilter Value="*.(bak|ppu|ppw|o|so);*~;backup"/>
+    </PublishOptions>
+    <RunParams>
+      <local>
+        <FormatVersion Value="1"/>
+        <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
+      </local>
+    </RunParams>
+    <RequiredPackages Count="2">
+      <Item1>
+        <PackageName Value="Orpheus"/>
+      </Item1>
+      <Item2>
+        <PackageName Value="LCL"/>
+      </Item2>
+    </RequiredPackages>
+    <Units Count="2">
+      <Unit0>
+        <Filename Value="project1.dpr"/>
+        <IsPartOfProject Value="True"/>
+        <CursorPos X="40" Y="8"/>
+        <TopLine Value="1"/>
+        <EditorIndex Value="0"/>
+        <UsageCount Value="20"/>
+        <Loaded Value="True"/>
+      </Unit0>
+      <Unit1>
+        <Filename Value="unit1.pas"/>
+        <ComponentName Value="Form1"/>
+        <HasResources Value="True"/>
+        <UnitName Value="Unit1"/>
+        <CursorPos X="51" Y="7"/>
+        <TopLine Value="1"/>
+        <EditorIndex Value="1"/>
+        <UsageCount Value="10"/>
+        <Loaded Value="True"/>
+      </Unit1>
+    </Units>
+    <JumpHistory Count="0" HistoryIndex="-1"/>
+  </ProjectOptions>
+  <CompilerOptions>
+    <Version Value="5"/>
+    <PathDelim Value="\"/>
+    <SearchPaths>
+      <SrcPath Value="$(LazarusDir)\lcl\;$(LazarusDir)\lcl\interfaces\$(LCLWidgetType)\"/>
+    </SearchPaths>
+    <Parsing>
+      <SyntaxOptions>
+        <D2Extensions Value="False"/>
+        <CStyleOperator Value="False"/>
+        <AllowLabel Value="False"/>
+        <CPPInline Value="False"/>
+        <DelphiCompat Value="True"/>
+      </SyntaxOptions>
+    </Parsing>
+    <CodeGeneration>
+      <Checks>
+        <IOChecks Value="True"/>
+        <RangeChecks Value="True"/>
+        <OverflowChecks Value="True"/>
+        <StackChecks Value="True"/>
+      </Checks>
+    </CodeGeneration>
+    <Linking>
+      <Options>
+        <Win32>
+          <GraphicApplication Value="True"/>
+        </Win32>
+      </Options>
+    </Linking>
+    <Other>
+      <Verbosity>
+        <ShowExecInfo Value="True"/>
+      </Verbosity>
+      <CompilerPath Value="$(CompPath)"/>
+    </Other>
+  </CompilerOptions>
+  <Debugging>
+    <Exceptions Count="2">
+      <Item1>
+        <Name Value="ECodetoolError"/>
+      </Item1>
+      <Item2>
+        <Name Value="EFOpenError"/>
+      </Item2>
+    </Exceptions>
+  </Debugging>
+</CONFIG>
diff --git a/components/orpheus/tests/TestTblEdits/project1.res b/components/orpheus/tests/TestTblEdits/project1.res
new file mode 100644
index 000000000..3adc0361f
Binary files /dev/null and b/components/orpheus/tests/TestTblEdits/project1.res differ
diff --git a/components/orpheus/tests/TestTblEdits/unit1.dfm b/components/orpheus/tests/TestTblEdits/unit1.dfm
new file mode 100644
index 000000000..15fd404da
--- /dev/null
+++ b/components/orpheus/tests/TestTblEdits/unit1.dfm
@@ -0,0 +1,141 @@
+object Form1: TForm1
+  Left = 192
+  Top = 114
+  Width = 776
+  Height = 480
+  Caption = 'Form1'
+  Color = clBtnFace
+  Font.Charset = DEFAULT_CHARSET
+  Font.Color = clWindowText
+  Font.Height = -11
+  Font.Name = 'Arial'
+  Font.Style = []
+  OldCreateOrder = False
+  OnCreate = FormCreate
+  OnDestroy = FormDestroy
+  DesignSize = (
+    768
+    446)
+  PixelsPerInch = 96
+  TextHeight = 14
+  object OvcTable1: TOvcTable
+    Left = 16
+    Top = 16
+    Width = 737
+    Height = 409
+    Anchors = [akLeft, akTop, akRight, akBottom]
+    Color = clWindow
+    Controller = OvcController1
+    GridPenSet.NormalGrid.NormalColor = clBtnShadow
+    GridPenSet.NormalGrid.Style = psDot
+    GridPenSet.NormalGrid.Effect = geBoth
+    GridPenSet.LockedGrid.NormalColor = clBtnShadow
+    GridPenSet.LockedGrid.Style = psSolid
+    GridPenSet.LockedGrid.Effect = ge3D
+    GridPenSet.CellWhenFocused.NormalColor = clBlack
+    GridPenSet.CellWhenFocused.Style = psSolid
+    GridPenSet.CellWhenFocused.Effect = geBoth
+    GridPenSet.CellWhenUnfocused.NormalColor = clBlack
+    GridPenSet.CellWhenUnfocused.Style = psDash
+    GridPenSet.CellWhenUnfocused.Effect = geBoth
+    LockedRowsCell = OvcTCColHead1
+    Options = [otoNoRowResizing, otoNoColResizing, otoTabToArrow, otoEnterToArrow, otoAlwaysEditing, otoNoSelection, otoThumbTrack]
+    TabOrder = 0
+    OnGetCellData = OvcTable1GetCellData
+    CellData = (
+      'Form1.OvcTCColHead1'
+      'Form1.O32TCFlexEdit1'
+      'Form1.OvcTCSimpleField1'
+      'Form1.OvcTCRowHead1'
+      'Form1.OvcTCString1')
+    RowData = (
+      35)
+    ColData = (
+      110
+      False
+      True
+      'Form1.OvcTCRowHead1'
+      150
+      False
+      True
+      'Form1.OvcTCString1'
+      150
+      False
+      True
+      'Form1.OvcTCSimpleField1'
+      150
+      False
+      True
+      'Form1.O32TCFlexEdit1')
+  end
+  object OvcTCColHead1: TOvcTCColHead
+    Headings.Strings = (
+      'TOvcTCRowHead'
+      'TOvcTCString'
+      'TOvcTCSimpleField'
+      'TO32TCFlexEdit'
+      '')
+    ShowLetters = False
+    Adjust = otaCenter
+    Table = OvcTable1
+    Left = 48
+  end
+  object OvcTCRowHead1: TOvcTCRowHead
+    Adjust = otaCenter
+    Table = OvcTable1
+    Left = 80
+  end
+  object OvcTCString1: TOvcTCString
+    AutoAdvanceLeftRight = True
+    Table = OvcTable1
+    Left = 144
+  end
+  object OvcController1: TOvcController
+    EntryCommands.TableList = (
+      'Default'
+      True
+      ()
+      'WordStar'
+      False
+      ()
+      'Grid'
+      False
+      ())
+    Epoch = 2000
+    Left = 16
+  end
+  object OvcTCSimpleField1: TOvcTCSimpleField
+    CaretOvr.Shape = csBlock
+    EFColors.Disabled.BackColor = clWindow
+    EFColors.Disabled.TextColor = clGrayText
+    EFColors.Error.BackColor = clRed
+    EFColors.Error.TextColor = clBlack
+    EFColors.Highlight.BackColor = clHighlight
+    EFColors.Highlight.TextColor = clHighlightText
+    Table = OvcTable1
+    OnError = OvcTCSimpleField1Error
+    OnUserValidation = OvcTCSimpleField1UserValidation
+    Left = 296
+    RangeHigh = {00000000000000000000}
+    RangeLow = {00000000000000000000}
+  end
+  object O32TCFlexEdit1: TO32TCFlexEdit
+    EditorBorders.Active = False
+    EditorBorders.FlatColor = clBlack
+    EditorBorders.BorderStyle = bstyRaised
+    EditorOptions.Alignment = taLeftJustify
+    EditorOptions.Color = clWindow
+    EditorOptions.Cursor = crDefault
+    EditorOptions.MaxLines = 3
+    EditorOptions.PasswordChar = #0
+    EditorOptions.ReadOnly = False
+    EditorOptions.ShowButton = False
+    Table = OvcTable1
+    Validation.BeepOnError = True
+    Validation.InputRequired = False
+    Validation.ValidatorType = 'None'
+    Validation.ValidationType = vtUser
+    OnUserValidation = O32TCFlexEdit1UserValidation
+    Left = 448
+  end
+end
diff --git a/components/orpheus/tests/TestTblEdits/unit1.lfm b/components/orpheus/tests/TestTblEdits/unit1.lfm
new file mode 100644
index 000000000..b769a0785
--- /dev/null
+++ b/components/orpheus/tests/TestTblEdits/unit1.lfm
@@ -0,0 +1,136 @@
+object Form1: TForm1
+  Left = 192
+  Top = 114
+  Width = 768
+  Height = 446
+  Caption = 'Form1'
+  Color = clBtnFace
+  Font.Charset = DEFAULT_CHARSET
+  Font.Color = clWindowText
+  Font.Height = -11
+  Font.Style = []
+  OnCreate = FormCreate
+  OnDestroy = FormDestroy
+  PixelsPerInch = 96
+  TextHeight = 14
+  object OvcTable1: TOvcTable
+    Left = 16
+    Top = 16
+    Width = 737
+    Height = 409
+    Anchors = [akLeft, akTop, akRight, akBottom]
+    Color = clWindow
+    Controller = OvcController1
+    GridPenSet.NormalGrid.NormalColor = clBtnShadow
+    GridPenSet.NormalGrid.Style = psDot
+    GridPenSet.NormalGrid.Effect = geBoth
+    GridPenSet.LockedGrid.NormalColor = clBtnShadow
+    GridPenSet.LockedGrid.Style = psSolid
+    GridPenSet.LockedGrid.Effect = ge3D
+    GridPenSet.CellWhenFocused.NormalColor = clBlack
+    GridPenSet.CellWhenFocused.Style = psSolid
+    GridPenSet.CellWhenFocused.Effect = geBoth
+    GridPenSet.CellWhenUnfocused.NormalColor = clBlack
+    GridPenSet.CellWhenUnfocused.Style = psDash
+    GridPenSet.CellWhenUnfocused.Effect = geBoth
+    LockedRowsCell = OvcTCColHead1
+    Options = [otoNoRowResizing, otoNoColResizing, otoTabToArrow, otoEnterToArrow, otoAlwaysEditing, otoNoSelection, otoThumbTrack]
+    TabOrder = 0
+    OnGetCellData = OvcTable1GetCellData
+    CellData = (
+      'Form1.OvcTCColHead1'
+      'Form1.O32TCFlexEdit1'
+      'Form1.OvcTCSimpleField1'
+      'Form1.OvcTCRowHead1'
+      'Form1.OvcTCString1')
+    RowData = (
+      35)
+    ColData = (
+      110
+      False
+      True
+      'Form1.OvcTCRowHead1'
+      150
+      False
+      True
+      'Form1.OvcTCString1'
+      150
+      False
+      True
+      'Form1.OvcTCSimpleField1'
+      150
+      False
+      True
+      'Form1.O32TCFlexEdit1')
+  end
+  object OvcTCColHead1: TOvcTCColHead
+    Headings.Strings = (
+      'TOvcTCRowHead'
+      'TOvcTCString'
+      'TOvcTCSimpleField'
+      'TO32TCFlexEdit'
+      '')
+    ShowLetters = False
+    Adjust = otaCenter
+    Table = OvcTable1
+    Top = 48
+  end
+  object OvcTCRowHead1: TOvcTCRowHead
+    Adjust = otaCenter
+    Table = OvcTable1
+    Top = 80
+  end
+  object OvcTCString1: TOvcTCString
+    AutoAdvanceLeftRight = True
+    Table = OvcTable1
+    Top = 144
+  end
+  object OvcController1: TOvcController
+    EntryCommands.TableList = (
+      'Default'
+      True
+      ()
+      'WordStar'
+      False
+      ()
+      'Grid'
+      False
+      ())
+    Epoch = 2000
+    Top = 16
+  end
+  object OvcTCSimpleField1: TOvcTCSimpleField
+    CaretOvr.Shape = csBlock
+    EFColors.Disabled.BackColor = clWindow
+    EFColors.Disabled.TextColor = clGrayText
+    EFColors.Error.BackColor = clRed
+    EFColors.Error.TextColor = clBlack
+    EFColors.Highlight.BackColor = clHighlight
+    EFColors.Highlight.TextColor = clHighlightText
+    Table = OvcTable1
+    OnError = OvcTCSimpleField1Error
+    OnUserValidation = OvcTCSimpleField1UserValidation
+    Top = 296
+    RangeHigh = {00000000000000000000}
+    RangeLow = {00000000000000000000}
+  end
+  object O32TCFlexEdit1: TO32TCFlexEdit
+    EditorBorders.Active = False
+    EditorBorders.FlatColor = clBlack
+    EditorBorders.BorderStyle = bstyRaised
+    EditorOptions.Alignment = taLeftJustify
+    EditorOptions.Color = clWindow
+    EditorOptions.Cursor = crDefault
+    EditorOptions.MaxLines = 3
+    EditorOptions.PasswordChar = #0
+    EditorOptions.ReadOnly = False
+    EditorOptions.ShowButton = False
+    Table = OvcTable1
+    Validation.BeepOnError = True
+    Validation.InputRequired = False
+    Validation.ValidatorType = 'None'
+    Validation.ValidationType = vtUser
+    OnUserValidation = O32TCFlexEdit1UserValidation
+    Top = 448
+  end
+end
diff --git a/components/orpheus/tests/TestTblEdits/unit1.lrs b/components/orpheus/tests/TestTblEdits/unit1.lrs
new file mode 100644
index 000000000..a82a47360
--- /dev/null
+++ b/components/orpheus/tests/TestTblEdits/unit1.lrs
@@ -0,0 +1,49 @@
+LazarusResources.Add('TForm1','FORMDATA',[
+  'TPF0'#6'TForm1'#5'Form1'#4'Left'#3#192#0#3'Top'#2'r'#5'Width'#3#0#3#6'Height'
+  +#3#190#1#7'Caption'#6#5'Form1'#5'Color'#7#9'clBtnFace'#12'Font.Charset'#7#15
+  +'DEFAULT_CHARSET'#10'Font.Color'#7#12'clWindowText'#11'Font.Height'#2#245#10
+  +'Font.Style'#11#0#8'OnCreate'#7#10'FormCreate'#9'OnDestroy'#7#11'FormDestroy'
+  +#13'PixelsPerInch'#2'`'#10'TextHeight'#2#14#0#9'TOvcTable'#9'OvcTable1'#4'Le'
+  +'ft'#2#16#3'Top'#2#16#5'Width'#3#225#2#6'Height'#3#153#1#7'Anchors'#11#6'akL'
+  +'eft'#5'akTop'#7'akRight'#8'akBottom'#0#5'Color'#7#8'clWindow'#10'Controller'
+  +#7#14'OvcController1!GridPenSet.NormalGrid.NormalColor'#7#11'clBtnShadow'#27
+  +'GridPenSet.NormalGrid.Style'#7#5'psDot'#28'GridPenSet.NormalGrid.Effect'#7#6
+  +'geBoth!GridPenSet.LockedGrid.NormalColor'#7#11'clBtnShadow'#27'GridPenSet.L'
+  +'ockedGrid.Style'#7#7'psSolid'#28'GridPenSet.LockedGrid.Effect'#7#4'ge3D&Gri'
+  +'dPenSet.CellWhenFocused.NormalColor'#7#7'clBlack GridPenSet.CellWhenFocused'
+  +'.Style'#7#7'psSolid!GridPenSet.CellWhenFocused.Effect'#7#6'geBoth(GridPenSe'
+  +'t.CellWhenUnfocused.NormalColor'#7#7'clBlack"GridPenSet.CellWhenUnfocused.S'
+  +'tyle'#7#6'psDash#GridPenSet.CellWhenUnfocused.Effect'#7#6'geBoth'#14'Locked'
+  +'RowsCell'#7#13'OvcTCColHead1'#7'Options'#11#16'otoNoRowResizing'#16'otoNoCo'
+  +'lResizing'#13'otoTabToArrow'#15'otoEnterToArrow'#16'otoAlwaysEditing'#14'ot'
+  +'oNoSelection'#13'otoThumbTrack'#0#8'TabOrder'#2#0#13'OnGetCellData'#7#20'Ov'
+  +'cTable1GetCellData'#8'CellData'#1#6#19'Form1.OvcTCColHead1'#6#20'Form1.O32T'
+  +'CFlexEdit1'#6#23'Form1.OvcTCSimpleField1'#6#19'Form1.OvcTCRowHead1'#6#18'Fo'
+  +'rm1.OvcTCString1'#0#7'RowData'#1#2'#'#0#7'ColData'#1#2'n'#8#9#6#19'Form1.Ov'
+  +'cTCRowHead1'#3#150#0#8#9#6#18'Form1.OvcTCString1'#3#150#0#8#9#6#23'Form1.Ov'
+  +'cTCSimpleField1'#3#150#0#8#9#6#20'Form1.O32TCFlexEdit1'#0#0#0#13'TOvcTCColH'
+  +'ead'#13'OvcTCColHead1'#16'Headings.Strings'#1#6#13'TOvcTCRowHead'#6#12'TOvc'
+  +'TCString'#6#17'TOvcTCSimpleField'#6#14'TO32TCFlexEdit'#6#0#0#11'ShowLetters'
+  +#8#6'Adjust'#7#9'otaCenter'#5'Table'#7#9'OvcTable1'#3'Top'#2'0'#0#0#13'TOvcT'
+  +'CRowHead'#13'OvcTCRowHead1'#6'Adjust'#7#9'otaCenter'#5'Table'#7#9'OvcTable1'
+  +#3'Top'#2'P'#0#0#12'TOvcTCString'#12'OvcTCString1'#20'AutoAdvanceLeftRight'#9
+  +#5'Table'#7#9'OvcTable1'#3'Top'#3#144#0#0#0#14'TOvcController'#14'OvcControl'
+  +'ler1'#23'EntryCommands.TableList'#1#6#7'Default'#9#1#0#6#8'WordStar'#8#1#0#6
+  +#4'Grid'#8#1#0#0#5'Epoch'#3#208#7#3'Top'#2#16#0#0#17'TOvcTCSimpleField'#17'O'
+  +'vcTCSimpleField1'#14'CaretOvr.Shape'#7#7'csBlock'#27'EFColors.Disabled.Back'
+  +'Color'#7#8'clWindow'#27'EFColors.Disabled.TextColor'#7#10'clGrayText'#24'EF'
+  +'Colors.Error.BackColor'#7#5'clRed'#24'EFColors.Error.TextColor'#7#7'clBlack'
+  +#28'EFColors.Highlight.BackColor'#7#11'clHighlight'#28'EFColors.Highlight.Te'
+  +'xtColor'#7#15'clHighlightText'#5'Table'#7#9'OvcTable1'#7'OnError'#7#22'OvcT'
+  +'CSimpleField1Error'#16'OnUserValidation'#7#31'OvcTCSimpleField1UserValidati'
+  +'on'#3'Top'#3'('#1#9'RangeHigh'#10#10#0#0#0#0#0#0#0#0#0#0#0#0#0#8'RangeLow'
+  +#10#10#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#14'TO32TCFlexEdit'#14'O32TCFlexEdit1'#20
+  +'EditorBorders.Active'#8#23'EditorBorders.FlatColor'#7#7'clBlack'#25'EditorB'
+  +'orders.BorderStyle'#7#10'bstyRaised'#23'EditorOptions.Alignment'#7#13'taLef'
+  +'tJustify'#19'EditorOptions.Color'#7#8'clWindow'#20'EditorOptions.Cursor'#7#9
+  +'crDefault'#22'EditorOptions.MaxLines'#2#3#26'EditorOptions.PasswordChar'#6#1
+  +#0#22'EditorOptions.ReadOnly'#8#24'EditorOptions.ShowButton'#8#5'Table'#7#9
+  +'OvcTable1'#22'Validation.BeepOnError'#9#24'Validation.InputRequired'#8#24'V'
+  +'alidation.ValidatorType'#6#4'None'#25'Validation.ValidationType'#7#6'vtUser'
+  +#16'OnUserValidation'#7#28'O32TCFlexEdit1UserValidation'#3'Top'#3#192#1#0#0#0
+]);
diff --git a/components/orpheus/tests/TestTblEdits/unit1.pas b/components/orpheus/tests/TestTblEdits/unit1.pas
new file mode 100644
index 000000000..387f53980
--- /dev/null
+++ b/components/orpheus/tests/TestTblEdits/unit1.pas
@@ -0,0 +1,139 @@
+unit Unit1;
+
+interface
+
+uses
+  {$IFNDEF LCL} Windows, Messages, {$ELSE} LclIntf, LMessages, LclType, LResources, {$ENDIF}
+  SysUtils, Variants, Classes, Graphics, Controls, Forms, Dialogs, StdCtrls, 
+  ovctcedt, ovctchdr, ovctcmmn, ovctable, ovcbase, ovctcsim, o32tcflx,
+  ovcdata, ovcsf, ovctcbef, ovctcell, ovctcstr;
+
+const
+  MaxDataRecs = 20;
+  MaxStrLen = 100;
+  cnStr = 1;  {Column numbers for controls}
+  cnSimp = 2;
+  cnFlex = 3;
+  
+type
+  TDataRec = record
+    Str  : string[MaxStrLen];
+    Simp : string[MaxStrLen];
+    Flex : string;
+    end;
+    
+  TDataArray = array[1..MaxDataRecs] of TDataRec;
+
+  TForm1 = class(TForm)
+    OvcTable1: TOvcTable;
+    OvcController1: TOvcController;
+    OvcTCColHead1: TOvcTCColHead;
+    OvcTCRowHead1: TOvcTCRowHead;
+    OvcTCString1: TOvcTCString;
+    OvcTCSimpleField1: TOvcTCSimpleField;
+    O32TCFlexEdit1: TO32TCFlexEdit;
+    procedure FormCreate(Sender: TObject);
+    procedure FormDestroy(Sender: TObject);
+    procedure OvcTable1GetCellData(Sender: TObject; RowNum,
+      ColNum: Integer; var Data: Pointer; Purpose: TOvcCellDataPurpose);
+    procedure OvcTCSimpleField1UserValidation(Sender: TObject;
+      var ErrorCode: Word);
+    procedure OvcTCSimpleField1Error(Sender: TObject; ErrorCode: Word;
+      ErrorMsg: String);
+    procedure O32TCFlexEdit1UserValidation(Sender: TObject; Value: String;
+      var ValidEntry: Boolean);
+  private
+    DataArray : TDataArray;  {A place to store data entered in table}
+  public
+  end;
+
+var
+  Form1: TForm1;
+
+
+implementation
+
+{$IFNDEF LCL}
+{$R *.dfm}  {Link Delphi form file}
+{$ENDIF}
+
+procedure TForm1.FormCreate(Sender: TObject);
+ {Initialize the main form.
+  Do anything that needs to be done before the form
+   can be displayed.}
+var
+  RowNum : Integer;
+begin
+  OvcTable1.RowLimit := MaxDataRecs + OvcTable1.LockedRows;
+  
+  OvcTCString1.MaxLength := MaxStrLen;  {Be sure to set this here or in form}
+  OvcTCSimpleField1.MaxLength := MaxStrLen;
+  O32TCFlexEdit1.MaxLength := MaxStrLen;
+  
+{$IFDEF FPC}
+  for RowNum := 1 to MaxDataRecs do
+    SetLength(DataArray[RowNum].Flex, MaxStrLen);
+{$ENDIF}    
+end;  {TForm1.FormCreate}
+
+
+procedure TForm1.FormDestroy(Sender: TObject);
+begin
+end;  {TForm1.FormDestroy}
+
+
+procedure TForm1.OvcTable1GetCellData(Sender: TObject; RowNum,
+  ColNum: Integer; var Data: Pointer; Purpose: TOvcCellDataPurpose);
+ {This event handler is called when the table needs data to display 
+   or edit in a cell or a place to save a cell's edited data.}
+begin
+  Data := nil;
+  if (RowNum < OvcTable1.LockedRows) or (RowNum > OvcTable1.RowLimit) then
+    Exit;
+    
+  case ColNum of
+    cnStr  : Data := @DataArray[RowNum].Str;
+    cnSimp : Data := @DataArray[RowNum].Simp;
+    cnFlex : Data := PChar(DataArray[RowNum].Flex);
+    end;   
+end;  {TForm1.OvcTable1GetCellData}
+
+
+procedure TForm1.OvcTCSimpleField1UserValidation(Sender: TObject;
+  var ErrorCode: Word);
+var
+  AnInt : Integer;
+begin
+  ErrorCode := 0;
+  if (TOvcSimpleField(Sender).Text <> '') and
+     (not TryStrToInt(TOvcSimpleField(Sender).Text, AnInt)) then
+    ErrorCode := oeInvalidNumber; 
+end;
+
+procedure TForm1.OvcTCSimpleField1Error(Sender: TObject; ErrorCode: Word;
+  ErrorMsg: String);
+begin
+  MessageDlg(ErrorMsg + #13#10 + 'Enter an integer or press Ctrl+Z to undo.', 
+             mtError, [mbOK], 0);
+end;
+
+procedure TForm1.O32TCFlexEdit1UserValidation(Sender: TObject;
+  Value: String; var ValidEntry: Boolean);
+var
+  AnInt : Integer;
+begin
+  ValidEntry := True;
+  if (Value <> '') and (not TryStrToInt(Value, AnInt)) then
+    begin
+    ValidEntry := False;
+    MessageDlg('Invalid value.' + #13#10 + 
+               'Enter an integer or press Ctrl+Z to undo.', mtError, [mbOK], 0);
+    end;
+end;
+
+initialization
+{$IFDEF LCL}
+{$I unit1.lrs}  {Include form's Lazarus resource file}
+{$ENDIF}
+
+end.