paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-19 01:49:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: trunk@28411 -
This commit is contained in:
zeljko 2010-11-22 16:19:05 +00:00
parent 136094c9c3
commit c2e17f304b
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lcl/interfaces/carbon/carbonprivate.pp
View File

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

13
lcl/interfaces/carbon/carbonwsstdctrls.pp
View File

@ -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 }
{------------------------------------------------------------------------------