From ebd919ca8691181edb6251a086c8638803f4de1e Mon Sep 17 00:00:00 2001 From: mattias Date: Sun, 24 Jul 2005 10:56:27 +0000 Subject: [PATCH] removed unneeded TCustomImageList.GetCount git-svn-id: trunk@7415 - --- lcl/imglist.pp | 7 ++++--- lcl/include/imglist.inc | 21 +++++---------------- 2 files changed, 9 insertions(+), 19 deletions(-) diff --git a/lcl/imglist.pp b/lcl/imglist.pp index f27d70612d..fac7479f71 100644 --- a/lcl/imglist.pp +++ b/lcl/imglist.pp @@ -136,8 +136,6 @@ type procedure SetShareImages(const AValue: Boolean); procedure SetWidth(const Value: Integer); - Function GetCount: Integer; - procedure ShiftImages(const Source: TCanvas; Start, Shift: Integer); protected FUpdateCount: integer; @@ -187,7 +185,7 @@ type property AllocBy: Integer read FAllocBy write FAllocBy default 4; property BlendColor: TColor read FBlendColor write FBlendColor default clNone; property BkColor: TColor read FBkColor write SetBkColor default clNone; - property Count: Integer read GetCount; + property Count: Integer read FCount; property DrawingStyle: TDrawingStyle read FDrawingStyle write SetDrawingStyle default dsNormal; property Handle: THandle read FHandle; property Height: Integer read FHeight write SetHeight default 16; @@ -219,6 +217,9 @@ end. { $Log$ + Revision 1.27 2005/07/24 10:56:27 mattias + removed unneeded TCustomImageList.GetCount + Revision 1.26 2005/07/24 08:08:58 mattias fixed updating FCount in TCustomImageList.Insert/Delete diff --git a/lcl/include/imglist.inc b/lcl/include/imglist.inc index b8f2805bbf..ba9dd8ca64 100644 --- a/lcl/include/imglist.inc +++ b/lcl/include/imglist.inc @@ -410,8 +410,8 @@ begin FMaskBitmap:=nil; for i:=0 to FImageList.Count-1 do TObject(FImageList[i]).Free; for i:=0 to FMaskList.Count-1 do TObject(FMaskList[i]).Free; - FreeThenNil(FImageList); //shane - FreeThenNil(FMaskList); //shane + FreeThenNil(FImageList); + FreeThenNil(FMaskList); inherited Destroy; FChangeLinkList.Free; FChangeLinkList:=nil; @@ -487,20 +487,6 @@ begin ImageRect:=Rect(0,0,Image.Width,Image.Height); end; -{------------------------------------------------------------------------------ - Method: TCustomImageList.GetCount - Params: - Returns: Count - - Returns the number of images. - ------------------------------------------------------------------------------} -Function TCustomImageList.GetCount : Integer; -begin - Result := FImageList.Count; - FCount := Result; -end; - - {------------------------------------------------------------------------------ Function: TCustomImageList.GetHotspot Params: None @@ -1203,6 +1189,9 @@ end; { $Log$ + Revision 1.44 2005/07/24 10:56:27 mattias + removed unneeded TCustomImageList.GetCount + Revision 1.43 2005/07/24 08:08:58 mattias fixed updating FCount in TCustomImageList.Insert/Delete