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

lcl: properly override TObject.Equals for TGraphic class

Browse Source 
git-svn-id: trunk@22393 -
This commit is contained in:
paul 2009-11-03 02:17:39 +00:00
parent 7f1e276971
commit 929dc64acd
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lcl/graphics.pp
View File

@ -761,7 +761,7 @@ type
FPaletteModified: Boolean; FPaletteModified: Boolean;
protected protected
procedure Changed(Sender: TObject); virtual; procedure Changed(Sender: TObject); virtual;
function Equals(Graphic: TGraphic): Boolean; virtual; reintroduce; function Equals(Graphic: TGraphic): Boolean; virtual; {$IF declared(vmtEquals)}overload;{$IFEND}
procedure DefineProperties(Filer: TFiler); override; procedure DefineProperties(Filer: TFiler); override;
procedure Draw(ACanvas: TCanvas; const Rect: TRect); virtual; abstract; procedure Draw(ACanvas: TCanvas; const Rect: TRect); virtual; abstract;
function GetEmpty: Boolean; virtual; abstract; function GetEmpty: Boolean; virtual; abstract;
@ -787,6 +787,9 @@ type
procedure Assign(ASource: TPersistent); override; procedure Assign(ASource: TPersistent); override;
constructor Create; virtual; constructor Create; virtual;
procedure Clear; virtual; procedure Clear; virtual;
{$IF declared(vmtEquals)}
function Equals(Obj: TObject): Boolean; override; overload;
{$IFEND}
function LazarusResourceTypeValid(const AResourceType: string): boolean; virtual; function LazarusResourceTypeValid(const AResourceType: string): boolean; virtual;
procedure LoadFromFile(const Filename: string); virtual; procedure LoadFromFile(const Filename: string); virtual;
procedure LoadFromStream(Stream: TStream); virtual; abstract; procedure LoadFromStream(Stream: TStream); virtual; abstract;

10
lcl/include/graphic.inc
View File

@ -85,6 +85,16 @@ begin
Progress(Sender,Stage,PercentDone,RedrawNow,R,Msg,DoContinue); Progress(Sender,Stage,PercentDone,RedrawNow,R,Msg,DoContinue);
end; end;
{$IF declared(vmtEquals)}
function TGraphic.Equals(Obj: TObject): Boolean;
begin
if Obj is TGraphic then
Result := Equals(TGraphic(Obj))
else
Result := inherited Equals(Obj);
end;
{$IFEND}
function TGraphic.Equals(Graphic: TGraphic): Boolean; function TGraphic.Equals(Graphic: TGraphic): Boolean;
var var
SelfImage, GraphicsImage: TMemoryStream; SelfImage, GraphicsImage: TMemoryStream;