From 6dd4f32f378d19d715264bdc9c453cf389de8aa9 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 28 Aug 2010 19:09:21 -0400 Subject: [PATCH] Remove deprecated GTK_CALENDAR_WEEK_START_MONDAY option This has been deprecated and ignored for a long time. --- gtk/gtkcalendar.c | 8 ++------ gtk/gtkcalendar.h | 3 --- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/gtk/gtkcalendar.c b/gtk/gtkcalendar.c index 4470a38115..5dfffebfd9 100644 --- a/gtk/gtkcalendar.c +++ b/gtk/gtkcalendar.c @@ -3875,20 +3875,16 @@ gtk_calendar_set_display_options (GtkCalendar *calendar, } } - if ((flags ^ priv->display_flags) & GTK_CALENDAR_WEEK_START_MONDAY) - g_warning ("GTK_CALENDAR_WEEK_START_MONDAY is ignored; the first day of the week is determined from the locale"); - if ((flags ^ priv->display_flags) & GTK_CALENDAR_SHOW_DETAILS) resize++; priv->display_flags = flags; if (resize) gtk_widget_queue_resize (GTK_WIDGET (calendar)); - - } + } else priv->display_flags = flags; - + g_object_freeze_notify (G_OBJECT (calendar)); if ((old_flags ^ priv->display_flags) & GTK_CALENDAR_SHOW_HEADING) g_object_notify (G_OBJECT (calendar), "show-heading"); diff --git a/gtk/gtkcalendar.h b/gtk/gtkcalendar.h index 51cd8f3c39..feafd48d9e 100644 --- a/gtk/gtkcalendar.h +++ b/gtk/gtkcalendar.h @@ -59,8 +59,6 @@ typedef struct _GtkCalendarPrivate GtkCalendarPrivate; * @GTK_CALENDAR_NO_MONTH_CHANGE: Prevents the user from switching months with the calendar. * @GTK_CALENDAR_SHOW_WEEK_NUMBERS: Displays each week numbers of the current year, down the * left side of the calendar. - * @GTK_CALENDAR_WEEK_START_MONDAY: Since GTK+ 2.4, this option is deprecated and ignored by GTK+. - * The information on which day the calendar week starts is derived from the locale. * @GTK_CALENDAR_SHOW_DETAILS: Just show an indicator, not the full details * text when details are provided. See gtk_calendar_set_detail_func(). * @@ -72,7 +70,6 @@ typedef enum GTK_CALENDAR_SHOW_DAY_NAMES = 1 << 1, GTK_CALENDAR_NO_MONTH_CHANGE = 1 << 2, GTK_CALENDAR_SHOW_WEEK_NUMBERS = 1 << 3, - GTK_CALENDAR_WEEK_START_MONDAY = 1 << 4, GTK_CALENDAR_SHOW_DETAILS = 1 << 5 } GtkCalendarDisplayOptions;