diff options
| author | Graeme Geldenhuys <graemeg@gmail.com> | 2015-04-09 08:12:22 +0100 |
|---|---|---|
| committer | Graeme Geldenhuys <graemeg@gmail.com> | 2015-04-09 08:12:22 +0100 |
| commit | db31f06d5e7adf28fad60e36fd9e5d2cf0519e84 (patch) | |
| tree | bc7782a4a174ce57836947cec194281651b642e7 /docview/components/richtext | |
| parent | c8acc2c1666015daeb3038c838e5018c0ecd8903 (diff) | |
| parent | f37cd9b2a08a41b8d877f64f9d5d5402105ee74a (diff) | |
| download | fpGUI-db31f06d5e7adf28fad60e36fd9e5d2cf0519e84.tar.xz | |
Merge branch 'release-1.4'
Diffstat (limited to 'docview/components/richtext')
| -rw-r--r-- | docview/components/richtext/CanvasFontManager.pas | 4 | ||||
| -rw-r--r-- | docview/components/richtext/RichTextStyleUnit.pas | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/docview/components/richtext/CanvasFontManager.pas b/docview/components/richtext/CanvasFontManager.pas index edeb8cb9..e650141b 100644 --- a/docview/components/richtext/CanvasFontManager.pas +++ b/docview/components/richtext/CanvasFontManager.pas @@ -222,7 +222,7 @@ begin // if nothing found, use default font of fpGUI if FontDesc = '' then - FontDesc := fpgApplication.DefaultFont.FontDesc; + FontDesc := fpgStyle.DefaultFont.FontDesc; end; @@ -242,7 +242,7 @@ destructor TCanvasFontManager.Destroy; var i: Integer; begin - FCanvas.Font := fpgApplication.DefaultFont; + FCanvas.Font := fpgStyle.DefaultFont; FDefaultFont.Free; for i := 0 to FFontCache.Count-1 do diff --git a/docview/components/richtext/RichTextStyleUnit.pas b/docview/components/richtext/RichTextStyleUnit.pas index e0cc3b62..f6582802 100644 --- a/docview/components/richtext/RichTextStyleUnit.pas +++ b/docview/components/richtext/RichTextStyleUnit.pas @@ -470,7 +470,7 @@ end; Procedure TRichTextSettings.AssignFont(var AFont: TfpgFont; NewFont: TfpgFont ); begin If NewFont = Nil Then - NewFont := fpgApplication.DefaultFont; + NewFont := fpgStyle.DefaultFont; if FontSame( NewFont, AFont ) then begin |