[JVCL-Checkins] dev/JVCL3/run JvListComb.pas,1.47,1.48 - Removed overload from TJvImageItems.Add and renamed the othe

[Andreas H. <ah...@us...>]

Update of /cvsroot/jvcl/dev/JVCL3/run
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1756/run

Modified Files:
	JvListComb.pas 
Log Message:
Removed overload from TJvImageItems.Add and renamed the other methods to allow the compiler to select the correct Add method.


Index: JvListComb.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvListComb.pas,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** JvListComb.pas	21 May 2005 23:20:36 -0000	1.47
--- JvListComb.pas	14 Jun 2005 13:29:01 -0000	1.48
***************
*** 136,146 ****
      procedure FillItems;
    public
-     function Add: TJvImageItem; overload;
-     function Add(const Text: string): Integer; overload;
-     function Insert(Index: Integer): TJvImageItem; overload;
-     procedure Insert(Index: Integer; const Text: string); overload;
-     procedure Move(CurIndex, NewIndex: Integer);
-     procedure Assign(Source: TPersistent); override;
      constructor Create(AOwner: TPersistent);
      property Items[Index: Integer]: TJvImageItem read GetItems write SetItems; default;
      property Objects[Index: Integer]: TObject read GetObjects write SetObjects;
--- 136,151 ----
      procedure FillItems;
    public
      constructor Create(AOwner: TPersistent);
+     procedure Assign(Source: TPersistent); override;
+     function Add: TJvImageItem;
+     function AddText(const Text: string): Integer;
+     function AddObject(const Text: string; ALinkedObject: TObject): Integer;
+     function Insert(Index: Integer): TJvImageItem;
+     procedure InsertText(Index: Integer; const Text: string);
+     procedure InsertObject(Index: Integer; const Text: string; ALinkedObject: TObject);
+     procedure Move(CurIndex, NewIndex: Integer);
+ 
+     function IndexOfLinkedObject(ALinkedObject: TObject): Integer;
+ 
      property Items[Index: Integer]: TJvImageItem read GetItems write SetItems; default;
      property Objects[Index: Integer]: TObject read GetObjects write SetObjects;
***************
*** 577,584 ****
    Result := TJvImageItem(inherited Add);
    while FStrings.Count < Count do
!     Result.Index := FStrings.AddObject('',Result);
  end;
  
! function TJvImageItems.Add(const Text: string): Integer;
  var
    Item: TJvImageItem;
--- 582,589 ----
    Result := TJvImageItem(inherited Add);
    while FStrings.Count < Count do
!     Result.Index := FStrings.AddObject('', Result);
  end;
  
! function TJvImageItems.AddText(const Text: string): Integer;
  var
    Item: TJvImageItem;
***************
*** 592,600 ****
  begin
    Result := TJvImageItem(inherited Insert(Index));
!   FStrings.InsertObject(Index,'',Result);
    Result.Index := FStrings.IndexOfObject(Result);
  end;
  
! procedure TJvImageItems.Insert(Index: Integer; const Text: string);
  begin
    Insert(Index).Text := Text;
--- 597,605 ----
  begin
    Result := TJvImageItem(inherited Insert(Index));
!   FStrings.InsertObject(Index, '', Result);
    Result.Index := FStrings.IndexOfObject(Result);
  end;
  
! procedure TJvImageItems.InsertText(Index: Integer; const Text: string);
  begin
    Insert(Index).Text := Text;
***************
*** 627,630 ****
--- 632,643 ----
  end;
  
+ function TJvImageItems.IndexOfLinkedObject(ALinkedObject: TObject): Integer;
+ begin
+   for Result := 0 to Count - 1 do
+     if Items[Result].LinkedObject = ALinkedObject then
+       Exit;
+   Result := -1;
+ end;
+ 
  procedure TJvImageItems.Assign(Source: TPersistent);
  var
***************
*** 695,698 ****
--- 708,732 ----
  end;
  
+ function TJvImageItems.AddObject(const Text: string;
+   ALinkedObject: TObject): Integer;
+ var
+   Item: TJvImageItem;
+ begin
+   Item := Add;
+   Item.Text := Text;
+   Item.LinkedObject := ALinkedObject;
+   Result := Item.Index;
+ end;
+ 
+ procedure TJvImageItems.InsertObject(Index: Integer; const Text: string;
+   ALinkedObject: TObject);
+ var
+   Item: TJvImageItem;
+ begin
+   Item := Insert(Index);
+   Item.Text := Text;
+   Item.LinkedObject := ALinkedObject;
+ end;
+ 
  //=== { TJvImageComboBox } ===================================================