Fixing types inheritance

Author: lmbelo

Packages/Delphi/Delphi 10.4+/PythonFmx.dpk

@@ -48,6 +48,8 @@ contains
   WrapFmxShapes in '..\..\..\Source\fmx\WrapFmxShapes.pas',
   WrapFmxStdCtrls in '..\..\..\Source\fmx\WrapFmxStdCtrls.pas',
   WrapFmxTypes in '..\..\..\Source\fmx\WrapFmxTypes.pas',
-  WrapDelphiFmx in '..\..\..\Source\fmx\WrapDelphiFmx.pas';
+  WrapDelphiFmx in '..\..\..\Source\fmx\WrapDelphiFmx.pas',
+  WrapFmxEdit in '..\..\..\Source\fmx\WrapFmxEdit.pas',
+  WrapFmxListBox in '..\..\..\Source\fmx\WrapFmxListBox.pas';
 
 end.

Source/fmx/WrapDelphiFmx.pas

@@ -12,7 +12,7 @@ implementation
   WrapFmxTypes,
   WrapFmxStdCtrls,
   WrapFmxEdit,
-  WrapFmxList,
+  WrapFmxListBox,
   WrapFmxActnList,
   WrapFmxComCtrls,
   WrapFmxDialogs,

Source/fmx/WrapFmxEdit.pas

@@ -1,15 +1,26 @@
-{$I Definition.Inc}
+{$I ..\Definition.Inc}
 
 unit WrapFmxEdit;
 
 interface
 
 uses
-	FMX.Edit, WrapFmxTypes, PythonEngine;
+	FMX.Edit, PythonEngine, WrapFmxTypes, WrapFmxControls;
 
 
 type
-	TPyDelphiEdit = class(TPyDelphiFMXObject)
+  TPyDelphiCustomEdit = class(TPyDelphiPresentedControl)
+	private
+		function GetDelphiObject: TCustomEdit;
+		procedure SetDelphiObject(const Value: TCustomEdit);
+	public
+		class function DelphiObjectClass: TClass; override;
+		// Properties
+		property DelphiObject: TCustomEdit read GetDelphiObject
+			write SetDelphiObject;
+	end;
+
+	TPyDelphiEdit = class(TPyDelphiCustomEdit)
 	private
 		function GetDelphiObject: TEdit;
 		procedure SetDelphiObject(const Value: TEdit);
@@ -50,9 +61,27 @@ procedure TEditRegistration.RegisterWrappers(
   APyDelphiWrapper: TPyDelphiWrapper);
 begin
   inherited;
+  APyDelphiWrapper.RegisterDelphiWrapper(TPyDelphiCustomEdit);
   APyDelphiWrapper.RegisterDelphiWrapper(TPyDelphiEdit);
 end;
 
+{ TPyDelphiCustomEdit }
+
+class function TPyDelphiCustomEdit.DelphiObjectClass: TClass;
+begin
+	Result := TCustomEdit;
+end;
+
+function TPyDelphiCustomEdit.GetDelphiObject: TCustomEdit;
+begin
+	Result := TCustomEdit(inherited DelphiObject);
+end;
+
+procedure TPyDelphiCustomEdit.SetDelphiObject(const Value: TCustomEdit);
+begin
+	inherited DelphiObject := Value;
+end;
+
 { TPyDelphiEdit }
 
 class function TPyDelphiEdit.DelphiObjectClass: TClass;

Source/fmx/WrapFmxListBox.pas

@@ -1,14 +1,14 @@
-{$I Definition.Inc}
+{$I ..\Definition.Inc}
 
 unit WrapFmxListBox;
 
 interface
 
 uses
-	FMX.ListBox, WrapFmxTypes, PythonEngine;
+	FMX.ListBox, WrapFmxTypes, WrapFmxControls, WrapFmxLayouts, PythonEngine;
 
 type
-	TPyListBoxItem = class(TPyDelphiFMXObject)
+	TPyListBoxItem = class(TPyDelphiTextControl)
 	private
 		function GetDelphiObject: TListBoxItem;
 		procedure SetDelphiObject(const Value: TListBoxItem);
@@ -17,7 +17,19 @@ 	TPyListBoxItem = class(TPyDelphiFMXObject)
 		property DelphiObject: TListBoxItem read GetDelphiObject
 			write SetDelphiObject;
 	end;
-	TPyDelphiListBox = class(TPyDelphiFMXObject)
+
+  TPyDelphiCustomListBox = class(TPyDelphiScrollBox)
+  private
+		function GetDelphiObject: TCustomListBox;
+		procedure SetDelphiObject(const Value: TCustomListBox);
+	public
+		class function DelphiObjectClass: TClass; override;
+		// Properties
+		property DelphiObject: TCustomListBox read GetDelphiObject
+			write SetDelphiObject;
+  end;
+
+	TPyDelphiListBox = class(TPyDelphiCustomListBox)
 	private
 		function GetDelphiObject: TListBox;
 		procedure SetDelphiObject(const Value: TListBox);
@@ -58,40 +70,59 @@ procedure TListBoxRegistration.RegisterWrappers(
   APyDelphiWrapper: TPyDelphiWrapper);
 begin
   inherited;
+  APyDelphiWrapper.RegisterDelphiWrapper(TPyListBoxItem);
+  APyDelphiWrapper.RegisterDelphiWrapper(TPyDelphiCustomListBox);
   APyDelphiWrapper.RegisterDelphiWrapper(TPyDelphiListBox);
 end;
 
-{ TPyDelphiListBox }
+{ TPyListBoxItem }
 
-class function TPyDelphiListBox.DelphiObjectClass: TClass;
+class function TPyListBoxItem.DelphiObjectClass: TClass;
 begin
 	Result := TListBox;
 end;
 
-function TPyDelphiListBox.GetDelphiObject: TListBox;
+function TPyListBoxItem.GetDelphiObject: TListBoxItem;
 begin
-	Result := TListBox(inherited DelphiObject);
+	Result := TListBoxItem(inherited DelphiObject);
 end;
 
+procedure TPyListBoxItem.SetDelphiObject(const Value: TListBoxItem);
+begin
+	inherited DelphiObject := Value;
+end;
 
-procedure TPyDelphiListBox.SetDelphiObject(const Value: TListBox);
+{ TPyDelphiCustomListBox }
+
+class function TPyDelphiCustomListBox.DelphiObjectClass: TClass;
+begin
+	Result := TCustomListBox;
+end;
+
+function TPyDelphiCustomListBox.GetDelphiObject: TCustomListBox;
+begin
+	Result := TCustomListBox(inherited DelphiObject);
+end;
+
+procedure TPyDelphiCustomListBox.SetDelphiObject(const Value: TCustomListBox);
 begin
 	inherited DelphiObject := Value;
 end;
 
-{ TPyListBoxItem }
+{ TPyDelphiListBox }
 
-class function TPyListBoxItem.DelphiObjectClass: TClass;
+class function TPyDelphiListBox.DelphiObjectClass: TClass;
 begin
 	Result := TListBox;
 end;
 
-function TPyListBoxItem.GetDelphiObject: TListBoxItem;
+function TPyDelphiListBox.GetDelphiObject: TListBox;
 begin
 	Result := TListBox(inherited DelphiObject);
 end;
 
-procedure TPyListBoxItem.SetDelphiObject(const Value: TListBoxItem);
+
+procedure TPyDelphiListBox.SetDelphiObject(const Value: TListBox);
 begin
 	inherited DelphiObject := Value;
 end;