Merge branch 'main' into 'main'

fix for TControl.GetDefaultColor never recursing up to parent

See merge request freepascal.org/lazarus/lazarus!452

components/codetools/pascalparsertool.pas

@@ -4708,8 +4708,16 @@ begin
     CreateChildNode;
     CurNode.Desc:=ctnIdentifier;
     CurNode.EndPos:=CurPos.EndPos;
-    EndChildNode;
     ReadNextAtom;
+    while CurPos.Flag = cafPoint do begin
+      // TMyClassClass = class of unit1.TMyClass
+      ReadNextAtom;
+      AtomIsIdentifierSaveE(20250403202500);
+      CurNode.EndPos:=CurPos.EndPos;
+      ReadNextAtom;
+    end;
+    EndChildNode;
+    ReadHintModifiers(False);
     if CurPos.Flag<>cafSemicolon then
       SaveRaiseCharExpectedButAtomFound(20170421195756,';');
   end else begin

components/codetools/tests/moduletests/fdt_classof.pas

@@ -6,6 +6,7 @@ interface
 
 type
   TClassOfMy = class of TMy{declaration:fdt_classof.TMy};
+  TClass1OfMy = class of TMy{declaration:fdt_classof.TMy} deprecated 'abc' experimental;
 
   { TMy }
 
@@ -14,6 +15,8 @@ type
     class procedure Run;
   end;
 
+  TClass2OfMy = class of fdt_classof.TMy{declaration!:fdt_classof.TMy};
+
 procedure DoIt;
 
 implementation

lcl/include/control.inc

@@ -1434,11 +1434,10 @@ const
   );
 begin
   Result := TWSControlClass(WidgetSetClass).GetDefaultColor(Self, DefaultColorType);
-  if (Result = clDefault) then
-    if ParentColor and Assigned(Parent) then
-      Result := Parent.GetDefaultColor(DefaultColorType)
+  if (Self.Color = clDefault) and ParentColor and Assigned(Parent) then
+      Result := Parent.GetDefaultColor(DefaultColorType)                      // recursion
     else
-      Result := DefColors[DefaultColorType];
+      if Result = clDefault then Result := DefColors[DefaultColorType];       // backstop
 end;
 
 function TControl.GetColorResolvingParent: TColor;

lcl/include/inputdialog.inc

@@ -81,6 +81,7 @@ begin
       Parent := Form;
       ShowBevel := False;
       ShowButtons := [pbOK, pbCancel];
+      Color:=Parent.GetDefaultColor(dctBrush);   // fix for wrong background colour
       Align := alTop;
     end;