diff options
| author | Graeme Geldenhuys <graemeg@gmail.com> | 2015-02-19 00:57:31 +0000 |
|---|---|---|
| committer | Graeme Geldenhuys <graemeg@gmail.com> | 2015-02-19 09:02:20 +0000 |
| commit | b4672388778f4c89a5cd05d87bb8818fa6d31592 (patch) | |
| tree | 5f797e8d8774f8b1e7edf16778711a4e21503606 /src/corelib | |
| parent | 19984743b90f4de05381d5e26f08e0333c6420eb (diff) | |
| download | fpGUI-b4672388778f4c89a5cd05d87bb8818fa6d31592.tar.xz | |
Removed fpgApplication.DefaultFont
We really don't need yet another "default font". All references to
fpgApplication.DefaultFont has been changed to fpgStyle.DefaultFont - as
it should be.
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/fpg_base.pas | 2 | ||||
| -rw-r--r-- | src/corelib/fpg_main.pas | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/src/corelib/fpg_base.pas b/src/corelib/fpg_base.pas index e6e3ab7e..365ca20a 100644 --- a/src/corelib/fpg_base.pas +++ b/src/corelib/fpg_base.pas @@ -1864,7 +1864,7 @@ begin SetColor(clText1); SetTextColor(clText1); - SetFont(fpgApplication.DefaultFont); + SetFont(fpgStyle.DefaultFont); SetLineStyle(0, lsSolid); FBeginDrawCount := 0; diff --git a/src/corelib/fpg_main.pas b/src/corelib/fpg_main.pas index d74a9be4..1bdbff2e 100644 --- a/src/corelib/fpg_main.pas +++ b/src/corelib/fpg_main.pas @@ -275,7 +275,6 @@ type FDisplayParams: string; FScreenWidth: integer; FScreenHeight: integer; - FDefaultFont: TfpgFont; FFontResList: TList; FMessageHookList: TFPList; procedure FreeFontRes(afontres: TfpgFontResource); @@ -297,7 +296,6 @@ type procedure SetMessageHook(AWidget: TObject; const AMsgCode: integer; AListener: TObject); procedure ShowException(E: Exception); procedure UnsetMessageHook(AWidget: TObject; const AMsgCode: integer; AListener: TObject); - property DefaultFont: TfpgFont read FDefaultFont; property HintPause: Integer read FHintPause write SetHintPause; property HintWindow: TfpgWindow read FHintWindow; property ScreenWidth: integer read FScreenWidth; @@ -1384,8 +1382,6 @@ begin TfpgTimer(fpgTimers[i]).Free; fpgTimers.Free; - FDefaultFont.Free; - for i := FFontResList.Count-1 downto 0 do begin TfpgFontResource(FFontResList[i]).Free; @@ -1671,7 +1667,6 @@ end; procedure TfpgApplication.InternalInit; begin - FDefaultFont := GetFont(FPG_DEFAULT_FONT_DESC); fpgInitTimers; fpgNamedFonts := TList.Create; |