From 9c262a1e27954313202bca0ea8b72bcc4b301672 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 26 Nov 2007 17:43:07 +0000 Subject: [PATCH] Fix a theming problem with colors in GtkCalendar. (#499703, Michael 2007-11-26 Matthias Clasen * gtk/gtkcalendar.c: Fix a theming problem with colors in GtkCalendar. (#499703, Michael Hofmann) svn path=/branches/gtk-2-12/; revision=19056 --- ChangeLog | 9 +++++++++ gtk/gtkcalendar.c | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0f82a8118c..8eab848222 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,14 @@ 2007-11-26 Matthias Clasen + Merged from trunk: + + * gtk/gtkcalendar.c: Fix a theming problem with colors + in GtkCalendar. (#499703, Michael Hofmann) + +2007-11-26 Matthias Clasen + + Merged from trunk: + * gtk/gtkfilechooserbutton.c: * gtk/gtktoolbar.c: Don't use guint8 for bitfields, since some compilers choke on that. (#467722) diff --git a/gtk/gtkcalendar.c b/gtk/gtkcalendar.c index dc32cba7a8..61a832ac3f 100644 --- a/gtk/gtkcalendar.c +++ b/gtk/gtkcalendar.c @@ -191,10 +191,10 @@ dates_difference(guint year1, guint mm1, guint dd1, #define HEADER_BG_COLOR(widget) (& (widget)->style->bg[GTK_WIDGET_STATE (widget)]) #define SELECTED_BG_COLOR(widget) (& (widget)->style->base[GTK_WIDGET_HAS_FOCUS (widget) ? GTK_STATE_SELECTED : GTK_STATE_ACTIVE]) #define SELECTED_FG_COLOR(widget) (& (widget)->style->text[GTK_WIDGET_HAS_FOCUS (widget) ? GTK_STATE_SELECTED : GTK_STATE_ACTIVE]) -#define NORMAL_DAY_COLOR(widget) (& (widget)->style->fg[GTK_WIDGET_STATE (widget)]) +#define NORMAL_DAY_COLOR(widget) (& (widget)->style->text[GTK_WIDGET_STATE (widget)]) #define PREV_MONTH_COLOR(widget) (& (widget)->style->mid[GTK_WIDGET_STATE (widget)]) #define NEXT_MONTH_COLOR(widget) (& (widget)->style->mid[GTK_WIDGET_STATE (widget)]) -#define MARKED_COLOR(widget) (& (widget)->style->fg[GTK_WIDGET_STATE (widget)]) +#define MARKED_COLOR(widget) (& (widget)->style->text[GTK_WIDGET_STATE (widget)]) #define BACKGROUND_COLOR(widget) (& (widget)->style->base[GTK_WIDGET_STATE (widget)]) #define HIGHLIGHT_BACK_COLOR(widget) (& (widget)->style->mid[GTK_WIDGET_STATE (widget)])