paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-14 19:59:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

FPC: Extend System.UITypes

Browse Source
This commit is contained in:
Ondrej Pokorny 2022-12-18 09:47:42 +01:00
parent c45dfb7a56
commit 829f320095
3 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/lazreport/source/fr3tolrf.pas
View File

@ -126,7 +126,7 @@ end;
function DelphiIntToFpcFontStyle(aStyle: Integer): TFontStyles; function DelphiIntToFpcFontStyle(aStyle: Integer): TFontStyles;
begin begin
result := TFontStyles(aStyle); result := TFontStyles(Byte(aStyle));
end; end;
function DelphiIntToFPCFrameBorders(aFrameTyp: Integer): TfrFrameBorders; function DelphiIntToFPCFrameBorders(aFrameTyp: Integer): TfrFrameBorders;

15
components/tachart/tachartutils.pas
View File

@ -26,6 +26,9 @@ unit TAChartUtils;
interface interface
uses uses
{$IF FPC_FULLVERSION>30300}
System.UITypes,
{$ENDIF}
Classes, Math, Types, SysUtils; Classes, Math, Types, SysUtils;
const const
@ -47,12 +50,24 @@ type
EListenerError = class(EChartError); EListenerError = class(EChartError);
EDrawDataError = class(EChartError); EDrawDataError = class(EChartError);
{$IF FPC_FULLVERSION>30300}
TChartColor = TColor;
TChartFontStyle = TFontStyle;
TChartFontStyles = TFontStyles;
const
cfsBold = fsBold;
cfsItalic = fsItalic;
cfsUnderline = fsUnderline;
cfsStrikeout = fsStrikeout;
type
{$ELSE}
// Like TColor, but avoiding dependency on Graphics. // Like TColor, but avoiding dependency on Graphics.
TChartColor = -$7FFFFFFF-1..$7FFFFFFF; TChartColor = -$7FFFFFFF-1..$7FFFFFFF;
// dto with TFontStyle // dto with TFontStyle
TChartFontStyle = (cfsBold, cfsItalic, cfsUnderline, cfsStrikeout); TChartFontStyle = (cfsBold, cfsItalic, cfsUnderline, cfsStrikeout);
TChartFontStyles = set of TChartFontStyle; TChartFontStyles = set of TChartFontStyle;
{$ENDIF}
TChartTextFormat = (tfNormal, tfHTML); TChartTextFormat = (tfNormal, tfHTML);

8
components/virtualtreeview/laz.virtualtrees.pas
View File

@ -11754,7 +11754,11 @@ begin
ReadBuffer(Dummy, SizeOf(Dummy)); ReadBuffer(Dummy, SizeOf(Dummy));
Pitch := TFontPitch(Dummy); Pitch := TFontPitch(Dummy);
ReadBuffer(Dummy, SizeOf(Dummy)); ReadBuffer(Dummy, SizeOf(Dummy));
{$IF FPC_FULLVERSION>30300}
Style := TFontStyles(Byte(Dummy));
{$ELSE}
Style := TFontStyles(LongWord(Dummy)); Style := TFontStyles(LongWord(Dummy));
{$ENDIF}
end; end;
// LCL port started with header stream version 6 so no need to do the check here // LCL port started with header stream version 6 so no need to do the check here
// Read data introduced by stream version 1+. // Read data introduced by stream version 1+.
@ -12027,7 +12031,11 @@ begin
WriteBuffer(PAnsiChar(Tmp)^, Dummy); WriteBuffer(PAnsiChar(Tmp)^, Dummy);
Dummy := Ord(Pitch); Dummy := Ord(Pitch);
WriteBuffer(Dummy, SizeOf(Dummy)); WriteBuffer(Dummy, SizeOf(Dummy));
{$IF FPC_FULLVERSION>30300}
Dummy := Byte(Style);
{$ELSE}
Dummy := Integer(Style); Dummy := Integer(Style);
{$ENDIF}
WriteBuffer(Dummy, SizeOf(Dummy)); WriteBuffer(Dummy, SizeOf(Dummy));
end; end;