From f758bdf23598665aa7001afb25d98f33d5723fdc Mon Sep 17 00:00:00 2001 From: sekelsenmat Date: Thu, 17 Jan 2013 09:17:52 +0000 Subject: [PATCH] Fixes compilation of Lazarus with FPC trunk due to the fix to spelling mistake in TFPCustomFont git-svn-id: trunk@39870 - --- components/aggpas/src/agg_fpimage.pas | 2 +- components/fpvectorial/fpvectorial.pas | 2 +- lcl/interfaces/customdrawn/customdrawnwinapi.inc | 2 +- lcl/lazcanvas.pas | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/components/aggpas/src/agg_fpimage.pas b/components/aggpas/src/agg_fpimage.pas index a0e7a648f6..b8149dcd1b 100644 --- a/components/aggpas/src/agg_fpimage.pas +++ b/components/aggpas/src/agg_fpimage.pas @@ -382,7 +382,7 @@ type property Bold; // only windows property Italic; // only windows property Underline; // not supported - property StrikeTrough; // not supported + //property StrikeThrough; // not supported, uncomment when FPC 2.6.2+ only is supported end; { TAggFPPath } diff --git a/components/fpvectorial/fpvectorial.pas b/components/fpvectorial/fpvectorial.pas index 3a021bb157..d24d55c6be 100644 --- a/components/fpvectorial/fpvectorial.pas +++ b/components/fpvectorial/fpvectorial.pas @@ -1198,7 +1198,7 @@ begin ADest.Font.Bold := Font.Bold; ADest.Font.Italic := Font.Italic; ADest.Font.Underline := Font.Underline; - ADest.Font.StrikeTrough := Font.StrikeThrough; + //ADest.Font.StrikeThrough := Font.StrikeThrough; uncomment when FPC 2.6.2+ only is supported {$ifdef USE_LCL_CANVAS} ALCLDest.Font.Orientation := Round(Font.Orientation * 16); {$endif} diff --git a/lcl/interfaces/customdrawn/customdrawnwinapi.inc b/lcl/interfaces/customdrawn/customdrawnwinapi.inc index df4bc48f97..d1da6c62fb 100644 --- a/lcl/interfaces/customdrawn/customdrawnwinapi.inc +++ b/lcl/interfaces/customdrawn/customdrawnwinapi.inc @@ -4090,7 +4090,7 @@ begin TM.tmBreakChar := '?'; TM.tmItalic := Ord(lFont.Italic); TM.tmUnderlined := Ord(lFont.Underline); - TM.tmStruckOut := Ord(lFont.StrikeTrough); + //TM.tmStruckOut := Ord(lFont.StrikeThrough); uncomment when FPC 2.6.2+ only is supported { Defaults to a TrueType font. Note that the meaning of the FIXED_PITCH constant is the opposite of diff --git a/lcl/lazcanvas.pas b/lcl/lazcanvas.pas index 444877199f..13df3504e2 100644 --- a/lcl/lazcanvas.pas +++ b/lcl/lazcanvas.pas @@ -761,7 +761,7 @@ begin Font.Bold := AFont.Bold; Font.Italic := AFont.Italic; Font.Underline := AFont.Underline; - Font.StrikeTrough := AFont.StrikeTrough; + //Font.StrikeThrough := AFont.StrikeThrough; uncomment when FPC 2.6.2+ only is supported end; { TFPWindowsSharpInterpolation }