From e1689db00f8a91cc510ae0851513a07ba7910834 Mon Sep 17 00:00:00 2001 From: Graeme Geldenhuys Date: Thu, 31 Oct 2013 14:35:27 +0200 Subject: Updates some the prototype projects with the latest framework API changes. --- prototypes/fpgui2/tests/edittest.lpr | 2 +- prototypes/fpgui2/tests/fpg_styler.pas | 2 +- prototypes/fpgui2/tests/themetest.lpr | 2 +- prototypes/fpgui2/tests/threedee.lpi | 17 ++++++++++++----- prototypes/fpgui2/tests/threedee.lpr | 1 + 5 files changed, 16 insertions(+), 8 deletions(-) (limited to 'prototypes/fpgui2') 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 @@ - + - + @@ -11,11 +11,13 @@ - - + + + + @@ -46,7 +48,12 @@ - + + + + + + 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} -- cgit v1.2.3-70-g09d2