From cb399a6260b5bd4378286b83d005124db84e409a Mon Sep 17 00:00:00 2001 From: ondrej Date: Tue, 14 Jan 2020 16:32:58 +0000 Subject: [PATCH] revert r62550 #e254ce3acb git-svn-id: trunk@62553 - --- lcl/graphics.pp | 7 ------- lcl/lclproc.pas | 7 +++++++ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lcl/graphics.pp b/lcl/graphics.pp index 9cad3de2a9..2868eb47db 100644 --- a/lcl/graphics.pp +++ b/lcl/graphics.pp @@ -1972,8 +1972,6 @@ function CreateCompatibleBitmaps(const ARawImage: TRawImage; out ABitmap, AMask: function CreateBitmapFromFPImage(Img: TFPCustomImage): TBitmap; function AllocPatternBitmap(colorBG, colorFG: TColor): TBitmap; -// Font -function IsFontNameDefault(const AName: string): boolean; inline; var { Stores information about the current screen @@ -2032,11 +2030,6 @@ var GraphicsUpdateCount: Integer = 0; UpdateLock: TCriticalSection; -function IsFontNameDefault(const AName: string): boolean; -begin - Result := CompareText(AName, DefFontData.Name) = 0; -end; - procedure UpdateHandleObjects; begin // renew all brushes, pens, fonts, ... diff --git a/lcl/lclproc.pas b/lcl/lclproc.pas index 4b41a3defa..78424e016d 100644 --- a/lcl/lclproc.pas +++ b/lcl/lclproc.pas @@ -310,6 +310,8 @@ function UnicodeToUTF16(u: cardinal): UTF16String; // identifier function CreateFirstIdentifier(const Identifier: string): string; function CreateNextIdentifier(const Identifier: string): string; +// Font +function IsFontNameDefault(const AName: string): boolean; inline; {$IFDEF WithOldDebugln} type @@ -2455,6 +2457,11 @@ begin +IntToStr(1+StrToIntDef(copy(Identifier,p+1,length(Identifier)-p),0)); end; +function IsFontNameDefault(const AName: string): boolean; +begin + Result := CompareText(AName, 'default') = 0; +end; + { TDebugLCLItems } constructor TDebugLCLItems.Create(const TheName: string);