mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-09-11 11:29:29 +02:00
+ Some bug fixes by Romio
This commit is contained in:
parent
02f26788b8
commit
0539b2fe23
@ -34,6 +34,7 @@ begin
|
||||
begin
|
||||
If FCollection<>Nil then FCollection.RemoveItem(Self);
|
||||
if Value<>Nil then Value.InsertItem(Self);
|
||||
FCollection:=Value;
|
||||
end;
|
||||
end;
|
||||
|
||||
@ -161,7 +162,6 @@ begin
|
||||
If Not(Item Is FitemClass) then
|
||||
exit;
|
||||
FItems.add(Pointer(Item));
|
||||
Item.Collection:=Self;
|
||||
Item.FID:=FNextID;
|
||||
inc(FNextID);
|
||||
SetItemName(Item);
|
||||
@ -198,7 +198,7 @@ function TCollection.GetItemAttr(Index, ItemIndex: Integer): string;
|
||||
|
||||
|
||||
begin
|
||||
Result:=TCollectionItem(FItems[ItemIndex]).DisplayName;
|
||||
Result:=TCollectionItem(FItems.Items[ItemIndex]).DisplayName;
|
||||
end;
|
||||
|
||||
|
||||
@ -238,7 +238,7 @@ end;
|
||||
procedure TCollection.SetItem(Index: Integer; Value: TCollectionItem);
|
||||
|
||||
begin
|
||||
TCollectionItem(FItems[Index]).Assign(Value);
|
||||
TCollectionItem(FItems.items[Index]).Assign(Value);
|
||||
end;
|
||||
|
||||
|
||||
@ -260,6 +260,7 @@ end;
|
||||
constructor TCollection.Create(AItemClass: TCollectionItemClass);
|
||||
|
||||
begin
|
||||
inherited create;
|
||||
FItemClass:=AItemClass;
|
||||
FItems:=TList.Create;
|
||||
end;
|
||||
@ -333,14 +334,17 @@ begin
|
||||
Result:=Nil;
|
||||
For I:=0 to Fitems.Count-1 do
|
||||
begin
|
||||
Result:=TCollectionItem(FItems[I]);
|
||||
Result:=TCollectionItem(FItems.items[I]);
|
||||
If Result.Id=Id then exit;
|
||||
end;
|
||||
end;
|
||||
|
||||
{
|
||||
$Log$
|
||||
Revision 1.4 1999-04-05 09:56:04 michael
|
||||
Revision 1.5 1999-04-13 12:46:15 michael
|
||||
+ Some bug fixes by Romio
|
||||
|
||||
Revision 1.4 1999/04/05 09:56:04 michael
|
||||
+ Fixed bugs reported by Romio in TCollection
|
||||
|
||||
Revision 1.3 1998/10/02 22:41:23 michael
|
||||
|
@ -188,8 +188,10 @@ end;
|
||||
function TList.First: Pointer;
|
||||
|
||||
begin
|
||||
// Wouldn't it be better to return Nil if count is zero ?
|
||||
Result:=Items[0];
|
||||
If FCount=0 then
|
||||
Result:=Nil
|
||||
else
|
||||
Result:=Items[0];
|
||||
end;
|
||||
|
||||
|
||||
@ -222,7 +224,10 @@ function TList.Last: Pointer;
|
||||
|
||||
begin
|
||||
// Wouldn't it be better to return nil if the count is zero ?
|
||||
Result:=Items[FCount-1];
|
||||
If FCount=0 then
|
||||
Result:=Nil
|
||||
else
|
||||
Result:=Items[FCount-1];
|
||||
end;
|
||||
|
||||
|
||||
@ -390,7 +395,10 @@ end;
|
||||
|
||||
{
|
||||
$Log$
|
||||
Revision 1.6 1999-04-08 10:18:52 peter
|
||||
Revision 1.7 1999-04-13 12:46:16 michael
|
||||
+ Some bug fixes by Romio
|
||||
|
||||
Revision 1.6 1999/04/08 10:18:52 peter
|
||||
* makefile updates
|
||||
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user