summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2007-11-26 17:42:35 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2007-11-26 17:42:35 +0000
commit225803d3cea634f68ca452e2d4f9f2e50cc53b61 (patch)
treef873b311ac4b9be521a51e85505912fc0d40be1d
parent8dd889e420e8fde803eb3f3340266424ba99a0cb (diff)
downloadgtk+-225803d3cea634f68ca452e2d4f9f2e50cc53b61.tar.gz
Fix a theming problem with colors in GtkCalendar. (#499703, Michael
2007-11-26 Matthias Clasen <mclasen@redhat.com> * gtk/gtkcalendar.c: Fix a theming problem with colors in GtkCalendar. (#499703, Michael Hofmann) svn path=/trunk/; revision=19055
-rw-r--r--ChangeLog5
-rw-r--r--gtk/gtkcalendar.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 9f96930326..65366c2c7a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2007-11-26 Matthias Clasen <mclasen@redhat.com>
+ * gtk/gtkcalendar.c: Fix a theming problem with colors
+ in GtkCalendar. (#499703, Michael Hofmann)
+
+2007-11-26 Matthias Clasen <mclasen@redhat.com>
+
* configure.in: Bump glib requirement to 2.15.0 (for g_test_init)
2007-11-26 Matthias Clasen <mclasen@redhat.com>
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)])