From a04e9956ad181530d3d18ddc39b44d2a9087a7d7 Mon Sep 17 00:00:00 2001 From: Reinier Sterkenburg Date: Sun, 4 Oct 2020 14:42:52 +0200 Subject: [PATCH 1/3] Win64 is now the default platform; removed/replaced old icons; improved high DPI awareness --- Demos/Demo28/Demo28.dproj | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) 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= From 3c1142993713bf58d85e69552449646c7a2b5a38 Mon Sep 17 00:00:00 2001 From: Reinier Sterkenburg Date: Sun, 4 Oct 2020 14:43:01 +0200 Subject: [PATCH 2/3] Fixed Integer/NativeInt issue --- Demos/Demo28/Unit1.pas | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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; From f21c4a075a37f12e7e32730cf416b1e2a44e885e Mon Sep 17 00:00:00 2001 From: Reinier Sterkenburg Date: Sun, 4 Oct 2020 14:43:06 +0200 Subject: [PATCH 3/3] Python code now Python 3 compatible; Memo font is now Consolas, size 10 --- Demos/Demo28/Unit1.dfm | Bin 2600 -> 4064 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/Demos/Demo28/Unit1.dfm b/Demos/Demo28/Unit1.dfm index 1eb278e5ad09b9cec51bbc4a79be2a1c07443d66..429153b6c890c2546c2e691c58b1208998372fc4 100644 GIT binary patch literal 4064 zcmd5ZFSd+d~tKch{n%_SWGGvJ+zml*Sz+x&h_zqev_`c_J zy@XZk;tW<-j4zgG*lOYOjwv0*N~URts>Xzh1w$vt$DnJ+nm@6w6dLp(?X0zy0^N6M zrnwX#t6j2{Br+l67rm6ChDw=A1*#Za#*Ygn*J2LhKKN;LmsI5p!(aCL?c3q>_wH4D z67{Cuz;C|iVlJPjY@?mdLk|#x@pnU4h_`kfk%)?%L`?AnK^X0r>lja-WOr0?I!l?; zMEWJgjSt^JGD_!N#i(W@HD`!?s@7;Z<{OsgW2OeexVbn5Ap$CaoPb2ydPG^uwPp%y z;=V!a3xgSTg$a)@%*vPM98Xj!4*G>mu2pVRsqTzRBW1O8);i)w!@pe-V zh|I1}+29D{kG92!LhB3hb6_*JMG9bUE>oH#A3kD4q1)mFl#L6PHzKXLSmcoIy759t zjjuAPG|8HC>lj2s(8Ic6X*9K)hCJ8x;E04rK z0Kq6;{_55u;+IP)*q1V_N9j)d5PmPULs%htq3ig0Kn_W`Z%1)_V^i+-F3GS#=kt1S zd_chYfvJ+EK9T_fl+5>y4(plc9jTYbd`f5T>LZ7@uELlKmf~G7AI5yoWoVu?jq2UY z(6svUE@S~r+`ZxKLYRqm06k)HjTbNT7CEq>fqEN z-H-diHkVIe4<(%!m>Z489@x&yF6{6V*eCD64o_`e-%Izo?em|&j_8w1^?um4k-p9L z$u8_I>SFiCe1Fu%EwLOsTD$L%d#Fm@x;N+l-@yNQ6TozDWzr5eJ+Xi{!Sn(%?AW#8 z`d|b%z*>E~9SlUa)^MTWe@nQcW1PHkJj$53|(XUM)qPE z-RG(86*U`?B+$vq6 ze+x&Z%ctLmpTgs9wpqS-q7-y8D(FXM0tIE&hZPzN^x~%7%79T+6qNmxnmOe`XUP>5 z?HkiLZFkm5!W6urRvNKC*G$B0AiN0Jn!?OD%5pE7@Oasks|+ScFS}>-al(?)2qyur z?ZTX8RUMi$1dEe3455l8e1rV8XR&y%<$P@@n61XmOJfL=`xB30;)4A=h7Aw19FEY| z8iLI7sQjF;%!;fAVc1ySMRB5=^=f9`R5Rrh{Nuoecvs=FgW>ah$izY~k6==O7%TkU zwx2uUu4$IRkcgYCrpgcZGBn?i)|}n5#HPfg;sc&oE5`#rg7%b>3Wu6sels2l0H)u3 z0HDHFJJw0%@%#(cI$xi&*I8Ot{1~nvn=tMTbjqDV{wKWI@%gvNagNV0b`t#e7rv*F A9RL6T literal 2600 zcmcIl-A*Gn6doqTlVk|&vao7-wTb+xtbMWG`g5w13 z`T+{+QjN;lO6-a;dzv5S)ZJ10~0z zw^oP4rRtCrAS35A9N$mjDd~QK{?^iweI!-pY09v#0=MnU8&!98jN(z-DyviAPEjF2; zy3{p_iGf~01vZMLGB`T!p)Z^G>v&MIbOd%&lWDV4-p7ag_-G#=?;orE+pxNBt8052r2tP`|8-T3BA3i`%E71Eo1Jp6>Vn(&R0h1rRRyLb;DqSx~s z={1uzv^BNkW{LEAJLQ92{K+ZIN?vr-ilxqw_Jb>gl-Y(bj{%2D!tl#Ab2QWee1 zV1J$paAf4Da7u3}Z;c@+4_)70LL77Nj^hPZPE%FcDnqeI-JJFA>Qtic=X1@~CNu<} zSci&5X2GM^5>Nx-jklKSG?_gEI<)QJ$E2QTNFSFVH6`h#Fr`vyj2NvHkwwa_ zJc{X?B}iRzI}PX&lKT|tC`DQni4Dl=(|xWHQ0$@{|2F5KzG7gTSxpQ;NyWuU*=@AE zZEJaV)o6%lY#_bxO=|-?jvurlD$W?;a^TO0<-!^5lQB27i9xG-rRW~j8HdV12i70% zgG}^8yz&q?q}kj|%tM9q*?cb>FvBTYjh$P9e*zi$LCj%_J0Je{xL%U0inh?d0Q7ds z*kekT^OV05ER;RkXyx-Aa%b7gA^YzoJugk?+c+l6O#tm?Ei&_Vg=})X$Jxn2{U?3i z+g#jiZMoP<@`3hw%S8Qipzs|v@oRND?)RyBnHszF`!N+EZHTD_ zlFy-+w<5in?&+{_Se2s)n)^m-`asD|hxWCf&g1^JmX52O=w#uPXc}L`L2X6*Y=V%z zF}jewF{fTO8nutl*5SRoWg)b7*v~>gf34xB6=M{Px^{%Fb%#bO3kIWL62m#KX9v?O zUyeuDRQb-vY+-77IkQaT^>bP`sTi0cv`26^%4=P*Bj?3z_XUX}cx`+qsR{ROBKL#2 zlx!e2j^(K<*eywZGVxPYQ%Wkmo_fSnkBb$twU}i4a!9q@{k$^1Sa#@Xg}hp*keTEE VBRK_|qf5~Hzs%D=Wupx`{R;y$Jb?fJ