Skip to content

Commit 4a16aa7

Browse files
authored
Merge pull request pyscripter#183 from ReinierNL/update_demo28
Updates for demo 28
2 parents 9190d34 + f21c4a0 commit 4a16aa7

File tree

3 files changed

+13
-8
lines changed

3 files changed

+13
-8
lines changed

Demos/Demo28/Demo28.dproj

+7-2
Original file line numberDiff line numberDiff line change
@@ -68,15 +68,15 @@
6868
<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
6969
</PropertyGroup>
7070
<PropertyGroup Condition="'$(Base_Win32)'!=''">
71-
<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
71+
<DCC_Namespace>System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
7272
<BT_BuildType>Debug</BT_BuildType>
7373
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
7474
<VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName)</VerInfo_Keys>
75-
<VerInfo_Locale>1033</VerInfo_Locale>
7675
<Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
7776
<AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
7877
<UWP_DelphiLogo44>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png</UWP_DelphiLogo44>
7978
<UWP_DelphiLogo150>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png</UWP_DelphiLogo150>
79+
<Icon_MainIcon>$(BDS)\bin\delphi_PROJECTICON.ico</Icon_MainIcon>
8080
</PropertyGroup>
8181
<PropertyGroup Condition="'$(Base_Win64)'!=''">
8282
<UWP_DelphiLogo44>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png</UWP_DelphiLogo44>
@@ -86,6 +86,9 @@
8686
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
8787
<VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
8888
<Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
89+
<Icon_MainIcon>$(BDS)\bin\delphi_PROJECTICON.ico</Icon_MainIcon>
90+
<AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
91+
<AppDPIAwarenessMode>PerMonitorV2</AppDPIAwarenessMode>
8992
</PropertyGroup>
9093
<PropertyGroup Condition="'$(Cfg_1)'!=''">
9194
<DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
@@ -111,6 +114,8 @@
111114
<PropertyGroup Condition="'$(Cfg_2_Win64)'!=''">
112115
<AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
113116
<AppDPIAwarenessMode>PerMonitorV2</AppDPIAwarenessMode>
117+
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
118+
<VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
114119
</PropertyGroup>
115120
<ItemGroup>
116121
<DelphiCompile Include="$(MainSource)">

Demos/Demo28/Unit1.dfm

1.43 KB
Binary file not shown.

Demos/Demo28/Unit1.pas

+6-6
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ TPyStringList = class(TPyObject)
2525
function Iter : PPyObject; override;
2626

2727
// Sequence services
28-
function SqLength : Integer; override;
29-
function SqItem( idx : Integer ) : PPyObject; override;
30-
function SqAssItem( idx : integer; obj : PPyObject) : Integer; override;
28+
function SqLength : NativeInt; override;
29+
function SqItem( idx : NativeInt ) : PPyObject; override;
30+
function SqAssItem( idx : NativeInt; obj : PPyObject) : Integer; override;
3131

3232
// Class methods
3333
class procedure RegisterMethods( PythonType : TPythonType ); override;
@@ -196,7 +196,7 @@ procedure TPyStringList.SetStrings(const Value: TStringList);
196196
fStrings.Assign(Value);
197197
end;
198198

199-
function TPyStringList.SqAssItem(idx: integer; obj: PPyObject): Integer;
199+
function TPyStringList.SqAssItem(idx: NativeInt; obj: PPyObject): Integer;
200200
begin
201201
with GetPythonEngine do
202202
begin
@@ -213,7 +213,7 @@ function TPyStringList.SqAssItem(idx: integer; obj: PPyObject): Integer;
213213
end;
214214
end;
215215

216-
function TPyStringList.SqItem(idx: Integer): PPyObject;
216+
function TPyStringList.SqItem(idx: NativeInt): PPyObject;
217217
begin
218218
with GetPythonEngine do
219219
begin
@@ -227,7 +227,7 @@ function TPyStringList.SqItem(idx: Integer): PPyObject;
227227
end;
228228
end;
229229

230-
function TPyStringList.SqLength: Integer;
230+
function TPyStringList.SqLength: NativeInt;
231231
begin
232232
Result := Strings.Count;
233233
end;

0 commit comments

Comments
 (0)