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

Gtk2: fixed long standing bug with clBtnText color, removed GetDefaultColor() for TToolBar and TCustomPanel, since it's color is ok now.

Browse Source 
git-svn-id: trunk@29491 -
This commit is contained in:
zeljko 2011-02-12 19:53:25 +00:00
parent be8772f584
commit 96ead3b94a
3 changed files with 1 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lcl/interfaces/gtk2/gtk2proc.inc
View File

@ -7047,7 +7047,7 @@ begin
SysColorMap[COLOR_BTNFACE] := TGDKColorToTColor(bg[GTK_STATE_INSENSITIVE]); SysColorMap[COLOR_BTNFACE] := TGDKColorToTColor(bg[GTK_STATE_INSENSITIVE]);
SysColorMap[COLOR_BTNSHADOW] := TGDKColorToTColor(dark[GTK_STATE_INSENSITIVE]); SysColorMap[COLOR_BTNSHADOW] := TGDKColorToTColor(dark[GTK_STATE_INSENSITIVE]);
SysColorMap[COLOR_BTNTEXT] := TGDKColorToTColor(fg[GTK_STATE_INSENSITIVE]); SysColorMap[COLOR_BTNTEXT] := TGDKColorToTColor(fg[GTK_STATE_NORMAL]);
SysColorMap[COLOR_BTNHIGHLIGHT] := TGDKColorToTColor(light[GTK_STATE_INSENSITIVE]); SysColorMap[COLOR_BTNHIGHLIGHT] := TGDKColorToTColor(light[GTK_STATE_INSENSITIVE]);
SysColorMap[COLOR_3DDKSHADOW] := TGDKColorToTColor(black); SysColorMap[COLOR_3DDKSHADOW] := TGDKColorToTColor(black);
SysColorMap[COLOR_3DLIGHT] := TGDKColorToTColor(bg[GTK_STATE_INSENSITIVE]); SysColorMap[COLOR_3DLIGHT] := TGDKColorToTColor(bg[GTK_STATE_INSENSITIVE]);

10
lcl/interfaces/gtk2/gtk2wscomctrls.pp
View File

@ -205,7 +205,6 @@ type
class procedure SetCallbacks(const AWidget: PGtkWidget; const AWidgetInfo: PWidgetInfo); virtual; class procedure SetCallbacks(const AWidget: PGtkWidget; const AWidgetInfo: PWidgetInfo); virtual;
published published
class function CreateHandle(const AWinControl: TWinControl; const AParams: TCreateParams): TLCLIntfHandle; override; class function CreateHandle(const AWinControl: TWinControl; const AParams: TCreateParams): TLCLIntfHandle; override;
class function GetDefaultColor(const AControl: TControl; const ADefaultColorType: TDefaultColorType): TColor; override;
end; end;
{ TGtk2WSTrackBar } { TGtk2WSTrackBar }
@ -628,13 +627,4 @@ begin
SetCallbacks(Widget, WidgetInfo); SetCallbacks(Widget, WidgetInfo);
end; end;
class function TGtk2WSToolBar.GetDefaultColor(const AControl: TControl;
const ADefaultColorType: TDefaultColorType): TColor;
begin
if ADefaultColorType = dctFont then
Result := clWindowText
else
Result := clDefault;
end;
end. end.

10
lcl/interfaces/gtk2/gtk2wsextctrls.pp
View File

@ -191,7 +191,6 @@ type
class procedure SetCallbacks(const AGtkWidget: PGtkWidget; const AWidgetInfo: PWidgetInfo); virtual; class procedure SetCallbacks(const AGtkWidget: PGtkWidget; const AWidgetInfo: PWidgetInfo); virtual;
published published
class function CreateHandle(const AWinControl: TWinControl; const AParams: TCreateParams): TLCLIntfHandle; override; class function CreateHandle(const AWinControl: TWinControl; const AParams: TCreateParams): TLCLIntfHandle; override;
class function GetDefaultColor(const AControl: TControl; const ADefaultColorType: TDefaultColorType): TColor; override;
class procedure SetColor(const AWinControl: TWinControl); override; class procedure SetColor(const AWinControl: TWinControl); override;
end; end;
@ -791,15 +790,6 @@ begin
SetCallbacks(Widget, WidgetInfo); SetCallbacks(Widget, WidgetInfo);
end; end;
class function TGtk2WSCustomPanel.GetDefaultColor(const AControl: TControl;
const ADefaultColorType: TDefaultColorType): TColor;
begin
if ADefaultColorType = dctFont then
Result := clWindowText
else
Result := clDefault;
end;
class procedure TGtk2WSCustomPanel.SetColor(const AWinControl: TWinControl); class procedure TGtk2WSCustomPanel.SetColor(const AWinControl: TWinControl);
var var
MainWidget: PGtkWidget; MainWidget: PGtkWidget;