paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-02 10:10:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Patch from Darek Mazur for reading idents from property stream

Browse Source
This commit is contained in:
michael 2003-12-15 08:55:56 +00:00
parent cb201089ea
commit 2d7ecc1273
2 changed files with 50 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
fcl/classes/classes.inc
View File

@ -60,6 +60,11 @@ var
{ TStrings and TStringList implementations }
{$i stringl.inc}
{$ifndef VER1_0}
{ TThread implementation }
{$i tthread.inc}
{$endif}
{ TPersistent implementation }
{$i persist.inc }
@ -227,6 +232,20 @@ begin
Result := False;
end;
function GlobalIdentToInt(const Ident: String; var Int: LongInt):boolean;
var
i : Integer;
begin
with IntConstList.LockList do
try
for i := 0 to Count - 1 do
if TIntConst(Items[I]).IdentToIntFn(Ident, Int) then
Exit(True);
Result := false;
finally
IntConstList.UnlockList;
end;
end;
{ TPropFixup }
@ -273,16 +292,16 @@ Type
AHandler : TInitComponentHandler;
AClass : TComponentClass;
end;
Var
Var
InitHandlerList : TList;
procedure RegisterInitComponentHandler(ComponentClass: TComponentClass; Handler: TInitComponentHandler);
Var
I : Integer;
H: TInitHandler;
begin
If (InitHandlerList=Nil) then
InitHandlerList:=TList.Create;
@ -292,10 +311,10 @@ begin
With InitHandlerList do
begin
I:=0;
While (I<Count) and not H.AClass.InheritsFrom(TInitHandler(Items[i]).AClass) do
While (I<Count) and not H.AClass.InheritsFrom(TInitHandler(Items[i]).AClass) do
Inc(I);
InitHandlerList.Insert(I,H);
end;
end;
end;
function InitInheritedComponent(Instance: TComponent; RootAncestor: TClass): Boolean;
@ -312,11 +331,11 @@ begin
// Instance is the normally the lowest one, so that one should be used when searching.
While Not result and (I<Count) do
begin
If (Instance.InheritsFrom(TInitHandler(Items[i]).AClass)) then
Result:=TInitHandler(Items[i]).AHandler(Instance,RootAncestor);
If (Instance.InheritsFrom(TInitHandler(Items[i]).AClass)) then
Result:=TInitHandler(Items[i]).AHandler(Instance,RootAncestor);
Inc(I);
end;
end;
end;
end;
@ -1209,10 +1228,17 @@ end;
{
$Log$
Revision 1.1 2003-10-06 20:33:58 peter
* classes moved to rtl for 1.1
* classes .inc and classes.pp files moved to fcl/classes for
backwards 1.0.x compatiblity to have it in the fcl
Revision 1.2 2003-12-15 08:57:24 michael
Patch from Darek Mazur for reading idents from property stream
Revision 1.3 2003/12/15 08:55:56 michael
Patch from Darek Mazur for reading idents from property stream
Revision 1.2 2003/11/19 15:51:54 peter
* tthread disabled for 1.0.x
Revision 1.1 2003/10/06 21:01:06 peter
* moved classes unit to rtl
Revision 1.14 2003/06/04 17:40:44 michael
+ Minor fix by Mattias Gaertner
@ -1237,4 +1263,4 @@ end;
Revision 1.8 2002/01/06 21:54:49 peter
* action classes added
}
}

17
fcl/classes/reader.inc
View File

@ -1026,9 +1026,8 @@ begin
tkInteger:
if FDriver.NextValue = vaIdent then
begin
IdentToIntFn := FindIdentToInt(PPropInfo(PropInfo)^.PropType);
Ident := ReadIdent;
if Assigned(IdentToIntFn) and IdentToIntFn(Ident, Value) then
if GlobalIdentToInt(Ident,Value) then
SetOrdProp(Instance, PropInfo, Value)
else
raise EReadError.Create(SInvalidPropertyValue);
@ -1305,10 +1304,14 @@ end;
{
$Log$
Revision 1.1 2003-10-06 20:33:58 peter
* classes moved to rtl for 1.1
* classes .inc and classes.pp files moved to fcl/classes for
backwards 1.0.x compatiblity to have it in the fcl
Revision 1.2 2003-12-15 08:57:24 michael
Patch from Darek Mazur for reading idents from property stream
Revision 1.2 2003/12/15 08:55:56 michael
Patch from Darek Mazur for reading idents from property stream
Revision 1.1 2003/10/06 21:01:06 peter
* moved classes unit to rtl
Revision 1.8 2003/08/16 15:50:47 michael
+ Fix from Mattias gaertner for IDE support
@ -1321,4 +1324,4 @@ end;
Revision 1.6 2002/09/07 15:15:25 peter
* old logs removed and tabs fixed
}
}