Quickly made the prototypes compilable again.

7 files changed, 50 insertions, 60 deletions

diff --git a/prototypes/fpgui2/tests/drawtest.lpi b/prototypes/fpgui2/tests/drawtest.lpi
index 978bd036..b24d08d8 100644
--- a/prototypes/fpgui2/tests/drawtest.lpi
+++ b/prototypes/fpgui2/tests/drawtest.lpi
@@ -1,15 +1,14 @@
 <?xml version="1.0"?>
 <CONFIG>
   <ProjectOptions>
-    <PathDelim Value="/"/>
-    <Version Value="6"/>
+    <Version Value="7"/>
     <General>
       <Flags>
         <SaveOnlyProjectUnits Value="True"/>
+        <LRSInOutputDirectory Value="False"/>
       </Flags>
       <SessionStorage Value="InProjectDir"/>
       <MainUnit Value="0"/>
-      <IconPath Value="./"/>
       <TargetFileExt Value=""/>
     </General>
     <VersionInfo>
@@ -40,10 +39,7 @@
     </Units>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="5"/>
-    <CodeGeneration>
-      <Generate Value="Faster"/>
-    </CodeGeneration>
+    <Version Value="8"/>
     <Other>
       <CompilerPath Value="$(CompPath)"/>
     </Other>
diff --git a/prototypes/fpgui2/tests/drawtest.lpr b/prototypes/fpgui2/tests/drawtest.lpr
index dc2dfaec..b9f917aa 100644
--- a/prototypes/fpgui2/tests/drawtest.lpr
+++ b/prototypes/fpgui2/tests/drawtest.lpr
@@ -7,10 +7,10 @@ uses
   cthreads,
   {$ENDIF}{$ENDIF}
   Classes,
-  fpgfx,
-  gfxbase,
-  gui_form,
-  gfx_imgfmt_bmp, fpgui_toolkit;
+  fpg_base,
+  fpg_main,
+  fpg_form,
+  fpg_imgfmt_bmp;
   
 type
 
diff --git a/prototypes/fpgui2/tests/edittest.lpi b/prototypes/fpgui2/tests/edittest.lpi
index fa79a0d7..11119cdb 100644
--- a/prototypes/fpgui2/tests/edittest.lpi
+++ b/prototypes/fpgui2/tests/edittest.lpi
@@ -1,15 +1,14 @@
 <?xml version="1.0"?>
 <CONFIG>
   <ProjectOptions>
-    <PathDelim Value="/"/>
-    <Version Value="6"/>
+    <Version Value="7"/>
     <General>
       <Flags>
         <SaveOnlyProjectUnits Value="True"/>
+        <LRSInOutputDirectory Value="False"/>
       </Flags>
       <SessionStorage Value="InProjectDir"/>
       <MainUnit Value="0"/>
-      <IconPath Value="./"/>
       <TargetFileExt Value=""/>
     </General>
     <VersionInfo>
@@ -45,10 +44,7 @@
     </Units>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="5"/>
-    <CodeGeneration>
-      <Generate Value="Faster"/>
-    </CodeGeneration>
+    <Version Value="8"/>
     <Linking>
       <Debugging>
         <UseLineInfoUnit Value="False"/>
diff --git a/prototypes/fpgui2/tests/edittest.lpr b/prototypes/fpgui2/tests/edittest.lpr
index ede76f86..16b32e58 100644
--- a/prototypes/fpgui2/tests/edittest.lpr
+++ b/prototypes/fpgui2/tests/edittest.lpr
@@ -5,24 +5,24 @@ program edittest;
 uses
   Classes,
   SysUtils,
-  gfxbase,
-  fpgfx,
-  gfx_widget,
-  gfx_imgfmt_bmp,
-  gfx_UTF8utils,
-  gui_form,
-  gui_label,
-  gui_button,
-  gui_edit,
-  gui_combobox,
-  gui_scrollbar,
-  gui_memo,
-  gui_dialogs,
-  gui_listbox,
-  gui_checkbox,
-  gui_radiobutton,
-  gui_trackbar,
-  gui_progressbar;
+  fpg_base,
+  fpg_main,
+  fpg_widget,
+  fpg_imgfmt_bmp,
+  fpg_stringutils,
+  fpg_form,
+  fpg_label,
+  fpg_button,
+  fpg_edit,
+  fpg_combobox,
+  fpg_scrollbar,
+  fpg_memo,
+  fpg_dialogs,
+  fpg_listbox,
+  fpg_checkbox,
+  fpg_radiobutton,
+  fpg_trackbar,
+  fpg_progressbar;
 
 type
 
diff --git a/prototypes/fpgui2/tests/themetest.lpi b/prototypes/fpgui2/tests/themetest.lpi
index e269e7ee..3af53c03 100644
--- a/prototypes/fpgui2/tests/themetest.lpi
+++ b/prototypes/fpgui2/tests/themetest.lpi
@@ -2,14 +2,14 @@
 <CONFIG>
   <ProjectOptions>
     <PathDelim Value="\"/>
-    <Version Value="5"/>
+    <Version Value="7"/>
     <General>
       <Flags>
         <SaveOnlyProjectUnits Value="True"/>
+        <LRSInOutputDirectory Value="False"/>
       </Flags>
       <SessionStorage Value="InProjectDir"/>
       <MainUnit Value="0"/>
-      <IconPath Value=".\"/>
       <TargetFileExt Value=""/>
     </General>
     <VersionInfo>
@@ -40,11 +40,8 @@
     </Units>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="5"/>
+    <Version Value="8"/>
     <PathDelim Value="\"/>
-    <CodeGeneration>
-      <Generate Value="Faster"/>
-    </CodeGeneration>
     <Other>
       <CustomOptions Value="-FUunits"/>
       <CompilerPath Value="$(CompPath)"/>
diff --git a/prototypes/fpgui2/tests/themetest.lpr b/prototypes/fpgui2/tests/themetest.lpr
index c194e571..82761806 100644
--- a/prototypes/fpgui2/tests/themetest.lpr
+++ b/prototypes/fpgui2/tests/themetest.lpr
@@ -8,17 +8,17 @@ uses
   {$ENDIF}{$ENDIF}
   Classes,
   SysUtils,
-  fpgfx,
-  gfxbase,
-  gui_form,
-  gui_scrollbar,
-  gui_button,
-  gui_label,
-  gfx_imgfmt_bmp,
-  gfx_extinterpolation,
-  gui_trackbar,
-  gui_style,
-  gui_dialogs;
+  fpg_base,
+  fpg_main,
+  fpg_form,
+  fpg_scrollbar,
+  fpg_button,
+  fpg_label,
+  fpg_imgfmt_bmp,
+  fpg_extinterpolation,
+  fpg_trackbar,
+  fpg_style,
+  fpg_dialogs;
 
 type
   { Note:
@@ -142,21 +142,21 @@ begin
   buttonoptions.ButtonFeatures := [];
   
   if Enabled then
-    Include(buttonoptions.State, stEnabled);
-    
+    buttonoptions.State := buttonoptions.State + [stEnabled];
+
   if FDown then
-    Include(buttonoptions.State, stLowered)
+    buttonoptions.State := buttonoptions.State + [stLowered]
   else
-    Include(buttonoptions.State, stRaised);
+    buttonoptions.State := buttonoptions.State + [stRaised];
 
   if FFocused then
-    Include(buttonoptions.State, stHasFocus);
+    buttonoptions.State := buttonoptions.State + [stHasFocus];
 
   if FEmbedded then
-    Include(buttonoptions.ButtonFeatures, bfEmbedded);
+    buttonoptions.ButtonFeatures := buttonoptions.ButtonFeatures + [bfEmbedded];
 
   if FDefault then
-    Include(buttonoptions.ButtonFeatures, bfDefault);
+    buttonoptions.ButtonFeatures := buttonoptions.ButtonFeatures + [bfDefault];
 
   // Now let the Style do ALL the drawing. Nothing must be done here!
   FStyle.DrawControl(cePushButtonBevel, buttonoptions, Canvas, self);
diff --git a/prototypes/fpgui2/tests/units/.gitignore b/prototypes/fpgui2/tests/units/.gitignore
new file mode 100644
index 00000000..72e8ffc0
--- /dev/null
+++ b/prototypes/fpgui2/tests/units/.gitignore
@@ -0,0 +1 @@
+*