diff --git a/Demos/Demo28/Demo28.dproj b/Demos/Demo28/Demo28.dproj index 533236b9..d6e0c20f 100644 --- a/Demos/Demo28/Demo28.dproj +++ b/Demos/Demo28/Demo28.dproj @@ -68,15 +68,15 @@ CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments= - Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace) + System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace) Debug true CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName) - 1033 $(BDS)\bin\default_app.manifest true $(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png $(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png + $(BDS)\bin\delphi_PROJECTICON.ico $(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png @@ -86,6 +86,9 @@ true CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments= $(BDS)\bin\default_app.manifest + $(BDS)\bin\delphi_PROJECTICON.ico + true + PerMonitorV2 false @@ -111,6 +114,8 @@ true PerMonitorV2 + true + CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments= diff --git a/Demos/Demo28/Unit1.dfm b/Demos/Demo28/Unit1.dfm index 1eb278e5..429153b6 100644 Binary files a/Demos/Demo28/Unit1.dfm and b/Demos/Demo28/Unit1.dfm differ diff --git a/Demos/Demo28/Unit1.pas b/Demos/Demo28/Unit1.pas index ff408160..d1662d8c 100644 --- a/Demos/Demo28/Unit1.pas +++ b/Demos/Demo28/Unit1.pas @@ -25,9 +25,9 @@ TPyStringList = class(TPyObject) function Iter : PPyObject; override; // Sequence services - function SqLength : Integer; override; - function SqItem( idx : Integer ) : PPyObject; override; - function SqAssItem( idx : integer; obj : PPyObject) : Integer; override; + function SqLength : NativeInt; override; + function SqItem( idx : NativeInt ) : PPyObject; override; + function SqAssItem( idx : NativeInt; obj : PPyObject) : Integer; override; // Class methods class procedure RegisterMethods( PythonType : TPythonType ); override; @@ -196,7 +196,7 @@ procedure TPyStringList.SetStrings(const Value: TStringList); fStrings.Assign(Value); end; -function TPyStringList.SqAssItem(idx: integer; obj: PPyObject): Integer; +function TPyStringList.SqAssItem(idx: NativeInt; obj: PPyObject): Integer; begin with GetPythonEngine do begin @@ -213,7 +213,7 @@ function TPyStringList.SqAssItem(idx: integer; obj: PPyObject): Integer; end; end; -function TPyStringList.SqItem(idx: Integer): PPyObject; +function TPyStringList.SqItem(idx: NativeInt): PPyObject; begin with GetPythonEngine do begin @@ -227,7 +227,7 @@ function TPyStringList.SqItem(idx: Integer): PPyObject; end; end; -function TPyStringList.SqLength: Integer; +function TPyStringList.SqLength: NativeInt; begin Result := Strings.Count; end;