paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-22 08:59:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

LCL: Remove partially implemented TLazCanvas.DoPolygonFill in case of fpc/main where it is fully implemented by ancestor class (issue #40286).

Browse Source
This commit is contained in:
wp_xyz 2023-05-24 18:58:42 +02:00
parent 3685317e2b
commit e57f2594df
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lcl/lazcanvas.pas
View File

@ -86,7 +86,9 @@ type
FAssignedFont: TFPCustomFont; FAssignedFont: TFPCustomFont;
FAssignedPen: TFPCustomPen; FAssignedPen: TFPCustomPen;
FBaseWindowOrg: TPoint; FBaseWindowOrg: TPoint;
FPolygonWindingMode: Boolean; {$if FPC_FullVersion < 30301}
PolygonNonZeroWindingRule: Boolean;
{$endif}
{$if defined(ver2_6)} {$if defined(ver2_6)}
FLazClipRegion: TFPCustomRegion; FLazClipRegion: TFPCustomRegion;
{$endif} {$endif}
@ -103,7 +105,9 @@ type
// Routines broken/unimplemented/incompatible in FPC // Routines broken/unimplemented/incompatible in FPC
procedure DoRectangle (const Bounds:TRect); override; procedure DoRectangle (const Bounds:TRect); override;
procedure DoRectangleFill (const Bounds:TRect); override; procedure DoRectangleFill (const Bounds:TRect); override;
{$if FPC_FullVersion < 30301}
procedure DoPolygonFill (const points:array of TPoint); override; procedure DoPolygonFill (const points:array of TPoint); override;
{$endif}
// Routines which don't work with out extended clipping in TFPImageCanvas // Routines which don't work with out extended clipping in TFPImageCanvas
procedure DoLine (x1,y1,x2,y2:integer); override; procedure DoLine (x1,y1,x2,y2:integer); override;
// Other abstract routines that need implementation // Other abstract routines that need implementation
@ -336,6 +340,7 @@ begin
end; end;
end; end;
{$IF FPC_FullVersion < 30301}
// unimplemented in FPC // unimplemented in FPC
// algorithm explained here: http://alienryderflex.com/polygon_fill/ // algorithm explained here: http://alienryderflex.com/polygon_fill/
procedure TLazCanvas.DoPolygonFill(const points: array of TPoint); procedure TLazCanvas.DoPolygonFill(const points: array of TPoint);
@ -467,6 +472,7 @@ begin
end; end;
end; end;
end; end;
{$ENDIF}
procedure TLazCanvas.DoLine(x1, y1, x2, y2: integer); procedure TLazCanvas.DoLine(x1, y1, x2, y2: integer);
procedure DrawOneLine (xx1,yy1, xx2,yy2:integer); procedure DrawOneLine (xx1,yy1, xx2,yy2:integer);
@ -855,7 +861,7 @@ end;
procedure TLazCanvas.Polygon(const Points: array of TPoint; Winding: Boolean); procedure TLazCanvas.Polygon(const Points: array of TPoint; Winding: Boolean);
begin begin
FPolygonWindingMode := Winding; PolygonNonZeroWindingRule := Winding;
inherited Polygon(Points); inherited Polygon(Points);
end; end;