paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-12-02 16:37:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed compilation with fpc 2.6.1 23444

Browse Source 
git-svn-id: trunk@39879 -
This commit is contained in:
mattias 2013-01-18 16:21:23 +00:00
parent 00419b8bb3
commit f1fe1fc167
4 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
components/aggpas/src/agg_fpimage.pas
View File

@ -382,7 +382,11 @@ type
property Bold; // only windows
property Italic; // only windows
property Underline; // not supported
//property StrikeThrough; // not supported, uncomment when FPC 2.6.2+ only is supported
{$IF FPC_FULLVERSION>=20601} //changed in 2.6.2 and 2.7; remove when FPC 2.6.2+ only is supported
property StrikeThrough;
{$ELSE}
property StrikeTrough; //old version with typo
{$END}
end;
{ TAggFPPath }
@ -3582,7 +3586,7 @@ begin
inherited SetFlags(5,NewBold); // Bold
inherited SetFlags(6,NewItalic); // Italic
inherited SetFlags(7,false); // Underline
inherited SetFlags(8,false); // StrikeTrough
inherited SetFlags(8,false); // StrikeThrough
c:=TAggFPCanvas(Canvas);

7
components/fpvectorial/fpvectorial.pas
View File

@ -1198,7 +1198,12 @@ begin
ADest.Font.Bold := Font.Bold;
ADest.Font.Italic := Font.Italic;
ADest.Font.Underline := Font.Underline;
//ADest.Font.StrikeThrough := Font.StrikeThrough; uncomment when FPC 2.6.2+ only is supported
{$IF FPC_FULLVERSION>=20601} //changed in 2.6.2 and 2.7; remove when FPC 2.6.2+ only is supported
ADest.Font.StrikeThrough := Font.StrikeThrough;
{$ELSE}
ADest.Font.StrikeTrough := Font.StrikeTrough; //old version with typo
{$END}
{$ifdef USE_LCL_CANVAS}
ALCLDest.Font.Orientation := Round(Font.Orientation * 16);
{$endif}

6
lcl/interfaces/customdrawn/customdrawnwinapi.inc
View File

@ -4090,7 +4090,11 @@ begin
TM.tmBreakChar := '?';
TM.tmItalic := Ord(lFont.Italic);
TM.tmUnderlined := Ord(lFont.Underline);
//TM.tmStruckOut := Ord(lFont.StrikeThrough); uncomment when FPC 2.6.2+ only is supported
{$IF FPC_FULLVERSION>=20601} //changed in 2.6.2 and 2.7; remove when FPC 2.6.2+ only is supported
TM.tmStruckOut := Ord(lFont.StrikeThrough);
{$ELSE}
TM.tmStruckOut := Ord(lFont.StrikeTrough); //old version with typo
{$END}
{ Defaults to a TrueType font.
Note that the meaning of the FIXED_PITCH constant is the opposite of

6
lcl/lazcanvas.pas
View File

@ -761,7 +761,11 @@ begin
Font.Bold := AFont.Bold;
Font.Italic := AFont.Italic;
Font.Underline := AFont.Underline;
//Font.StrikeThrough := AFont.StrikeThrough; uncomment when FPC 2.6.2+ only is supported
{$IF FPC_FULLVERSION>=20601} //changed in 2.6.2 and 2.7; remove when FPC 2.6.2+ only is supported
Font.StrikeThrough := AFont.StrikeThrough;
{$ELSE}
Font.StrikeTrough := AFont.StrikeTrough; //old version with typo
{$ENDIF}
end;
{ TFPWindowsSharpInterpolation }