paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-10 14:16:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

lcl: remove OverrideClipping define

Browse Source 
git-svn-id: trunk@23431 -
This commit is contained in:
paul 2010-01-13 07:17:28 +00:00
parent 7145aff4ca
commit 2cd1e874be
2 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lcl/graphics.pp
View File

@ -30,10 +30,6 @@ interface
{$ifdef Trace} {$ifdef Trace}
{$ASSERTIONS ON} {$ASSERTIONS ON}
{$endif} {$endif}
{$IFNDEF VER2_2}
{$DEFINE OverrideClipping}
{$ENDIF}
uses uses
SysUtils, Math, Types, Classes, FPCAdds, SysUtils, Math, Types, Classes, FPCAdds,
@ -1030,8 +1026,8 @@ type
protected protected
function GetClipRect: TRect; override; function GetClipRect: TRect; override;
procedure SetClipRect(const ARect: TRect); override; procedure SetClipRect(const ARect: TRect); override;
function GetClipping: Boolean; {$ifdef OverrideClipping}override;{$endif} function GetClipping: Boolean; override;
procedure SetClipping(const AValue: boolean); {$ifdef OverrideClipping}override;{$endif} procedure SetClipping(const AValue: boolean); override;
function GetPixel(X,Y: Integer): TColor; virtual; function GetPixel(X,Y: Integer): TColor; virtual;
procedure CreateBrush; virtual; procedure CreateBrush; virtual;
procedure CreateFont; virtual; procedure CreateFont; virtual;
@ -1124,9 +1120,6 @@ type
function HandleAllocated: boolean; virtual; function HandleAllocated: boolean; virtual;
function GetUpdatedHandle(ReqState: TCanvasState): HDC; virtual; function GetUpdatedHandle(ReqState: TCanvasState): HDC; virtual;
public public
{$ifndef OverrideClipping}
property Clipping : boolean read GetClipping write SetClipping;
{$endif}
property Pixels[X, Y: Integer]: TColor read GetPixel write SetPixel; property Pixels[X, Y: Integer]: TColor read GetPixel write SetPixel;
property Handle: HDC read GetHandle write SetHandle; property Handle: HDC read GetHandle write SetHandle;
property TextStyle: TTextStyle read FTextStyle write FTextStyle; property TextStyle: TTextStyle read FTextStyle write FTextStyle;

8
lcl/include/canvas.inc
View File

@ -70,11 +70,7 @@ var
RGN: HRGN; RGN: HRGN;
begin begin
inherited SetClipRect(ARect); inherited SetClipRect(ARect);
{$ifdef OverrideClipping}
if inherited GetClipping then if inherited GetClipping then
{$else}
if inherited Clipping then
{$endif}
begin begin
with ARect do with ARect do
RGN := CreateRectRGN(Left, Top, Right, Bottom); RGN := CreateRectRGN(Left, Top, Right, Bottom);
@ -92,11 +88,7 @@ end;
procedure TCanvas.SetClipping(const AValue: boolean); procedure TCanvas.SetClipping(const AValue: boolean);
begin begin
{$ifdef OverrideClipping}
inherited SetClipping(AValue); inherited SetClipping(AValue);
{$else}
inherited Clipping := AValue;
{$endif}
if AValue then if AValue then
SetClipRect(inherited GetClipRect) SetClipRect(inherited GetClipRect)
else else