View Issue Details
| ID | Project | Category | View Status | Date Submitted | Last Update |
|---|---|---|---|---|---|
| 0023666 | Lazarus | LCL | public | 2013-01-17 02:46 | 2013-01-17 12:48 |
| Reporter | Do-wan Kim | Assigned To | Felipe Monteiro de Carvalho | ||
| Priority | normal | Severity | block | Reproducibility | always |
| Status | closed | Resolution | fixed | ||
| Product Version | 1.1 (SVN) | Product Build | |||
| Target Version | Fixed in Version | 1.1 (SVN) | |||
| Summary | 0023666: Error in building Lazarus trunk after FPC trunk 0023411 | ||||
| Description | Error in building lazarus after FPC trunk 0023411. Patch included. | ||||
| Tags | No tags attached. | ||||
| Fixed in Revision | 39870 | ||||
| LazTarget | - | ||||
| Widgetset | |||||
| Attached Files |
| ||||
|
2013-01-17 02:46
|
font-strikethough.patch (2,670 bytes)
Index: components/aggpas/src/agg_fpimage.pas
===================================================================
--- components/aggpas/src/agg_fpimage.pas (revision 39867)
+++ components/aggpas/src/agg_fpimage.pas (working copy)
@@ -382,7 +382,7 @@
property Bold; // only windows
property Italic; // only windows
property Underline; // not supported
- property StrikeTrough; // not supported
+ property StrikeThrough; // not supported
end;
{ TAggFPPath }
@@ -3582,7 +3582,7 @@
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);
Index: components/fpvectorial/fpvectorial.pas
===================================================================
--- components/fpvectorial/fpvectorial.pas (revision 39867)
+++ components/fpvectorial/fpvectorial.pas (working copy)
@@ -1,4 +1,4 @@
-{
+{
fpvectorial.pas
Vector graphics document
@@ -1198,7 +1198,7 @@
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;
{$ifdef USE_LCL_CANVAS}
ALCLDest.Font.Orientation := Round(Font.Orientation * 16);
{$endif}
Index: lcl/interfaces/customdrawn/customdrawnwinapi.inc
===================================================================
--- lcl/interfaces/customdrawn/customdrawnwinapi.inc (revision 39867)
+++ lcl/interfaces/customdrawn/customdrawnwinapi.inc (working copy)
@@ -1,4 +1,4 @@
-{%MainUnit customdrawnint.pp}
+{%MainUnit customdrawnint.pp}
{******************************************************************************
All CustomDrawn backend independent Winapi implementations.
@@ -4090,7 +4090,7 @@
TM.tmBreakChar := '?';
TM.tmItalic := Ord(lFont.Italic);
TM.tmUnderlined := Ord(lFont.Underline);
- TM.tmStruckOut := Ord(lFont.StrikeTrough);
+ TM.tmStruckOut := Ord(lFont.StrikeThrough);
{ Defaults to a TrueType font.
Note that the meaning of the FIXED_PITCH constant is the opposite of
Index: lcl/lazcanvas.pas
===================================================================
--- lcl/lazcanvas.pas (revision 39867)
+++ lcl/lazcanvas.pas (working copy)
@@ -761,7 +761,7 @@
Font.Bold := AFont.Bold;
Font.Italic := AFont.Italic;
Font.Underline := AFont.Underline;
- Font.StrikeTrough := AFont.StrikeTrough;
+ Font.StrikeThrough := AFont.StrikeThrough;
end;
{ TFPWindowsSharpInterpolation }
|
|
|
FPC trunk revision 23411. |
|
|
This patch is incompatible with fpc 2.6.0. |
|
|
Please test and close if ok |
|
|
ok, thank you :) |
| Date Modified | Username | Field | Change |
|---|---|---|---|
| 2013-01-17 02:46 | Do-wan Kim | New Issue | |
| 2013-01-17 02:46 | Do-wan Kim | File Added: font-strikethough.patch | |
| 2013-01-17 06:13 | Do-wan Kim | Note Added: 0064932 | |
| 2013-01-17 07:36 | Vincent Snijders | Note Added: 0064936 | |
| 2013-01-17 07:36 | Vincent Snijders | Status | new => assigned |
| 2013-01-17 07:36 | Vincent Snijders | Assigned To | => Felipe Monteiro de Carvalho |
| 2013-01-17 10:18 | Felipe Monteiro de Carvalho | Fixed in Revision | => 39870 |
| 2013-01-17 10:18 | Felipe Monteiro de Carvalho | LazTarget | => - |
| 2013-01-17 10:18 | Felipe Monteiro de Carvalho | Status | assigned => resolved |
| 2013-01-17 10:18 | Felipe Monteiro de Carvalho | Fixed in Version | => 1.1 (SVN) |
| 2013-01-17 10:18 | Felipe Monteiro de Carvalho | Resolution | open => fixed |
| 2013-01-17 10:19 | Felipe Monteiro de Carvalho | Note Added: 0064943 | |
| 2013-01-17 12:48 | Do-wan Kim | Status | resolved => closed |
| 2013-01-17 12:48 | Do-wan Kim | Note Added: 0064946 |
