summaryrefslogtreecommitdiff
path: root/examples/corelib
diff options
context:
space:
mode:
authorGraeme Geldenhuys <graemeg@gmail.com>2015-09-02 23:25:41 +0100
committerGraeme Geldenhuys <graemeg@gmail.com>2015-09-02 23:25:41 +0100
commitb0a9f3d90d7a8127ba41ab77a7054d797e816c83 (patch)
treeb11cdae78c316a7b728522e9a4bfb43880fad8f5 /examples/corelib
parentdb31f06d5e7adf28fad60e36fd9e5d2cf0519e84 (diff)
parentf52bde1cd49d0d01002e8b684909268b723a3edb (diff)
downloadfpGUI-master.tar.xz
Merge branch 'fixes_1.4'HEADmaster
Diffstat (limited to 'examples/corelib')
-rw-r--r--examples/corelib/aggcanvas/agg_canvas_test.lpr2
-rw-r--r--examples/corelib/canvastest/fpgcanvas.lpr6
2 files changed, 4 insertions, 4 deletions
diff --git a/examples/corelib/aggcanvas/agg_canvas_test.lpr b/examples/corelib/aggcanvas/agg_canvas_test.lpr
index 3b3a75ef..a3bde27f 100644
--- a/examples/corelib/aggcanvas/agg_canvas_test.lpr
+++ b/examples/corelib/aggcanvas/agg_canvas_test.lpr
@@ -245,7 +245,7 @@ begin
// Testing basic style drawings
- Canvas.Font := fpgApplication.DefaultFont;
+ Canvas.Font := fpgStyle.DefaultFont;
Canvas.DrawString(320, 3, 'DrawButtonFace():');
r.SetRect(300, 20, 75, 25);
diff --git a/examples/corelib/canvastest/fpgcanvas.lpr b/examples/corelib/canvastest/fpgcanvas.lpr
index 9d0656e4..14c87a82 100644
--- a/examples/corelib/canvastest/fpgcanvas.lpr
+++ b/examples/corelib/canvastest/fpgcanvas.lpr
@@ -96,7 +96,7 @@ begin
// Testing Text and Fonts
y := 60;
Canvas.SetTextColor(clBlack);
- Canvas.DrawString(5, y, 'This text must be black and default font (' + fpgApplication.DefaultFont.FontDesc + ')');
+ Canvas.DrawString(5, y, 'This text must be black and default font (' + fpgStyle.DefaultFont.FontDesc + ')');
// red dot indicates top/left corner of where previous text was started
Canvas.Pixels[5,y] := clRed;
@@ -117,7 +117,7 @@ begin
// Testing basic style drawings
- Canvas.Font := fpgApplication.DefaultFont;
+ Canvas.Font := fpgStyle.DefaultFont;
Canvas.DrawString(320, 3, 'DrawButtonFace():');
r.SetRect(300, 20, 75, 25);
@@ -138,7 +138,7 @@ begin
Canvas.DrawString(45, y, 'DrawControlFrame():');
y := y + Canvas.Font.Height;
- Canvas.DrawControlFrame(5, y, 200, 23);
+ fpgStyle.DrawControlFrame(Canvas, 5, y, 200, 23);
// Testing Bitmap painting