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

fixed compilation with fpc 2.6.3

Browse Source 
git-svn-id: trunk@40410 -
This commit is contained in:
mattias 2013-02-25 22:17:54 +00:00
parent e79302ec8c
commit 48ec025ae8
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -382,10 +382,10 @@ type
property Bold; // only windows property Bold; // only windows
property Italic; // only windows property Italic; // only windows
property Underline; // not supported property Underline; // not supported
{$IF (FPC_FULLVERSION=20601) or (FPC_FULLVERSION>=20701)} //changed in 2.6.1 and 2.7; remove when FPC 2.6.2+ only is supported {$IF (FPC_FULLVERSION<=20600) or (FPC_FULLVERSION=20602)}
property StrikeThrough;
{$ELSE}
property StrikeTrough; //old version with typo property StrikeTrough; //old version with typo
{$ELSE}
property StrikeThrough;
{$ENDIF} {$ENDIF}
end; end;

6
components/fpvectorial/fpvectorial.pas
View File

@ -1213,10 +1213,10 @@ begin
ADest.Font.Bold := Font.Bold; ADest.Font.Bold := Font.Bold;
ADest.Font.Italic := Font.Italic; ADest.Font.Italic := Font.Italic;
ADest.Font.Underline := Font.Underline; ADest.Font.Underline := Font.Underline;
{$IF (FPC_FULLVERSION=20601) or (FPC_FULLVERSION>=20701)} //changed in 2.6.1 and 2.7; remove when FPC 2.6.2+ only is supported {$IF (FPC_FULLVERSION<=20600) or (FPC_FULLVERSION=20602)}
ADest.Font.StrikeThrough := Font.StrikeThrough;
{$ELSE}
ADest.Font.StrikeTrough := Font.StrikeThrough; //old version with typo ADest.Font.StrikeTrough := Font.StrikeThrough; //old version with typo
{$ELSE}
ADest.Font.StrikeThrough := Font.StrikeThrough;
{$ENDIF} {$ENDIF}
{$ifdef USE_LCL_CANVAS} {$ifdef USE_LCL_CANVAS}

4
lcl/graphics.pp
View File

@ -35,11 +35,11 @@ interface
{$DEFINE HasFPCanvas1} {$DEFINE HasFPCanvas1}
{$ENDIF} {$ENDIF}
{$IF FPC_FULLVERSION>=20701} {$IF FPC_FULLVERSION>=20603}
{$DEFINE HasFPEndCap} {$DEFINE HasFPEndCap}
{$ENDIF} {$ENDIF}
{$IF FPC_FULLVERSION>=20701} {$IF FPC_FULLVERSION>=20603}
{$DEFINE HasFPJoinStyle} {$DEFINE HasFPJoinStyle}
{$ENDIF} {$ENDIF}

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

@ -4090,10 +4090,10 @@ begin
TM.tmBreakChar := '?'; TM.tmBreakChar := '?';
TM.tmItalic := Ord(lFont.Italic); TM.tmItalic := Ord(lFont.Italic);
TM.tmUnderlined := Ord(lFont.Underline); TM.tmUnderlined := Ord(lFont.Underline);
{$IF (FPC_FULLVERSION=20601) or (FPC_FULLVERSION>=20701)} //changed in 2.6.1 and 2.7; remove when FPC 2.6.2+ only is supported {$IF (FPC_FULLVERSION<=20600) or (FPC_FULLVERSION=20602)}
TM.tmStruckOut := Ord(lFont.StrikeThrough);
{$ELSE}
TM.tmStruckOut := Ord(lFont.StrikeTrough); //old version with typo TM.tmStruckOut := Ord(lFont.StrikeTrough); //old version with typo
{$ELSE}
TM.tmStruckOut := Ord(lFont.StrikeThrough);
{$ENDIF} {$ENDIF}
{ Defaults to a TrueType font. { Defaults to a TrueType font.

6
lcl/lazcanvas.pas
View File

@ -761,10 +761,10 @@ begin
Font.Bold := AFont.Bold; Font.Bold := AFont.Bold;
Font.Italic := AFont.Italic; Font.Italic := AFont.Italic;
Font.Underline := AFont.Underline; Font.Underline := AFont.Underline;
{$IF (FPC_FULLVERSION=20601) or (FPC_FULLVERSION>=20701)} //changed in 2.6.1 and 2.7; remove when FPC 2.6.2+ only is supported {$IF (FPC_FULLVERSION<=20600) or (FPC_FULLVERSION=20602)}
Font.StrikeThrough := AFont.StrikeThrough;
{$ELSE}
Font.StrikeTrough := AFont.StrikeTrough; //old version with typo Font.StrikeTrough := AFont.StrikeTrough; //old version with typo
{$ELSE}
Font.StrikeThrough := AFont.StrikeThrough;
{$ENDIF} {$ENDIF}
end; end;