carbon: fixed clDefault for TGroupBox.Part of issue #17994

git-svn-id: trunk@28411 -

lcl/interfaces/carbon/carbonprivate.pp

@@ -1290,9 +1290,14 @@ end;
   Sets groupbox's color
  ------------------------------------------------------------------------------}
 procedure TCarbonGroupBox.SetColor(const AColor: TColor);
+var
+  TempColor: TColor;
 begin
-  FBoxColor:=AColor;
+  TempColor := AColor;
-  inherited SetColor(AColor);
+  if TempColor = clDefault then
+    TempColor := LCLObject.GetDefaultColor(dctBrush);
+  FBoxColor := TempColor;
+  inherited SetColor(TempColor);
 end;
 
 { TCarbonStatusBar }

lcl/interfaces/carbon/carbonwsstdctrls.pp

@@ -55,6 +55,7 @@ type
   TCarbonWSCustomGroupBox = class(TWSCustomGroupBox)
   published
     class function CreateHandle(const AWinControl: TWinControl; const AParams: TCreateParams): TLCLIntfHandle; override;
+    class function GetDefaultColor(const AControl: TControl; const ADefaultColorType: TDefaultColorType): TColor; override;
   end;
 
   { TCarbonWSGroupBox }
@@ -293,6 +294,18 @@ begin
   Result := TLCLIntfHandle(TCarbonGroupBox.Create(AWinControl, AParams));
 end;
 
+class function TCarbonWSCustomGroupBox.GetDefaultColor(
+  const AControl: TControl; const ADefaultColorType: TDefaultColorType
+  ): TColor;
+const
+  DefColors: array[TDefaultColorType] of TColor = (
+ { dctBrush } clBtnFace,
+ { dctFont  } clBtnText
+  );
+begin
+  Result := DefColors[ADefaultColorType];
+end;
+
 { TCarbonWSCustomComboBox }
 
 {------------------------------------------------------------------------------