Skip to content

Commit d12ea0b

Browse files
lmbelolmbelo
authored
Merge pull request #70 from Embarcadero/sync
Synchronize with upstream
2 parents 3d385c0 + 267b68e commit d12ea0b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+2407
-1828
lines changed

‎Contributors.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
## Contributors
2+
3+
### Fpc and Lazarus support:
4+
- Alexey-T (https://github.com/Alexey-T)
5+
### Early Contributors:
6+
- Grzegorz Makarewicz (mak@mikroplan.com.pl)
7+
- Samuel Iseli (iseli@vertec.ch)
8+
- Andrew Robinson (andy@hps1.demon.co.uk)
9+
- Mark Watts(mark_watts@hotmail.com)
10+
- Olivier Deckmyn (olivier.deckmyn@mail.dotcom.fr)
11+
- Sigve Tjora (public@tjora.no)
12+
- Mark Derricutt (mark@talios.com)
13+
- Igor E. Poteryaev (jah@mail.ru)
14+
- Yuri Filimonov (fil65@mail.ru)
15+
- Stefan Hoffmeister (Stefan.Hoffmeister@Econos.de)
16+
- Michiel du Toit (micdutoit@hsbfn.com) - Lazarus Port
17+
- Chris Nicolai (nicolaitanes@gmail.com)
18+
- Andrey Gruzdev (andrey.gruzdev@gmail.com)
19+
20+
More recent contributors can be seen at the [project contributors graph](https://github.com/pyscripter/python4delphi/graphs/contributors).

‎Packages/Delphi/Delphi 10.4+/Python.dproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,7 @@
178178
<DCCReference Include="..\..\..\Source\WrapActions.pas"/>
179179
<DCCReference Include="..\..\..\Source\WrapDelphiDataBind.pas"/>
180180
<DCCReference Include="..\..\..\Source\PythonDocs.pas"/>
181+
<DCCReference Include="..\..\..\Source\WrapDelphiImageList.pas"/>
181182
<BuildConfiguration Include="Base">
182183
<Key>Base</Key>
183184
</BuildConfiguration>

‎Packages/Delphi/Delphi 10.4+/PythonFmxLinux.dproj

Lines changed: 968 additions & 968 deletions
Large diffs are not rendered by default.

‎Packages/Delphi/Delphi 10.4+/PythonVcl.dproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@
118118
<DCCReference Include="..\..\..\Source\vcl\WrapVclWinXCtrls.pas"/>
119119
<DCCReference Include="..\..\..\Source\vcl\WrapVclThemes.pas"/>
120120
<DCCReference Include="..\..\..\Source\vcl\WrapVclMedia.pas"/>
121+
<DCCReference Include="..\..\..\Source\vcl\WrapVclImgList.pas"/>
121122
<BuildConfiguration Include="Base">
122123
<Key>Base</Key>
123124
</BuildConfiguration>

‎Packages/Delphi/P4DComponentSuite.groupproj

Lines changed: 96 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -1,96 +1,96 @@
1-
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2-
<PropertyGroup>
3-
<ProjectGuid>{8BE1193B-E609-445D-9BA3-F57DBEA042F5}</ProjectGuid>
4-
</PropertyGroup>
5-
<ItemGroup>
6-
<Projects Include="Delphi 10.4+\Python.dproj">
7-
<Dependencies/>
8-
</Projects>
9-
<Projects Include="Delphi 10.4+\dclPython.dproj">
10-
<Dependencies>Delphi 10.4+\Python.dproj</Dependencies>
11-
</Projects>
12-
<Projects Include="Delphi 10.4+\PythonVcl.dproj">
13-
<Dependencies>Delphi 10.4+\Python.dproj</Dependencies>
14-
</Projects>
15-
<Projects Include="Delphi 10.4+\dclPythonVcl.dproj">
16-
<Dependencies>Delphi 10.4+\PythonVcl.dproj</Dependencies>
17-
</Projects>
18-
<Projects Include="Delphi 10.4+\PythonFmx.dproj">
19-
<Dependencies/>
20-
</Projects>
21-
<Projects Include="Delphi 10.4+\dclPythonFmx.dproj">
22-
<Dependencies/>
23-
</Projects>
24-
</ItemGroup>
25-
<ProjectExtensions>
26-
<Borland.Personality>Default.Personality.12</Borland.Personality>
27-
<Borland.ProjectType/>
28-
<BorlandProject>
29-
<Default.Personality/>
30-
</BorlandProject>
31-
</ProjectExtensions>
32-
<Target Name="Python">
33-
<MSBuild Projects="Delphi 10.4+\Python.dproj"/>
34-
</Target>
35-
<Target Name="Python:Clean">
36-
<MSBuild Projects="Delphi 10.4+\Python.dproj" Targets="Clean"/>
37-
</Target>
38-
<Target Name="Python:Make">
39-
<MSBuild Projects="Delphi 10.4+\Python.dproj" Targets="Make"/>
40-
</Target>
41-
<Target Name="dclPython" DependsOnTargets="Python">
42-
<MSBuild Projects="Delphi 10.4+\dclPython.dproj"/>
43-
</Target>
44-
<Target Name="dclPython:Clean" DependsOnTargets="Python:Clean">
45-
<MSBuild Projects="Delphi 10.4+\dclPython.dproj" Targets="Clean"/>
46-
</Target>
47-
<Target Name="dclPython:Make" DependsOnTargets="Python:Make">
48-
<MSBuild Projects="Delphi 10.4+\dclPython.dproj" Targets="Make"/>
49-
</Target>
50-
<Target Name="PythonVcl" DependsOnTargets="Python">
51-
<MSBuild Projects="Delphi 10.4+\PythonVcl.dproj"/>
52-
</Target>
53-
<Target Name="PythonVcl:Clean" DependsOnTargets="Python:Clean">
54-
<MSBuild Projects="Delphi 10.4+\PythonVcl.dproj" Targets="Clean"/>
55-
</Target>
56-
<Target Name="PythonVcl:Make" DependsOnTargets="Python:Make">
57-
<MSBuild Projects="Delphi 10.4+\PythonVcl.dproj" Targets="Make"/>
58-
</Target>
59-
<Target Name="dclPythonVcl" DependsOnTargets="PythonVcl">
60-
<MSBuild Projects="Delphi 10.4+\dclPythonVcl.dproj"/>
61-
</Target>
62-
<Target Name="dclPythonVcl:Clean" DependsOnTargets="PythonVcl:Clean">
63-
<MSBuild Projects="Delphi 10.4+\dclPythonVcl.dproj" Targets="Clean"/>
64-
</Target>
65-
<Target Name="dclPythonVcl:Make" DependsOnTargets="PythonVcl:Make">
66-
<MSBuild Projects="Delphi 10.4+\dclPythonVcl.dproj" Targets="Make"/>
67-
</Target>
68-
<Target Name="PythonFmx">
69-
<MSBuild Projects="Delphi 10.4+\PythonFmx.dproj"/>
70-
</Target>
71-
<Target Name="PythonFmx:Clean">
72-
<MSBuild Projects="Delphi 10.4+\PythonFmx.dproj" Targets="Clean"/>
73-
</Target>
74-
<Target Name="PythonFmx:Make">
75-
<MSBuild Projects="Delphi 10.4+\PythonFmx.dproj" Targets="Make"/>
76-
</Target>
77-
<Target Name="dclPythonFmx">
78-
<MSBuild Projects="Delphi 10.4+\dclPythonFmx.dproj"/>
79-
</Target>
80-
<Target Name="dclPythonFmx:Clean">
81-
<MSBuild Projects="Delphi 10.4+\dclPythonFmx.dproj" Targets="Clean"/>
82-
</Target>
83-
<Target Name="dclPythonFmx:Make">
84-
<MSBuild Projects="Delphi 10.4+\dclPythonFmx.dproj" Targets="Make"/>
85-
</Target>
86-
<Target Name="Build">
87-
<CallTarget Targets="Python;dclPython;PythonVcl;dclPythonVcl;PythonFmx;dclPythonFmx"/>
88-
</Target>
89-
<Target Name="Clean">
90-
<CallTarget Targets="Python:Clean;dclPython:Clean;PythonVcl:Clean;dclPythonVcl:Clean;PythonFmx:Clean;dclPythonFmx:Clean"/>
91-
</Target>
92-
<Target Name="Make">
93-
<CallTarget Targets="Python:Make;dclPython:Make;PythonVcl:Make;dclPythonVcl:Make;PythonFmx:Make;dclPythonFmx:Make"/>
94-
</Target>
95-
<Import Project="$(BDS)\Bin\CodeGear.Group.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Group.Targets')"/>
96-
</Project>
1+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<PropertyGroup>
3+
<ProjectGuid>{8BE1193B-E609-445D-9BA3-F57DBEA042F5}</ProjectGuid>
4+
</PropertyGroup>
5+
<ItemGroup>
6+
<Projects Include="Delphi 10.4+\Python.dproj">
7+
<Dependencies/>
8+
</Projects>
9+
<Projects Include="Delphi 10.4+\dclPython.dproj">
10+
<Dependencies>Delphi 10.4+\Python.dproj</Dependencies>
11+
</Projects>
12+
<Projects Include="Delphi 10.4+\PythonVcl.dproj">
13+
<Dependencies>Delphi 10.4+\Python.dproj</Dependencies>
14+
</Projects>
15+
<Projects Include="Delphi 10.4+\dclPythonVcl.dproj">
16+
<Dependencies>Delphi 10.4+\PythonVcl.dproj</Dependencies>
17+
</Projects>
18+
<Projects Include="Delphi 10.4+\PythonFmx.dproj">
19+
<Dependencies/>
20+
</Projects>
21+
<Projects Include="Delphi 10.4+\dclPythonFmx.dproj">
22+
<Dependencies/>
23+
</Projects>
24+
</ItemGroup>
25+
<ProjectExtensions>
26+
<Borland.Personality>Default.Personality.12</Borland.Personality>
27+
<Borland.ProjectType/>
28+
<BorlandProject>
29+
<Default.Personality/>
30+
</BorlandProject>
31+
</ProjectExtensions>
32+
<Target Name="Python">
33+
<MSBuild Projects="Delphi 10.4+\Python.dproj"/>
34+
</Target>
35+
<Target Name="Python:Clean">
36+
<MSBuild Projects="Delphi 10.4+\Python.dproj" Targets="Clean"/>
37+
</Target>
38+
<Target Name="Python:Make">
39+
<MSBuild Projects="Delphi 10.4+\Python.dproj" Targets="Make"/>
40+
</Target>
41+
<Target Name="dclPython" DependsOnTargets="Python">
42+
<MSBuild Projects="Delphi 10.4+\dclPython.dproj"/>
43+
</Target>
44+
<Target Name="dclPython:Clean" DependsOnTargets="Python:Clean">
45+
<MSBuild Projects="Delphi 10.4+\dclPython.dproj" Targets="Clean"/>
46+
</Target>
47+
<Target Name="dclPython:Make" DependsOnTargets="Python:Make">
48+
<MSBuild Projects="Delphi 10.4+\dclPython.dproj" Targets="Make"/>
49+
</Target>
50+
<Target Name="PythonVcl" DependsOnTargets="Python">
51+
<MSBuild Projects="Delphi 10.4+\PythonVcl.dproj"/>
52+
</Target>
53+
<Target Name="PythonVcl:Clean" DependsOnTargets="Python:Clean">
54+
<MSBuild Projects="Delphi 10.4+\PythonVcl.dproj" Targets="Clean"/>
55+
</Target>
56+
<Target Name="PythonVcl:Make" DependsOnTargets="Python:Make">
57+
<MSBuild Projects="Delphi 10.4+\PythonVcl.dproj" Targets="Make"/>
58+
</Target>
59+
<Target Name="dclPythonVcl" DependsOnTargets="PythonVcl">
60+
<MSBuild Projects="Delphi 10.4+\dclPythonVcl.dproj"/>
61+
</Target>
62+
<Target Name="dclPythonVcl:Clean" DependsOnTargets="PythonVcl:Clean">
63+
<MSBuild Projects="Delphi 10.4+\dclPythonVcl.dproj" Targets="Clean"/>
64+
</Target>
65+
<Target Name="dclPythonVcl:Make" DependsOnTargets="PythonVcl:Make">
66+
<MSBuild Projects="Delphi 10.4+\dclPythonVcl.dproj" Targets="Make"/>
67+
</Target>
68+
<Target Name="PythonFmx">
69+
<MSBuild Projects="Delphi 10.4+\PythonFmx.dproj"/>
70+
</Target>
71+
<Target Name="PythonFmx:Clean">
72+
<MSBuild Projects="Delphi 10.4+\PythonFmx.dproj" Targets="Clean"/>
73+
</Target>
74+
<Target Name="PythonFmx:Make">
75+
<MSBuild Projects="Delphi 10.4+\PythonFmx.dproj" Targets="Make"/>
76+
</Target>
77+
<Target Name="dclPythonFmx">
78+
<MSBuild Projects="Delphi 10.4+\dclPythonFmx.dproj"/>
79+
</Target>
80+
<Target Name="dclPythonFmx:Clean">
81+
<MSBuild Projects="Delphi 10.4+\dclPythonFmx.dproj" Targets="Clean"/>
82+
</Target>
83+
<Target Name="dclPythonFmx:Make">
84+
<MSBuild Projects="Delphi 10.4+\dclPythonFmx.dproj" Targets="Make"/>
85+
</Target>
86+
<Target Name="Build">
87+
<CallTarget Targets="Python;dclPython;PythonVcl;dclPythonVcl;PythonFmx;dclPythonFmx"/>
88+
</Target>
89+
<Target Name="Clean">
90+
<CallTarget Targets="Python:Clean;dclPython:Clean;PythonVcl:Clean;dclPythonVcl:Clean;PythonFmx:Clean;dclPythonFmx:Clean"/>
91+
</Target>
92+
<Target Name="Make">
93+
<CallTarget Targets="Python:Make;dclPython:Make;PythonVcl:Make;dclPythonVcl:Make;PythonFmx:Make;dclPythonFmx:Make"/>
94+
</Target>
95+
<Import Project="$(BDS)\Bin\CodeGear.Group.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Group.Targets')"/>
96+
</Project>

‎Source/MethodCallBack.pas

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,18 @@
11
(**************************************************************************)
2+
(* This unit is part of the Python for Delphi (P4D) library *)
3+
(* Project home: https://github.com/pyscripter/python4delphi *)
24
(* *)
3-
(* Module: Unit 'MethodCallback' Copyright (c) 1998 *)
4-
(* *)
5-
(* Version: 0.0 Dr. Dietmar Budelsky *)
6-
(* Sub-Version: 0.3 dbudelsky@web.de *)
7-
(* Germany *)
5+
(* Project Maintainer: PyScripter (pyscripter@gmail.com) *)
6+
(* Original Authors: Dr. Dietmar Budelsky (dbudelsky@web.de) *)
7+
(* Morgan Martinet (https://github.com/mmm-experts) *)
8+
(* Core developer: Lucas Belo (lucas.belo@live.com) *)
9+
(* Contributors: See contributors.md at project home *)
810
(* *)
11+
(* LICENCE and Copyright: MIT (see project home) *)
912
(**************************************************************************)
1013
(* Functionality: Generates synthetic callback functions which calls *)
1114
(* DELPHI Class Methods. A callback mechanism (DDE, PYTHON, TCL) can now *)
1215
(* use DELPHI objects. *)
13-
(* *)
14-
(**************************************************************************)
15-
(* Contributors: *)
16-
(* Grzegorz Makarewicz (mak@mikroplan.com.pl) *)
17-
(* Morgan Martinet (p4d@mmm-experts.com) *)
18-
(* Samuel Iseli (iseli@vertec.ch) *)
19-
(* Andrey Gruzdev (andrey.gruzdev@gmail.com) *)
20-
(* Lucas Belo (lucas.belo@live.com) *)
21-
(**************************************************************************)
22-
(* This source code is distributed with no WARRANTY, for no reason or use.*)
23-
(* Everyone is allowed to use and change this code free, as long as this *)
24-
(* header and its copyright text is intact. *)
25-
(* Dr. Dietmar Budelsky, 1998-01-07 *)
2616
(**************************************************************************)
2717

2818
{$I Definition.Inc}

‎Source/PythonAction.pas

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
(**************************************************************************)
2+
(* This unit is part of the Python for Delphi (P4D) library *)
3+
(* Project home: https://github.com/pyscripter/python4delphi *)
4+
(* *)
5+
(* Project Maintainer: PyScripter (pyscripter@gmail.com) *)
6+
(* Original Authors: Dr. Dietmar Budelsky (dbudelsky@web.de) *)
7+
(* Morgan Martinet (https://github.com/mmm-experts) *)
8+
(* Core developer: Lucas Belo (lucas.belo@live.com) *)
9+
(* Contributors: See contributors.md at project home *)
10+
(* *)
11+
(* LICENCE and Copyright: MIT (see project home) *)
12+
(**************************************************************************)
13+
114
unit PythonAction;
215

316
interface

0 commit comments

Comments
 (0)