diff options
| author | marco <marco@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2010-02-27 19:14:28 +0000 |
|---|---|---|
| committer | marco <marco@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2010-02-27 19:14:28 +0000 |
| commit | 3cbb0dff222c4f78babd0796e10e8a1ad3aeb69d (patch) | |
| tree | 4d2377acbaf007bf8c30612424d3484d22967647 /packages | |
| parent | 4f4f94cb1542c7d0be45f1d07499ff71b2619237 (diff) | |
| download | fpc-3cbb0dff222c4f78babd0796e10e8a1ad3aeb69d.tar.gz | |
* fix for mantis #13171, a default for gettextheight so that it doesn't
totally fall apart if no canvas is assigned.
git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@14950 3ad0048d-3df7-0310-abae-a5850022a9f2
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/fcl-image/src/fpfont.inc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/packages/fcl-image/src/fpfont.inc b/packages/fcl-image/src/fpfont.inc index af1e2b573f..e664a34b2e 100644 --- a/packages/fcl-image/src/fpfont.inc +++ b/packages/fcl-image/src/fpfont.inc @@ -54,7 +54,10 @@ begin if inheritsFrom (TFPCustomDrawFont) then result := TFPCustomDrawFont(self).DoGetTextHeight (text) else - result := FCanvas.GetTextHeight (text); + if assigned(FCanvas) then + result := FCanvas.GetTextHeight (text) + else + result :=16; // *some* default better than none. end; function TFPCustomFont.GetTextWidth (text:string) : integer; |