diff --git a/Demos/Demo01/Demo01.dpr b/Demos/Demo01/Demo01.dpr index c7f5bc0b..a5311311 100644 --- a/Demos/Demo01/Demo01.dpr +++ b/Demos/Demo01/Demo01.dpr @@ -1,6 +1,6 @@ program Demo01; -{$I Definition.Inc} + uses Forms, diff --git a/Demos/Demo01/Demo01.dproj b/Demos/Demo01/Demo01.dproj index 8914c9c7..45ee1595 100644 --- a/Demos/Demo01/Demo01.dproj +++ b/Demos/Demo01/Demo01.dproj @@ -1,181 +1,181 @@ - - - {CA67512A-3B3A-48FD-8952-5503337690C4} - Demo01.dpr - Debug - DCC32 - 19.1 - VCL - True - Win64 - 3 - Application - - - true - - - true - Base - true - - - true - Base - true - - - true - Base - true - - - true - Cfg_1 - true - true - - - true - Cfg_1 - true - true - - - true - Base - true - - - true - Cfg_2 - true - true - - - true - Cfg_2 - true - true - - - Demo01 - Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;System;Xml;Data;Datasnap;Web;Soap;Winapi;$(DCC_Namespace) - CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments= - 1033 - Demo01.exe - 00400000 - x86 - - - true - System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace) - 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 - - - true - $(BDS)\bin\default_app.manifest - System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace) - true - $(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png - $(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png - - - false - RELEASE;$(DCC_Define) - 0 - 0 - - - Debug - - - Debug - - - DEBUG;$(DCC_Define) - - - Debug - - - true - Debug - true - PerMonitorV2 - - - - MainSource - - -
Form1
- - - Cfg_2 - Base - - - Base - - - Cfg_1 - Base - - - - - Delphi.Personality.12 - VCLApplication - - - - Demo01.dpr - - - False - True - False - - - False - False - 1 - 0 - 0 - 0 - False - False - False - False - False - 1033 - 1252 - - - - - 1.0.0.0 - - - - - - 1.0.0.0 - - - - - - True - True - - - 12 - - - + + + {CA67512A-3B3A-48FD-8952-5503337690C4} + Demo01.dpr + Debug + DCC32 + 19.1 + VCL + True + Win64 + 3 + Application + + + true + + + true + Base + true + + + true + Base + true + + + true + Base + true + + + true + Cfg_1 + true + true + + + true + Cfg_1 + true + true + + + true + Base + true + + + true + Cfg_2 + true + true + + + true + Cfg_2 + true + true + + + Demo01 + Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;System;Xml;Data;Datasnap;Web;Soap;Winapi;$(DCC_Namespace) + CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments= + 1033 + Demo01.exe + 00400000 + x86 + + + true + System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace) + 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 + + + true + $(BDS)\bin\default_app.manifest + System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace) + true + $(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png + $(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png + + + false + RELEASE;$(DCC_Define) + 0 + 0 + + + Debug + + + Debug + + + DEBUG;$(DCC_Define) + + + Debug + + + true + Debug + true + PerMonitorV2 + + + + MainSource + + +
Form1
+ + + Cfg_2 + Base + + + Base + + + Cfg_1 + Base + + + + + Delphi.Personality.12 + VCLApplication + + + + Demo01.dpr + + + False + True + False + + + False + False + 1 + 0 + 0 + 0 + False + False + False + False + False + 1033 + 1252 + + + + + 1.0.0.0 + + + + + + 1.0.0.0 + + + + + + True + True + + + 12 + + + diff --git a/Demos/Demo01/Unit1.dfm b/Demos/Demo01/Unit1.dfm index 81e0adeb..08b2d94e 100644 --- a/Demos/Demo01/Unit1.dfm +++ b/Demos/Demo01/Unit1.dfm @@ -1,122 +1,122 @@ -object Form1: TForm1 - Left = 241 - Top = 155 - Width = 544 - Height = 375 - VertScrollBar.Range = 200 - ActiveControl = Button1 - Caption = 'Demo of Python' - Color = clBtnFace - Font.Charset = DEFAULT_CHARSET - Font.Color = clWindowText - Font.Height = 11 - Font.Name = 'MS Sans Serif' - Font.Pitch = fpVariable - Font.Style = [] - OldCreateOrder = True - PixelsPerInch = 96 - TextHeight = 13 - object Splitter1: TSplitter - Left = 0 - Top = 153 - Width = 528 - Height = 3 - Cursor = crVSplit - Align = alTop - Color = clBtnFace - ParentColor = False - ExplicitWidth = 536 - end - object Memo1: TMemo - Left = 0 - Top = 156 - Width = 528 - Height = 136 - Align = alClient - Font.Charset = DEFAULT_CHARSET - Font.Color = clWindowText - Font.Height = -13 - Font.Name = 'Consolas' - Font.Pitch = fpVariable - Font.Style = [] - Lines.Strings = ( - 'print(2+2)') - ParentFont = False - ScrollBars = ssBoth - TabOrder = 1 - end - object Panel1: TPanel - Left = 0 - Top = 292 - Width = 528 - Height = 44 - Align = alBottom - BevelOuter = bvNone - TabOrder = 0 - object Button1: TButton - Left = 6 - Top = 8 - Width = 115 - Height = 25 - Caption = 'Execute script' - TabOrder = 0 - OnClick = Button1Click - end - object Button2: TButton - Left = 168 - Top = 8 - Width = 91 - Height = 25 - Caption = 'Load script...' - TabOrder = 1 - OnClick = Button2Click - end - object Button3: TButton - Left = 264 - Top = 8 - Width = 89 - Height = 25 - Caption = 'Save script...' - TabOrder = 2 - OnClick = Button3Click - end - end - object Memo2: TMemo - Left = 0 - Top = 0 - Width = 528 - Height = 153 - Align = alTop - Font.Charset = DEFAULT_CHARSET - Font.Color = clWindowText - Font.Height = -13 - Font.Name = 'Consolas' - Font.Pitch = fpVariable - Font.Style = [] - ParentFont = False - ScrollBars = ssBoth - TabOrder = 2 - end - object PythonEngine1: TPythonEngine - IO = PythonGUIInputOutput1 - Left = 32 - end - object OpenDialog1: TOpenDialog - DefaultExt = '*.py' - Filter = 'Python files|*.py|Text files|*.txt|All files|*.*' - Title = 'Open' - Left = 176 - end - object SaveDialog1: TSaveDialog - DefaultExt = '*.py' - Filter = 'Python files|*.py|Text files|*.txt|All files|*.*' - Title = 'Save As' - Left = 208 - end - object PythonGUIInputOutput1: TPythonGUIInputOutput - UnicodeIO = True - RawOutput = False - Output = Memo2 - Left = 64 - end -end +object Form1: TForm1 + Left = 241 + Top = 155 + Width = 544 + Height = 375 + VertScrollBar.Range = 200 + ActiveControl = Button1 + Caption = 'Demo of Python' + Color = clBtnFace + Font.Charset = DEFAULT_CHARSET + Font.Color = clWindowText + Font.Height = 11 + Font.Name = 'MS Sans Serif' + Font.Pitch = fpVariable + Font.Style = [] + OldCreateOrder = True + PixelsPerInch = 96 + TextHeight = 13 + object Splitter1: TSplitter + Left = 0 + Top = 153 + Width = 528 + Height = 3 + Cursor = crVSplit + Align = alTop + Color = clBtnFace + ParentColor = False + ExplicitWidth = 536 + end + object Memo1: TMemo + Left = 0 + Top = 156 + Width = 528 + Height = 136 + Align = alClient + Font.Charset = DEFAULT_CHARSET + Font.Color = clWindowText + Font.Height = -13 + Font.Name = 'Consolas' + Font.Pitch = fpVariable + Font.Style = [] + Lines.Strings = ( + 'print(2+2)') + ParentFont = False + ScrollBars = ssBoth + TabOrder = 1 + end + object Panel1: TPanel + Left = 0 + Top = 292 + Width = 528 + Height = 44 + Align = alBottom + BevelOuter = bvNone + TabOrder = 0 + object Button1: TButton + Left = 6 + Top = 8 + Width = 115 + Height = 25 + Caption = 'Execute script' + TabOrder = 0 + OnClick = Button1Click + end + object Button2: TButton + Left = 168 + Top = 8 + Width = 91 + Height = 25 + Caption = 'Load script...' + TabOrder = 1 + OnClick = Button2Click + end + object Button3: TButton + Left = 264 + Top = 8 + Width = 89 + Height = 25 + Caption = 'Save script...' + TabOrder = 2 + OnClick = Button3Click + end + end + object Memo2: TMemo + Left = 0 + Top = 0 + Width = 528 + Height = 153 + Align = alTop + Font.Charset = DEFAULT_CHARSET + Font.Color = clWindowText + Font.Height = -13 + Font.Name = 'Consolas' + Font.Pitch = fpVariable + Font.Style = [] + ParentFont = False + ScrollBars = ssBoth + TabOrder = 2 + end + object PythonEngine1: TPythonEngine + IO = PythonGUIInputOutput1 + Left = 32 + end + object OpenDialog1: TOpenDialog + DefaultExt = '*.py' + Filter = 'Python files|*.py|Text files|*.txt|All files|*.*' + Title = 'Open' + Left = 176 + end + object SaveDialog1: TSaveDialog + DefaultExt = '*.py' + Filter = 'Python files|*.py|Text files|*.txt|All files|*.*' + Title = 'Save As' + Left = 208 + end + object PythonGUIInputOutput1: TPythonGUIInputOutput + UnicodeIO = True + RawOutput = False + Output = Memo2 + Left = 64 + end +end diff --git a/Demos/Demo01/Unit1.pas b/Demos/Demo01/Unit1.pas index 02c074c9..107403d3 100644 --- a/Demos/Demo01/Unit1.pas +++ b/Demos/Demo01/Unit1.pas @@ -1,6 +1,6 @@ unit Unit1; -{$I Definition.Inc} + interface diff --git a/Demos/Demo02/Demo02.dpr b/Demos/Demo02/Demo02.dpr index 4cd6ecac..0c707f87 100644 --- a/Demos/Demo02/Demo02.dpr +++ b/Demos/Demo02/Demo02.dpr @@ -3,7 +3,7 @@ // JCL_DEBUG_EXPERT_DELETEMAPFILE OFF program Demo02; -{$I Definition.Inc} + uses Forms, diff --git a/Demos/Demo02/Demo02.dproj b/Demos/Demo02/Demo02.dproj index 7de9f5d7..b8cf54f5 100644 --- a/Demos/Demo02/Demo02.dproj +++ b/Demos/Demo02/Demo02.dproj @@ -1,190 +1,190 @@ - - - {C2FA2A8D-7DA4-4631-B05E-4C16A0FC8F3B} - Demo02.dpr - Debug - DCC32 - 19.1 - VCL - True - Win64 - 3 - Application - - - true - - - true - Base - true - - - true - Base - true - - - true - Base - true - - - true - Cfg_1 - true - true - - - true - Cfg_1 - true - true - - - true - Base - true - - - true - Cfg_2 - true - true - - - true - Cfg_2 - true - true - - - Demo02.exe - 00400000 - x86 - Demo02 - Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;System;Xml;Data;Datasnap;Web;Soap;Winapi;$(DCC_Namespace) - 1033 - CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments= - - - 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\Artwork\Windows\UWP\delphi_UwpDefault_44.png - $(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png - System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace) - Debug - 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 - - - false - RELEASE;$(DCC_Define) - 0 - 0 - - - true - PerMonitorV2 - - - true - PerMonitorV2 - - - DEBUG;$(DCC_Define) - - - true - PerMonitorV2 - 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) - - - 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= - $(BDS)\bin\delphi_PROJECTICON.ico - - - - MainSource - - -
Form1
- - - Cfg_2 - Base - - - Base - - - Cfg_1 - Base - - - - - Delphi.Personality.12 - VCLApplication - - - - Demo02.dpr - - - False - True - False - - - False - False - 1 - 0 - 0 - 0 - False - False - False - False - False - 1033 - 1252 - - - - - 1.0.0.0 - - - - - - 1.0.0.0 - - - - - - True - True - - - 12 - - - + + + {C2FA2A8D-7DA4-4631-B05E-4C16A0FC8F3B} + Demo02.dpr + Debug + DCC32 + 19.1 + VCL + True + Win64 + 3 + Application + + + true + + + true + Base + true + + + true + Base + true + + + true + Base + true + + + true + Cfg_1 + true + true + + + true + Cfg_1 + true + true + + + true + Base + true + + + true + Cfg_2 + true + true + + + true + Cfg_2 + true + true + + + Demo02.exe + 00400000 + x86 + Demo02 + Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;System;Xml;Data;Datasnap;Web;Soap;Winapi;$(DCC_Namespace) + 1033 + CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments= + + + 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\Artwork\Windows\UWP\delphi_UwpDefault_44.png + $(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png + System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace) + Debug + 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 + + + false + RELEASE;$(DCC_Define) + 0 + 0 + + + true + PerMonitorV2 + + + true + PerMonitorV2 + + + DEBUG;$(DCC_Define) + + + true + PerMonitorV2 + 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) + + + 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= + $(BDS)\bin\delphi_PROJECTICON.ico + + + + MainSource + + +
Form1
+ + + Cfg_2 + Base + + + Base + + + Cfg_1 + Base + + + + + Delphi.Personality.12 + VCLApplication + + + + Demo02.dpr + + + False + True + False + + + False + False + 1 + 0 + 0 + 0 + False + False + False + False + False + 1033 + 1252 + + + + + 1.0.0.0 + + + + + + 1.0.0.0 + + + + + + True + True + + + 12 + + + diff --git a/Demos/Demo02/Unit1.pas b/Demos/Demo02/Unit1.pas index 47ee2da2..0ec12e8c 100644 --- a/Demos/Demo02/Unit1.pas +++ b/Demos/Demo02/Unit1.pas @@ -1,6 +1,6 @@ unit Unit1; -{$I Definition.Inc} + interface diff --git a/Demos/Demo03/Demo03.dpr b/Demos/Demo03/Demo03.dpr index c0e9a6ee..bf2ca159 100644 --- a/Demos/Demo03/Demo03.dpr +++ b/Demos/Demo03/Demo03.dpr @@ -1,6 +1,6 @@ program Demo03; -{$I Definition.Inc} + uses Forms, diff --git a/Demos/Demo03/Unit1.pas b/Demos/Demo03/Unit1.pas index 6aa4787f..70cdff86 100644 --- a/Demos/Demo03/Unit1.pas +++ b/Demos/Demo03/Unit1.pas @@ -1,6 +1,6 @@ unit Unit1; -{$I Definition.Inc} + interface diff --git a/Demos/Demo04/Demo04.dpr b/Demos/Demo04/Demo04.dpr index d0e17826..c7c5cb0e 100644 --- a/Demos/Demo04/Demo04.dpr +++ b/Demos/Demo04/Demo04.dpr @@ -1,6 +1,6 @@ program Demo04; -{$I Definition.Inc} + uses Forms, diff --git a/Demos/Demo04/Unit1.pas b/Demos/Demo04/Unit1.pas index 333fc897..c10562e2 100644 --- a/Demos/Demo04/Unit1.pas +++ b/Demos/Demo04/Unit1.pas @@ -1,6 +1,6 @@ unit Unit1; -{$I Definition.Inc} + interface diff --git a/Demos/Demo05/Demo05.dpr b/Demos/Demo05/Demo05.dpr index 1067d716..ffc556ff 100644 --- a/Demos/Demo05/Demo05.dpr +++ b/Demos/Demo05/Demo05.dpr @@ -1,6 +1,6 @@ program Demo05; -{$I Definition.Inc} + uses Forms, diff --git a/Demos/Demo05/Unit1.pas b/Demos/Demo05/Unit1.pas index 70ae2a69..127cf209 100644 --- a/Demos/Demo05/Unit1.pas +++ b/Demos/Demo05/Unit1.pas @@ -1,6 +1,6 @@ unit Unit1; -{$I Definition.Inc} + interface diff --git a/Demos/Demo06/Demo06.dpr b/Demos/Demo06/Demo06.dpr index 78d014a2..56766a80 100644 --- a/Demos/Demo06/Demo06.dpr +++ b/Demos/Demo06/Demo06.dpr @@ -1,6 +1,6 @@ program Demo06; -{$I Definition.Inc} + uses Forms, diff --git a/Demos/Demo06/Unit1.pas b/Demos/Demo06/Unit1.pas index afc9b592..ebf58592 100644 --- a/Demos/Demo06/Unit1.pas +++ b/Demos/Demo06/Unit1.pas @@ -1,6 +1,6 @@ unit Unit1; -{$I Definition.Inc} + interface diff --git a/Demos/Demo07/Demo07.dpr b/Demos/Demo07/Demo07.dpr index e9fc9205..29711893 100644 --- a/Demos/Demo07/Demo07.dpr +++ b/Demos/Demo07/Demo07.dpr @@ -1,6 +1,6 @@ program Demo07; -{$I Definition.Inc} + uses Forms, diff --git a/Demos/Demo07/Unit1.pas b/Demos/Demo07/Unit1.pas index 43ceb659..5a8a742c 100644 --- a/Demos/Demo07/Unit1.pas +++ b/Demos/Demo07/Unit1.pas @@ -1,6 +1,6 @@ unit Unit1; -{$I Definition.Inc} + interface diff --git a/Demos/Demo08/Demo08.dpr b/Demos/Demo08/Demo08.dpr index 0f344d3a..12b61e1a 100644 --- a/Demos/Demo08/Demo08.dpr +++ b/Demos/Demo08/Demo08.dpr @@ -1,6 +1,6 @@ program Demo08; -{$I Definition.Inc} + uses Forms, diff --git a/Demos/Demo08/Unit1.pas b/Demos/Demo08/Unit1.pas index 2d92f78a..9f6bbbff 100644 --- a/Demos/Demo08/Unit1.pas +++ b/Demos/Demo08/Unit1.pas @@ -1,6 +1,6 @@ unit Unit1; -{$I Definition.Inc} + interface diff --git a/Demos/Demo09/Demo09.dpr b/Demos/Demo09/Demo09.dpr index b6e899a7..d184dc72 100644 --- a/Demos/Demo09/Demo09.dpr +++ b/Demos/Demo09/Demo09.dpr @@ -1,6 +1,6 @@ program Demo09; -{$I Definition.Inc} + uses Forms, diff --git a/Demos/Demo09/Unit1.pas b/Demos/Demo09/Unit1.pas index 8bbc8a67..0f3042ec 100644 --- a/Demos/Demo09/Unit1.pas +++ b/Demos/Demo09/Unit1.pas @@ -1,6 +1,6 @@ unit Unit1; -{$I Definition.Inc} + interface diff --git a/Demos/Demo09/demodll.dpr b/Demos/Demo09/demodll.dpr index 4b2b8fe0..435bc4a0 100644 --- a/Demos/Demo09/demodll.dpr +++ b/Demos/Demo09/demodll.dpr @@ -3,7 +3,7 @@ // JCL_DEBUG_EXPERT_DELETEMAPFILE OFF library demodll; -{$I Definition.Inc} + uses SysUtils, diff --git a/Demos/Demo11/SortThds.pas b/Demos/Demo11/SortThds.pas index d9b0cae1..bb696357 100644 --- a/Demos/Demo11/SortThds.pas +++ b/Demos/Demo11/SortThds.pas @@ -1,6 +1,6 @@ unit SortThds; -{$I Definition.Inc} + interface diff --git a/Demos/Demo11/ThSort.pas b/Demos/Demo11/ThSort.pas index c766f910..c96acd51 100644 --- a/Demos/Demo11/ThSort.pas +++ b/Demos/Demo11/ThSort.pas @@ -1,6 +1,6 @@ unit ThSort; -{$I Definition.Inc} + interface diff --git a/Demos/Demo11/ThrdDemo.dpr b/Demos/Demo11/ThrdDemo.dpr index 1a995c75..379b411e 100644 --- a/Demos/Demo11/ThrdDemo.dpr +++ b/Demos/Demo11/ThrdDemo.dpr @@ -1,6 +1,6 @@ program ThrdDemo; -{$I Definition.Inc} + uses Forms, diff --git a/Demos/Demo16/Example1/Demo16a.dpr b/Demos/Demo16/Example1/Demo16a.dpr index dec3bf31..54592df1 100644 --- a/Demos/Demo16/Example1/Demo16a.dpr +++ b/Demos/Demo16/Example1/Demo16a.dpr @@ -1,6 +1,6 @@ program Demo16a; -{$I Definition.Inc} + uses Forms, diff --git a/Demos/Demo16/Example1/Unit1.pas b/Demos/Demo16/Example1/Unit1.pas index 429785de..6e87ab86 100644 --- a/Demos/Demo16/Example1/Unit1.pas +++ b/Demos/Demo16/Example1/Unit1.pas @@ -1,6 +1,6 @@ unit Unit1; -{$I Definition.Inc} + interface diff --git a/Demos/Demo16/Example2/Demo16b.dpr b/Demos/Demo16/Example2/Demo16b.dpr index 3b22e055..030afc3c 100644 --- a/Demos/Demo16/Example2/Demo16b.dpr +++ b/Demos/Demo16/Example2/Demo16b.dpr @@ -1,6 +1,6 @@ program Demo16b; -{$I Definition.Inc} + uses Forms, diff --git a/Demos/Demo16/Example2/Unit1.pas b/Demos/Demo16/Example2/Unit1.pas index de336e96..a6c14404 100644 --- a/Demos/Demo16/Example2/Unit1.pas +++ b/Demos/Demo16/Example2/Unit1.pas @@ -1,6 +1,6 @@ unit Unit1; -{$I Definition.Inc} + interface diff --git a/Demos/Demo17/Demo17.dpr b/Demos/Demo17/Demo17.dpr index 1f28b9a2..c8fa2a6a 100644 --- a/Demos/Demo17/Demo17.dpr +++ b/Demos/Demo17/Demo17.dpr @@ -1,6 +1,6 @@ program Demo17; -{$I Definition.Inc} + uses Forms, diff --git a/Demos/Demo17/Unit1.pas b/Demos/Demo17/Unit1.pas index 9d6c744e..cbf77ee7 100644 --- a/Demos/Demo17/Unit1.pas +++ b/Demos/Demo17/Unit1.pas @@ -2,7 +2,7 @@ interface -{$I Definition.Inc} + uses SysUtils, Classes, diff --git a/Demos/Demo19/Demo19.cbproj b/Demos/Demo19/Demo19.cbproj index ef20e5cc..beec6991 100644 --- a/Demos/Demo19/Demo19.cbproj +++ b/Demos/Demo19/Demo19.cbproj @@ -1,7 +1,7 @@  {17A182E0-5BEF-443A-B925-E001DA03D4B9} - 18.4 + 19.1 VCL Application Demo19.cpp @@ -70,7 +70,7 @@ CppVCLApplication CloudService;FireDAC;FireDACCommon;FireDACCommonDriver;FireDACIBDriver;FireDACSqliteDriver;FlexCel_Core;FlexCel_Pdf;FlexCel_Render;FlexCel_Report;FlexCel_XlsAdapter;inet;RESTBackendComponents;RESTComponents;soapmidas;soaprtl;soapserver;$(PackageImports) System;Xml;Data;Datasnap;Web;Soap;Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;$(DCC_Namespace) - rtl.lib;vcl.lib;Python_D.lib + rtl.lib;vcl.lib;Python.lib;FireDACCommon.lib;xmlrtl.lib;dbrtl.lib;FireDACCommonDriver.lib;FireDAC.lib;PythonVcl.lib;VclSmp.lib;vclx.lib <_TCHARMapping>wchar_t true $(BDS)\bin\cbuilder_PROJECTICON.ico @@ -123,15 +123,15 @@ true - true rtl.bpi;vcl.bpi + PerMonitor true - true true 1033 rtl.bpi;vcl.bpi + PerMonitor NDEBUG;$(Defines) @@ -139,14 +139,14 @@ true - true + PerMonitor true - true - rtl.bpi;vcl.bpi;Python_D.bpi + rtl.bpi;vcl.bpi;Python.bpi;FireDACCommon.bpi;xmlrtl.bpi;dbrtl.bpi;FireDACCommonDriver.bpi;FireDAC.bpi;PythonVcl.bpi;VclSmp.bpi;vclx.bpi true 1033 + PerMonitor @@ -199,6 +199,16 @@ + + + true + + + + + true + + true @@ -235,14 +245,13 @@ true - - + + true - - - Demo19.exe + + true @@ -256,11 +265,42 @@ true + + + true + + + + + true + + + + + Demo19.exe + true + + + + + true + + true + + + true + + + + + true + + 1 @@ -270,7 +310,6 @@ 1 - Contents\MacOS 0 @@ -279,6 +318,20 @@ classes 1 + + classes + 1 + + + + + res\xml + 1 + + + res\xml + 1 + @@ -291,90 +344,242 @@ library\lib\armeabi 1 + + library\lib\armeabi + 1 + + + + + library\lib\armeabi-v7a + 1 + library\lib\mips 1 + + library\lib\mips + 1 + library\lib\armeabi-v7a 1 + + library\lib\arm64-v8a + 1 + + + + + library\lib\armeabi-v7a + 1 + res\drawable 1 + + res\drawable + 1 + res\values 1 + + res\values + 1 + + + + + res\values-v21 + 1 + + + res\values-v21 + 1 + + + + + res\values + 1 + + + res\values + 1 + res\drawable 1 + + res\drawable + 1 + res\drawable-xxhdpi 1 + + res\drawable-xxhdpi + 1 + res\drawable-ldpi 1 + + res\drawable-ldpi + 1 + res\drawable-mdpi 1 + + res\drawable-mdpi + 1 + res\drawable-hdpi 1 + + res\drawable-hdpi + 1 + res\drawable-xhdpi 1 + + res\drawable-xhdpi + 1 + + + + + res\drawable-mdpi + 1 + + + res\drawable-mdpi + 1 + + + + + res\drawable-hdpi + 1 + + + res\drawable-hdpi + 1 + + + + + res\drawable-xhdpi + 1 + + + res\drawable-xhdpi + 1 + + + + + res\drawable-xxhdpi + 1 + + + res\drawable-xxhdpi + 1 + + + + + res\drawable-xxxhdpi + 1 + + + res\drawable-xxxhdpi + 1 + res\drawable-small 1 + + res\drawable-small + 1 + res\drawable-normal 1 + + res\drawable-normal + 1 + res\drawable-large 1 + + res\drawable-large + 1 + res\drawable-xlarge 1 + + res\drawable-xlarge + 1 + + + + + res\values + 1 + + + res\values + 1 + @@ -394,6 +599,11 @@ 1 .framework + + Contents\MacOS + 1 + .framework + 0 @@ -416,6 +626,11 @@ 1 .dylib + + Contents\MacOS + 1 + .dylib + 0 .dll;.bpl @@ -439,6 +654,11 @@ 1 .dylib + + Contents\MacOS + 1 + .dylib + 0 .bpl @@ -448,6 +668,9 @@ 0 + + 0 + 0 @@ -461,10 +684,40 @@ Contents\Resources\StartUp\ 0 + + Contents\Resources\StartUp\ + 0 + 0 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + 1 @@ -498,6 +751,16 @@ 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + 1 + + 1 @@ -509,6 +772,76 @@ 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + 1 + + 1 @@ -520,6 +853,16 @@ 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + 1 + + 1 @@ -542,10 +885,93 @@ 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + 1 + + 1 + @@ -586,6 +1012,16 @@ 1 + + + ..\$(PROJECTNAME).launchscreen + 64 + + + ..\$(PROJECTNAME).launchscreen + 64 + + 1 @@ -597,29 +1033,51 @@ 1 + + + ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF + 1 + + ..\ 1 + + ..\ + 1 + Contents 1 + + Contents + 1 + Contents\Resources 1 + + Contents\Resources + 1 + library\lib\armeabi-v7a 1 + + library\lib\arm64-v8a + 1 + 1 @@ -636,10 +1094,20 @@ Contents\MacOS 1 + + Contents\MacOS + 1 + 0 + + + library\lib\armeabi-v7a + 1 + + 1 @@ -675,7 +1143,9 @@ + + True diff --git a/Demos/Demo19/Unit1.cpp b/Demos/Demo19/Unit1.cpp index 872bf34f..a94c3eec 100644 --- a/Demos/Demo19/Unit1.cpp +++ b/Demos/Demo19/Unit1.cpp @@ -6,7 +6,7 @@ //--------------------------------------------------------------------------- #pragma package(smart_init) #pragma link "PythonEngine" -#pragma link "PythonGUIInputOutput" +#pragma link "Vcl.PythonGUIInputOutput" #pragma resource "*.dfm" TForm1 *Form1; //--------------------------------------------------------------------------- diff --git a/Demos/Demo19/Unit1.dfm b/Demos/Demo19/Unit1.dfm index f0e3bb0b..93f0a392 100644 --- a/Demos/Demo19/Unit1.dfm +++ b/Demos/Demo19/Unit1.dfm @@ -1,113 +1,113 @@ -object Form1: TForm1 - Left = 192 - Top = 109 - Caption = 'Form1' - ClientHeight = 336 - ClientWidth = 528 - Color = clBtnFace - Font.Charset = DEFAULT_CHARSET - Font.Color = clWindowText - Font.Height = -11 - Font.Name = 'MS Sans Serif' - Font.Style = [] - OldCreateOrder = True - PixelsPerInch = 96 - TextHeight = 13 - object Splitter1: TSplitter - Left = 0 - Top = 153 - Width = 528 - Height = 3 - Cursor = crVSplit - Align = alTop - ExplicitWidth = 536 - end - object Memo1: TMemo - Left = 0 - Top = 156 - Width = 528 - Height = 144 - Align = alClient - Lines.Strings = ( - 'import spam' - 'print (spam.foo('#39'hello world'#39', 1))') - ScrollBars = ssBoth - TabOrder = 0 - end - object Panel1: TPanel - Left = 0 - Top = 300 - Width = 528 - Height = 36 - Align = alBottom - BevelOuter = bvNone - TabOrder = 1 - object Button1: TButton - Left = 6 - Top = 8 - Width = 115 - Height = 25 - Caption = 'Execute script' - TabOrder = 0 - OnClick = Button1Click - end - object Button2: TButton - Left = 168 - Top = 8 - Width = 91 - Height = 25 - Caption = 'Load script...' - TabOrder = 1 - OnClick = Button2Click - end - object Button3: TButton - Left = 264 - Top = 8 - Width = 89 - Height = 25 - Caption = 'Save script...' - TabOrder = 2 - OnClick = Button3Click - end - end - object Memo2: TMemo - Left = 0 - Top = 0 - Width = 528 - Height = 153 - Align = alTop - TabOrder = 2 - end - object PythonEngine1: TPythonEngine - InitScript.Strings = ( - 'import sys' - 'print ("Python Dll: ", sys.version)' - 'print (sys.copyright)' - 'print') - IO = PythonGUIInputOutput1 - Left = 32 - end - object PythonModule1: TPythonModule - Engine = PythonEngine1 - OnInitialization = PythonModule1Initialization - ModuleName = 'spam' - Errors = <> - Left = 96 - end - object OpenDialog1: TOpenDialog - DefaultExt = '*.py' - Filter = 'Python files|*.py|Text files|*.txt|All files|*.*' - Left = 176 - end - object SaveDialog1: TSaveDialog - DefaultExt = '*.py' - Filter = 'Python files|*.py|Text files|*.txt|All files|*.*' - Left = 208 - end - object PythonGUIInputOutput1: TPythonGUIInputOutput - UnicodeIO = True - RawOutput = False - Output = Memo2 - Left = 64 - end -end +object Form1: TForm1 + Left = 192 + Top = 109 + Caption = 'Form1' + ClientHeight = 336 + ClientWidth = 528 + Color = clBtnFace + Font.Charset = DEFAULT_CHARSET + Font.Color = clWindowText + Font.Height = -11 + Font.Name = 'MS Sans Serif' + Font.Style = [] + OldCreateOrder = True + PixelsPerInch = 96 + TextHeight = 13 + object Splitter1: TSplitter + Left = 0 + Top = 153 + Width = 528 + Height = 3 + Cursor = crVSplit + Align = alTop + ExplicitWidth = 536 + end + object Memo1: TMemo + Left = 0 + Top = 156 + Width = 528 + Height = 144 + Align = alClient + Lines.Strings = ( + 'import spam' + 'print (spam.foo('#39'hello world'#39', 1))') + ScrollBars = ssBoth + TabOrder = 0 + end + object Panel1: TPanel + Left = 0 + Top = 300 + Width = 528 + Height = 36 + Align = alBottom + BevelOuter = bvNone + TabOrder = 1 + object Button1: TButton + Left = 6 + Top = 8 + Width = 115 + Height = 25 + Caption = 'Execute script' + TabOrder = 0 + OnClick = Button1Click + end + object Button2: TButton + Left = 168 + Top = 8 + Width = 91 + Height = 25 + Caption = 'Load script...' + TabOrder = 1 + OnClick = Button2Click + end + object Button3: TButton + Left = 264 + Top = 8 + Width = 89 + Height = 25 + Caption = 'Save script...' + TabOrder = 2 + OnClick = Button3Click + end + end + object Memo2: TMemo + Left = 0 + Top = 0 + Width = 528 + Height = 153 + Align = alTop + TabOrder = 2 + end + object PythonEngine1: TPythonEngine + InitScript.Strings = ( + 'import sys' + 'print ("Python Dll: ", sys.version)' + 'print (sys.copyright)' + 'print') + IO = PythonGUIInputOutput1 + Left = 32 + end + object PythonModule1: TPythonModule + Engine = PythonEngine1 + OnInitialization = PythonModule1Initialization + ModuleName = 'spam' + Errors = <> + Left = 96 + end + object OpenDialog1: TOpenDialog + DefaultExt = '*.py' + Filter = 'Python files|*.py|Text files|*.txt|All files|*.*' + Left = 176 + end + object SaveDialog1: TSaveDialog + DefaultExt = '*.py' + Filter = 'Python files|*.py|Text files|*.txt|All files|*.*' + Left = 208 + end + object PythonGUIInputOutput1: TPythonGUIInputOutput + UnicodeIO = True + RawOutput = False + Output = Memo2 + Left = 64 + end +end diff --git a/Demos/Demo19/Unit1.h b/Demos/Demo19/Unit1.h index a334a513..dbd3b11f 100644 --- a/Demos/Demo19/Unit1.h +++ b/Demos/Demo19/Unit1.h @@ -7,7 +7,7 @@ #include #include #include "PythonEngine.hpp" -#include "PythonGUIInputOutput.hpp" +#include "Vcl.PythonGUIInputOutput.hpp" #include #include //--------------------------------------------------------------------------- diff --git a/Demos/Demo20/Demo20.cbproj b/Demos/Demo20/Demo20.cbproj index 44c17ce1..fa430c84 100644 --- a/Demos/Demo20/Demo20.cbproj +++ b/Demos/Demo20/Demo20.cbproj @@ -1,7 +1,7 @@  {EBAFD654-3767-498E-9F0B-2F12C816685B} - 18.4 + 19.1 VCL Application Demo20.cpp @@ -68,7 +68,7 @@ CppVCLApplication CloudService;FireDAC;FireDACCommon;FireDACCommonDriver;FireDACIBDriver;FireDACSqliteDriver;FlexCel_Core;FlexCel_Pdf;FlexCel_Render;FlexCel_Report;FlexCel_XlsAdapter;inet;RESTBackendComponents;RESTComponents;soapmidas;soaprtl;soapserver;$(PackageImports) System;Xml;Data;Datasnap;Web;Soap;Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;$(DCC_Namespace) - rtl.lib;vcl.lib;Python_D.lib + rtl.lib;vcl.lib;Python.lib;FireDACCommon.lib;xmlrtl.lib;dbrtl.lib;FireDACCommonDriver.lib;FireDAC.lib;PythonVcl.lib;VclSmp.lib;vclx.lib <_TCHARMapping>wchar_t true $(BDS)\bin\cbuilder_PROJECTICON.ico @@ -120,17 +120,17 @@ true - true rtl.lib;vcl.lib;Python_D.lib true 1033 + PerMonitor true - true true 1033 rtl.lib;vcl.lib;Python_D.lib + PerMonitor NDEBUG;$(Defines) @@ -138,15 +138,15 @@ true - true rtl.lib;vcl.lib;Python_D.lib + PerMonitor true - true - rtl.lib;vcl.lib;Python_D.lib + rtl.lib;vcl.lib;Python.lib;FireDACCommon.lib;xmlrtl.lib;dbrtl.lib;FireDACCommonDriver.lib;FireDAC.lib;PythonVcl.lib;VclSmp.lib;vclx.lib true 1033 + PerMonitor @@ -199,6 +199,16 @@ + + + true + + + + + true + + true @@ -224,11 +234,26 @@ true + + + true + + true + + + true + + + + + true + + Demo20.exe @@ -251,11 +276,21 @@ true + + + true + + true + + + true + + Demo20.tds @@ -267,6 +302,11 @@ true + + + true + + 1 @@ -276,7 +316,6 @@ 1 - Contents\MacOS 0 @@ -285,6 +324,20 @@ classes 1 + + classes + 1 + + + + + res\xml + 1 + + + res\xml + 1 + @@ -297,90 +350,242 @@ library\lib\armeabi 1 + + library\lib\armeabi + 1 + + + + + library\lib\armeabi-v7a + 1 + library\lib\mips 1 + + library\lib\mips + 1 + library\lib\armeabi-v7a 1 + + library\lib\arm64-v8a + 1 + + + + + library\lib\armeabi-v7a + 1 + res\drawable 1 + + res\drawable + 1 + res\values 1 + + res\values + 1 + + + + + res\values-v21 + 1 + + + res\values-v21 + 1 + + + + + res\values + 1 + + + res\values + 1 + res\drawable 1 + + res\drawable + 1 + res\drawable-xxhdpi 1 + + res\drawable-xxhdpi + 1 + res\drawable-ldpi 1 + + res\drawable-ldpi + 1 + res\drawable-mdpi 1 + + res\drawable-mdpi + 1 + res\drawable-hdpi 1 + + res\drawable-hdpi + 1 + res\drawable-xhdpi 1 + + res\drawable-xhdpi + 1 + + + + + res\drawable-mdpi + 1 + + + res\drawable-mdpi + 1 + + + + + res\drawable-hdpi + 1 + + + res\drawable-hdpi + 1 + + + + + res\drawable-xhdpi + 1 + + + res\drawable-xhdpi + 1 + + + + + res\drawable-xxhdpi + 1 + + + res\drawable-xxhdpi + 1 + + + + + res\drawable-xxxhdpi + 1 + + + res\drawable-xxxhdpi + 1 + res\drawable-small 1 + + res\drawable-small + 1 + res\drawable-normal 1 + + res\drawable-normal + 1 + res\drawable-large 1 + + res\drawable-large + 1 + res\drawable-xlarge 1 + + res\drawable-xlarge + 1 + + + + + res\values + 1 + + + res\values + 1 + @@ -400,6 +605,11 @@ 1 .framework + + Contents\MacOS + 1 + .framework + 0 @@ -422,6 +632,11 @@ 1 .dylib + + Contents\MacOS + 1 + .dylib + 0 .dll;.bpl @@ -445,6 +660,11 @@ 1 .dylib + + Contents\MacOS + 1 + .dylib + 0 .bpl @@ -454,6 +674,9 @@ 0 + + 0 + 0 @@ -467,10 +690,40 @@ Contents\Resources\StartUp\ 0 + + Contents\Resources\StartUp\ + 0 + 0 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + 1 @@ -504,6 +757,16 @@ 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + 1 + + 1 @@ -515,6 +778,76 @@ 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + 1 + + 1 @@ -526,6 +859,16 @@ 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + 1 + + 1 @@ -548,10 +891,93 @@ 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + 1 + + 1 + @@ -592,6 +1018,16 @@ 1 + + + ..\$(PROJECTNAME).launchscreen + 64 + + + ..\$(PROJECTNAME).launchscreen + 64 + + 1 @@ -603,29 +1039,51 @@ 1 + + + ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF + 1 + + ..\ 1 + + ..\ + 1 + Contents 1 + + Contents + 1 + Contents\Resources 1 + + Contents\Resources + 1 + library\lib\armeabi-v7a 1 + + library\lib\arm64-v8a + 1 + 1 @@ -642,10 +1100,20 @@ Contents\MacOS 1 + + Contents\MacOS + 1 + 0 + + + library\lib\armeabi-v7a + 1 + + 1 @@ -681,7 +1149,9 @@ + + True diff --git a/Demos/Demo20/Demo20.res b/Demos/Demo20/Demo20.res index 44c9c725..7f918b80 100644 Binary files a/Demos/Demo20/Demo20.res and b/Demos/Demo20/Demo20.res differ diff --git a/Demos/Demo20/Unit1.cpp b/Demos/Demo20/Unit1.cpp index ab182320..75767f9f 100644 --- a/Demos/Demo20/Unit1.cpp +++ b/Demos/Demo20/Unit1.cpp @@ -3,11 +3,11 @@ #pragma hdrstop #include "Unit1.h" -#pragma comment (lib,"Python_D") +//#pragma comment (lib,"Python_D") //--------------------------------------------------------------------------- #pragma package(smart_init) #pragma link "PythonEngine" -#pragma link "PythonGUIInputOutput" +#pragma link "Vcl.PythonGUIInputOutput" #pragma resource "*.dfm" TForm1 *Form1; diff --git a/Demos/Demo20/Unit1.dfm b/Demos/Demo20/Unit1.dfm index a17f8f43..48b03302 100644 --- a/Demos/Demo20/Unit1.dfm +++ b/Demos/Demo20/Unit1.dfm @@ -1,164 +1,164 @@ -object Form1: TForm1 - Left = 193 - Top = 110 - Caption = 'Form1' - ClientHeight = 336 - ClientWidth = 528 - Color = clBtnFace - Font.Charset = DEFAULT_CHARSET - Font.Color = clWindowText - Font.Height = -11 - Font.Name = 'MS Sans Serif' - Font.Style = [] - OldCreateOrder = True - PixelsPerInch = 96 - TextHeight = 13 - object Splitter1: TSplitter - Left = 0 - Top = 145 - Width = 528 - Height = 3 - Cursor = crVSplit - Align = alTop - ExplicitWidth = 536 - end - object Memo1: TMemo - Left = 0 - Top = 0 - Width = 528 - Height = 145 - Align = alTop - ScrollBars = ssVertical - TabOrder = 0 - end - object Memo2: TMemo - Left = 0 - Top = 148 - Width = 528 - Height = 147 - Align = alClient - Lines.Strings = ( - 'import spam' - 'p = spam.CreatePoint(2, 5)' - 'print (p)' - 'p.OffsetBy( 3, 3 )' - 'print (p.x, p.y)' - 'print (dir(spam))' - 'print (spam.Point)' - 'print ("p = ", p, " --> ",)' - 'if type(p) is spam.Point:' - ' print ("p is a Point")' - 'else:' - ' print ("p is not a point")' - 'p = 2' - 'print ("p = ", p, " --> ",)' - 'if type(p) is spam.Point:' - ' print ("p is a Point")' - 'else:' - ' print ("p is not a point")' - 'p = spam.CreatePoint(2, 5)' - 'try:' - ' print ("raising an error of class EBadPoint")' - ' p.RaiseError() # it will raise spam.EBadPoint' - - 'except spam.PointError as what: #it shows you that you can inter' + - 'cept a parent class' - ' print ("Caught an error derived from PointError")' - - ' print ("Error class = ", what.__class__, " a =", what.a, "' + - ' b =", what.b, " c =", what.c)' - '' - '# You can raise errors from a Python script too!' - - 'print ("--------------------------------------------------------' + - '----------")' - 'print ("Errors in a Python script")' - 'try:' - ' raise spam.EBadPoint("this is a test !")' - 'except:' - ' pass' - '' - 'try:' - ' err = spam.EBadPoint()' - ' err.a = 1' - ' err.b = 2' - ' err.c = 3' - ' raise err' - - 'except spam.PointError as what: #it shows you that you can inter' + - 'cept a parent class' - ' print ("Caught an error derived from PointError")' - - ' print ("Error class = ", what.__class__, " a =", what.a, "' + - ' b =", what.b, " c =", what.c)' - '' - 'if p == spam.CreatePoint(2, 5):' - ' print ("Equal")' - 'else:' - ' print ("Not equal")' - '') - ScrollBars = ssVertical - TabOrder = 1 - end - object Panel1: TPanel - Left = 0 - Top = 295 - Width = 528 - Height = 41 - Align = alBottom - BevelOuter = bvNone - TabOrder = 2 - object Button1: TButton - Left = 8 - Top = 8 - Width = 105 - Height = 25 - Caption = 'Execute' - TabOrder = 0 - OnClick = Button1Click - end - end - object PythonEngine1: TPythonEngine - AutoLoad = False - IO = PythonGUIInputOutput1 - Left = 16 - Top = 32 - end - object PythonGUIInputOutput1: TPythonGUIInputOutput - UnicodeIO = True - RawOutput = False - Output = Memo1 - Left = 48 - Top = 32 - end - object PythonModule1: TPythonModule - Engine = PythonEngine1 - ModuleName = 'spam' - Errors = < - item - Name = 'PointError' - ErrorType = etClass - end - item - Name = 'EBadPoint' - ErrorType = etClass - ParentClass.Name = 'PointError' - end> - Left = 80 - Top = 32 - end - object PythonType1: TPythonType - Engine = PythonEngine1 - OnInitialization = PythonType1Initialization - TypeName = 'Point' - Prefix = 'Create' - Module = PythonModule1 - Services.Basic = [bsGetAttr, bsSetAttr, bsRepr, bsStr] - Services.InplaceNumber = [] - Services.Number = [] - Services.Sequence = [] - Services.Mapping = [] - Left = 112 - Top = 32 - end -end +object Form1: TForm1 + Left = 193 + Top = 110 + Caption = 'Form1' + ClientHeight = 336 + ClientWidth = 528 + Color = clBtnFace + Font.Charset = DEFAULT_CHARSET + Font.Color = clWindowText + Font.Height = -11 + Font.Name = 'MS Sans Serif' + Font.Style = [] + OldCreateOrder = True + PixelsPerInch = 96 + TextHeight = 13 + object Splitter1: TSplitter + Left = 0 + Top = 145 + Width = 528 + Height = 3 + Cursor = crVSplit + Align = alTop + ExplicitWidth = 536 + end + object Memo1: TMemo + Left = 0 + Top = 0 + Width = 528 + Height = 145 + Align = alTop + ScrollBars = ssVertical + TabOrder = 0 + end + object Memo2: TMemo + Left = 0 + Top = 148 + Width = 528 + Height = 147 + Align = alClient + Lines.Strings = ( + 'import spam' + 'p = spam.CreatePoint(2, 5)' + 'print (p)' + 'p.OffsetBy( 3, 3 )' + 'print (p.x, p.y)' + 'print (dir(spam))' + 'print (spam.Point)' + 'print ("p = ", p, " --> ",)' + 'if type(p) is spam.Point:' + ' print ("p is a Point")' + 'else:' + ' print ("p is not a point")' + 'p = 2' + 'print ("p = ", p, " --> ",)' + 'if type(p) is spam.Point:' + ' print ("p is a Point")' + 'else:' + ' print ("p is not a point")' + 'p = spam.CreatePoint(2, 5)' + 'try:' + ' print ("raising an error of class EBadPoint")' + ' p.RaiseError() # it will raise spam.EBadPoint' + + 'except spam.PointError as what: #it shows you that you can inter' + + 'cept a parent class' + ' print ("Caught an error derived from PointError")' + + ' print ("Error class = ", what.__class__, " a =", what.a, "' + + ' b =", what.b, " c =", what.c)' + '' + '# You can raise errors from a Python script too!' + + 'print ("--------------------------------------------------------' + + '----------")' + 'print ("Errors in a Python script")' + 'try:' + ' raise spam.EBadPoint("this is a test !")' + 'except:' + ' pass' + '' + 'try:' + ' err = spam.EBadPoint()' + ' err.a = 1' + ' err.b = 2' + ' err.c = 3' + ' raise err' + + 'except spam.PointError as what: #it shows you that you can inter' + + 'cept a parent class' + ' print ("Caught an error derived from PointError")' + + ' print ("Error class = ", what.__class__, " a =", what.a, "' + + ' b =", what.b, " c =", what.c)' + '' + 'if p == spam.CreatePoint(2, 5):' + ' print ("Equal")' + 'else:' + ' print ("Not equal")' + '') + ScrollBars = ssVertical + TabOrder = 1 + end + object Panel1: TPanel + Left = 0 + Top = 295 + Width = 528 + Height = 41 + Align = alBottom + BevelOuter = bvNone + TabOrder = 2 + object Button1: TButton + Left = 8 + Top = 8 + Width = 105 + Height = 25 + Caption = 'Execute' + TabOrder = 0 + OnClick = Button1Click + end + end + object PythonEngine1: TPythonEngine + AutoLoad = False + IO = PythonGUIInputOutput1 + Left = 16 + Top = 32 + end + object PythonGUIInputOutput1: TPythonGUIInputOutput + UnicodeIO = True + RawOutput = False + Output = Memo1 + Left = 48 + Top = 32 + end + object PythonModule1: TPythonModule + Engine = PythonEngine1 + ModuleName = 'spam' + Errors = < + item + Name = 'PointError' + ErrorType = etClass + end + item + Name = 'EBadPoint' + ErrorType = etClass + ParentClass.Name = 'PointError' + end> + Left = 80 + Top = 32 + end + object PythonType1: TPythonType + Engine = PythonEngine1 + OnInitialization = PythonType1Initialization + TypeName = 'Point' + Prefix = 'Create' + Module = PythonModule1 + Services.Basic = [bsGetAttr, bsSetAttr, bsRepr, bsStr] + Services.InplaceNumber = [] + Services.Number = [] + Services.Sequence = [] + Services.Mapping = [] + Left = 112 + Top = 32 + end +end diff --git a/Demos/Demo20/Unit1.h b/Demos/Demo20/Unit1.h index eafe18a2..e89a7eb3 100644 --- a/Demos/Demo20/Unit1.h +++ b/Demos/Demo20/Unit1.h @@ -7,7 +7,7 @@ #include #include #include "PythonEngine.hpp" -#include "PythonGUIInputOutput.hpp" +#include "Vcl.PythonGUIInputOutput.hpp" #include //--------------------------------------------------------------------------- // New Python type Point diff --git a/Demos/Demo21/Demo21.dpr b/Demos/Demo21/Demo21.dpr index 35fb9fb2..4e33a039 100644 --- a/Demos/Demo21/Demo21.dpr +++ b/Demos/Demo21/Demo21.dpr @@ -1,6 +1,6 @@ program Demo21; -{$I Definition.Inc} + uses Forms, diff --git a/Demos/Demo21/Unit1.pas b/Demos/Demo21/Unit1.pas index 3705a5e3..bb307e81 100644 --- a/Demos/Demo21/Unit1.pas +++ b/Demos/Demo21/Unit1.pas @@ -1,6 +1,6 @@ unit Unit1; -{$I Definition.Inc} + interface diff --git a/Demos/Demo22/Demo22.dpr b/Demos/Demo22/Demo22.dpr index 3a546f9c..e689f19f 100644 --- a/Demos/Demo22/Demo22.dpr +++ b/Demos/Demo22/Demo22.dpr @@ -1,6 +1,6 @@ program Demo22; -{$I Definition.Inc} + uses Forms, diff --git a/Demos/Demo22/Unit1.pas b/Demos/Demo22/Unit1.pas index 6b312036..5758ff51 100644 --- a/Demos/Demo22/Unit1.pas +++ b/Demos/Demo22/Unit1.pas @@ -1,6 +1,6 @@ unit Unit1; -{$I Definition.Inc} + interface diff --git a/Demos/Demo23/Demo23.dpr b/Demos/Demo23/Demo23.dpr index c1f55b5a..0d37f15a 100644 --- a/Demos/Demo23/Demo23.dpr +++ b/Demos/Demo23/Demo23.dpr @@ -1,6 +1,6 @@ program Demo23; -{$I Definition.Inc} + uses Forms, diff --git a/Demos/Demo23/Unit1.pas b/Demos/Demo23/Unit1.pas index 37c680c4..e72038a4 100644 --- a/Demos/Demo23/Unit1.pas +++ b/Demos/Demo23/Unit1.pas @@ -1,6 +1,6 @@ unit Unit1; -{$I Definition.Inc} + interface diff --git a/Demos/Demo25/fmMain.pas b/Demos/Demo25/fmMain.pas index 17632424..a88c02f9 100644 --- a/Demos/Demo25/fmMain.pas +++ b/Demos/Demo25/fmMain.pas @@ -1,6 +1,6 @@ unit fmMain; -{$I Definition.Inc} + interface diff --git a/Demos/Demo26/Demo26.dpr b/Demos/Demo26/Demo26.dpr index 0d98fcbe..d36a8783 100644 --- a/Demos/Demo26/Demo26.dpr +++ b/Demos/Demo26/Demo26.dpr @@ -1,6 +1,6 @@ program Demo26; -{$I Definition.Inc} + uses Forms, diff --git a/Demos/Demo26/Unit1.pas b/Demos/Demo26/Unit1.pas index 1d70e40b..94a54ec9 100644 --- a/Demos/Demo26/Unit1.pas +++ b/Demos/Demo26/Unit1.pas @@ -1,6 +1,6 @@ unit Unit1; -{$I Definition.Inc} + interface diff --git a/Demos/Demo28/Demo28.dpr b/Demos/Demo28/Demo28.dpr index e98150ac..46ba377f 100644 --- a/Demos/Demo28/Demo28.dpr +++ b/Demos/Demo28/Demo28.dpr @@ -1,6 +1,6 @@ program Demo28; -{$I Definition.Inc} + uses Forms, diff --git a/Demos/Demo28/Unit1.pas b/Demos/Demo28/Unit1.pas index 6ef15472..72d223bd 100644 --- a/Demos/Demo28/Unit1.pas +++ b/Demos/Demo28/Unit1.pas @@ -1,6 +1,6 @@ unit Unit1; -{$I Definition.Inc} + interface diff --git a/Demos/Demo30/Demo30.dpr b/Demos/Demo30/Demo30.dpr index e1337957..ceea88c2 100644 --- a/Demos/Demo30/Demo30.dpr +++ b/Demos/Demo30/Demo30.dpr @@ -1,6 +1,6 @@ program Demo30; -{$I Definition.Inc} + uses Forms, diff --git a/Demos/Demo30/Unit1.pas b/Demos/Demo30/Unit1.pas index 808b4a6c..c1c5b654 100644 --- a/Demos/Demo30/Unit1.pas +++ b/Demos/Demo30/Unit1.pas @@ -1,6 +1,6 @@ unit Unit1; -{$I Definition.Inc} + interface diff --git a/Demos/Demo31/Demo31.dpr b/Demos/Demo31/Demo31.dpr index e1263c36..62bbc2c6 100644 --- a/Demos/Demo31/Demo31.dpr +++ b/Demos/Demo31/Demo31.dpr @@ -1,19 +1,19 @@ program Demo31; -{$I Definition.Inc} + uses Forms, Unit1 in 'Unit1.pas' {Form1}, Unit2 in 'Unit2.pas' {TestForm}, - WrapDelphiExtCtrls, WrapDelphiTypes, WrapDelphiWindows, - WrapDelphiComCtrls, - WrapDelphiGrids, - WrapDelphiGraphics, - WrapDelphiButtons, - WrapDelphiDialogs; + WrapVclExtCtrls, + WrapVclComCtrls, + WrapVclGrids, + WrapVclGraphics, + WrapVclButtons, + WrapVclDialogs; {$R *.res} diff --git a/Demos/Demo31/Demo31.dproj b/Demos/Demo31/Demo31.dproj index 24b947c6..c7e0eed9 100644 --- a/Demos/Demo31/Demo31.dproj +++ b/Demos/Demo31/Demo31.dproj @@ -1,1132 +1,1132 @@ - - - {13782AFF-38C4-49AC-BA0A-8FAFC09245D8} - Demo31.dpr - Debug - DCC32 - 19.1 - VCL - True - Win64 - 3 - Application - - - true - - - true - Base - true - - - true - Base - true - - - true - Base - true - - - true - Base - true - - - true - Cfg_2 - true - true - - - true - Cfg_2 - true - true - - - Demo31 - Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;System;Xml;Data;Datasnap;Web;Soap;Winapi;$(DCC_Namespace) - CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments= - 4105 - Demo31.exe - 00400000 - x86 - - - true - $(BDS)\bin\delphi_PROJECTICON.ico - System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace) - 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 - PerMonitorV2 - - - true - System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace) - 1033 - $(BDS)\bin\default_app.manifest - $(BDS)\bin\delphi_PROJECTICON.ico - true - $(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png - $(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png - PerMonitorV2 - - - false - RELEASE;$(DCC_Define) - 0 - 0 - - - DEBUG;$(DCC_Define) - - - Debug - true - 1033 - true - true - - - Debug - true - 1033 - true - true - - - - MainSource - - -
Form1
- - -
TestForm
- - - Cfg_2 - Base - - - Base - - - Cfg_1 - Base - - - - - Delphi.Personality.12 - VCLApplication - - - - Demo31.dpr - - - False - True - False - - - False - False - 1 - 0 - 0 - 0 - False - False - False - False - False - 4105 - 1252 - - - - - 1.0.0.0 - - - - - - 1.0.0.0 - - - - - - True - True - - - - - Demo31.exe - true - - - - - 1 - - - 0 - - - - - classes - 1 - - - classes - 1 - - - - - res\xml - 1 - - - res\xml - 1 - - - - - library\lib\armeabi-v7a - 1 - - - - - library\lib\armeabi - 1 - - - library\lib\armeabi - 1 - - - - - library\lib\armeabi-v7a - 1 - - - - - library\lib\mips - 1 - - - library\lib\mips - 1 - - - - - library\lib\armeabi-v7a - 1 - - - library\lib\arm64-v8a - 1 - - - - - library\lib\armeabi-v7a - 1 - - - - - res\drawable - 1 - - - res\drawable - 1 - - - - - res\values - 1 - - - res\values - 1 - - - - - res\values-v21 - 1 - - - res\values-v21 - 1 - - - - - res\values - 1 - - - res\values - 1 - - - - - res\drawable - 1 - - - res\drawable - 1 - - - - - res\drawable-xxhdpi - 1 - - - res\drawable-xxhdpi - 1 - - - - - res\drawable-ldpi - 1 - - - res\drawable-ldpi - 1 - - - - - res\drawable-mdpi - 1 - - - res\drawable-mdpi - 1 - - - - - res\drawable-hdpi - 1 - - - res\drawable-hdpi - 1 - - - - - res\drawable-xhdpi - 1 - - - res\drawable-xhdpi - 1 - - - - - res\drawable-mdpi - 1 - - - res\drawable-mdpi - 1 - - - - - res\drawable-hdpi - 1 - - - res\drawable-hdpi - 1 - - - - - res\drawable-xhdpi - 1 - - - res\drawable-xhdpi - 1 - - - - - res\drawable-xxhdpi - 1 - - - res\drawable-xxhdpi - 1 - - - - - res\drawable-xxxhdpi - 1 - - - res\drawable-xxxhdpi - 1 - - - - - res\drawable-small - 1 - - - res\drawable-small - 1 - - - - - res\drawable-normal - 1 - - - res\drawable-normal - 1 - - - - - res\drawable-large - 1 - - - res\drawable-large - 1 - - - - - res\drawable-xlarge - 1 - - - res\drawable-xlarge - 1 - - - - - res\values - 1 - - - res\values - 1 - - - - - 1 - - - 1 - - - 0 - - - - - 1 - .framework - - - 1 - .framework - - - 0 - - - - - 1 - .dylib - - - 1 - .dylib - - - 0 - .dll;.bpl - - - - - 1 - .dylib - - - 1 - .dylib - - - 1 - .dylib - - - 1 - .dylib - - - 1 - .dylib - - - 0 - .bpl - - - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 - - - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 - - - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 - - - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - - - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset - 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset - 1 - - - - - 1 - - - 1 - - - 1 - - - - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset - 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset - 1 - - - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 - - - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 - - - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 - - - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 - - - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 - - - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - - - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset - 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset - 1 - - - - - 1 - - - 1 - - - 1 - - - - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset - 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset - 1 - - - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - - - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset - 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset - 1 - - - - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset - 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset - 1 - - - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 - - - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 - - - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 - - - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 - - - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 - - - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 - - - - - 1 - - - 1 - - - - - ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF - 1 - - - ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF - 1 - - - - - - - - - 1 - - - 1 - - - 1 - - - - - - - - Contents\Resources - 1 - - - Contents\Resources - 1 - - - - - library\lib\armeabi-v7a - 1 - - - library\lib\arm64-v8a - 1 - - - 1 - - - 1 - - - 1 - - - 1 - - - 1 - - - 1 - - - 0 - - - - - library\lib\armeabi-v7a - 1 - - - - - 1 - - - 1 - - - - - Assets - 1 - - - Assets - 1 - - - - - Assets - 1 - - - Assets - 1 - - - - - - - - - - - - - - - 12 - - - - + + + {13782AFF-38C4-49AC-BA0A-8FAFC09245D8} + Demo31.dpr + Debug + DCC32 + 19.1 + VCL + True + Win64 + 3 + Application + + + true + + + true + Base + true + + + true + Base + true + + + true + Base + true + + + true + Base + true + + + true + Cfg_2 + true + true + + + true + Cfg_2 + true + true + + + Demo31 + Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;System;Xml;Data;Datasnap;Web;Soap;Winapi;$(DCC_Namespace) + CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments= + 4105 + Demo31.exe + 00400000 + x86 + + + true + $(BDS)\bin\delphi_PROJECTICON.ico + System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace) + 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 + PerMonitorV2 + + + true + System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace) + 1033 + $(BDS)\bin\default_app.manifest + $(BDS)\bin\delphi_PROJECTICON.ico + true + $(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png + $(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png + PerMonitorV2 + + + false + RELEASE;$(DCC_Define) + 0 + 0 + + + DEBUG;$(DCC_Define) + + + Debug + true + 1033 + true + true + + + Debug + true + 1033 + true + true + + + + MainSource + + +
Form1
+ + +
TestForm
+ + + Cfg_2 + Base + + + Base + + + Cfg_1 + Base + + + + + Delphi.Personality.12 + VCLApplication + + + + Demo31.dpr + + + False + True + False + + + False + False + 1 + 0 + 0 + 0 + False + False + False + False + False + 4105 + 1252 + + + + + 1.0.0.0 + + + + + + 1.0.0.0 + + + + + + True + True + + + + + Demo31.exe + true + + + + + 1 + + + 0 + + + + + classes + 1 + + + classes + 1 + + + + + res\xml + 1 + + + res\xml + 1 + + + + + library\lib\armeabi-v7a + 1 + + + + + library\lib\armeabi + 1 + + + library\lib\armeabi + 1 + + + + + library\lib\armeabi-v7a + 1 + + + + + library\lib\mips + 1 + + + library\lib\mips + 1 + + + + + library\lib\armeabi-v7a + 1 + + + library\lib\arm64-v8a + 1 + + + + + library\lib\armeabi-v7a + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\values + 1 + + + res\values + 1 + + + + + res\values-v21 + 1 + + + res\values-v21 + 1 + + + + + res\values + 1 + + + res\values + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\drawable-xxhdpi + 1 + + + res\drawable-xxhdpi + 1 + + + + + res\drawable-ldpi + 1 + + + res\drawable-ldpi + 1 + + + + + res\drawable-mdpi + 1 + + + res\drawable-mdpi + 1 + + + + + res\drawable-hdpi + 1 + + + res\drawable-hdpi + 1 + + + + + res\drawable-xhdpi + 1 + + + res\drawable-xhdpi + 1 + + + + + res\drawable-mdpi + 1 + + + res\drawable-mdpi + 1 + + + + + res\drawable-hdpi + 1 + + + res\drawable-hdpi + 1 + + + + + res\drawable-xhdpi + 1 + + + res\drawable-xhdpi + 1 + + + + + res\drawable-xxhdpi + 1 + + + res\drawable-xxhdpi + 1 + + + + + res\drawable-xxxhdpi + 1 + + + res\drawable-xxxhdpi + 1 + + + + + res\drawable-small + 1 + + + res\drawable-small + 1 + + + + + res\drawable-normal + 1 + + + res\drawable-normal + 1 + + + + + res\drawable-large + 1 + + + res\drawable-large + 1 + + + + + res\drawable-xlarge + 1 + + + res\drawable-xlarge + 1 + + + + + res\values + 1 + + + res\values + 1 + + + + + 1 + + + 1 + + + 0 + + + + + 1 + .framework + + + 1 + .framework + + + 0 + + + + + 1 + .dylib + + + 1 + .dylib + + + 0 + .dll;.bpl + + + + + 1 + .dylib + + + 1 + .dylib + + + 1 + .dylib + + + 1 + .dylib + + + 1 + .dylib + + + 0 + .bpl + + + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + 1 + + + + + 1 + + + 1 + + + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + 1 + + + + + 1 + + + 1 + + + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + 1 + + + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + + + 1 + + + 1 + + + + + ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF + 1 + + + ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF + 1 + + + + + + + + + 1 + + + 1 + + + 1 + + + + + + + + Contents\Resources + 1 + + + Contents\Resources + 1 + + + + + library\lib\armeabi-v7a + 1 + + + library\lib\arm64-v8a + 1 + + + 1 + + + 1 + + + 1 + + + 1 + + + 1 + + + 1 + + + 0 + + + + + library\lib\armeabi-v7a + 1 + + + + + 1 + + + 1 + + + + + Assets + 1 + + + Assets + 1 + + + + + Assets + 1 + + + Assets + 1 + + + + + + + + + + + + + + + 12 + + + + diff --git a/Demos/Demo31/Unit1.pas b/Demos/Demo31/Unit1.pas index b079c711..b1ff8178 100644 --- a/Demos/Demo31/Unit1.pas +++ b/Demos/Demo31/Unit1.pas @@ -1,6 +1,6 @@ unit Unit1; -{$I Definition.Inc} + interface diff --git a/Demos/Demo32/Demo32.dpr b/Demos/Demo32/Demo32.dpr index cd0f1304..b3e0be6b 100644 --- a/Demos/Demo32/Demo32.dpr +++ b/Demos/Demo32/Demo32.dpr @@ -2,7 +2,7 @@ // JCL_DEBUG_EXPERT_INSERTJDBG OFF program Demo32; -{$I Definition.Inc} + uses Forms, diff --git a/Demos/Demo32/Unit1.pas b/Demos/Demo32/Unit1.pas index 90b75c09..7f8984d4 100644 --- a/Demos/Demo32/Unit1.pas +++ b/Demos/Demo32/Unit1.pas @@ -6,7 +6,7 @@ at the comments at the top of the unit. } -{$I Definition.Inc} + interface diff --git a/Demos/Demo33/SortThds.pas b/Demos/Demo33/SortThds.pas index a1ab554a..39263e36 100644 --- a/Demos/Demo33/SortThds.pas +++ b/Demos/Demo33/SortThds.pas @@ -1,6 +1,6 @@ unit SortThds; -{$I Definition.Inc} + interface diff --git a/Demos/Demo33/ThSort.pas b/Demos/Demo33/ThSort.pas index cac6ed8b..ca82a386 100644 --- a/Demos/Demo33/ThSort.pas +++ b/Demos/Demo33/ThSort.pas @@ -1,6 +1,6 @@ unit ThSort; -{$I Definition.Inc} + interface diff --git a/Demos/Demo34/Demo34.dpr b/Demos/Demo34/Demo34.dpr index bcb8b2eb..ea91f388 100644 --- a/Demos/Demo34/Demo34.dpr +++ b/Demos/Demo34/Demo34.dpr @@ -1,6 +1,6 @@ program Demo34; -{$I Definition.Inc} + uses Forms, diff --git a/Demos/Demo34/Unit1.pas b/Demos/Demo34/Unit1.pas index 9abd6da5..d860dd0a 100644 --- a/Demos/Demo34/Unit1.pas +++ b/Demos/Demo34/Unit1.pas @@ -1,6 +1,6 @@ unit Unit1; -{$I Definition.Inc} + interface @@ -8,7 +8,7 @@ interface SysUtils, Classes, Windows, Messages, Graphics, Controls, Forms, Dialogs, StdCtrls, ExtCtrls, ComCtrls, PythonVersions, - PythonEngine, Vcl.PythonGUIInputOutput, PythonGUIInputOutput; + PythonEngine, Vcl.PythonGUIInputOutput; type TForm1 = class(TForm) @@ -290,7 +290,7 @@ function TPyPoint.DoRaiseError( args : PPyObject ) : PPyObject; end; end; -///////////////////////////////////////////////// +/// procedure TForm1.Button1Click(Sender: TObject); var diff --git a/Demos/FPC/Demo06/Unit1.pas b/Demos/FPC/Demo06/Unit1.pas index 1caf8f5e..34c8a901 100644 --- a/Demos/FPC/Demo06/Unit1.pas +++ b/Demos/FPC/Demo06/Unit1.pas @@ -1,6 +1,6 @@ unit Unit1; -{$I Definition.Inc} + interface diff --git a/Packages/Delphi/Delphi 10.4+/Python.dproj b/Packages/Delphi/Delphi 10.4+/Python.dproj index 1a534179..38e62cca 100644 --- a/Packages/Delphi/Delphi 10.4+/Python.dproj +++ b/Packages/Delphi/Delphi 10.4+/Python.dproj @@ -8,7 +8,7 @@ Win32 {018AAA56-F5BD-4A04-BCCA-A0043EAAA5CE} 19.1 - 1 + 3 true @@ -18,6 +18,11 @@ Base true + + true + Base + true + true Base @@ -45,6 +50,12 @@ Debug Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace) + + Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace) + Debug + 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= + 0 RELEASE;$(DCC_Define) @@ -105,7 +116,7 @@ True - False + True diff --git a/Packages/Delphi/Delphi 10.4+/PythonFmx.dproj b/Packages/Delphi/Delphi 10.4+/PythonFmx.dproj index 24bb75fb..3fb0f1d2 100644 --- a/Packages/Delphi/Delphi 10.4+/PythonFmx.dproj +++ b/Packages/Delphi/Delphi 10.4+/PythonFmx.dproj @@ -7,7 +7,7 @@ True Debug Win32 - 1 + 3 Package @@ -18,6 +18,11 @@ Base true + + true + Base + true + true Base @@ -60,6 +65,11 @@ CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments= 1033 + + Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace) + Debug + true + DEBUG;$(DCC_Define) true @@ -127,14 +137,14 @@ - - - PythonFmx.bpl + + true - - + + + PythonFmx.bpl true @@ -833,7 +843,7 @@ True - False + True 12 diff --git a/Packages/Delphi/Delphi 10.4+/PythonVcl.dpk b/Packages/Delphi/Delphi 10.4+/PythonVcl.dpk index dfd8b6b6..0cdecfd5 100644 --- a/Packages/Delphi/Delphi 10.4+/PythonVcl.dpk +++ b/Packages/Delphi/Delphi 10.4+/PythonVcl.dpk @@ -38,17 +38,17 @@ requires contains Vcl.PythonGUIInputOutput in '..\..\..\Source\vcl\Vcl.PythonGUIInputOutput.pas', - WrapDelphiActnList in '..\..\..\Source\WrapDelphiActnList.pas', - WrapDelphiButtons in '..\..\..\Source\WrapDelphiButtons.pas', - WrapDelphiComCtrls in '..\..\..\Source\WrapDelphiComCtrls.pas', - WrapDelphiControls in '..\..\..\Source\WrapDelphiControls.pas', - WrapDelphiDialogs in '..\..\..\Source\WrapDelphiDialogs.pas', - WrapDelphiExtCtrls in '..\..\..\Source\WrapDelphiExtCtrls.pas', - WrapDelphiForms in '..\..\..\Source\WrapDelphiForms.pas', - WrapDelphiGraphics in '..\..\..\Source\WrapDelphiGraphics.pas', - WrapDelphiGrids in '..\..\..\Source\WrapDelphiGrids.pas', - WrapDelphiSamplesSpin in '..\..\..\Source\WrapDelphiSamplesSpin.pas', - WrapDelphiStdCtrls in '..\..\..\Source\WrapDelphiStdCtrls.pas', - WrapDelphiVCL in '..\..\..\Source\WrapDelphiVCL.pas'; + WrapDelphiVCL in '..\..\..\Source\vcl\WrapDelphiVCL.pas', + WrapVclActnList in '..\..\..\Source\vcl\WrapVclActnList.pas', + WrapVclButtons in '..\..\..\Source\vcl\WrapVclButtons.pas', + WrapVclComCtrls in '..\..\..\Source\vcl\WrapVclComCtrls.pas', + WrapVclControls in '..\..\..\Source\vcl\WrapVclControls.pas', + WrapVclDialogs in '..\..\..\Source\vcl\WrapVclDialogs.pas', + WrapVclExtCtrls in '..\..\..\Source\vcl\WrapVclExtCtrls.pas', + WrapVclForms in '..\..\..\Source\vcl\WrapVclForms.pas', + WrapVclGraphics in '..\..\..\Source\vcl\WrapVclGraphics.pas', + WrapVclGrids in '..\..\..\Source\vcl\WrapVclGrids.pas', + WrapVclSamplesSpin in '..\..\..\Source\vcl\WrapVclSamplesSpin.pas', + WrapVclStdCtrls in '..\..\..\Source\vcl\WrapVclStdCtrls.pas'; end. diff --git a/Packages/Delphi/Delphi 10.4+/PythonVcl.dproj b/Packages/Delphi/Delphi 10.4+/PythonVcl.dproj index 97fdd974..c6efc0e9 100644 --- a/Packages/Delphi/Delphi 10.4+/PythonVcl.dproj +++ b/Packages/Delphi/Delphi 10.4+/PythonVcl.dproj @@ -7,7 +7,7 @@ True Debug Win32 - 1 + 3 Package @@ -18,6 +18,11 @@ Base true + + true + Base + true + true Base @@ -60,6 +65,11 @@ CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments= 1033 + + Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace) + Debug + true + DEBUG;$(DCC_Define) true @@ -88,18 +98,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + Cfg_2 Base @@ -149,6 +159,12 @@ true + + + PythonVcl.bpl + true + + 1 @@ -834,7 +850,7 @@ True - False + True 12 diff --git a/Packages/Delphi/Delphi 10.4+/dclPython.dproj b/Packages/Delphi/Delphi 10.4+/dclPython.dproj index 919d14fb..ef9f508c 100644 --- a/Packages/Delphi/Delphi 10.4+/dclPython.dproj +++ b/Packages/Delphi/Delphi 10.4+/dclPython.dproj @@ -7,7 +7,7 @@ True Debug Win32 - 1 + 3 Package @@ -68,6 +68,9 @@ rtl;$(DCC_UsePackage) + Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace) + Debug + true DEBUG;$(DCC_Define) @@ -857,7 +860,7 @@ True - False + True 12 diff --git a/Packages/Delphi/Delphi 10.4+/dclPythonFmx.dproj b/Packages/Delphi/Delphi 10.4+/dclPythonFmx.dproj index 0f1215d1..c527bf9a 100644 --- a/Packages/Delphi/Delphi 10.4+/dclPythonFmx.dproj +++ b/Packages/Delphi/Delphi 10.4+/dclPythonFmx.dproj @@ -7,42 +7,12 @@ True Debug Win32 - 1 + 3 Package true - - true - Base - true - - - true - Base - true - - - true - Base - true - - - true - Base - true - - - true - Base - true - - - true - Base - true - true Base @@ -88,30 +58,6 @@ true $(Auto) - - None - android-support-v4.dex.jar;cloud-messaging.dex.jar;com-google-android-gms.play-services-ads-base.17.2.0.dex.jar;com-google-android-gms.play-services-ads-identifier.16.0.0.dex.jar;com-google-android-gms.play-services-ads-lite.17.2.0.dex.jar;com-google-android-gms.play-services-ads.17.2.0.dex.jar;com-google-android-gms.play-services-analytics-impl.16.0.8.dex.jar;com-google-android-gms.play-services-analytics.16.0.8.dex.jar;com-google-android-gms.play-services-base.16.0.1.dex.jar;com-google-android-gms.play-services-basement.16.2.0.dex.jar;com-google-android-gms.play-services-gass.17.2.0.dex.jar;com-google-android-gms.play-services-identity.16.0.0.dex.jar;com-google-android-gms.play-services-maps.16.1.0.dex.jar;com-google-android-gms.play-services-measurement-base.16.4.0.dex.jar;com-google-android-gms.play-services-measurement-sdk-api.16.4.0.dex.jar;com-google-android-gms.play-services-stats.16.0.1.dex.jar;com-google-android-gms.play-services-tagmanager-v4-impl.16.0.8.dex.jar;com-google-android-gms.play-services-tasks.16.0.1.dex.jar;com-google-android-gms.play-services-wallet.16.0.1.dex.jar;com-google-firebase.firebase-analytics.16.4.0.dex.jar;com-google-firebase.firebase-common.16.1.0.dex.jar;com-google-firebase.firebase-iid-interop.16.0.1.dex.jar;com-google-firebase.firebase-iid.17.1.1.dex.jar;com-google-firebase.firebase-measurement-connector.17.0.1.dex.jar;com-google-firebase.firebase-messaging.17.5.0.dex.jar;fmx.dex.jar;google-play-billing.dex.jar;google-play-licensing.dex.jar - rtl;$(DCC_UsePackage) - - - None - android-support-v4.dex.jar;cloud-messaging.dex.jar;com-google-android-gms.play-services-ads-base.17.2.0.dex.jar;com-google-android-gms.play-services-ads-identifier.16.0.0.dex.jar;com-google-android-gms.play-services-ads-lite.17.2.0.dex.jar;com-google-android-gms.play-services-ads.17.2.0.dex.jar;com-google-android-gms.play-services-analytics-impl.16.0.8.dex.jar;com-google-android-gms.play-services-analytics.16.0.8.dex.jar;com-google-android-gms.play-services-base.16.0.1.dex.jar;com-google-android-gms.play-services-basement.16.2.0.dex.jar;com-google-android-gms.play-services-gass.17.2.0.dex.jar;com-google-android-gms.play-services-identity.16.0.0.dex.jar;com-google-android-gms.play-services-maps.16.1.0.dex.jar;com-google-android-gms.play-services-measurement-base.16.4.0.dex.jar;com-google-android-gms.play-services-measurement-sdk-api.16.4.0.dex.jar;com-google-android-gms.play-services-stats.16.0.1.dex.jar;com-google-android-gms.play-services-tagmanager-v4-impl.16.0.8.dex.jar;com-google-android-gms.play-services-tasks.16.0.1.dex.jar;com-google-android-gms.play-services-wallet.16.0.1.dex.jar;com-google-firebase.firebase-analytics.16.4.0.dex.jar;com-google-firebase.firebase-common.16.1.0.dex.jar;com-google-firebase.firebase-iid-interop.16.0.1.dex.jar;com-google-firebase.firebase-iid.17.1.1.dex.jar;com-google-firebase.firebase-measurement-connector.17.0.1.dex.jar;com-google-firebase.firebase-messaging.17.5.0.dex.jar;fmx.dex.jar;google-play-billing.dex.jar;google-play-licensing.dex.jar - rtl;$(DCC_UsePackage) - - - None - rtl;$(DCC_UsePackage) - - - None - rtl;$(DCC_UsePackage) - - - rtl;$(DCC_UsePackage) - - - rtl;$(DCC_UsePackage) - Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace) Debug @@ -122,6 +68,9 @@ rtl;$(DCC_UsePackage) + Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace) + Debug + true DEBUG;$(DCC_Define) @@ -886,14 +835,8 @@ - False - False - False - False - False - False True - False + True 12 diff --git a/Packages/Delphi/Delphi 10.4+/dclPythonVcl.dproj b/Packages/Delphi/Delphi 10.4+/dclPythonVcl.dproj index 7162f163..a168bee0 100644 --- a/Packages/Delphi/Delphi 10.4+/dclPythonVcl.dproj +++ b/Packages/Delphi/Delphi 10.4+/dclPythonVcl.dproj @@ -7,7 +7,7 @@ True Debug Win32 - 1 + 3 Package @@ -68,6 +68,9 @@ rtl;vcl;$(DCC_UsePackage) + Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace) + Debug + true DEBUG;$(DCC_Define) @@ -835,7 +838,7 @@ True - False + True 12 diff --git a/Source/WrapDelphiVCL.pas b/Source/vcl/WrapDelphiVCL.pas similarity index 55% rename from Source/WrapDelphiVCL.pas rename to Source/vcl/WrapDelphiVCL.pas index 11e36901..7aba27f2 100644 --- a/Source/WrapDelphiVCL.pas +++ b/Source/vcl/WrapDelphiVCL.pas @@ -13,15 +13,15 @@ implementation WrapDelphiTypes, WrapDelphiClasses, WrapDelphiWindows, - WrapDelphiControls, - WrapDelphiGraphics, - WrapDelphiForms, - WrapDelphiActnList, - WrapDelphiStdCtrls, - WrapDelphiComCtrls, - WrapDelphiExtCtrls, - WrapDelphiButtons, - WrapDelphiGrids, - WrapDelphiSamplesSpin; + WrapVclControls, + WrapVclGraphics, + WrapVclForms, + WrapVclActnList, + WrapVclStdCtrls, + WrapVclComCtrls, + WrapVclExtCtrls, + WrapVclButtons, + WrapVclGrids, + WrapVclSamplesSpin; end. diff --git a/Source/WrapDelphiActnList.pas b/Source/vcl/WrapVclActnList.pas similarity index 95% rename from Source/WrapDelphiActnList.pas rename to Source/vcl/WrapVclActnList.pas index d26b65b9..b63d88d5 100644 --- a/Source/WrapDelphiActnList.pas +++ b/Source/vcl/WrapVclActnList.pas @@ -1,6 +1,6 @@ -{$I Definition.Inc} +{$I ..\Definition.Inc} -unit WrapDelphiActnList; +unit WrapVclActnList; interface diff --git a/Source/WrapDelphiButtons.pas b/Source/vcl/WrapVclButtons.pas similarity index 94% rename from Source/WrapDelphiButtons.pas rename to Source/vcl/WrapVclButtons.pas index 28f9af75..cf4e7801 100644 --- a/Source/WrapDelphiButtons.pas +++ b/Source/vcl/WrapVclButtons.pas @@ -1,12 +1,12 @@ -{$I Definition.Inc} +{$I ..\Definition.Inc} -unit WrapDelphiButtons; +unit WrapVclButtons; interface uses Classes, SysUtils, PythonEngine, WrapDelphi, WrapDelphiClasses, - WrapDelphiControls, Buttons; + WrapVclControls, Buttons; type TPyDelphiSpeedButton = class (TPyDelphiControl) diff --git a/Source/WrapDelphiComCtrls.pas b/Source/vcl/WrapVclComCtrls.pas similarity index 96% rename from Source/WrapDelphiComCtrls.pas rename to Source/vcl/WrapVclComCtrls.pas index 83bec4f9..c70bd46e 100644 --- a/Source/WrapDelphiComCtrls.pas +++ b/Source/vcl/WrapVclComCtrls.pas @@ -1,12 +1,12 @@ -{$I Definition.Inc} +{$I ..\Definition.Inc} -unit WrapDelphiComCtrls; +unit WrapVclComCtrls; interface uses Classes, SysUtils, PythonEngine, WrapDelphi, WrapDelphiClasses, - WrapDelphiControls, Windows, ComCtrls, TypInfo; + WrapVclControls, Windows, ComCtrls, TypInfo; type TTabChangingEventHandler = class(TEventHandler) diff --git a/Source/WrapDelphiControls.pas b/Source/vcl/WrapVclControls.pas similarity index 96% rename from Source/WrapDelphiControls.pas rename to Source/vcl/WrapVclControls.pas index 66110313..eb360372 100644 --- a/Source/WrapDelphiControls.pas +++ b/Source/vcl/WrapVclControls.pas @@ -1,6 +1,6 @@ -{$I Definition.Inc} +{$I ..\Definition.Inc} -unit WrapDelphiControls; +unit WrapVclControls; interface diff --git a/Source/WrapDelphiDialogs.pas b/Source/vcl/WrapVclDialogs.pas similarity index 93% rename from Source/WrapDelphiDialogs.pas rename to Source/vcl/WrapVclDialogs.pas index 42cf32be..3956d6c8 100644 --- a/Source/WrapDelphiDialogs.pas +++ b/Source/vcl/WrapVclDialogs.pas @@ -1,11 +1,12 @@ -unit WrapDelphiDialogs; -{$I Definition.Inc} +{$I ..\Definition.Inc} + +unit WrapVclDialogs; interface uses Classes, SysUtils, PythonEngine, WrapDelphi, WrapDelphiClasses, - WrapDelphiControls, Windows, Dialogs, TypInfo; + WrapVclControls, Windows, Dialogs, TypInfo; type TPyDelphiOpenDialog = class(TPyDelphiComponent) diff --git a/Source/WrapDelphiExtCtrls.pas b/Source/vcl/WrapVclExtCtrls.pas similarity index 95% rename from Source/WrapDelphiExtCtrls.pas rename to Source/vcl/WrapVclExtCtrls.pas index fa541172..887e1ae3 100644 --- a/Source/WrapDelphiExtCtrls.pas +++ b/Source/vcl/WrapVclExtCtrls.pas @@ -1,11 +1,11 @@ -{$I Definition.Inc} +{$I ..\Definition.Inc} -unit WrapDelphiExtCtrls; +unit WrapVclExtCtrls; interface uses - Classes, SysUtils, PythonEngine, WrapDelphi, WrapDelphiClasses, WrapDelphiControls, + Classes, SysUtils, PythonEngine, WrapDelphi, WrapDelphiClasses, WrapVclControls, Windows, ExtCtrls; type diff --git a/Source/WrapDelphiForms.pas b/Source/vcl/WrapVclForms.pas similarity index 96% rename from Source/WrapDelphiForms.pas rename to Source/vcl/WrapVclForms.pas index d6b88b26..4063671d 100644 --- a/Source/WrapDelphiForms.pas +++ b/Source/vcl/WrapVclForms.pas @@ -1,11 +1,11 @@ -{$I Definition.Inc} +{$I ..\Definition.Inc} -unit WrapDelphiForms; +unit WrapVclForms; interface uses - Classes, SysUtils, PythonEngine, WrapDelphi, WrapDelphiClasses, WrapDelphiControls, + Classes, SysUtils, PythonEngine, WrapDelphi, WrapDelphiClasses, WrapVclControls, Windows, Forms, Graphics, TypInfo; type diff --git a/Source/WrapDelphiGraphics.pas b/Source/vcl/WrapVclGraphics.pas similarity index 96% rename from Source/WrapDelphiGraphics.pas rename to Source/vcl/WrapVclGraphics.pas index 59eb76ba..a3330d09 100644 --- a/Source/WrapDelphiGraphics.pas +++ b/Source/vcl/WrapVclGraphics.pas @@ -1,6 +1,6 @@ -{$I Definition.Inc} +{$I ..\Definition.Inc} -unit WrapDelphiGraphics; +unit WrapVclGraphics; interface diff --git a/Source/WrapDelphiGrids.pas b/Source/vcl/WrapVclGrids.pas similarity index 96% rename from Source/WrapDelphiGrids.pas rename to Source/vcl/WrapVclGrids.pas index 761975be..8daa885d 100644 --- a/Source/WrapDelphiGrids.pas +++ b/Source/vcl/WrapVclGrids.pas @@ -1,12 +1,12 @@ -{$I Definition.Inc} +{$I ..\Definition.Inc} -unit WrapDelphiGrids; +unit WrapVclGrids; interface uses Classes, SysUtils, PythonEngine, WrapDelphi, WrapDelphiClasses, - WrapDelphiControls, Windows, Grids, TypInfo; + WrapVclControls, Windows, Grids, TypInfo; type TDrawCellEventHandler = class(TEventHandler) diff --git a/Source/WrapDelphiSamplesSpin.pas b/Source/vcl/WrapVclSamplesSpin.pas similarity index 94% rename from Source/WrapDelphiSamplesSpin.pas rename to Source/vcl/WrapVclSamplesSpin.pas index c4355e14..dea16146 100644 --- a/Source/WrapDelphiSamplesSpin.pas +++ b/Source/vcl/WrapVclSamplesSpin.pas @@ -1,11 +1,11 @@ -{$I Definition.Inc} +{$I ..\Definition.Inc} -unit WrapDelphiSamplesSpin; +unit WrapVclSamplesSpin; interface uses - Classes, Vcl.Samples.Spin, WrapDelphi, WrapDelphiControls, WrapDelphiStdCtrls; + Classes, Vcl.Samples.Spin, WrapDelphi, WrapVclControls, WrapVclStdCtrls; type TPyDelphiSpinButton = class (TPyDelphiWinControl) diff --git a/Source/WrapDelphiStdCtrls.pas b/Source/vcl/WrapVclStdCtrls.pas similarity index 95% rename from Source/WrapDelphiStdCtrls.pas rename to Source/vcl/WrapVclStdCtrls.pas index ff1dc260..07e11f57 100644 --- a/Source/WrapDelphiStdCtrls.pas +++ b/Source/vcl/WrapVclStdCtrls.pas @@ -1,12 +1,12 @@ -{$I Definition.Inc} +{$I ..\Definition.Inc} -unit WrapDelphiStdCtrls; +unit WrapVclStdCtrls; interface uses Classes, SysUtils, PythonEngine, WrapDelphi, WrapDelphiClasses, - WrapDelphiControls, Windows, StdCtrls; + WrapVclControls, Windows, StdCtrls; type TPyDelphiButton = class (TPyDelphiWinControl) diff --git a/Tests/P4DTests.res b/Tests/P4DTests.res index 6130c835..5e585f00 100644 Binary files a/Tests/P4DTests.res and b/Tests/P4DTests.res differ