Skip to content

Commit 9190d34

Browse files
authored
Merge pull request #182 from ReinierNL/update_demo27
Updates for demo 27
2 parents ae65f06 + 547f656 commit 9190d34

File tree

3 files changed

+34
-13
lines changed

3 files changed

+34
-13
lines changed

Demos/Demo27/Demo27.dproj

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
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>
@@ -77,6 +77,7 @@
7777
<AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
7878
<UWP_DelphiLogo44>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png</UWP_DelphiLogo44>
7979
<UWP_DelphiLogo150>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png</UWP_DelphiLogo150>
80+
<Icon_MainIcon>$(BDS)\bin\delphi_PROJECTICON.ico</Icon_MainIcon>
8081
</PropertyGroup>
8182
<PropertyGroup Condition="'$(Base_Win64)'!=''">
8283
<UWP_DelphiLogo44>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png</UWP_DelphiLogo44>
@@ -87,6 +88,9 @@
8788
<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>
8889
<VerInfo_Locale>1033</VerInfo_Locale>
8990
<Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
91+
<Icon_MainIcon>$(BDS)\bin\delphi_PROJECTICON.ico</Icon_MainIcon>
92+
<AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
93+
<AppDPIAwarenessMode>PerMonitorV2</AppDPIAwarenessMode>
9094
</PropertyGroup>
9195
<PropertyGroup Condition="'$(Cfg_1)'!=''">
9296
<DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
@@ -112,6 +116,9 @@
112116
<PropertyGroup Condition="'$(Cfg_2_Win64)'!=''">
113117
<AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
114118
<AppDPIAwarenessMode>PerMonitorV2</AppDPIAwarenessMode>
119+
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
120+
<VerInfo_Locale>1033</VerInfo_Locale>
121+
<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>
115122
</PropertyGroup>
116123
<ItemGroup>
117124
<DelphiCompile Include="$(MainSource)">

Demos/Demo27/Unit1.dfm

Lines changed: 24 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
object Form1: TForm1
22
Left = 192
33
Top = 114
4-
Width = 870
5-
Height = 640
64
Caption = 'Form1'
5+
ClientHeight = 601
6+
ClientWidth = 854
77
Color = clBtnFace
88
Font.Charset = DEFAULT_CHARSET
99
Font.Color = clWindowText
@@ -18,24 +18,36 @@ object Form1: TForm1
1818
Top = 24
1919
Width = 745
2020
Height = 281
21+
Font.Charset = DEFAULT_CHARSET
22+
Font.Color = clWindowText
23+
Font.Height = -13
24+
Font.Name = 'Consolas'
25+
Font.Style = []
26+
ParentFont = False
2127
TabOrder = 0
2228
end
2329
object Memo2: TMemo
2430
Left = 56
2531
Top = 320
2632
Width = 745
2733
Height = 217
34+
Font.Charset = DEFAULT_CHARSET
35+
Font.Color = clWindowText
36+
Font.Height = -13
37+
Font.Name = 'Consolas'
38+
Font.Style = []
2839
Lines.Strings = (
2940
'import test'
3041
'S=test.CreateMySeq()'
31-
'print S'
32-
'print len(S)'
33-
'print S[1]'
34-
'print S[1,2]'
35-
'print S[1:2]'
36-
'print S[1:20:2]'
37-
'print S[...]'
38-
'print S[1,4,5:8, 10:20:2, ...]')
42+
'print (S)'
43+
'print (len(S))'
44+
'print (S[1])'
45+
'print (S[1,2])'
46+
'print (S[1:2])'
47+
'print (S[1:20:2])'
48+
'print (S[...])'
49+
'print (S[1,4,5:8, 10:20:2, ...])')
50+
ParentFont = False
3951
TabOrder = 1
4052
end
4153
object Button1: TButton
@@ -53,6 +65,8 @@ object Form1: TForm1
5365
Top = 144
5466
end
5567
object PythonGUIInputOutput1: TPythonGUIInputOutput
68+
UnicodeIO = True
69+
RawOutput = False
5670
Output = Memo1
5771
Left = 40
5872
Top = 176

Demos/Demo27/Unit1.pas

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ interface
1010
TMySeq = class(TPyObject)
1111
public
1212
// Mapping services
13-
function MpLength : Integer; override;
13+
function MpLength : NativeInt; override;
1414
function MpSubscript( obj : PPyObject) : PPyObject; override;
1515
//function MpAssSubscript( obj1, obj2 : PPyObject) : Integer; override;
1616
end;
@@ -40,7 +40,7 @@ implementation
4040

4141
{ TMySeq }
4242

43-
function TMySeq.MpLength: Integer;
43+
function TMySeq.MpLength: NativeInt;
4444
begin
4545
Result := 10;
4646
end;

0 commit comments

Comments
 (0)