5 files changed, 16 insertions, 8 deletions
diff --git a/prototypes/fpgui2/tests/edittest.lpr b/prototypes/fpgui2/tests/edittest.lpr
index e69cfca4..ec7d5626 100644
--- a/prototypes/fpgui2/tests/edittest.lpr
+++ b/prototypes/fpgui2/tests/edittest.lpr
@@ -116,7 +116,7 @@ begin
   
   InflateRect(r, -1, -1);
 //  Canvas.DrawControlFrame(2, 2, Width-4, Height-4);
-  Canvas.DrawControlFrame(r);
+  fpgStyle.DrawControlFrame(Canvas, r);
 
 {
   Canvas.SetColor(clGreen);
diff --git a/prototypes/fpgui2/tests/fpg_styler.pas b/prototypes/fpgui2/tests/fpg_styler.pas
index ad967214..d0c298cc 100644
--- a/prototypes/fpgui2/tests/fpg_styler.pas
+++ b/prototypes/fpgui2/tests/fpg_styler.pas
@@ -331,7 +331,7 @@ begin
             InflateRect(r, -3, -3);
 
             oldColor      := Canvas.Color;
-            oldLineWidth  := Canvas.LineWidth;
+            oldLineWidth  := Canvas.GetLineWidth;
             oldLineStyle  := Canvas.LineStyle;
 
             Canvas.SetColor(clText1);
diff --git a/prototypes/fpgui2/tests/themetest.lpr b/prototypes/fpgui2/tests/themetest.lpr
index c9ec5c19..1484e957 100644
--- a/prototypes/fpgui2/tests/themetest.lpr
+++ b/prototypes/fpgui2/tests/themetest.lpr
@@ -807,7 +807,7 @@ begin
   img.Free;
   
   nr.SetRect(20, 250, 100, 4);
-  Canvas.DrawControlFrame(nr);
+  fpgStyle.DrawControlFrame(Canvas, nr);
   nr.SetRect(70, 241, 11, 21);
   Canvas.DrawButtonFace(nr, []);
 
diff --git a/prototypes/fpgui2/tests/threedee.lpi b/prototypes/fpgui2/tests/threedee.lpi
index 73845ab0..c5361e9e 100644
--- a/prototypes/fpgui2/tests/threedee.lpi
+++ b/prototypes/fpgui2/tests/threedee.lpi
@@ -1,7 +1,7 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="7"/>
+    <Version Value="9"/>
     <General>
       <Flags>
         <SaveOnlyProjectUnits Value="True"/>
@@ -11,11 +11,13 @@
       </Flags>
       <SessionStorage Value="InProjectDir"/>
       <MainUnit Value="0"/>
-      <TargetFileExt Value=""/>
     </General>
     <VersionInfo>
-      <ProjectVersion Value=""/>
+      <StringTable ProductVersion=""/>
     </VersionInfo>
+    <BuildModes Count="1">
+      <Item1 Name="default" Default="True"/>
+    </BuildModes>
     <PublishOptions>
       <Version Value="2"/>
       <IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/>
@@ -46,7 +48,12 @@
     </Units>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="8"/>
+    <Version Value="11"/>
+    <Parsing>
+      <SyntaxOptions>
+        <UseAnsiStrings Value="False"/>
+      </SyntaxOptions>
+    </Parsing>
     <Other>
       <CompilerPath Value="$(CompPath)"/>
     </Other>
diff --git a/prototypes/fpgui2/tests/threedee.lpr b/prototypes/fpgui2/tests/threedee.lpr
index 380d431b..158f3c54 100644
--- a/prototypes/fpgui2/tests/threedee.lpr
+++ b/prototypes/fpgui2/tests/threedee.lpr
@@ -6,6 +6,7 @@
 program threedee;
 
 {$mode objfpc}{$H+}
+{$IFDEF MSWINDOWS} {$apptype gui} {$ENDIF}
 
 uses
   {$IFDEF UNIX}{$IFDEF UseCThreads}