Merge branch 'main' into 'main'

fix for TControl.GetDefaultColor never recursing up to parent

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

components/jcf2/Ui/Settings/fRegistrySettings.pas

@@ -233,7 +233,7 @@ begin
   rgWriteSettingsFile.Caption := lisCnfGenWriteSettings;
   rgWriteSettingsFile.Items[0] := lisCnfGenAlways;
   rgWriteSettingsFile.Items[1] := lisCnfGenFail;
-  //rgWriteSettingsFile.Items[2] := lisCnfGenNever;
+  rgWriteSettingsFile.Items[2] := lisCnfGenNever;
   rgShowParseTree.Caption := lisCnfGenShowParseTree;
   rgShowParseTree.Items[0] := lisCnfGenAlways;
   rgShowParseTree.Items[1] := lisCnfGenOnParseError;

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;