Restored FPC compatibility.

pyscripter · Jun 28, 2022 · 6038788 · 6038788
1 parent 2d96639
commit 6038788
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/Source/PythonEngine.pas b/Source/PythonEngine.pas
@@ -2790,7 +2790,11 @@ implementation
 {$ENDIF}
 {$IFDEF MSWINDOWS}
   Registry,
+{$IFDEF FPC}
+  JwaPsApi,
+{$ELSE}
   PsAPI,
+{$ENDIF}
 {$ENDIF}
   Math;
 

diff --git a/Source/WrapDelphiClasses.pas b/Source/WrapDelphiClasses.pas
@@ -107,8 +107,10 @@   TPyDelphiComponent = class (TPyDelphiPersistent)
     function  CreateComponent(AOwner : TComponent) : TComponent; virtual;
     procedure SubscribeToFreeNotification; override;
     procedure UnSubscribeToFreeNotification; override;
+{$IFNDEF FPC}
     function InternalReadComponent(const AResFile: string;
       const AInstance: TComponent): boolean; virtual;
+{$ENDIF}
     // Exposed Methods
     function GetParentComponent_Wrapper(args : PPyObject) : PPyObject; cdecl;
     function HasParent_Wrapper(args : PPyObject) : PPyObject; cdecl;
@@ -244,8 +246,9 @@   TPyDelphiBasicAction = class (TPyDelphiComponent)
 implementation
 
 uses
-  TypInfo, System.IOUtils, System.Rtti;
+  TypInfo {$IFNDEF FPC}, System.Rtti{$ENDIF};
 
+{$IFNDEF FPC}
 type
   TPyReader = class(TReader)
   private
@@ -258,6 +261,7 @@   TPyReader = class(TReader)
   public
     constructor Create(APyObject: TPyDelphiObject; Stream: TStream; BufSize: Integer);
   end;
+{$ENDIF}
 
 { Register the wrappers, the globals and the constants }
 type
@@ -892,6 +896,7 @@ function TPyDelphiComponent.HasParent_Wrapper(args: PPyObject): PPyObject;
   end;
 end;
 
+{$IFNDEF FPC}
 function TPyDelphiComponent.InternalReadComponent(const AResFile: string;
   const AInstance: TComponent): boolean;
 
@@ -930,7 +935,7 @@ function TPyDelphiComponent.InternalReadComponent(const AResFile: string;
   LInput: TFileStream;
   LOutput: TMemoryStream;
 begin
-  if AResFile.IsEmpty or not TFile.Exists(AResFile) then
+  if AResFile.IsEmpty or not FileExists(AResFile) then
     Exit(false);
 
   LInput := TFileStream.Create(AResFile, fmOpenRead);
@@ -956,6 +961,7 @@ function TPyDelphiComponent.InternalReadComponent(const AResFile: string;
   end;
   Result := true;
 end;
+{$ENDIF}
 
 function TPyDelphiComponent.GetAttrO(key: PPyObject): PPyObject;
 Var
@@ -1655,6 +1661,7 @@ function TPyDelphiStrings.Set_Text(AValue: PPyObject;
   end;
 end;
 
+{$IFNDEF FPC}
 { TPyReader }
 
 constructor TPyReader.Create(APyObject: TPyDelphiObject; Stream: TStream;
@@ -1750,6 +1757,7 @@ procedure TPyReader.SetName(Component: TComponent; var Name: string);
   end;
   FInstance := Component;
 end;
+{$ENDIF}
 
 initialization
   RegisteredUnits.Add(TClassesRegistration.Create);