Skip to content

Commit d84ecc6

Browse files
atkins126atkins126
authored
Merge branch 'pyscripter:master' into master
2 parents 3278bee + f01e820 commit d84ecc6

File tree

78 files changed

+9526
-3107
lines changed

Some content is hidden

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

78 files changed

+9526
-3107
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 ([email protected])
7+
- Samuel Iseli ([email protected])
8+
- Andrew Robinson ([email protected])
9+
- Mark Watts([email protected])
10+
- Olivier Deckmyn ([email protected])
11+
- Sigve Tjora ([email protected])
12+
- Mark Derricutt ([email protected])
13+
- Igor E. Poteryaev ([email protected])
14+
- Yuri Filimonov ([email protected])
15+
- Stefan Hoffmeister ([email protected])
16+
- Michiel du Toit ([email protected]) - Lazarus Port
17+
- Chris Nicolai ([email protected])
18+
- Andrey Gruzdev ([email protected])
19+
20+
More recent contributors can be seen at the [project contributors graph](https://github.com/pyscripter/python4delphi/graphs/contributors).

‎Demos/Demo08/Unit1.pas‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ TPyPoint = class(TPyObject)
3838

3939
// Constructors & Destructors
4040
constructor Create( APythonType : TPythonType ); override;
41-
constructor CreateWith(PythonType: TPythonType; args: PPyObject); override;
41+
constructor CreateWith(PythonType: TPythonType; args, kwds: PPyObject); override;
4242

4343
// Type services
4444
////////////////
@@ -88,9 +88,9 @@ constructor TPyPoint.Create( APythonType : TPythonType );
8888
// the Create constructor first, and because the constructors
8989
// are virtual, TPyPoint.Create will be automatically be called.
9090

91-
constructor TPyPoint.CreateWith(PythonType: TPythonType; args: PPyObject);
91+
constructor TPyPoint.CreateWith(PythonType: TPythonType; args, kwds: PPyObject);
9292
begin
93-
inherited;
93+
Create(PythonType);
9494
with GetPythonEngine do
9595
begin
9696
if PyArg_ParseTuple( args, 'ii:CreatePoint',@x, @y ) = 0 then

‎Demos/Demo21/Unit1.pas‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ TPyPoint = class(TPyObject)
4646

4747
// Constructors & Destructors
4848
constructor Create( APythonType : TPythonType ); override;
49-
constructor CreateWith(PythonType: TPythonType; args: PPyObject); override;
49+
constructor CreateWith(PythonType: TPythonType; args, kwds: PPyObject); override;
5050

5151
// Type services
5252
////////////////
@@ -81,9 +81,9 @@ constructor TPyPoint.Create( APythonType : TPythonType );
8181
// the Create constructor first, and because the constructors
8282
// are virtual, TPyPoint.Create will be automatically be called.
8383

84-
constructor TPyPoint.CreateWith(PythonType: TPythonType; args: PPyObject);
84+
constructor TPyPoint.CreateWith(PythonType: TPythonType; args, kwds: PPyObject);
8585
begin
86-
inherited;
86+
Create(PythonType);
8787
with GetPythonEngine do
8888
begin
8989
if PyArg_ParseTuple( args, 'ii:CreatePoint',@x, @y ) = 0 then

‎Demos/Demo26/Unit1.pas‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ TPyPoint = class(TPyObject)
3535

3636
// Constructors & Destructors
3737
constructor Create( APythonType : TPythonType ); override;
38-
constructor CreateWith(PythonType: TPythonType; args: PPyObject); override;
38+
constructor CreateWith(PythonType: TPythonType; args, kwds: PPyObject); override;
3939

4040
// Type services
4141
////////////////
@@ -84,9 +84,9 @@ constructor TPyPoint.Create( APythonType : TPythonType );
8484
// the Create constructor first, and because the constructors
8585
// are virtual, TPyPoint.Create will be automatically be called.
8686

87-
constructor TPyPoint.CreateWith(PythonType: TPythonType; args: PPyObject);
87+
constructor TPyPoint.CreateWith(PythonType: TPythonType; args, kwds: PPyObject);
8888
begin
89-
inherited;
89+
Create(PythonType);
9090
with GetPythonEngine do
9191
begin
9292
if PyArg_ParseTuple( args, 'ii:CreatePoint',@x, @y ) = 0 then

‎Demos/Demo28/Unit1.pas‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ TPyStringList = class(TPyObject)
1818
public
1919
// Constructors & Destructors
2020
constructor Create( APythonType : TPythonType ); override;
21-
constructor CreateWith(PythonType: TPythonType; args: PPyObject); override;
21+
constructor CreateWith(PythonType: TPythonType; args, kwds: PPyObject); override;
2222
destructor Destroy; override;
2323

2424
// Basic services
@@ -46,7 +46,7 @@ TPyStringListIterator = class(TPyObject)
4646
procedure SetStringList(const Value: TPyStringList);
4747
public
4848
constructor Create( APythonType : TPythonType ); override;
49-
constructor CreateWith(PythonType: TPythonType; args: PPyObject); override;
49+
constructor CreateWith(PythonType: TPythonType; args, kwds: PPyObject); override;
5050
destructor Destroy; override;
5151

5252
// Basic services
@@ -145,11 +145,11 @@ constructor TPyStringList.Create(APythonType: TPythonType);
145145
fStrings := TStringList.Create;
146146
end;
147147

148-
constructor TPyStringList.CreateWith(PythonType: TPythonType; args: PPyObject);
148+
constructor TPyStringList.CreateWith(PythonType: TPythonType; args, kwds: PPyObject);
149149
var
150150
i : Integer;
151151
begin
152-
inherited;
152+
Create(PythonType);
153153
with GetPythonEngine do
154154
begin
155155
for i := 0 to PyTuple_Size(args)-1 do
@@ -241,12 +241,12 @@ constructor TPyStringListIterator.Create(APythonType: TPythonType);
241241
inherited;
242242
end;
243243

244-
constructor TPyStringListIterator.CreateWith(PythonType: TPythonType; args: PPyObject);
244+
constructor TPyStringListIterator.CreateWith(PythonType: TPythonType; args, kwds: PPyObject);
245245
var
246246
_obj : PPyObject;
247247
_stringList : TPyStringList;
248248
begin
249-
inherited;
249+
Create(PythonType);
250250
with GetPythonEngine do
251251
begin
252252
if PyArg_ParseTuple( args, 'O:TPyStringListIterator constructor',@_obj ) <> 0 then

‎Demos/Demo32/Unit1.pas‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ constructor TPyPoint.CreateWith(PythonType: TPythonType; args, kwds: PPyObject);
111111
KeyArray: array of AnsiString;
112112
KeyPointerArray: array of PAnsiChar;
113113
begin
114-
inherited;
114+
Create(PythonType);
115115
KeyArray := ['x', 'y'];
116116
KeyPointerArray := [PAnsiChar(KeyArray[0]), PAnsiChar(KeyArray[1]), nil];
117117
with GetPythonEngine, DelphiObject as TPoint do

‎Demos/Demo34/Unit1.pas‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ TPyPoint = class(TPyObject)
4343

4444
// Constructors & Destructors
4545
constructor Create( APythonType : TPythonType ); override;
46-
constructor CreateWith(PythonType: TPythonType; args: PPyObject); override;
46+
constructor CreateWith(PythonType: TPythonType; args, kwds: PPyObject); override;
4747

4848
// Type services
4949
////////////////
@@ -158,9 +158,9 @@ constructor TPyPoint.Create( APythonType : TPythonType );
158158
// the Create constructor first, and because the constructors
159159
// are virtual, TPyPoint.Create will automatically be called.
160160

161-
constructor TPyPoint.CreateWith(PythonType: TPythonType; args: PPyObject);
161+
constructor TPyPoint.CreateWith(PythonType: TPythonType; args, kwds: PPyObject);
162162
begin
163-
inherited;
163+
Create(PythonType);
164164
with GetPythonEngine do
165165
begin
166166
if PyArg_ParseTuple( args, 'ii:CreatePoint',@x, @y ) = 0 then

‎Modules/DelphiVCL/DelphiVCL.dpr‎

Lines changed: 22 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,22 @@
1-
library DelphiVCL;
2-
3-
uses
4-
SysUtils,
5-
Classes,
6-
uMain in 'uMain.pas';
7-
8-
{$I ..\..\Source\Definition.Inc}
9-
10-
exports
11-
// This must match the pattern "PyInit_[ProjectName]"
12-
// So if the project is named DelphiVCL then
13-
// the export must be PyInit_DelphiVCL
14-
PyInit_DelphiVCL;
15-
{$IFDEF MSWINDOWS}
16-
{$E pyd}
17-
{$ENDIF}
18-
{$IFDEF LINUX}
19-
{$SONAME 'DelphiVCL'}
20-
21-
{$ENDIF}
22-
23-
begin
24-
end.
25-
1+
library DelphiVCL;
2+
3+
uses
4+
SysUtils,
5+
Classes,
6+
uMain in 'uMain.pas';
7+
8+
{$I ..\..\Source\Definition.Inc}
9+
10+
exports
11+
// This must match the pattern "PyInit_[ProjectName]"
12+
// So if the project is named DelphiVCL then
13+
// the export must be PyInit_DelphiVCL
14+
PyInit_DelphiVCL;
15+
16+
{$IFDEF MSWINDOWS}
17+
{$E pyd}
18+
{$ENDIF}
19+
20+
begin
21+
end.
22+

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
package Python;
2+
23
{$R *.res}
34
{$IFDEF IMPLICITBUILDING This IFDEF should not be used by users}
45
{$ALIGN 8}
@@ -48,6 +49,7 @@ contains
4849
WrapDelphiWindows in '..\..\..\Source\WrapDelphiWindows.pas',
4950
WrapFireDAC in '..\..\..\Source\WrapFireDAC.pas',
5051
WrapActions in '..\..\..\Source\WrapActions.pas',
51-
WrapDelphiDataBind in '..\..\..\Source\WrapDelphiDataBind.pas';
52+
WrapDelphiDataBind in '..\..\..\Source\WrapDelphiDataBind.pas',
53+
WrapDelphiImageList in '..\..\..\Source\WrapDelphiImageList.pas';
5254

5355
end.

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

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

0 commit comments

Comments
 (0)