Browse Source

+ Fixed some int<->object proprty issues which prevent 64 bit compilation

michael 21 years ago
parent
commit
123188cda8
1 changed files with 7 additions and 7 deletions
  1. 7 7
      fcl/inc/rttiutils.pp

+ 7 - 7
fcl/inc/rttiutils.pp

@@ -463,7 +463,7 @@ var
   SectName: string;
   SectName: string;
 begin
 begin
   Result := '';
   Result := '';
-  List := TObject(GetOrdProp(Self.FObject, PropInfo));
+  List := TObject(GetObjectProp(Self.FObject, PropInfo));
   SectName := Format('%s.%s', [Section, GetItemName(PropInfo^.Name)]);
   SectName := Format('%s.%s', [Section, GetItemName(PropInfo^.Name)]);
   EraseSection(SectName);
   EraseSection(SectName);
   if (List is TStrings) and (TStrings(List).Count > 0) then begin
   if (List is TStrings) and (TStrings(List).Count > 0) then begin
@@ -478,7 +478,7 @@ var
   Comp: TComponent;
   Comp: TComponent;
   RootName: string;
   RootName: string;
 begin
 begin
-  Comp := TComponent(GetOrdProp(FObject, PropInfo));
+  Comp := TComponent(GetObjectProp(FObject, PropInfo));
   if Comp <> nil then begin
   if Comp <> nil then begin
     Result := Comp.Name;
     Result := Comp.Name;
     if (Comp.Owner <> nil) and (Comp.Owner <> FOwner) then begin
     if (Comp.Owner <> nil) and (Comp.Owner <> FOwner) then begin
@@ -522,7 +522,7 @@ var
 
 
 begin
 begin
   Result := '';
   Result := '';
-  Obj := TObject(GetOrdProp(Self.FObject, PropInfo));
+  Obj := TObject(GetObjectProp(Self.FObject, PropInfo));
   if (Obj <> nil) then begin
   if (Obj <> nil) then begin
     if Obj is TStrings then StoreStringsProperty(PropInfo)
     if Obj is TStrings then StoreStringsProperty(PropInfo)
     else if Obj is TCollection then begin
     else if Obj is TCollection then begin
@@ -642,7 +642,7 @@ var
   I, Cnt: Integer;
   I, Cnt: Integer;
   SectName: string;
   SectName: string;
 begin
 begin
-  List := TObject(GetOrdProp(Self.FObject, PropInfo));
+  List := TObject(GetObjectProp(Self.FObject, PropInfo));
   if (List is TStrings) then begin
   if (List is TStrings) then begin
     SectName := Format('%s.%s', [Section, GetItemName(PropInfo^.Name)]);
     SectName := Format('%s.%s', [Section, GetItemName(PropInfo^.Name)]);
     Cnt := StrToIntDef(Trim(ReadString(SectName, sCount, '0')), 0);
     Cnt := StrToIntDef(Trim(ReadString(SectName, sCount, '0')), 0);
@@ -682,7 +682,7 @@ begin
   if RootName <> '' then Root := FindGlobalComponent(RootName)
   if RootName <> '' then Root := FindGlobalComponent(RootName)
   else Root := FOwner;
   else Root := FOwner;
   if (Root <> nil) then
   if (Root <> nil) then
-    SetOrdProp(FObject, PropInfo, Longint(Root.FindComponent(Name)));
+    SetObjectProp(FObject, PropInfo, Root.FindComponent(Name));
 end;
 end;
 
 
 procedure TPropsStorage.LoadClassProperty(const S: string; PropInfo: PPropInfo);
 procedure TPropsStorage.LoadClassProperty(const S: string; PropInfo: PPropInfo);
@@ -713,7 +713,7 @@ var
   end;
   end;
 
 
 begin
 begin
-  Obj := TObject(GetOrdProp(Self.FObject, PropInfo));
+  Obj := TObject(GetObjectProp(Self.FObject, PropInfo));
   if (Obj <> nil) then begin
   if (Obj <> nil) then begin
     if Obj is TStrings then LoadStringsProperty(S, PropInfo)
     if Obj is TStrings then LoadStringsProperty(S, PropInfo)
     else if Obj is TCollection then begin
     else if Obj is TCollection then begin
@@ -908,4 +908,4 @@ begin
   if Assigned(FOnEraseSection) then FOnEraseSection(ASection);
   if Assigned(FOnEraseSection) then FOnEraseSection(ASection);
 end;
 end;
 
 
-end.
+end.