paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-06-06 09:38:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

revert r62550 #e254ce3acb

Browse Source 
git-svn-id: trunk@62553 -
This commit is contained in:
ondrej 2020-01-14 16:32:58 +00:00
parent 6e3d70b796
commit cb399a6260
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lcl/graphics.pp
View File

@ -1972,8 +1972,6 @@ function CreateCompatibleBitmaps(const ARawImage: TRawImage; out ABitmap, AMask:
function CreateBitmapFromFPImage(Img: TFPCustomImage): TBitmap; function CreateBitmapFromFPImage(Img: TFPCustomImage): TBitmap;
function AllocPatternBitmap(colorBG, colorFG: TColor): TBitmap; function AllocPatternBitmap(colorBG, colorFG: TColor): TBitmap;
// Font
function IsFontNameDefault(const AName: string): boolean; inline;
var var
{ Stores information about the current screen { Stores information about the current screen
@ -2032,11 +2030,6 @@ var
GraphicsUpdateCount: Integer = 0; GraphicsUpdateCount: Integer = 0;
UpdateLock: TCriticalSection; UpdateLock: TCriticalSection;
function IsFontNameDefault(const AName: string): boolean;
begin
Result := CompareText(AName, DefFontData.Name) = 0;
end;
procedure UpdateHandleObjects; procedure UpdateHandleObjects;
begin begin
// renew all brushes, pens, fonts, ... // renew all brushes, pens, fonts, ...

7
lcl/lclproc.pas
View File

@ -310,6 +310,8 @@ function UnicodeToUTF16(u: cardinal): UTF16String;
// identifier // identifier
function CreateFirstIdentifier(const Identifier: string): string; function CreateFirstIdentifier(const Identifier: string): string;
function CreateNextIdentifier(const Identifier: string): string; function CreateNextIdentifier(const Identifier: string): string;
// Font
function IsFontNameDefault(const AName: string): boolean; inline;
{$IFDEF WithOldDebugln} {$IFDEF WithOldDebugln}
type type
@ -2455,6 +2457,11 @@ begin
+IntToStr(1+StrToIntDef(copy(Identifier,p+1,length(Identifier)-p),0)); +IntToStr(1+StrToIntDef(copy(Identifier,p+1,length(Identifier)-p),0));
end; end;
function IsFontNameDefault(const AName: string): boolean;
begin
Result := CompareText(AName, 'default') = 0;
end;
{ TDebugLCLItems } { TDebugLCLItems }
constructor TDebugLCLItems.Create(const TheName: string); constructor TDebugLCLItems.Create(const TheName: string);