3 files changed, 9 insertions, 16 deletions
diff --git a/prototypes/fpgui2/tests/frm_threedee.pas b/prototypes/fpgui2/tests/frm_threedee.pas
index dd3bc46d..836de485 100644
--- a/prototypes/fpgui2/tests/frm_threedee.pas
+++ b/prototypes/fpgui2/tests/frm_threedee.pas
@@ -10,12 +10,9 @@ unit frm_threedee;
 interface
 
 uses
-  SysUtils, Classes, gfxbase, fpgfx, gui_edit, 
-  gfx_widget, gui_form, gui_label, gui_button,
-  gui_listbox, gui_memo, gui_combobox, gui_grid, 
-  gui_dialogs, gui_checkbox, gui_tree, gui_trackbar, 
-  gui_progressbar, gui_radiobutton, gui_tab, gui_menu,
-  gui_bevel;
+  SysUtils, Classes, fpg_base, fpg_main, fpg_edit,
+  fpg_widget, fpg_form, fpg_label, fpg_button, fpg_dialogs,
+  fpg_checkbox, fpg_trackbar, fpg_progressbar, fpg_menu;
 
 type
 
@@ -69,8 +66,8 @@ type
 implementation
 
 uses
-  gfx_UTF8utils,
-  gfx_imgfmt_bmp;
+  fpg_stringutils,
+  fpg_imgfmt_bmp;
   
 const
   clM2DarkBlue = $187EC0;
diff --git a/prototypes/fpgui2/tests/threedee.lpi b/prototypes/fpgui2/tests/threedee.lpi
index c0669034..73845ab0 100644
--- a/prototypes/fpgui2/tests/threedee.lpi
+++ b/prototypes/fpgui2/tests/threedee.lpi
@@ -1,17 +1,16 @@
 <?xml version="1.0"?>
 <CONFIG>
   <ProjectOptions>
-    <PathDelim Value="/"/>
-    <Version Value="6"/>
+    <Version Value="7"/>
     <General>
       <Flags>
         <SaveOnlyProjectUnits Value="True"/>
         <MainUnitHasCreateFormStatements Value="False"/>
         <MainUnitHasTitleStatement Value="False"/>
+        <LRSInOutputDirectory Value="False"/>
       </Flags>
       <SessionStorage Value="InProjectDir"/>
       <MainUnit Value="0"/>
-      <IconPath Value="./"/>
       <TargetFileExt Value=""/>
     </General>
     <VersionInfo>
@@ -47,10 +46,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/threedee.lpr b/prototypes/fpgui2/tests/threedee.lpr
index 83766c7b..380d431b 100644
--- a/prototypes/fpgui2/tests/threedee.lpr
+++ b/prototypes/fpgui2/tests/threedee.lpr
@@ -11,7 +11,7 @@ uses
   {$IFDEF UNIX}{$IFDEF UseCThreads}
   cthreads,
   {$ENDIF}{$ENDIF}
-  Classes, fpgfx, frm_threedee, fpgui_toolkit;
+  Classes, fpg_main, frm_threedee;
 
 
 procedure MainProc;