* Applied Jean-Marc memo patch adding TextColor and BackgroundColor properties.

* Renamed the Color property to TextColor for RadioButton, Memo, DBLabel, Label, Edit and CheckBox. It's less confusing.

2 files changed, 15 insertions, 14 deletions

diff --git a/prototypes/fpgui2/tests/edittest.lpi b/prototypes/fpgui2/tests/edittest.lpi
index 4184dcf4..ae200625 100644
--- a/prototypes/fpgui2/tests/edittest.lpi
+++ b/prototypes/fpgui2/tests/edittest.lpi
@@ -1,15 +1,15 @@
 <?xml version="1.0"?>
 <CONFIG>
   <ProjectOptions>
-    <PathDelim Value="\"/>
-    <Version Value="5"/>
+    <PathDelim Value="/"/>
+    <Version Value="6"/>
     <General>
       <Flags>
         <SaveOnlyProjectUnits Value="True"/>
       </Flags>
       <SessionStorage Value="InProjectDir"/>
       <MainUnit Value="0"/>
-      <IconPath Value=".\"/>
+      <IconPath Value="./"/>
       <TargetFileExt Value=""/>
     </General>
     <VersionInfo>
@@ -23,7 +23,7 @@
     <RunParams>
       <local>
         <FormatVersion Value="1"/>
-        <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
+        <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
       </local>
     </RunParams>
     <RequiredPackages Count="1">
@@ -47,7 +47,6 @@
   </ProjectOptions>
   <CompilerOptions>
     <Version Value="5"/>
-    <PathDelim Value="\"/>
     <CodeGeneration>
       <Generate Value="Faster"/>
     </CodeGeneration>
diff --git a/prototypes/fpgui2/tests/edittest.lpr b/prototypes/fpgui2/tests/edittest.lpr
index 5c99685f..ecd50d71 100644
--- a/prototypes/fpgui2/tests/edittest.lpr
+++ b/prototypes/fpgui2/tests/edittest.lpr
@@ -333,19 +333,21 @@ begin
       'and it should have done so. If not, there is a bug in the code. It ' +
       'has also been optimized to wordwrap and not split words over two lines.'
       , 'My cool message title');
-  if btn2.Color = clBlue then
+  if btn2.TextColor = clBlue then
   begin
-    edit1.Color := clText1;
-    btn2.Color := clText1;
-    checkbox2.Color := clText1;
-    radiobtn1.Color := clText1;
+    edit1.TextColor     := clText1;
+    btn2.TextColor      := clText1;
+    checkbox2.TextColor := clText1;
+    radiobtn1.TextColor := clText1;
+    memo.TextColor      := clText1;
   end
   else
   begin
-    edit1.Color := clBlue;
-    btn2.Color := clBlue;
-    checkbox2.Color := clBlue;
-    radiobtn1.Color := clBlue;
+    edit1.TextColor     := clBlue;
+    btn2.TextColor      := clBlue;
+    checkbox2.TextColor := clBlue;
+    radiobtn1.TextColor := clBlue;
+    memo.TextColor      := clBlue;
   end;
 end;