not building with fpc 2.7 branch
Original Reporter info from Mantis: DaLiV
-
Reporter name: DaLiV
Original Reporter info from Mantis: DaLiV
- Reporter name: DaLiV
Description:
can not build lazarus on fpc (both from trunk svn repositories)
fix patch in additional info
Additional information:
Index: lcl/lazcanvas.pas
===================================================================
--- lcl/lazcanvas.pas (revision 34068)
+++ lcl/lazcanvas.pas (working copy)
@@ -69,7 +69,7 @@
FAssignedBrush: TFPCustomBrush;
FAssignedPen: TFPCustomPen;
FBaseWindowOrg: TPoint;
- {$if defined(ver2_4) or defined(ver2_5) or defined(ver2_6)}
+ {$if defined(ver2_4) or defined(ver2_5) or defined(ver2_6) or defined(ver2_7)}
FLazClipRegion: TFPCustomRegion;
{$endif}
FWindowOrg: TPoint; // already in absolute coords with BaseWindowOrg summed up
@@ -121,7 +121,7 @@
// because operations of SetWindowOrg inside a non-native wincontrol will be
// based upon the BaseWindowOrg which is set relative to the Form canvas
property BaseWindowOrg: TPoint read FBaseWindowOrg write FBaseWindowOrg;
- {$if defined(ver2_4) or defined(ver2_5) or defined(ver2_6)}
+ {$if defined(ver2_4) or defined(ver2_5) or defined(ver2_6) or defined(ver2_7)}
property ClipRegion: TFPCustomRegion read FLazClipRegion write FLazClipRegion;
{$endif}
property WindowOrg: TPoint read GetWindowOrg write SetWindowOrg;
@@ -173,7 +173,7 @@
begin
lx := x + FWindowOrg.X;
ly := y + FWindowOrg.Y;
- {$if defined(ver2_4) or defined(ver2_5) or defined(ver2_6)}
+ {$if defined(ver2_4) or defined(ver2_5) or defined(ver2_6) or defined(ver2_7)}
if Clipping and (not FLazClipRegion.IsPointInRegion(lx, ly)) then
Exit;
if (lx >= 0) and (lx < width) and (ly >= 0) and (ly < height) then
Index: lcl/lazregions.pas
===================================================================
--- lcl/lazregions.pas (revision 34068)
+++ lcl/lazregions.pas (working copy)
@@ -29,7 +29,7 @@
function IsPointInPart(AX, AY: Integer): Boolean; override;
end;
- {$if defined(ver2_4) or defined(ver2_5) or defined(ver2_6)}
+ {$if defined(ver2_4) or defined(ver2_5) or defined(ver2_6) or defined(ver2_7)}
TFPCustomRegion = class
function GetBoundingRect: TRect; virtual; abstract;
function IsPointInRegion(AX, AY: Integer): Boolean; virtual; abstract;
Mantis conversion info:
- Mantis ID: 20855
- OS: Windows XP
- OS Build: SP3
- Build: 34068
- Platform: i386
- Version: 0.9.31 (SVN)
- Target version: 0.99.0