diff --git a/lcl/include/customlabel.inc b/lcl/include/customlabel.inc index 6e5955bb10..f24f03ee7f 100644 --- a/lcl/include/customlabel.inc +++ b/lcl/include/customlabel.inc @@ -394,11 +394,6 @@ begin end; end; -function TCustomLabel.ColorIsStored: boolean; -begin - Result := (Color <> clNone); -end; - {------------------------------------------------------------------------------- function TCustomLabel.AdjustFontForOptimalFill: Boolean; @@ -433,7 +428,7 @@ const begin R := Rect(0,0,Width,Height); Canvas.Brush.Color := Color; - if (Color<>clNone) and not Transparent then + if not Transparent then begin Canvas.Brush.Style:=bsSolid; Canvas.FillRect(R); diff --git a/lcl/stdctrls.pp b/lcl/stdctrls.pp index be75a38188..08c045a70d 100644 --- a/lcl/stdctrls.pp +++ b/lcl/stdctrls.pp @@ -1606,12 +1606,11 @@ type function CalcFittingFontHeight(const TheText: string; MaxWidth, MaxHeight: Integer; out FontHeight, NeededWidth, NeededHeight: Integer): Boolean; - function ColorIsStored: boolean; override; function AdjustFontForOptimalFill: Boolean; procedure Paint; override; procedure SetBounds(aLeft, aTop, aWidth, aHeight: integer); override; property AutoSize default True; - property Color default clDefault; + property Color nodefault; end;