Form class validation

Author: lmbelo

Source/fmx/WrapFmxForms.pas

@@ -88,8 +88,6 @@   TPyDelphiScreen = class(TPyDelphiComponent)
     property DelphiObject: TScreen read GetDelphiObject write SetDelphiObject;
   end;
 
-  EInvalidFormClass = class(Exception);
-
 implementation
 
 uses
@@ -167,28 +165,23 @@   TCommonCustomFormClass = class of TCommonCustomForm;
   LFormClass: TCommonCustomFormClass;
   LClassName: string;
 begin
+  //get de default form class
+  if DelphiObjectClass.InheritsFrom(TCommonCustomForm) then
+    LFormClass := TCommonCustomFormClass(DelphiObjectClass);
+
   //if we have a subclass of our Form wrapper, then check if we can find a
   //Delphi class that would have the same name as the Python class.
   //This would allow Python to instanciate an existing Delphi form class,
   //insted of only using a blank form.
-  LFormClass := nil;
   if (ob_type <> PythonType.TheTypePtr) then begin
     LClassName := string(ob_type.tp_name);
     LClass := GetClass(LClassName);
     if not Assigned(LClass) then
       LClass := GetClass('T' + LClassName);
     if Assigned(LClass) and LClass.InheritsFrom(TCommonCustomForm) then
       LFormClass := TCommonCustomFormClass(LClass);
-  end else begin
-    //get de default form class
-    if DelphiObjectClass.InheritsFrom(TCommonCustomForm) then
-      LFormClass := TCommonCustomFormClass(DelphiObjectClass);
   end;
 
-  if not Assigned(LFormClass) then
-    raise EInvalidFormClass.CreateFmt('Type %s is not a valid form class', [
-      DelphiObjectClass.ClassName]);
-
   //if it's not a design form, so we create it as a non-resourced form,
   //using the non-resourced constructor.
   //if the Owner is TApplication, then we have to call its CreateForm method,