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

gtk: treat clBtnFace as default bg color as it was before (temporary solution)

Browse Source 
git-svn-id: trunk@20446 -
This commit is contained in:
paul 2009-06-05 16:24:35 +00:00
parent a20af130ed
commit b92167f4b3
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lcl/interfaces/gtk/gtkint.pp
View File

@ -236,9 +236,9 @@ type
; const AComponent: TComponent = nil;
const ASignalWidget: PGTKWidget = nil;
const ASignal: PChar = nil{$ENDIF}); virtual; abstract;
procedure SetWidgetColor(const AWidget : PGtkWidget;
const FGColor,BGColor : TColor;
const Mask : tGtkStateEnum);
procedure SetWidgetColor(const AWidget: PGtkWidget;
const FGColor, BGColor: TColor;
const Mask: tGtkStateEnum);
procedure SetWidgetFont(const AWidget : PGtkWidget;const AFONT : tFont); virtual; abstract;
procedure SetCallbackEx(const AMsg: LongInt; const AGTKObject: PGTKObject;
const ALCLObject: TObject; Direct: boolean); virtual;

4
lcl/interfaces/gtk/gtkwidgetset.inc
View File

@ -1066,7 +1066,7 @@ begin
if ChangeBGColor then
begin
if BGColor = clBackground then
if (BGColor = clBackground) or (BGColor = clBtnFace) then
begin
RCStyle := gtk_rc_get_style(AWidget);
if RCStyle <> nil then
@ -1133,7 +1133,7 @@ begin
if ChangeBGColor then
begin
if BGColor = clBackground then
if (BGColor = clBackground) or (BGColor = clBtnFace) then
NewColor := nil
else
begin

2
lcl/interfaces/gtk2/gtk2wsstdctrls.pp
View File

@ -1958,7 +1958,7 @@ var
BtnWidget: PGTKWidget;
begin
BtnWidget := PGTKWidget(GetButtonWidget(PGtkEventBox(AWinControl.Handle)));
Gtk2WidgetSet.SetWidgetColor(BtnWidget, clNone, AWinControl.color,
Gtk2WidgetSet.SetWidgetColor(BtnWidget, clNone, AWinControl.Color,
[GTK_STATE_NORMAL,GTK_STATE_ACTIVE,GTK_STATE_PRELIGHT,GTK_STATE_SELECTED]);
end;