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

keep old StrikeTrough for current RC 2.6.2

Browse Source 
git-svn-id: trunk@39901 -
This commit is contained in:
mattias 2013-01-19 20:35:10 +00:00
parent a5bf4cd13b
commit fb537b160f
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -382,7 +382,7 @@ type
property Bold; // only windows
property Italic; // only windows
property Underline; // not supported
{$IF FPC_FULLVERSION>=20601} //changed in 2.6.2 and 2.7; remove when FPC 2.6.2+ only is 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
property StrikeThrough;
{$ELSE}
property StrikeTrough; //old version with typo

2
components/fpvectorial/fpvectorial.pas
View File

@ -1198,7 +1198,7 @@ begin
ADest.Font.Bold := Font.Bold;
ADest.Font.Italic := Font.Italic;
ADest.Font.Underline := Font.Underline;
{$IF FPC_FULLVERSION>=20601} //changed in 2.6.2 and 2.7; remove when FPC 2.6.2+ only is 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
ADest.Font.StrikeThrough := Font.StrikeThrough;
{$ELSE}
ADest.Font.StrikeTrough := Font.StrikeThrough; //old version with typo

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

@ -4090,7 +4090,7 @@ begin
TM.tmBreakChar := '?';
TM.tmItalic := Ord(lFont.Italic);
TM.tmUnderlined := Ord(lFont.Underline);
{$IF FPC_FULLVERSION>=20601} //changed in 2.6.2 and 2.7; remove when FPC 2.6.2+ only is 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
TM.tmStruckOut := Ord(lFont.StrikeThrough);
{$ELSE}
TM.tmStruckOut := Ord(lFont.StrikeTrough); //old version with typo

2
lcl/lazcanvas.pas
View File

@ -761,7 +761,7 @@ begin
Font.Bold := AFont.Bold;
Font.Italic := AFont.Italic;
Font.Underline := AFont.Underline;
{$IF FPC_FULLVERSION>=20601} //changed in 2.6.2 and 2.7; remove when FPC 2.6.2+ only is 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
Font.StrikeThrough := AFont.StrikeThrough;
{$ELSE}
Font.StrikeTrough := AFont.StrikeTrough; //old version with typo