Annotation of /trunk/mozilla-firefox/patches/mozilla-firefox-1.0.7-gtk-system-colors.patch
Parent Directory | Revision Log
Revision 153 -
(hide annotations)
(download)
Tue May 8 20:52:56 2007 UTC (17 years, 4 months ago) by niro
File size: 1283 byte(s)
Tue May 8 20:52:56 2007 UTC (17 years, 4 months ago) by niro
File size: 1283 byte(s)
-import
1 | niro | 153 | Index: widget/src/gtk2/nsLookAndFeel.cpp |
2 | =================================================================== | ||
3 | RCS file: /cvsroot/mozilla/widget/src/gtk2/nsLookAndFeel.cpp,v | ||
4 | retrieving revision 1.20 | ||
5 | diff -d -u -p -r1.20 nsLookAndFeel.cpp | ||
6 | --- widget/src/gtk2/nsLookAndFeel.cpp 17 Dec 2004 05:39:19 -0000 1.20 | ||
7 | +++ widget/src/gtk2/nsLookAndFeel.cpp 22 Feb 2005 20:13:35 -0000 | ||
8 | @@ -78,17 +78,16 @@ nsLookAndFeel::~nsLookAndFeel() | ||
9 | nsresult nsLookAndFeel::NativeGetColor(const nsColorID aID, nscolor& aColor) | ||
10 | { | ||
11 | nsresult res = NS_OK; | ||
12 | - aColor = 0; // default color black | ||
13 | |||
14 | switch (aID) { | ||
15 | // These colors don't seem to be used for anything anymore in Mozilla | ||
16 | // (except here at least TextSelectBackground and TextSelectForeground) | ||
17 | // The CSS2 colors below are used. | ||
18 | case eColor_WindowBackground: | ||
19 | - aColor = GDK_COLOR_TO_NS_RGB(mStyle->bg[GTK_STATE_NORMAL]); | ||
20 | + aColor = GDK_COLOR_TO_NS_RGB(mStyle->base[GTK_STATE_NORMAL]); | ||
21 | break; | ||
22 | case eColor_WindowForeground: | ||
23 | - aColor = GDK_COLOR_TO_NS_RGB(mStyle->fg[GTK_STATE_NORMAL]); | ||
24 | + aColor = GDK_COLOR_TO_NS_RGB(mStyle->text[GTK_STATE_NORMAL]); | ||
25 | break; | ||
26 | case eColor_WidgetBackground: | ||
27 | aColor = GDK_COLOR_TO_NS_RGB(mStyle->bg[GTK_STATE_NORMAL]); |