]> Pileus Git - ~andy/gtk/blobdiff - gtk/gtkcalendar.c
Small documentation tweak
[~andy/gtk] / gtk / gtkcalendar.c
index 141bc61b4e9ac8c2a13749085ad159951aade222..cfceb08a1530698aec9c2ca9606e44b1229d2fd8 100644 (file)
@@ -2,8 +2,8 @@
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * GTK Calendar Widget
- * Copyright (C) 1998 Cesar Miquel, Shawn T. Amundson and Mattias Grรถnlund
- * 
+ * Copyright (C) 1998 Cesar Miquel, Shawn T. Amundson and Mattias Groenlund
+ *
  * lib_date routines
  * Copyright (c) 1995, 1996, 1997, 1998 by Steffen Beyer
  *
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.         See the GNU
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.Free
  */
 
 /*
  * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
  * file for a list of people on the GTK+ Team.  See the ChangeLog
  * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
+ */
+
+/**
+ * SECTION:gtkcalendar
+ * @Short_description: Displays a calendar and allows the user to select a date
+ * @Title: GtkCalendar
+ *
+ * #GtkCalendar is a widget that displays a Gregorian calendar, one month
+ * at a time. It can be created with gtk_calendar_new().
+ *
+ * The month and year currently displayed can be altered with
+ * gtk_calendar_select_month(). The exact day can be selected from the
+ * displayed month using gtk_calendar_select_day().
+ *
+ * To place a visual marker on a particular day, use gtk_calendar_mark_day()
+ * and to remove the marker, gtk_calendar_unmark_day(). Alternative, all
+ * marks can be cleared with gtk_calendar_clear_marks().
+ *
+ * The way in which the calendar itself is displayed can be altered using
+ * gtk_calendar_set_display_options().
+ *
+ * The selected date can be retrieved from a #GtkCalendar using
+ * gtk_calendar_get_date().
+ *
+ * Users should be aware that, although the Gregorian calendar is the legal
+ * calendar in most countries, it was adopted progressively between 1582 and
+ * 1929. Display before these dates is likely to be historically incorrect.
  */
 
 #include "config.h"
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
+#ifdef HAVE__NL_TIME_FIRST_WEEKDAY
+#include <langinfo.h>
+#endif
 #include <string.h>
 #include <stdlib.h>
 #include <time.h>
-#include <glib/gprintf.h>
+
+#include <glib.h>
+
+#ifdef G_OS_WIN32
+#include <windows.h>
+#endif
 
 #include "gtkcalendar.h"
 #include "gtkdnd.h"
 #include "gtkintl.h"
 #include "gtkmain.h"
 #include "gtkmarshalers.h"
-#include "gtkintl.h"
-#include "gdk/gdkkeysyms.h"
+#include "gtktooltip.h"
+#include "gtkprivate.h"
 
 /***************************************************************************/
-/* The following date routines are taken from the lib_date package.  Keep
- * them seperate in case we want to update them if a newer lib_date comes
- * out with fixes.  */
-
-typedef         unsigned   int     N_int;
-typedef         unsigned   long    N_long;
-typedef         signed     long    Z_long;
-typedef enum { false = FALSE , true = TRUE } boolean;
-
-#define and        &&      /* logical (boolean) operators: lower case */
-#define or         ||
+/* The following date routines are taken from the lib_date package.
+ * They have been minimally edited to avoid conflict with types defined
+ * in win32 headers.
+ */
 
-static const N_int month_length[2][13] =
+static const guint month_length[2][13] =
 {
   { 0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 },
   { 0, 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }
 };
 
-static const N_int days_in_months[2][14] =
+static const guint days_in_months[2][14] =
 {
   { 0, 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365 },
   { 0, 0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335, 366 }
 };
 
-static Z_long  calc_days(N_int year, N_int mm, N_int dd);
-static N_int   day_of_week(N_int year, N_int mm, N_int dd);
-static Z_long  dates_difference(N_int year1, N_int mm1, N_int dd1,
-                               N_int year2, N_int mm2, N_int dd2);
-static N_int   weeks_in_year(N_int year);
+static glong  calc_days(guint year, guint mm, guint dd);
+static guint  day_of_week(guint year, guint mm, guint dd);
+static glong  dates_difference(guint year1, guint mm1, guint dd1,
+                               guint year2, guint mm2, guint dd2);
+static guint  weeks_in_year(guint year);
 
-static boolean 
-leap(N_int year)
+static gboolean
+leap (guint year)
 {
-  return((((year % 4) == 0) and ((year % 100) != 0)) or ((year % 400) == 0));
+  return((((year % 4) == 0) && ((year % 100) != 0)) || ((year % 400) == 0));
 }
 
-static N_int 
-day_of_week(N_int year, N_int mm, N_int dd)
+static guint
+day_of_week (guint year, guint mm, guint dd)
 {
-  Z_long  days;
-  
+  glong  days;
+
   days = calc_days(year, mm, dd);
   if (days > 0L)
     {
@@ -96,72 +123,72 @@ day_of_week(N_int year, N_int mm, N_int dd)
       days %= 7L;
       days++;
     }
-  return( (N_int) days );
+  return( (guint) days );
 }
 
-static N_int weeks_in_year(N_int year)
+static guint weeks_in_year(guint year)
 {
-  return(52 + ((day_of_week(year,1,1)==4) or (day_of_week(year,12,31)==4)));
+  return(52 + ((day_of_week(year,1,1)==4) || (day_of_week(year,12,31)==4)));
 }
 
-static boolean 
-check_date(N_int year, N_int mm, N_int dd)
+static gboolean
+check_date(guint year, guint mm, guint dd)
 {
-  if (year < 1) return(false);
-  if ((mm < 1) or (mm > 12)) return(false);
-  if ((dd < 1) or (dd > month_length[leap(year)][mm])) return(false);
-  return(true);
+  if (year < 1) return FALSE;
+  if ((mm < 1) || (mm > 12)) return FALSE;
+  if ((dd < 1) || (dd > month_length[leap(year)][mm])) return FALSE;
+  return TRUE;
 }
 
-static N_int 
-week_number(N_int year, N_int mm, N_int dd)
+static guint
+week_number(guint year, guint mm, guint dd)
 {
-  N_int first;
-  
+  guint first;
+
   first = day_of_week(year,1,1) - 1;
-  return( (N_int) ( (dates_difference(year,1,1, year,mm,dd) + first) / 7L ) +
-         (first < 4) );
+  return( (guint) ( (dates_difference(year,1,1, year,mm,dd) + first) / 7L ) +
+          (first < 4) );
 }
 
-static Z_long 
-year_to_days(N_int year)
+static glong
+year_to_days(guint year)
 {
   return( year * 365L + (year / 4) - (year / 100) + (year / 400) );
 }
 
 
-static Z_long 
-calc_days(N_int year, N_int mm, N_int dd)
+static glong
+calc_days(guint year, guint mm, guint dd)
 {
-  boolean lp;
-  
+  gboolean lp;
+
   if (year < 1) return(0L);
-  if ((mm < 1) or (mm > 12)) return(0L);
-  if ((dd < 1) or (dd > month_length[(lp = leap(year))][mm])) return(0L);
+  if ((mm < 1) || (mm > 12)) return(0L);
+  if ((dd < 1) || (dd > month_length[(lp = leap(year))][mm])) return(0L);
   return( year_to_days(--year) + days_in_months[lp][mm] + dd );
 }
 
-static boolean 
-week_of_year(N_int *week, N_int *year, N_int mm, N_int dd)
+static gboolean
+week_of_year(guint *week, guint *year, guint mm, guint dd)
 {
   if (check_date(*year,mm,dd))
     {
       *week = week_number(*year,mm,dd);
-      if (*week == 0) 
-       *week = weeks_in_year(--(*year));
+      if (*week == 0)
+        *week = weeks_in_year(--(*year));
       else if (*week > weeks_in_year(*year))
-       {
-         *week = 1;
-         (*year)++;
-       }
-      return(true);
+        {
+          *week = 1;
+          (*year)++;
+        }
+      return TRUE;
     }
-  return(false);
+  return FALSE;
 }
 
-static Z_long 
-dates_difference(N_int year1, N_int mm1, N_int dd1,
-                N_int year2, N_int mm2, N_int dd2)
+static glong
+dates_difference(guint year1, guint mm1, guint dd1,
+                 guint year2, guint mm2, guint dd2)
 {
   return( calc_days(year2, mm2, dd2) - calc_days(year1, mm1, dd1) );
 }
@@ -169,28 +196,12 @@ dates_difference(N_int year1, N_int mm1, N_int dd1,
 /*** END OF lib_date routines ********************************************/
 
 /* Spacing around day/week headers and main area, inside those windows */
-#define CALENDAR_MARGIN                 0
-/* Spacing around day/week headers and main area, outside those windows */
-#define INNER_BORDER            4
-/* Separation between day headers and main area */
-#define CALENDAR_YSEP           4
-/* Separation between week headers and main area */
-#define CALENDAR_XSEP           4
-
-#define DAY_XSEP                0 /* not really good for small calendar */
-#define DAY_YSEP                0 /* not really good for small calendar */
-
-/* Color usage */
-#define HEADER_FG_COLOR(widget)                 (& (widget)->style->fg[GTK_WIDGET_STATE (widget)])
-#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 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 BACKGROUND_COLOR(widget)        (& (widget)->style->base[GTK_WIDGET_STATE (widget)])
-#define HIGHLIGHT_BACK_COLOR(widget)    (& (widget)->style->mid[GTK_WIDGET_STATE (widget)])
+#define CALENDAR_MARGIN          0
+
+#define DAY_XSEP                 0 /* not really good for small calendar */
+#define DAY_YSEP                 0 /* not really good for small calendar */
+
+#define SCROLL_DELAY_FACTOR      5
 
 enum {
   ARROW_YEAR_LEFT,
@@ -226,31 +237,44 @@ enum
   PROP_SHOW_DAY_NAMES,
   PROP_NO_MONTH_CHANGE,
   PROP_SHOW_WEEK_NUMBERS,
-  PROP_LAST
+  PROP_SHOW_DETAILS,
+  PROP_DETAIL_WIDTH_CHARS,
+  PROP_DETAIL_HEIGHT_ROWS
 };
 
-static gint gtk_calendar_signals[LAST_SIGNAL] = { 0 };
-
-static GtkWidgetClass *parent_class = NULL;
+static guint gtk_calendar_signals[LAST_SIGNAL] = { 0 };
 
-typedef struct _GtkCalendarPrivateData GtkCalendarPrivateData;
-struct _GtkCalendarPrivateData
+struct _GtkCalendarPrivate
 {
-  GdkWindow *header_win;
-  GdkWindow *day_name_win;
+  GtkCalendarDisplayOptions display_flags;
+
   GdkWindow *main_win;
-  GdkWindow *week_win;
   GdkWindow *arrow_win[4];
 
+  gchar grow_space [32];
+
+  gint  month;
+  gint  year;
+  gint  selected_day;
+
+  gint  day_month[6][7];
+  gint  day[6][7];
+
+  gint  num_marked_dates;
+  gint  marked_date[31];
+
+  gint  focus_row;
+  gint  focus_col;
+
   guint header_h;
   guint day_name_h;
   guint main_h;
 
-  guint             arrow_state[4];
-  guint             arrow_width;
-  guint             max_month_width;
-  guint             max_year_width;
-  
+  guint arrow_prelight : 4;
+  guint arrow_width;
+  guint max_month_width;
+  guint max_year_width;
+
   guint day_width;
   guint week_width;
 
@@ -261,15 +285,8 @@ struct _GtkCalendarPrivateData
   guint max_label_char_ascent;
   guint max_label_char_descent;
   guint max_week_char_width;
-  
-  guint freeze_count;
 
   /* flags */
-  guint dirty_header : 1;
-  guint dirty_day_names : 1;
-  guint dirty_main : 1;
-  guint dirty_week : 1;
-
   guint year_before : 1;
 
   guint need_timer  : 1;
@@ -284,154 +301,141 @@ struct _GtkCalendarPrivateData
 
   gint drag_start_x;
   gint drag_start_y;
+
+  /* Optional callback, used to display extra information for each day. */
+  GtkCalendarDetailFunc detail_func;
+  gpointer              detail_func_user_data;
+  GDestroyNotify        detail_func_destroy;
+
+  /* Size requistion for details provided by the hook. */
+  gint detail_height_rows;
+  gint detail_width_chars;
+  gint detail_overflow[6];
 };
 
-#define GTK_CALENDAR_PRIVATE_DATA(widget)  (((GtkCalendarPrivateData*)(GTK_CALENDAR (widget)->private_data)))
-
-typedef void (*GtkCalendarSignalDate) (GtkObject *object, guint arg1, guint arg2, guint arg3, gpointer data);
-
-static void gtk_calendar_class_init    (GtkCalendarClass *class);
-static void gtk_calendar_init          (GtkCalendar *calendar);
-static void gtk_calendar_finalize      (GObject *calendar);
-static void gtk_calendar_destroy       (GtkObject *calendar);
-static void gtk_calendar_set_property   (GObject      *object,
-                                        guint         prop_id,
-                                        const GValue *value,
-                                        GParamSpec   *pspec);
-static void gtk_calendar_get_property   (GObject      *object,
-                                        guint         prop_id,
-                                        GValue       *value,
-                                        GParamSpec   *pspec);
-static void gtk_calendar_realize       (GtkWidget *widget);
-static void gtk_calendar_unrealize     (GtkWidget *widget);
-static void gtk_calendar_size_request  (GtkWidget *widget,
-                                        GtkRequisition *requisition);
-static void gtk_calendar_size_allocate (GtkWidget *widget,
-                                        GtkAllocation *allocation);
-static gint gtk_calendar_expose                (GtkWidget *widget,
-                                        GdkEventExpose *event);
-static gint gtk_calendar_button_press  (GtkWidget *widget,
-                                        GdkEventButton *event);
-static gint gtk_calendar_button_release        (GtkWidget *widget,
-                                        GdkEventButton *event);
-static void gtk_calendar_main_button   (GtkWidget *widget,
-                                        GdkEventButton *event);
-static gint gtk_calendar_motion_notify (GtkWidget *widget,
-                                        GdkEventMotion *event);
-static gint gtk_calendar_enter_notify  (GtkWidget *widget,
-                                        GdkEventCrossing *event);
-static gint gtk_calendar_leave_notify  (GtkWidget *widget,
-                                        GdkEventCrossing *event);
-static gint gtk_calendar_key_press     (GtkWidget         *widget,
-                                        GdkEventKey       *event);
-static gint gtk_calendar_scroll         (GtkWidget         *widget,
-                                        GdkEventScroll    *event);
-static void gtk_calendar_grab_notify    (GtkWidget          *widget,
-                                        gboolean            was_grabbed);
-static void gtk_calendar_state_changed (GtkWidget *widget,
-                                        GtkStateType previous_state);
-static void gtk_calendar_style_set     (GtkWidget *widget,
-                                        GtkStyle  *previous_style);
-static void gtk_calendar_paint_header      (GtkWidget *widget);
-static void gtk_calendar_paint_day_names    (GtkWidget *widget);
-static void gtk_calendar_paint_week_numbers (GtkWidget *widget);
-static void gtk_calendar_paint_main        (GtkWidget *widget);
-
-static void gtk_calendar_select_and_focus_day (GtkCalendar *calendar,
-                                              guint        day);
-
-static void gtk_calendar_paint_arrow   (GtkWidget    *widget,
-                                        guint         arrow);
-static void gtk_calendar_paint_day_num (GtkWidget    *widget,
-                                        gint          day);
-static void gtk_calendar_paint_day     (GtkWidget    *widget,
-                                        gint          row,
-                                        gint          col);
-static void gtk_calendar_compute_days  (GtkCalendar  *calendar);
-static gint left_x_for_column          (GtkCalendar  *calendar,
-                                        gint          column);
-static gint top_y_for_row              (GtkCalendar  *calendar,
-                                        gint          row);
-
-static void gtk_calendar_drag_data_get      (GtkWidget        *widget,
-                                            GdkDragContext   *context,
-                                            GtkSelectionData *selection_data,
-                                            guint             info,
-                                            guint             time);
-static void gtk_calendar_drag_data_received (GtkWidget        *widget,
-                                            GdkDragContext   *context,
-                                            gint              x,
-                                            gint              y,
-                                            GtkSelectionData *selection_data,
-                                            guint             info,
-                                            guint             time);
-static gboolean gtk_calendar_drag_motion    (GtkWidget        *widget,
-                                            GdkDragContext   *context,
-                                            gint              x,
-                                            gint              y,
-                                            guint             time);
-static void gtk_calendar_drag_leave         (GtkWidget        *widget,
-                                            GdkDragContext   *context,
-                                            guint             time);
-static gboolean gtk_calendar_drag_drop      (GtkWidget        *widget,
-                                            GdkDragContext   *context,
-                                            gint              x,
-                                            gint              y,
-                                            guint             time);
-     
+#define GTK_CALENDAR_GET_PRIVATE(widget)  (GTK_CALENDAR (widget)->priv)
+
+static void gtk_calendar_finalize     (GObject      *calendar);
+static void gtk_calendar_destroy      (GtkWidget    *widget);
+static void gtk_calendar_set_property (GObject      *object,
+                                       guint         prop_id,
+                                       const GValue *value,
+                                       GParamSpec   *pspec);
+static void gtk_calendar_get_property (GObject      *object,
+                                       guint         prop_id,
+                                       GValue       *value,
+                                       GParamSpec   *pspec);
+
+static void     gtk_calendar_realize        (GtkWidget        *widget);
+static void     gtk_calendar_unrealize      (GtkWidget        *widget);
+static void     gtk_calendar_map            (GtkWidget        *widget);
+static void     gtk_calendar_unmap          (GtkWidget        *widget);
+static void     gtk_calendar_get_preferred_width  (GtkWidget   *widget,
+                                                   gint        *minimum,
+                                                   gint        *natural);
+static void     gtk_calendar_get_preferred_height (GtkWidget   *widget,
+                                                   gint        *minimum,
+                                                   gint        *natural);
+static void     gtk_calendar_size_allocate  (GtkWidget        *widget,
+                                             GtkAllocation    *allocation);
+static gboolean gtk_calendar_draw           (GtkWidget        *widget,
+                                             cairo_t          *cr);
+static gboolean gtk_calendar_button_press   (GtkWidget        *widget,
+                                             GdkEventButton   *event);
+static gboolean gtk_calendar_button_release (GtkWidget        *widget,
+                                             GdkEventButton   *event);
+static gboolean gtk_calendar_motion_notify  (GtkWidget        *widget,
+                                             GdkEventMotion   *event);
+static gboolean gtk_calendar_enter_notify   (GtkWidget        *widget,
+                                             GdkEventCrossing *event);
+static gboolean gtk_calendar_leave_notify   (GtkWidget        *widget,
+                                             GdkEventCrossing *event);
+static gboolean gtk_calendar_scroll         (GtkWidget        *widget,
+                                             GdkEventScroll   *event);
+static gboolean gtk_calendar_key_press      (GtkWidget        *widget,
+                                             GdkEventKey      *event);
+static gboolean gtk_calendar_focus_out      (GtkWidget        *widget,
+                                             GdkEventFocus    *event);
+static void     gtk_calendar_grab_notify    (GtkWidget        *widget,
+                                             gboolean          was_grabbed);
+static void     gtk_calendar_state_flags_changed  (GtkWidget     *widget,
+                                                   GtkStateFlags  previous_state);
+static gboolean gtk_calendar_query_tooltip  (GtkWidget        *widget,
+                                             gint              x,
+                                             gint              y,
+                                             gboolean          keyboard_mode,
+                                             GtkTooltip       *tooltip);
+
+static void     gtk_calendar_drag_data_get      (GtkWidget        *widget,
+                                                 GdkDragContext   *context,
+                                                 GtkSelectionData *selection_data,
+                                                 guint             info,
+                                                 guint             time);
+static void     gtk_calendar_drag_data_received (GtkWidget        *widget,
+                                                 GdkDragContext   *context,
+                                                 gint              x,
+                                                 gint              y,
+                                                 GtkSelectionData *selection_data,
+                                                 guint             info,
+                                                 guint             time);
+static gboolean gtk_calendar_drag_motion        (GtkWidget        *widget,
+                                                 GdkDragContext   *context,
+                                                 gint              x,
+                                                 gint              y,
+                                                 guint             time);
+static void     gtk_calendar_drag_leave         (GtkWidget        *widget,
+                                                 GdkDragContext   *context,
+                                                 guint             time);
+static gboolean gtk_calendar_drag_drop          (GtkWidget        *widget,
+                                                 GdkDragContext   *context,
+                                                 gint              x,
+                                                 gint              y,
+                                                 guint             time);
+
+
+static void calendar_start_spinning (GtkCalendar *calendar,
+                                     gint         click_child);
+static void calendar_stop_spinning  (GtkCalendar *calendar);
+
+static void calendar_invalidate_day     (GtkCalendar *widget,
+                                         gint       row,
+                                         gint       col);
+static void calendar_invalidate_day_num (GtkCalendar *widget,
+                                         gint       day);
+static void calendar_invalidate_arrow   (GtkCalendar *widget,
+                                         guint      arrow);
+
+static void calendar_compute_days      (GtkCalendar *calendar);
+static gint calendar_get_xsep          (GtkCalendar *calendar);
+static gint calendar_get_ysep          (GtkCalendar *calendar);
+static gint calendar_get_inner_border  (GtkCalendar *calendar);
+
 static char    *default_abbreviated_dayname[7];
 static char    *default_monthname[12];
 
-GType
-gtk_calendar_get_type (void)
-{
-  static GType calendar_type = 0;
-  
-  if (!calendar_type)
-    {
-      static const GTypeInfo calendar_info =
-      {
-       sizeof (GtkCalendarClass),
-       NULL,           /* base_init */
-       NULL,           /* base_finalize */
-       (GClassInitFunc) gtk_calendar_class_init,
-       NULL,           /* class_finalize */
-       NULL,           /* class_data */
-       sizeof (GtkCalendar),
-       0,              /* n_preallocs */
-       (GInstanceInitFunc) gtk_calendar_init,
-      };
-
-      calendar_type = g_type_register_static (GTK_TYPE_WIDGET, "GtkCalendar",
-                                             &calendar_info, 0);
-    }
-  
-  return calendar_type;
-}
+G_DEFINE_TYPE (GtkCalendar, gtk_calendar, GTK_TYPE_WIDGET)
 
 static void
 gtk_calendar_class_init (GtkCalendarClass *class)
 {
   GObjectClass   *gobject_class;
-  GtkObjectClass   *object_class;
   GtkWidgetClass *widget_class;
 
   gobject_class = (GObjectClass*)  class;
-  object_class = (GtkObjectClass*)  class;
   widget_class = (GtkWidgetClass*) class;
-  
-  parent_class = g_type_class_peek_parent (class);
-  
+
   gobject_class->set_property = gtk_calendar_set_property;
   gobject_class->get_property = gtk_calendar_get_property;
   gobject_class->finalize = gtk_calendar_finalize;
 
-  object_class->destroy = gtk_calendar_destroy;
-
+  widget_class->destroy = gtk_calendar_destroy;
   widget_class->realize = gtk_calendar_realize;
   widget_class->unrealize = gtk_calendar_unrealize;
-  widget_class->expose_event = gtk_calendar_expose;
-  widget_class->size_request = gtk_calendar_size_request;
+  widget_class->map = gtk_calendar_map;
+  widget_class->unmap = gtk_calendar_unmap;
+  widget_class->draw = gtk_calendar_draw;
+  widget_class->get_preferred_width = gtk_calendar_get_preferred_width;
+  widget_class->get_preferred_height = gtk_calendar_get_preferred_height;
   widget_class->size_allocate = gtk_calendar_size_allocate;
   widget_class->button_press_event = gtk_calendar_button_press;
   widget_class->button_release_event = gtk_calendar_button_release;
@@ -440,45 +444,61 @@ gtk_calendar_class_init (GtkCalendarClass *class)
   widget_class->leave_notify_event = gtk_calendar_leave_notify;
   widget_class->key_press_event = gtk_calendar_key_press;
   widget_class->scroll_event = gtk_calendar_scroll;
-  widget_class->style_set = gtk_calendar_style_set;
-  widget_class->state_changed = gtk_calendar_state_changed;
+  widget_class->state_flags_changed = gtk_calendar_state_flags_changed;
   widget_class->grab_notify = gtk_calendar_grab_notify;
+  widget_class->focus_out_event = gtk_calendar_focus_out;
+  widget_class->query_tooltip = gtk_calendar_query_tooltip;
 
   widget_class->drag_data_get = gtk_calendar_drag_data_get;
   widget_class->drag_motion = gtk_calendar_drag_motion;
   widget_class->drag_leave = gtk_calendar_drag_leave;
   widget_class->drag_drop = gtk_calendar_drag_drop;
   widget_class->drag_data_received = gtk_calendar_drag_data_received;
-  
-  class->month_changed = NULL;
-  class->day_selected = NULL;
-  class->day_selected_double_click = NULL;
-  class->prev_month = NULL;
-  class->next_month = NULL;
-  class->prev_year = NULL;
-  class->next_year = NULL;
 
+  gtk_widget_class_set_accessible_role (widget_class, ATK_ROLE_CALENDAR);
+
+  /**
+   * GtkCalendar:year:
+   *
+   * The selected year.
+   * This property gets initially set to the current year.
+   */
   g_object_class_install_property (gobject_class,
                                    PROP_YEAR,
                                    g_param_spec_int ("year",
-                                                    _("Year"),
-                                                    _("The selected year"),
-                                                    0, G_MAXINT, 0,
-                                                    G_PARAM_READWRITE));
+                                                     P_("Year"),
+                                                     P_("The selected year"),
+                                                     0, G_MAXINT >> 9, 0,
+                                                     GTK_PARAM_READWRITE));
+
+  /**
+   * GtkCalendar:month:
+   *
+   * The selected month (as a number between 0 and 11).
+   * This property gets initially set to the current month.
+   */
   g_object_class_install_property (gobject_class,
                                    PROP_MONTH,
                                    g_param_spec_int ("month",
-                                                    _("Month"),
-                                                    _("The selected month (as a number between 0 and 11)"),
-                                                    0, 11, 0,
-                                                    G_PARAM_READWRITE));
+                                                     P_("Month"),
+                                                     P_("The selected month (as a number between 0 and 11)"),
+                                                     0, 11, 0,
+                                                     GTK_PARAM_READWRITE));
+
+  /**
+   * GtkCalendar:day:
+   *
+   * The selected day (as a number between 1 and 31, or 0
+   * to unselect the currently selected day).
+   * This property gets initially set to the current day.
+   */
   g_object_class_install_property (gobject_class,
                                    PROP_DAY,
                                    g_param_spec_int ("day",
-                                                    _("Day"),
-                                                    _("The selected day (as a number between 1 and 31, or 0 to unselect the currently selected day)"),
-                                                    0, 31, 0,
-                                                    G_PARAM_READWRITE));
+                                                     P_("Day"),
+                                                     P_("The selected day (as a number between 1 and 31, or 0 to unselect the currently selected day)"),
+                                                     0, 31, 0,
+                                                     GTK_PARAM_READWRITE));
 
 /**
  * GtkCalendar:show-heading:
@@ -489,11 +509,11 @@ gtk_calendar_class_init (GtkCalendarClass *class)
  */
   g_object_class_install_property (gobject_class,
                                    PROP_SHOW_HEADING,
-                                   g_param_spec_boolean ("show_heading",
-                                                        _("Show Heading"),
-                                                        _("If TRUE, a heading is displayed"),
-                                                        TRUE,
-                                                        G_PARAM_READWRITE));
+                                   g_param_spec_boolean ("show-heading",
+                                                         P_("Show Heading"),
+                                                         P_("If TRUE, a heading is displayed"),
+                                                         TRUE,
+                                                         GTK_PARAM_READWRITE));
 
 /**
  * GtkCalendar:show-day-names:
@@ -504,11 +524,11 @@ gtk_calendar_class_init (GtkCalendarClass *class)
  */
   g_object_class_install_property (gobject_class,
                                    PROP_SHOW_DAY_NAMES,
-                                   g_param_spec_boolean ("show_day_names",
-                                                        _("Show Day Names"),
-                                                        _("If TRUE, day names are displayed"),
-                                                        TRUE,
-                                                        G_PARAM_READWRITE));
+                                   g_param_spec_boolean ("show-day-names",
+                                                         P_("Show Day Names"),
+                                                         P_("If TRUE, day names are displayed"),
+                                                         TRUE,
+                                                         GTK_PARAM_READWRITE));
 /**
  * GtkCalendar:no-month-change:
  *
@@ -518,11 +538,11 @@ gtk_calendar_class_init (GtkCalendarClass *class)
  */
   g_object_class_install_property (gobject_class,
                                    PROP_NO_MONTH_CHANGE,
-                                   g_param_spec_boolean ("no_month_change",
-                                                        _("No Month Change"),
-                                                        _("If TRUE, the selected month can not be changed"),
-                                                        FALSE,
-                                                        G_PARAM_READWRITE));
+                                   g_param_spec_boolean ("no-month-change",
+                                                         P_("No Month Change"),
+                                                         P_("If TRUE, the selected month cannot be changed"),
+                                                         FALSE,
+                                                         GTK_PARAM_READWRITE));
 
 /**
  * GtkCalendar:show-week-numbers:
@@ -533,2156 +553,2327 @@ gtk_calendar_class_init (GtkCalendarClass *class)
  */
   g_object_class_install_property (gobject_class,
                                    PROP_SHOW_WEEK_NUMBERS,
-                                   g_param_spec_boolean ("show_week_numbers",
-                                                        _("Show Week Numbers"),
-                                                        _("If TRUE, week numbers are displayed"),
-                                                        FALSE,
-                                                        G_PARAM_READWRITE));
+                                   g_param_spec_boolean ("show-week-numbers",
+                                                         P_("Show Week Numbers"),
+                                                         P_("If TRUE, week numbers are displayed"),
+                                                         FALSE,
+                                                         GTK_PARAM_READWRITE));
+
+/**
+ * GtkCalendar:detail-width-chars:
+ *
+ * Width of a detail cell, in characters.
+ * A value of 0 allows any width. See gtk_calendar_set_detail_func().
+ *
+ * Since: 2.14
+ */
+  g_object_class_install_property (gobject_class,
+                                   PROP_DETAIL_WIDTH_CHARS,
+                                   g_param_spec_int ("detail-width-chars",
+                                                     P_("Details Width"),
+                                                     P_("Details width in characters"),
+                                                     0, 127, 0,
+                                                     GTK_PARAM_READWRITE));
 
+/**
+ * GtkCalendar:detail-height-rows:
+ *
+ * Height of a detail cell, in rows.
+ * A value of 0 allows any width. See gtk_calendar_set_detail_func().
+ *
+ * Since: 2.14
+ */
+  g_object_class_install_property (gobject_class,
+                                   PROP_DETAIL_HEIGHT_ROWS,
+                                   g_param_spec_int ("detail-height-rows",
+                                                     P_("Details Height"),
+                                                     P_("Details height in rows"),
+                                                     0, 127, 0,
+                                                     GTK_PARAM_READWRITE));
+
+/**
+ * GtkCalendar:show-details:
+ *
+ * Determines whether details are shown directly in the widget, or if they are
+ * available only as tooltip. When this property is set days with details are
+ * marked.
+ *
+ * Since: 2.14
+ */
+  g_object_class_install_property (gobject_class,
+                                   PROP_SHOW_DETAILS,
+                                   g_param_spec_boolean ("show-details",
+                                                         P_("Show Details"),
+                                                         P_("If TRUE, details are shown"),
+                                                         TRUE,
+                                                         GTK_PARAM_READWRITE));
+
+
+  /**
+   * GtkCalendar:inner-border:
+   *
+   * The spacing around the day/week headers and main area.
+   */
+  gtk_widget_class_install_style_property (widget_class,
+                                           g_param_spec_int ("inner-border",
+                                                             P_("Inner border"),
+                                                             P_("Inner border space"),
+                                                             0, G_MAXINT, 4,
+                                                             GTK_PARAM_READABLE));
+
+  /**
+   * GtkCalndar:vertical-separation:
+   *
+   * Separation between day headers and main area.
+   */
+  gtk_widget_class_install_style_property (widget_class,
+                                           g_param_spec_int ("vertical-separation",
+                                                             P_("Vertical separation"),
+                                                             P_("Space between day headers and main area"),
+                                                             0, G_MAXINT, 4,
+                                                             GTK_PARAM_READABLE));
+
+  /**
+   * GtkCalendar:horizontal-separation:
+   *
+   * Separation between week headers and main area.
+   */
+  gtk_widget_class_install_style_property (widget_class,
+                                           g_param_spec_int ("horizontal-separation",
+                                                             P_("Horizontal separation"),
+                                                             P_("Space between week headers and main area"),
+                                                             0, G_MAXINT, 4,
+                                                             GTK_PARAM_READABLE));
+
+  /**
+   * GtkCalendar::month-changed:
+   * @calendar: the object which received the signal.
+   *
+   * Emitted when the user clicks a button to change the selected month on a
+   * calendar.
+   */
   gtk_calendar_signals[MONTH_CHANGED_SIGNAL] =
-    g_signal_new ("month_changed",
-                 G_OBJECT_CLASS_TYPE (gobject_class),
-                 G_SIGNAL_RUN_FIRST,
-                 G_STRUCT_OFFSET (GtkCalendarClass, month_changed),
-                 NULL, NULL,
-                 _gtk_marshal_VOID__VOID,
-                 G_TYPE_NONE, 0);
+    g_signal_new (I_("month-changed"),
+                  G_OBJECT_CLASS_TYPE (gobject_class),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GtkCalendarClass, month_changed),
+                  NULL, NULL,
+                  _gtk_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  /**
+   * GtkCalendar::day-selected:
+   * @calendar: the object which received the signal.
+   *
+   * Emitted when the user selects a day.
+   */
   gtk_calendar_signals[DAY_SELECTED_SIGNAL] =
-    g_signal_new ("day_selected",
-                 G_OBJECT_CLASS_TYPE (gobject_class),
-                 G_SIGNAL_RUN_FIRST,
-                 G_STRUCT_OFFSET (GtkCalendarClass, day_selected),
-                 NULL, NULL,
-                 _gtk_marshal_VOID__VOID,
-                 G_TYPE_NONE, 0);
+    g_signal_new (I_("day-selected"),
+                  G_OBJECT_CLASS_TYPE (gobject_class),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GtkCalendarClass, day_selected),
+                  NULL, NULL,
+                  _gtk_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  /**
+   * GtkCalendar::day-selected-double-click:
+   * @calendar: the object which received the signal.
+   *
+   * Emitted when the user double-clicks a day.
+   */
   gtk_calendar_signals[DAY_SELECTED_DOUBLE_CLICK_SIGNAL] =
-    g_signal_new ("day_selected_double_click",
-                 G_OBJECT_CLASS_TYPE (gobject_class),
-                 G_SIGNAL_RUN_FIRST,
-                 G_STRUCT_OFFSET (GtkCalendarClass, day_selected_double_click),
-                 NULL, NULL,
-                 _gtk_marshal_VOID__VOID,
-                 G_TYPE_NONE, 0);
+    g_signal_new (I_("day-selected-double-click"),
+                  G_OBJECT_CLASS_TYPE (gobject_class),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GtkCalendarClass, day_selected_double_click),
+                  NULL, NULL,
+                  _gtk_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  /**
+   * GtkCalendar::prev-month:
+   * @calendar: the object which received the signal.
+   *
+   * Emitted when the user switched to the previous month.
+   */
   gtk_calendar_signals[PREV_MONTH_SIGNAL] =
-    g_signal_new ("prev_month",
-                 G_OBJECT_CLASS_TYPE (gobject_class),
-                 G_SIGNAL_RUN_FIRST,
-                 G_STRUCT_OFFSET (GtkCalendarClass, prev_month),
-                 NULL, NULL,
-                 _gtk_marshal_VOID__VOID,
-                 G_TYPE_NONE, 0);
+    g_signal_new (I_("prev-month"),
+                  G_OBJECT_CLASS_TYPE (gobject_class),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GtkCalendarClass, prev_month),
+                  NULL, NULL,
+                  _gtk_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  /**
+   * GtkCalendar::next-month:
+   * @calendar: the object which received the signal.
+   *
+   * Emitted when the user switched to the next month.
+   */
   gtk_calendar_signals[NEXT_MONTH_SIGNAL] =
-    g_signal_new ("next_month",
-                 G_OBJECT_CLASS_TYPE (gobject_class),
-                 G_SIGNAL_RUN_FIRST,
-                 G_STRUCT_OFFSET (GtkCalendarClass, next_month),
-                 NULL, NULL,
-                 _gtk_marshal_VOID__VOID,
-                 G_TYPE_NONE, 0);
+    g_signal_new (I_("next-month"),
+                  G_OBJECT_CLASS_TYPE (gobject_class),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GtkCalendarClass, next_month),
+                  NULL, NULL,
+                  _gtk_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  /**
+   * GtkCalendar::prev-year:
+   * @calendar: the object which received the signal.
+   *
+   * Emitted when user switched to the previous year.
+   */
   gtk_calendar_signals[PREV_YEAR_SIGNAL] =
-    g_signal_new ("prev_year",
-                 G_OBJECT_CLASS_TYPE (gobject_class),
-                 G_SIGNAL_RUN_FIRST,
-                 G_STRUCT_OFFSET (GtkCalendarClass, prev_year),
-                 NULL, NULL,
-                 _gtk_marshal_VOID__VOID,
-                 G_TYPE_NONE, 0);
+    g_signal_new (I_("prev-year"),
+                  G_OBJECT_CLASS_TYPE (gobject_class),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GtkCalendarClass, prev_year),
+                  NULL, NULL,
+                  _gtk_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  /**
+   * GtkCalendar::next-year:
+   * @calendar: the object which received the signal.
+   *
+   * Emitted when user switched to the next year.
+   */
   gtk_calendar_signals[NEXT_YEAR_SIGNAL] =
-    g_signal_new ("next_year",
-                 G_OBJECT_CLASS_TYPE (gobject_class),
-                 G_SIGNAL_RUN_FIRST,
-                 G_STRUCT_OFFSET (GtkCalendarClass, next_year),
-                 NULL, NULL,
-                 _gtk_marshal_VOID__VOID,
-                 G_TYPE_NONE, 0);
-}
-
-enum
-{
-  TARGET_TEXT,
-};
+    g_signal_new (I_("next-year"),
+                  G_OBJECT_CLASS_TYPE (gobject_class),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GtkCalendarClass, next_year),
+                  NULL, NULL,
+                  _gtk_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
 
-static const GtkTargetEntry target_table[] = {
-  { "TEXT",               0, TARGET_TEXT },
-  { "STRING",             0, TARGET_TEXT },
-  { "UTF8_STRING",        0, TARGET_TEXT },
-};
+  g_type_class_add_private (gobject_class, sizeof (GtkCalendarPrivate));
+}
 
 static void
 gtk_calendar_init (GtkCalendar *calendar)
 {
+  GtkWidget *widget = GTK_WIDGET (calendar);
   time_t secs;
   struct tm *tm;
   gint i;
+#ifdef G_OS_WIN32
+  wchar_t wbuffer[100];
+#else
   char buffer[255];
   time_t tmp_time;
-  GtkWidget *widget;
-  GtkCalendarPrivateData *private_data;
+#endif
+  GtkCalendarPrivate *priv;
   gchar *year_before;
+#ifdef HAVE__NL_TIME_FIRST_WEEKDAY
+  union { unsigned int word; char *string; } langinfo;
+  gint week_1stday = 0;
+  gint first_weekday = 1;
+  guint week_origin;
+#else
   gchar *week_start;
-  
-  widget = GTK_WIDGET (calendar);
-  GTK_WIDGET_SET_FLAGS (widget, GTK_CAN_FOCUS);
-  
-  calendar->private_data = g_malloc (sizeof (GtkCalendarPrivateData));
-  private_data = GTK_CALENDAR_PRIVATE_DATA (calendar);
+#endif
+
+  priv = calendar->priv = G_TYPE_INSTANCE_GET_PRIVATE (calendar,
+                                                       GTK_TYPE_CALENDAR,
+                                                       GtkCalendarPrivate);
+
+  gtk_widget_set_can_focus (widget, TRUE);
+  gtk_widget_set_has_window (widget, FALSE);
 
   if (!default_abbreviated_dayname[0])
     for (i=0; i<7; i++)
       {
-       tmp_time= (i+3)*86400;
-       strftime ( buffer, sizeof (buffer), "%a", gmtime (&tmp_time));
-       default_abbreviated_dayname[i] = g_locale_to_utf8 (buffer, -1, NULL, NULL, NULL);
+#ifndef G_OS_WIN32
+        tmp_time= (i+3)*86400;
+        strftime ( buffer, sizeof (buffer), "%a", gmtime (&tmp_time));
+        default_abbreviated_dayname[i] = g_locale_to_utf8 (buffer, -1, NULL, NULL, NULL);
+#else
+        if (!GetLocaleInfoW (GetThreadLocale (), LOCALE_SABBREVDAYNAME1 + (i+6)%7,
+                             wbuffer, G_N_ELEMENTS (wbuffer)))
+          default_abbreviated_dayname[i] = g_strdup_printf ("(%d)", i);
+        else
+          default_abbreviated_dayname[i] = g_utf16_to_utf8 (wbuffer, -1, NULL, NULL, NULL);
+#endif
       }
-  
+
   if (!default_monthname[0])
     for (i=0; i<12; i++)
       {
-       tmp_time=i*2764800;
-       strftime ( buffer, sizeof (buffer), "%B", gmtime (&tmp_time));
-       default_monthname[i] = g_locale_to_utf8 (buffer, -1, NULL, NULL, NULL);
+#ifndef G_OS_WIN32
+        tmp_time=i*2764800;
+        strftime ( buffer, sizeof (buffer), "%B", gmtime (&tmp_time));
+        default_monthname[i] = g_locale_to_utf8 (buffer, -1, NULL, NULL, NULL);
+#else
+        if (!GetLocaleInfoW (GetThreadLocale (), LOCALE_SMONTHNAME1 + i,
+                             wbuffer, G_N_ELEMENTS (wbuffer)))
+          default_monthname[i] = g_strdup_printf ("(%d)", i);
+        else
+          default_monthname[i] = g_utf16_to_utf8 (wbuffer, -1, NULL, NULL, NULL);
+#endif
       }
-  
+
   /* Set defaults */
   secs = time (NULL);
   tm = localtime (&secs);
-  calendar->month = tm->tm_mon;
-  calendar->year  = 1900 + tm->tm_year;
-  
+  priv->month = tm->tm_mon;
+  priv->year  = 1900 + tm->tm_year;
+
   for (i=0;i<31;i++)
-    calendar->marked_date[i] = FALSE;
-  calendar->num_marked_dates = 0;
-  calendar->selected_day = tm->tm_mday;
-  
-  calendar->display_flags = ( GTK_CALENDAR_SHOW_HEADING | 
-                             GTK_CALENDAR_SHOW_DAY_NAMES );
-  
-  calendar->highlight_row = -1;
-  calendar->highlight_col = -1;
-  
-  calendar->focus_row = -1;
-  calendar->focus_col = -1;
-  calendar->xor_gc = NULL;
-
-  private_data->max_year_width = 0;
-  private_data->max_month_width = 0;
-  private_data->max_day_char_width = 0;
-  private_data->max_week_char_width = 0;
-
-  private_data->max_day_char_ascent = 0;
-  private_data->max_day_char_descent = 0;
-  private_data->max_label_char_ascent = 0;
-  private_data->max_label_char_descent = 0;
-
-  private_data->arrow_width = 10;
-
-  private_data->freeze_count = 0;
-  
-  private_data->dirty_header = 0;
-  private_data->dirty_day_names = 0;
-  private_data->dirty_week = 0;
-  private_data->dirty_main = 0;
-  
-  private_data->need_timer = 0;
-  private_data->timer = 0;
-  private_data->click_child = -1;
-
-  private_data->in_drag = 0;
-  private_data->drag_highlight = 0;
-
-  gtk_drag_dest_set (widget,
-                    0,
-                     target_table, G_N_ELEMENTS (target_table),
-                     GDK_ACTION_COPY);
-
-  private_data->year_before = 0;
+    priv->marked_date[i] = FALSE;
+  priv->num_marked_dates = 0;
+  priv->selected_day = tm->tm_mday;
+
+  priv->display_flags = (GTK_CALENDAR_SHOW_HEADING |
+                             GTK_CALENDAR_SHOW_DAY_NAMES |
+                             GTK_CALENDAR_SHOW_DETAILS);
+
+  priv->focus_row = -1;
+  priv->focus_col = -1;
+
+  priv->max_year_width = 0;
+  priv->max_month_width = 0;
+  priv->max_day_char_width = 0;
+  priv->max_week_char_width = 0;
+
+  priv->max_day_char_ascent = 0;
+  priv->max_day_char_descent = 0;
+  priv->max_label_char_ascent = 0;
+  priv->max_label_char_descent = 0;
+
+  priv->arrow_width = 10;
+
+  priv->need_timer = 0;
+  priv->timer = 0;
+  priv->click_child = -1;
+
+  priv->in_drag = 0;
+  priv->drag_highlight = 0;
+
+  gtk_drag_dest_set (widget, 0, NULL, 0, GDK_ACTION_COPY);
+  gtk_drag_dest_add_text_targets (widget);
+
+  priv->year_before = 0;
 
   /* Translate to calendar:YM if you want years to be displayed
    * before months; otherwise translate to calendar:MY.
    * Do *not* translate it to anything else, if it
    * it isn't calendar:YM or calendar:MY it will not work.
    *
-   * Note that this flipping is in top the text direction flipping,
-   * so if you have a default text direction of RTL and YM, then
-   * the year will appear on the right.
+   * Note that the ordering described here is logical order, which is
+   * further influenced by BIDI ordering. Thus, if you have a default
+   * text direction of RTL and specify "calendar:YM", then the year
+   * will appear to the right of the month.
    */
   year_before = _("calendar:MY");
   if (strcmp (year_before, "calendar:YM") == 0)
-    private_data->year_before = 1;
+    priv->year_before = 1;
   else if (strcmp (year_before, "calendar:MY") != 0)
     g_warning ("Whoever translated calendar:MY did so wrongly.\n");
 
-  /* Translate to calendar:week_start:1 if you want Monday to be the
-   * first day of the week; otherwise translate to calendar:week_start:0. 
-   * Do *not* translate it to anything else, if it isn't calendar:week_start:1 
-   * or calendar:week_start:0 it will not work.
+#ifdef G_OS_WIN32
+  priv->week_start = 0;
+  week_start = NULL;
+
+  if (GetLocaleInfoW (GetThreadLocale (), LOCALE_IFIRSTDAYOFWEEK,
+                      wbuffer, G_N_ELEMENTS (wbuffer)))
+    week_start = g_utf16_to_utf8 (wbuffer, -1, NULL, NULL, NULL);
+
+  if (week_start != NULL)
+    {
+      priv->week_start = (week_start[0] - '0' + 1) % 7;
+      g_free(week_start);
+    }
+#else
+#ifdef HAVE__NL_TIME_FIRST_WEEKDAY
+  langinfo.string = nl_langinfo (_NL_TIME_FIRST_WEEKDAY);
+  first_weekday = langinfo.string[0];
+  langinfo.string = nl_langinfo (_NL_TIME_WEEK_1STDAY);
+  week_origin = langinfo.word;
+  if (week_origin == 19971130) /* Sunday */
+    week_1stday = 0;
+  else if (week_origin == 19971201) /* Monday */
+    week_1stday = 1;
+  else
+    g_warning ("Unknown value of _NL_TIME_WEEK_1STDAY.\n");
+
+  priv->week_start = (week_1stday + first_weekday - 1) % 7;
+#else
+  /* Translate to calendar:week_start:0 if you want Sunday to be the
+   * first day of the week to calendar:week_start:1 if you want Monday
+   * to be the first day of the week, and so on.
    */
-   week_start = _("calendar:week_start:0");
-   if (strcmp (week_start, "calendar:week_start:1") == 0)
-     private_data->week_start = 1;
-   else if (strcmp (week_start, "calendar:week_start:0") == 0) 
-     private_data->week_start = 0;
-   else
-     g_warning ("Whoever translated calendar:week_start:0 did so wrongly.\n");
-}
+  week_start = _("calendar:week_start:0");
 
-GtkWidget*
-gtk_calendar_new (void)
-{
-  return g_object_new (GTK_TYPE_CALENDAR, NULL);
-}
+  if (strncmp (week_start, "calendar:week_start:", 20) == 0)
+    priv->week_start = *(week_start + 20) - '0';
+  else
+    priv->week_start = -1;
 
-/* column_from_x: returns the column 0-6 that the
- * x pixel of the xwindow is in */
-static gint
-column_from_x (GtkCalendar *calendar,
-              gint         event_x)
-{
-  gint c, column;
-  gint x_left, x_right;
-  
-  column = -1;
-  
-  for (c = 0; c < 7; c++)
+  if (priv->week_start < 0 || priv->week_start > 6)
     {
-      x_left = left_x_for_column (calendar, c);
-      x_right = x_left + GTK_CALENDAR_PRIVATE_DATA (calendar)->day_width;
-      
-      if (event_x >= x_left && event_x < x_right)
-       {
-         column = c;
-         break;
-       }
+      g_warning ("Whoever translated calendar:week_start:0 did so wrongly.\n");
+      priv->week_start = 0;
     }
-  
-  return column;
-}
+#endif
+#endif
 
-static gint
-row_height (GtkCalendar *calendar)
-{
-  return (GTK_CALENDAR_PRIVATE_DATA (calendar)->main_h - CALENDAR_MARGIN
-         - ((calendar->display_flags & GTK_CALENDAR_SHOW_DAY_NAMES)
-            ? CALENDAR_YSEP : CALENDAR_MARGIN)) / 6;
+  calendar_compute_days (calendar);
 }
 
+\f
+/****************************************
+ *          Utility Functions           *
+ ****************************************/
 
-/* row_from_y: returns the row 0-5 that the
- * y pixel of the xwindow is in */
-static gint
-row_from_y (GtkCalendar *calendar,
-           gint         event_y)
-{
-  gint r, row;
-  gint height;
-  gint y_top, y_bottom;
-  
-  height = row_height (calendar);
-  row = -1;
-  
-  for (r = 0; r < 6; r++)
-    {
-      y_top = top_y_for_row (calendar, r);
-      y_bottom = y_top + height;
-      
-      if (event_y >= y_top && event_y < y_bottom)
-       {
-         row = r;
-         break;
-       }
-    }
-  
-  return row;
-}/* left_x_for_column: returns the x coordinate
- * for the left of the column */
-static gint
-left_x_for_column (GtkCalendar *calendar,
-                  gint         column)
+static void
+calendar_queue_refresh (GtkCalendar *calendar)
 {
-  gint width;
-  gint x_left;
-  
-  if (gtk_widget_get_direction (GTK_WIDGET (calendar)) == GTK_TEXT_DIR_RTL)
-    column = 6 - column;
+  GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (calendar);
 
-  width = GTK_CALENDAR_PRIVATE_DATA (calendar)->day_width;
-  if (calendar->display_flags & GTK_CALENDAR_SHOW_WEEK_NUMBERS)
-    x_left = CALENDAR_XSEP + (width + DAY_XSEP) * column;
+  if (!(priv->detail_func) ||
+      !(priv->display_flags & GTK_CALENDAR_SHOW_DETAILS) ||
+       (priv->detail_width_chars && priv->detail_height_rows))
+    gtk_widget_queue_draw (GTK_WIDGET (calendar));
   else
-    x_left = CALENDAR_MARGIN + (width + DAY_XSEP) * column;
-  
-  return x_left;
-}
-
-/* top_y_for_row: returns the y coordinate
- * for the top of the row */
-static gint
-top_y_for_row (GtkCalendar *calendar,
-              gint         row)
-{
-  
-  return (GTK_CALENDAR_PRIVATE_DATA (calendar)->main_h 
-         - (CALENDAR_MARGIN + (6 - row)
-            * row_height (calendar)));
+    gtk_widget_queue_resize (GTK_WIDGET (calendar));
 }
 
-/* This function should be done by the toolkit, but we don't like the
- * GTK arrows because they don't look good on this widget */
 static void
-draw_arrow_right (GdkWindow *window,
-                 GdkGC     *gc,
-                 gint       x,
-                 gint       y,
-                 gint       size)
+calendar_set_month_next (GtkCalendar *calendar)
 {
-  gint i;
-  
-  for (i = 0; i <= size / 2; i++)
-    {
-      gdk_draw_line (window, gc,
-                    x + i,
-                    y + i,
-                    x + i,
-                    y + size - i);
-    }
-}
+  gint month_len;
+  GtkCalendarPrivate *priv = calendar->priv;
 
-/* This function should be done by the toolkit, but we don't like the
- * GTK arrows because they don't look good on this widget */
-static void
-draw_arrow_left (GdkWindow *window,
-                GdkGC     *gc,
-                gint       x,
-                gint       y,
-                gint       size)
-{
-  gint i;
-  
-  for (i = 0; i <= size / 2; i++)
+  if (priv->display_flags & GTK_CALENDAR_NO_MONTH_CHANGE)
+    return;
+
+  if (priv->month == 11)
     {
-      gdk_draw_line (window, gc,
-                    x + size/2 - i,
-                    y + i,
-                    x + size/2 - i,
-                    y + size - i);
+      priv->month = 0;
+      priv->year++;
     }
-}
+  else
+    priv->month++;
 
-static void
-gtk_calendar_set_month_prev (GtkCalendar *calendar)
-{
-  gint month_len;
-  
-  if (calendar->display_flags & GTK_CALENDAR_NO_MONTH_CHANGE)
-    return;
-  
-  if (calendar->month == 0)
-    {
-      calendar->month = 11;
-      calendar->year--;
-    } 
-  else 
-    calendar->month--;
-  
-  month_len = month_length[leap (calendar->year)][calendar->month + 1];
-  
-  gtk_calendar_freeze (calendar);
-  gtk_calendar_compute_days (calendar);
-  
+  calendar_compute_days (calendar);
   g_signal_emit (calendar,
-                gtk_calendar_signals[PREV_MONTH_SIGNAL],
-                0);
+                 gtk_calendar_signals[NEXT_MONTH_SIGNAL],
+                 0);
   g_signal_emit (calendar,
-                gtk_calendar_signals[MONTH_CHANGED_SIGNAL],
-                0);
-  
-  if (month_len < calendar->selected_day)
+                 gtk_calendar_signals[MONTH_CHANGED_SIGNAL],
+                 0);
+
+  month_len = month_length[leap (priv->year)][priv->month + 1];
+
+  if (month_len < priv->selected_day)
     {
-      calendar->selected_day = 0;
+      priv->selected_day = 0;
       gtk_calendar_select_day (calendar, month_len);
     }
   else
-    {
-      if (calendar->selected_day < 0)
-       calendar->selected_day = calendar->selected_day + 1 + month_length[leap (calendar->year)][calendar->month + 1];
-      gtk_calendar_select_day (calendar, calendar->selected_day);
-    }
+    gtk_calendar_select_day (calendar, priv->selected_day);
 
-  gtk_widget_queue_draw (GTK_WIDGET (calendar));
-  gtk_calendar_thaw (calendar);
+  calendar_queue_refresh (calendar);
 }
 
-
 static void
-gtk_calendar_set_month_next (GtkCalendar *calendar)
+calendar_set_year_prev (GtkCalendar *calendar)
 {
+  GtkCalendarPrivate *priv = calendar->priv;
   gint month_len;
-  
-  g_return_if_fail (GTK_IS_WIDGET (calendar));
-  
-  if (calendar->display_flags & GTK_CALENDAR_NO_MONTH_CHANGE)
-    return;
-  
-  
-  if (calendar->month == 11)
-    {
-      calendar->month = 0;
-      calendar->year++;
-    } 
-  else 
-    calendar->month++;
-  
-  gtk_calendar_freeze (calendar);
-  gtk_calendar_compute_days (calendar);
+
+  priv->year--;
+  calendar_compute_days (calendar);
   g_signal_emit (calendar,
-                gtk_calendar_signals[NEXT_MONTH_SIGNAL],
-                0);
+                 gtk_calendar_signals[PREV_YEAR_SIGNAL],
+                 0);
   g_signal_emit (calendar,
-                gtk_calendar_signals[MONTH_CHANGED_SIGNAL],
-                0);
-  
-  month_len = month_length[leap (calendar->year)][calendar->month + 1];
-  
-  if (month_len < calendar->selected_day)
-    {
-      calendar->selected_day = 0;
-      gtk_calendar_select_day (calendar, month_len);
-    }
-  else
-    gtk_calendar_select_day (calendar, calendar->selected_day);
+                 gtk_calendar_signals[MONTH_CHANGED_SIGNAL],
+                 0);
 
-  gtk_widget_queue_draw (GTK_WIDGET (calendar));
-  gtk_calendar_thaw (calendar);
-}
+  month_len = month_length[leap (priv->year)][priv->month + 1];
 
-static void
-gtk_calendar_set_year_prev (GtkCalendar *calendar)
-{
-  gint month_len;
-  
-  g_return_if_fail (GTK_IS_WIDGET (calendar));
-  
-  calendar->year--;
-  gtk_calendar_freeze (calendar);
-  gtk_calendar_compute_days (calendar);
-  g_signal_emit (calendar,
-                gtk_calendar_signals[PREV_YEAR_SIGNAL],
-                0);
-  g_signal_emit (calendar,
-                gtk_calendar_signals[MONTH_CHANGED_SIGNAL],
-                0);
-  
-  month_len = month_length[leap (calendar->year)][calendar->month + 1];
-  
-  if (month_len < calendar->selected_day)
-    {
-      calendar->selected_day = 0;
+  if (month_len < priv->selected_day)
+    {
+      priv->selected_day = 0;
       gtk_calendar_select_day (calendar, month_len);
     }
   else
-    gtk_calendar_select_day (calendar, calendar->selected_day);
-  
-  gtk_widget_queue_draw (GTK_WIDGET (calendar));
-  gtk_calendar_thaw (calendar);
+    gtk_calendar_select_day (calendar, priv->selected_day);
+
+  calendar_queue_refresh (calendar);
 }
 
 static void
-gtk_calendar_set_year_next (GtkCalendar *calendar)
+calendar_set_year_next (GtkCalendar *calendar)
 {
+  GtkCalendarPrivate *priv = calendar->priv;
   gint month_len;
-  GtkWidget *widget;
-  
-  g_return_if_fail (GTK_IS_WIDGET (calendar));
-  
-  widget = GTK_WIDGET (calendar);
-  
-  gtk_calendar_freeze (calendar);
-  
-  calendar->year++;
-  gtk_calendar_compute_days (calendar);
+
+  priv->year++;
+  calendar_compute_days (calendar);
   g_signal_emit (calendar,
-                gtk_calendar_signals[NEXT_YEAR_SIGNAL],
-                0);
+                 gtk_calendar_signals[NEXT_YEAR_SIGNAL],
+                 0);
   g_signal_emit (calendar,
-                gtk_calendar_signals[MONTH_CHANGED_SIGNAL],
-                0);
-  
-  month_len = month_length[leap (calendar->year)][calendar->month + 1];
-  
-  if (month_len < calendar->selected_day)
-    {
-      calendar->selected_day = 0;
+                 gtk_calendar_signals[MONTH_CHANGED_SIGNAL],
+                 0);
+
+  month_len = month_length[leap (priv->year)][priv->month + 1];
+
+  if (month_len < priv->selected_day)
+    {
+      priv->selected_day = 0;
       gtk_calendar_select_day (calendar, month_len);
     }
   else
-    gtk_calendar_select_day (calendar, calendar->selected_day);
-  
-  gtk_widget_queue_draw (GTK_WIDGET (calendar));
-  gtk_calendar_thaw (calendar);
+    gtk_calendar_select_day (calendar, priv->selected_day);
+
+  calendar_queue_refresh (calendar);
 }
 
 static void
-gtk_calendar_main_button (GtkWidget     *widget,
-                         GdkEventButton *event)
+calendar_compute_days (GtkCalendar *calendar)
 {
-  GtkCalendar *calendar;
-  GtkCalendarPrivateData *private_data;
-  gint x, y;
-  gint row, col;
-  gint day_month;
+  GtkCalendarPrivate *priv = calendar->priv;
+  gint month;
+  gint year;
+  gint ndays_in_month;
+  gint ndays_in_prev_month;
+  gint first_day;
+  gint row;
+  gint col;
   gint day;
-  
-  calendar = GTK_CALENDAR (widget);
-  private_data = GTK_CALENDAR_PRIVATE_DATA (widget);
-  
-  x = (gint) (event->x);
-  y = (gint) (event->y);
-  
-  row = row_from_y (calendar, y);
-  col = column_from_x (calendar, x);
 
-  /* If row or column isn't found, just return. */
-  if (row == -1 || col == -1)
-    return;
-  
-  day_month = calendar->day_month[row][col];
+  year = priv->year;
+  month = priv->month + 1;
 
-  if (event->type == GDK_BUTTON_PRESS)
-    {
-      day = calendar->day[row][col];
-      
-      if (day_month == MONTH_PREV)
-       gtk_calendar_set_month_prev (calendar);
-      else if (day_month == MONTH_NEXT)
-       gtk_calendar_set_month_next (calendar);
-      
-      if (!GTK_WIDGET_HAS_FOCUS (widget))
-       gtk_widget_grab_focus (widget);
-         
-      gtk_calendar_select_and_focus_day (calendar, day);
+  ndays_in_month = month_length[leap (year)][month];
 
-      private_data->in_drag = 1;
-      private_data->drag_start_x = x;
-      private_data->drag_start_y = y;
-    }
-  else if (event->type == GDK_2BUTTON_PRESS)
-    {
-      private_data->in_drag = 0;
-      if (day_month == MONTH_CURRENT)
-       g_signal_emit (calendar,
-                      gtk_calendar_signals[DAY_SELECTED_DOUBLE_CLICK_SIGNAL],
-                      0);
-    }
-}
+  first_day = day_of_week (year, month, 1);
+  first_day = (first_day + 7 - priv->week_start) % 7;
 
-static void
-gtk_calendar_realize_arrows (GtkWidget *widget)
-{
-  GtkCalendar *calendar;
-  GtkCalendarPrivateData *private_data;
-  GdkWindowAttr attributes;
-  gint attributes_mask;
-  gint i;
-  gboolean year_left;
-  
-  g_return_if_fail (GTK_IS_CALENDAR (widget));
-  
-  calendar = GTK_CALENDAR (widget);
-  private_data = GTK_CALENDAR_PRIVATE_DATA (widget);
-
-  if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR) 
-    year_left = private_data->year_before;
+  /* Compute days of previous month */
+  if (month > 1)
+    ndays_in_prev_month = month_length[leap (year)][month-1];
   else
-    year_left = !private_data->year_before;
-    
-  /* Arrow windows ------------------------------------- */
-  if (! (calendar->display_flags & GTK_CALENDAR_NO_MONTH_CHANGE)
-      && (calendar->display_flags & GTK_CALENDAR_SHOW_HEADING))
+    ndays_in_prev_month = month_length[leap (year)][12];
+  day = ndays_in_prev_month - first_day + 1;
+
+  row = 0;
+  if (first_day > 0)
     {
-      attributes.wclass = GDK_INPUT_OUTPUT;
-      attributes.window_type = GDK_WINDOW_CHILD;
-      attributes.visual = gtk_widget_get_visual (widget);
-      attributes.colormap = gtk_widget_get_colormap (widget);
-      attributes.event_mask = (gtk_widget_get_events (widget) | GDK_EXPOSURE_MASK
-                              | GDK_BUTTON_PRESS_MASK  | GDK_BUTTON_RELEASE_MASK
-                              | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK);
-      attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
-      attributes.y = 3;
-      attributes.width = private_data->arrow_width;
-      attributes.height = private_data->header_h - 7;
-      for (i = 0; i < 4; i++)
-       {
-         switch (i)
-           {
-           case ARROW_MONTH_LEFT:
-             if (year_left) 
-               attributes.x = (widget->allocation.width - 2 * widget->style->xthickness
-                               - (3 + 2*private_data->arrow_width 
-                                  + private_data->max_month_width));
-             else
-             attributes.x = 3;
-             break;
-           case ARROW_MONTH_RIGHT:
-             if (year_left) 
-               attributes.x = (widget->allocation.width - 2 * widget->style->xthickness 
-                               - 3 - private_data->arrow_width);
-             else
-             attributes.x = (private_data->arrow_width 
-                             + private_data->max_month_width);
-             break;
-           case ARROW_YEAR_LEFT:
-             if (year_left) 
-               attributes.x = 3;
-             else
-             attributes.x = (widget->allocation.width - 2 * widget->style->xthickness
-                             - (3 + 2*private_data->arrow_width 
-                                + private_data->max_year_width));
-             break;
-           case ARROW_YEAR_RIGHT:
-             if (year_left) 
-               attributes.x = (private_data->arrow_width 
-                               + private_data->max_year_width);
-             else
-             attributes.x = (widget->allocation.width - 2 * widget->style->xthickness 
-                             - 3 - private_data->arrow_width);
-             break;
-           }
-         private_data->arrow_win[i] = gdk_window_new (private_data->header_win,
-                                                      &attributes, 
-                                                      attributes_mask);
-         private_data->arrow_state[i] = GTK_STATE_NORMAL;
-         gdk_window_set_background (private_data->arrow_win[i],
-                                    HEADER_BG_COLOR (GTK_WIDGET (calendar)));
-         gdk_window_show (private_data->arrow_win[i]);
-         gdk_window_set_user_data (private_data->arrow_win[i], widget);
-       }
+      for (col = 0; col < first_day; col++)
+        {
+          priv->day[row][col] = day;
+          priv->day_month[row][col] = MONTH_PREV;
+          day++;
+        }
     }
-  else
+
+  /* Compute days of current month */
+  col = first_day;
+  for (day = 1; day <= ndays_in_month; day++)
     {
-      for (i = 0; i < 4; i++)
-       private_data->arrow_win[i] = NULL;
+      priv->day[row][col] = day;
+      priv->day_month[row][col] = MONTH_CURRENT;
+
+      col++;
+      if (col == 7)
+        {
+          row++;
+          col = 0;
+        }
+    }
+
+  /* Compute days of next month */
+  day = 1;
+  for (; row <= 5; row++)
+    {
+      for (; col <= 6; col++)
+        {
+          priv->day[row][col] = day;
+          priv->day_month[row][col] = MONTH_NEXT;
+          day++;
+        }
+      col = 0;
     }
 }
 
 static void
-gtk_calendar_realize_header (GtkWidget *widget)
+calendar_select_and_focus_day (GtkCalendar *calendar,
+                               guint        day)
 {
-  GtkCalendar *calendar;
-  GtkCalendarPrivateData *private_data;
-  GdkWindowAttr attributes;
-  gint attributes_mask;
-  
-  g_return_if_fail (GTK_IS_CALENDAR (widget));
-  
-  calendar = GTK_CALENDAR (widget);
-  private_data = GTK_CALENDAR_PRIVATE_DATA (widget);
+  GtkCalendarPrivate *priv = calendar->priv;
+  gint old_focus_row = priv->focus_row;
+  gint old_focus_col = priv->focus_col;
+  gint row;
+  gint col;
+
+  for (row = 0; row < 6; row ++)
+    for (col = 0; col < 7; col++)
+      {
+        if (priv->day_month[row][col] == MONTH_CURRENT
+            && priv->day[row][col] == day)
+          {
+            priv->focus_row = row;
+            priv->focus_col = col;
+          }
+      }
 
-  /* Header window ------------------------------------- */
-  if (calendar->display_flags & GTK_CALENDAR_SHOW_HEADING)
+  if (old_focus_row != -1 && old_focus_col != -1)
+    calendar_invalidate_day (calendar, old_focus_row, old_focus_col);
+
+  gtk_calendar_select_day (calendar, day);
+}
+
+\f
+/****************************************
+ *     Layout computation utilities     *
+ ****************************************/
+
+static gint
+calendar_row_height (GtkCalendar *calendar)
+{
+  GtkCalendarPrivate *priv = calendar->priv;
+
+  return (GTK_CALENDAR_GET_PRIVATE (calendar)->main_h - CALENDAR_MARGIN
+          - ((priv->display_flags & GTK_CALENDAR_SHOW_DAY_NAMES)
+             ? calendar_get_ysep (calendar) : CALENDAR_MARGIN)) / 6;
+}
+
+
+/* calendar_left_x_for_column: returns the x coordinate
+ * for the left of the column */
+static gint
+calendar_left_x_for_column (GtkCalendar *calendar,
+                            gint         column)
+{
+  GtkCalendarPrivate *priv = calendar->priv;
+  gint width;
+  gint x_left;
+  gint week_width;
+  gint calendar_xsep = calendar_get_xsep (calendar);
+  GtkStyleContext *context;
+  GtkStateFlags state;
+  gint inner_border = calendar_get_inner_border (calendar);
+  GtkBorder padding;
+
+  context = gtk_widget_get_style_context (GTK_WIDGET (calendar));
+  state = gtk_widget_get_state_flags (GTK_WIDGET (calendar));
+  gtk_style_context_get_padding (context, state, &padding);
+
+  week_width = priv->week_width + padding.left + inner_border;
+
+  if (gtk_widget_get_direction (GTK_WIDGET (calendar)) == GTK_TEXT_DIR_RTL)
     {
-      attributes.wclass = GDK_INPUT_OUTPUT;
-      attributes.window_type = GDK_WINDOW_CHILD;
-      attributes.visual = gtk_widget_get_visual (widget);
-      attributes.colormap = gtk_widget_get_colormap (widget);
-      attributes.event_mask = gtk_widget_get_events (widget) | GDK_EXPOSURE_MASK;
-      attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
-      attributes.x = widget->style->xthickness;
-      attributes.y = widget->style->ythickness;
-      attributes.width = widget->allocation.width - 2 * attributes.x;
-      attributes.height = private_data->header_h - 2 * attributes.y;
-      private_data->header_win = gdk_window_new (widget->window,
-                                            &attributes, attributes_mask);
-      
-      gdk_window_set_background (private_data->header_win,
-                                HEADER_BG_COLOR (GTK_WIDGET (calendar)));
-      gdk_window_show (private_data->header_win);
-      gdk_window_set_user_data (private_data->header_win, widget);
-      
+      column = 6 - column;
+      week_width = 0;
     }
+
+  width = GTK_CALENDAR_GET_PRIVATE (calendar)->day_width;
+  if (priv->display_flags & GTK_CALENDAR_SHOW_WEEK_NUMBERS)
+    x_left = week_width + calendar_xsep + (width + DAY_XSEP) * column;
   else
+    x_left = week_width + CALENDAR_MARGIN + (width + DAY_XSEP) * column;
+
+  return x_left;
+}
+
+/* column_from_x: returns the column 0-6 that the
+ * x pixel of the xwindow is in */
+static gint
+calendar_column_from_x (GtkCalendar *calendar,
+                        gint         event_x)
+{
+  gint c, column;
+  gint x_left, x_right;
+
+  column = -1;
+
+  for (c = 0; c < 7; c++)
     {
-      private_data->header_win = NULL;
+      x_left = calendar_left_x_for_column (calendar, c);
+      x_right = x_left + GTK_CALENDAR_GET_PRIVATE (calendar)->day_width;
+
+      if (event_x >= x_left && event_x < x_right)
+        {
+          column = c;
+          break;
+        }
     }
-  gtk_calendar_realize_arrows (widget);
+
+  return column;
+}
+
+/* calendar_top_y_for_row: returns the y coordinate
+ * for the top of the row */
+static gint
+calendar_top_y_for_row (GtkCalendar *calendar,
+                        gint         row)
+{
+  GtkStyleContext *context;
+  GtkAllocation allocation;
+  gint inner_border = calendar_get_inner_border (calendar);
+  GtkStateFlags state;
+  GtkBorder padding;
+
+  gtk_widget_get_allocation (GTK_WIDGET (calendar), &allocation);
+  context = gtk_widget_get_style_context (GTK_WIDGET (calendar));
+  state = gtk_widget_get_state_flags (GTK_WIDGET (calendar));
+
+  gtk_style_context_get_padding (context, state, &padding);
+
+  return  allocation.height
+          - padding.top - inner_border
+          - (CALENDAR_MARGIN + (6 - row)
+             * calendar_row_height (calendar));
+}
+
+/* row_from_y: returns the row 0-5 that the
+ * y pixel of the xwindow is in */
+static gint
+calendar_row_from_y (GtkCalendar *calendar,
+                     gint         event_y)
+{
+  gint r, row;
+  gint height;
+  gint y_top, y_bottom;
+
+  height = calendar_row_height (calendar);
+  row = -1;
+
+  for (r = 0; r < 6; r++)
+    {
+      y_top = calendar_top_y_for_row (calendar, r);
+      y_bottom = y_top + height;
+
+      if (event_y >= y_top && event_y < y_bottom)
+        {
+          row = r;
+          break;
+        }
+    }
+
+  return row;
 }
 
 static void
-gtk_calendar_realize_day_names (GtkWidget *widget)
+calendar_arrow_rectangle (GtkCalendar  *calendar,
+                          guint         arrow,
+                          GdkRectangle *rect)
+{
+  GtkWidget *widget = GTK_WIDGET (calendar);
+  GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (calendar);
+  GtkAllocation allocation;
+  GtkStyleContext *context;
+  GtkStateFlags state;
+  GtkBorder padding;
+  gboolean year_left;
+
+  gtk_widget_get_allocation (widget, &allocation);
+  context = gtk_widget_get_style_context (widget);
+  state = gtk_widget_get_state_flags (widget);
+
+  gtk_style_context_get_padding (context, state, &padding);
+
+  if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR)
+    year_left = priv->year_before;
+  else
+    year_left = !priv->year_before;
+
+  rect->y = 3;
+  rect->width = priv->arrow_width;
+  rect->height = priv->header_h - 7;
+
+  switch (arrow)
+    {
+    case ARROW_MONTH_LEFT:
+      if (year_left)
+        rect->x = (allocation.width - padding.left - padding.right
+                   - (3 + 2 * priv->arrow_width + priv->max_month_width));
+      else
+        rect->x = 3;
+      break;
+    case ARROW_MONTH_RIGHT:
+      if (year_left)
+        rect->x = (allocation.width - padding.left - padding.right
+                   - 3 - priv->arrow_width);
+      else
+        rect->x = (priv->arrow_width + priv->max_month_width);
+      break;
+    case ARROW_YEAR_LEFT:
+      if (year_left)
+        rect->x = 3;
+      else
+        rect->x = (allocation.width - padding.left - padding.right
+                   - (3 + 2 * priv->arrow_width + priv->max_year_width));
+      break;
+    case ARROW_YEAR_RIGHT:
+      if (year_left)
+        rect->x = (priv->arrow_width + priv->max_year_width);
+      else
+        rect->x = (allocation.width - padding.left - padding.right
+                   - 3 - priv->arrow_width);
+      break;
+    }
+
+  rect->x += padding.left;
+  rect->y += padding.top;
+}
+
+static void
+calendar_day_rectangle (GtkCalendar  *calendar,
+                        gint          row,
+                        gint          col,
+                        GdkRectangle *rect)
 {
-  GtkCalendar *calendar;
-  GtkCalendarPrivateData *private_data;
-  GdkWindowAttr attributes;
-  gint attributes_mask;
-  
-  g_return_if_fail (GTK_IS_CALENDAR (widget));
-  
-  calendar = GTK_CALENDAR (widget);
-  private_data = GTK_CALENDAR_PRIVATE_DATA (widget);
+  GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (calendar);
 
-  /* Day names window --------------------------------- */
-  if ( calendar->display_flags & GTK_CALENDAR_SHOW_DAY_NAMES)
+  rect->x = calendar_left_x_for_column (calendar, col);
+  rect->y = calendar_top_y_for_row (calendar, row);
+  rect->height = calendar_row_height (calendar);
+  rect->width = priv->day_width;
+}
+
+static void
+calendar_set_month_prev (GtkCalendar *calendar)
+{
+  GtkCalendarPrivate *priv = calendar->priv;
+  gint month_len;
+
+  if (priv->display_flags & GTK_CALENDAR_NO_MONTH_CHANGE)
+    return;
+
+  if (priv->month == 0)
     {
-      attributes.wclass = GDK_INPUT_OUTPUT;
-      attributes.window_type = GDK_WINDOW_CHILD;
-      attributes.visual = gtk_widget_get_visual (widget);
-      attributes.colormap = gtk_widget_get_colormap (widget);
-      attributes.event_mask = gtk_widget_get_events (widget) | GDK_EXPOSURE_MASK;
-      attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
-      attributes.x = (widget->style->xthickness + INNER_BORDER);
-      attributes.y = private_data->header_h + (widget->style->ythickness 
-                                          + INNER_BORDER);
-      attributes.width = (widget->allocation.width 
-                         - (widget->style->xthickness + INNER_BORDER) 
-                         * 2);
-      attributes.height = private_data->day_name_h;
-      private_data->day_name_win = gdk_window_new (widget->window,
-                                                  &attributes, 
-                                                  attributes_mask);
-      gdk_window_set_background (private_data->day_name_win, 
-                                BACKGROUND_COLOR ( GTK_WIDGET ( calendar)));
-      gdk_window_show (private_data->day_name_win);
-      gdk_window_set_user_data (private_data->day_name_win, widget);
+      priv->month = 11;
+      priv->year--;
+    }
+  else
+    priv->month--;
+
+  month_len = month_length[leap (priv->year)][priv->month + 1];
+
+  calendar_compute_days (calendar);
+
+  g_signal_emit (calendar,
+                 gtk_calendar_signals[PREV_MONTH_SIGNAL],
+                 0);
+  g_signal_emit (calendar,
+                 gtk_calendar_signals[MONTH_CHANGED_SIGNAL],
+                 0);
+
+  if (month_len < priv->selected_day)
+    {
+      priv->selected_day = 0;
+      gtk_calendar_select_day (calendar, month_len);
     }
   else
     {
-      private_data->day_name_win = NULL;
+      if (priv->selected_day < 0)
+        priv->selected_day = priv->selected_day + 1 + month_length[leap (priv->year)][priv->month + 1];
+      gtk_calendar_select_day (calendar, priv->selected_day);
     }
+
+  calendar_queue_refresh (calendar);
 }
 
+\f
+/****************************************
+ *           Basic object methods       *
+ ****************************************/
+
 static void
-gtk_calendar_realize_week_numbers (GtkWidget *widget)
+gtk_calendar_finalize (GObject *object)
 {
-  GtkCalendar *calendar;
-  GtkCalendarPrivateData *private_data;
+  G_OBJECT_CLASS (gtk_calendar_parent_class)->finalize (object);
+}
+
+static void
+gtk_calendar_destroy (GtkWidget *widget)
+{
+  GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (widget);
+
+  calendar_stop_spinning (GTK_CALENDAR (widget));
+
+  /* Call the destroy function for the extra display callback: */
+  if (priv->detail_func_destroy && priv->detail_func_user_data)
+    {
+      priv->detail_func_destroy (priv->detail_func_user_data);
+      priv->detail_func_user_data = NULL;
+      priv->detail_func_destroy = NULL;
+    }
+
+  GTK_WIDGET_CLASS (gtk_calendar_parent_class)->destroy (widget);
+}
+
+
+static void
+calendar_set_display_option (GtkCalendar              *calendar,
+                             GtkCalendarDisplayOptions flag,
+                             gboolean                  setting)
+{
+  GtkCalendarPrivate *priv = calendar->priv;
+  GtkCalendarDisplayOptions flags;
+
+  if (setting)
+    flags = priv->display_flags | flag;
+  else
+    flags = priv->display_flags & ~flag;
+  gtk_calendar_set_display_options (calendar, flags);
+}
+
+static gboolean
+calendar_get_display_option (GtkCalendar              *calendar,
+                             GtkCalendarDisplayOptions flag)
+{
+  GtkCalendarPrivate *priv = calendar->priv;
+
+  return (priv->display_flags & flag) != 0;
+}
+
+static void
+gtk_calendar_set_property (GObject      *object,
+                           guint         prop_id,
+                           const GValue *value,
+                           GParamSpec   *pspec)
+{
+  GtkCalendar *calendar = GTK_CALENDAR (object);
+  GtkCalendarPrivate *priv = calendar->priv;
+
+  switch (prop_id)
+    {
+    case PROP_YEAR:
+      gtk_calendar_select_month (calendar,
+                                 priv->month,
+                                 g_value_get_int (value));
+      break;
+    case PROP_MONTH:
+      gtk_calendar_select_month (calendar,
+                                 g_value_get_int (value),
+                                 priv->year);
+      break;
+    case PROP_DAY:
+      gtk_calendar_select_day (calendar,
+                               g_value_get_int (value));
+      break;
+    case PROP_SHOW_HEADING:
+      calendar_set_display_option (calendar,
+                                   GTK_CALENDAR_SHOW_HEADING,
+                                   g_value_get_boolean (value));
+      break;
+    case PROP_SHOW_DAY_NAMES:
+      calendar_set_display_option (calendar,
+                                   GTK_CALENDAR_SHOW_DAY_NAMES,
+                                   g_value_get_boolean (value));
+      break;
+    case PROP_NO_MONTH_CHANGE:
+      calendar_set_display_option (calendar,
+                                   GTK_CALENDAR_NO_MONTH_CHANGE,
+                                   g_value_get_boolean (value));
+      break;
+    case PROP_SHOW_WEEK_NUMBERS:
+      calendar_set_display_option (calendar,
+                                   GTK_CALENDAR_SHOW_WEEK_NUMBERS,
+                                   g_value_get_boolean (value));
+      break;
+    case PROP_SHOW_DETAILS:
+      calendar_set_display_option (calendar,
+                                   GTK_CALENDAR_SHOW_DETAILS,
+                                   g_value_get_boolean (value));
+      break;
+    case PROP_DETAIL_WIDTH_CHARS:
+      gtk_calendar_set_detail_width_chars (calendar,
+                                           g_value_get_int (value));
+      break;
+    case PROP_DETAIL_HEIGHT_ROWS:
+      gtk_calendar_set_detail_height_rows (calendar,
+                                           g_value_get_int (value));
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+}
+
+static void
+gtk_calendar_get_property (GObject      *object,
+                           guint         prop_id,
+                           GValue       *value,
+                           GParamSpec   *pspec)
+{
+  GtkCalendar *calendar = GTK_CALENDAR (object);
+  GtkCalendarPrivate *priv = calendar->priv;
+
+  switch (prop_id)
+    {
+    case PROP_YEAR:
+      g_value_set_int (value, priv->year);
+      break;
+    case PROP_MONTH:
+      g_value_set_int (value, priv->month);
+      break;
+    case PROP_DAY:
+      g_value_set_int (value, priv->selected_day);
+      break;
+    case PROP_SHOW_HEADING:
+      g_value_set_boolean (value, calendar_get_display_option (calendar,
+                                                               GTK_CALENDAR_SHOW_HEADING));
+      break;
+    case PROP_SHOW_DAY_NAMES:
+      g_value_set_boolean (value, calendar_get_display_option (calendar,
+                                                               GTK_CALENDAR_SHOW_DAY_NAMES));
+      break;
+    case PROP_NO_MONTH_CHANGE:
+      g_value_set_boolean (value, calendar_get_display_option (calendar,
+                                                               GTK_CALENDAR_NO_MONTH_CHANGE));
+      break;
+    case PROP_SHOW_WEEK_NUMBERS:
+      g_value_set_boolean (value, calendar_get_display_option (calendar,
+                                                               GTK_CALENDAR_SHOW_WEEK_NUMBERS));
+      break;
+    case PROP_SHOW_DETAILS:
+      g_value_set_boolean (value, calendar_get_display_option (calendar,
+                                                               GTK_CALENDAR_SHOW_DETAILS));
+      break;
+    case PROP_DETAIL_WIDTH_CHARS:
+      g_value_set_int (value, priv->detail_width_chars);
+      break;
+    case PROP_DETAIL_HEIGHT_ROWS:
+      g_value_set_int (value, priv->detail_height_rows);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+}
+
+\f
+/****************************************
+ *             Realization              *
+ ****************************************/
+
+static void
+calendar_realize_arrows (GtkCalendar *calendar)
+{
+  GtkWidget *widget = GTK_WIDGET (calendar);
+  GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (calendar);
   GdkWindowAttr attributes;
   gint attributes_mask;
-  
-  g_return_if_fail (GTK_IS_CALENDAR (widget));
-  
-  calendar = GTK_CALENDAR (widget);
-  private_data = GTK_CALENDAR_PRIVATE_DATA (widget);
+  gint i;
+  GtkAllocation allocation;
 
-  /* Week number window -------------------------------- */
-  if (calendar->display_flags & GTK_CALENDAR_SHOW_WEEK_NUMBERS)
+  if (! (priv->display_flags & GTK_CALENDAR_NO_MONTH_CHANGE)
+      && (priv->display_flags & GTK_CALENDAR_SHOW_HEADING))
     {
-      attributes.wclass = GDK_INPUT_OUTPUT;
+      gtk_widget_get_allocation (widget, &allocation);
+
+      attributes.wclass = GDK_INPUT_ONLY;
       attributes.window_type = GDK_WINDOW_CHILD;
-      attributes.visual = gtk_widget_get_visual (widget);
-      attributes.colormap = gtk_widget_get_colormap (widget);
-      attributes.event_mask = gtk_widget_get_events (widget) | GDK_EXPOSURE_MASK;
-      
-      attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
-      attributes.x = widget->style->xthickness + INNER_BORDER;
-      attributes.y = (private_data->header_h + private_data->day_name_h 
-                     + (widget->style->ythickness + INNER_BORDER));
-      attributes.width = private_data->week_width;
-      attributes.height = private_data->main_h;
-      private_data->week_win = gdk_window_new (widget->window,
-                                              &attributes, attributes_mask);
-      gdk_window_set_background (private_data->week_win,  
-                                BACKGROUND_COLOR (GTK_WIDGET (calendar)));
-      gdk_window_show (private_data->week_win);
-      gdk_window_set_user_data (private_data->week_win, widget);
-    } 
+      attributes.event_mask = (gtk_widget_get_events (widget)
+                               | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+                               | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK);
+      attributes_mask = GDK_WA_X | GDK_WA_Y;
+      for (i = 0; i < 4; i++)
+        {
+          GdkRectangle rect;
+          calendar_arrow_rectangle (calendar, i, &rect);
+
+          attributes.x = allocation.x + rect.x;
+          attributes.y = allocation.y + rect.y;
+          attributes.width = rect.width;
+          attributes.height = rect.height;
+          priv->arrow_win[i] = gdk_window_new (gtk_widget_get_window (widget),
+                                               &attributes,
+                                               attributes_mask);
+
+          gtk_widget_register_window (widget, priv->arrow_win[i]);
+        }
+      priv->arrow_prelight = 0x0;
+    }
   else
     {
-      private_data->week_win = NULL;
+      for (i = 0; i < 4; i++)
+        priv->arrow_win[i] = NULL;
     }
 }
 
+static void
+calendar_unrealize_arrows (GtkCalendar *calendar)
+{
+  GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (calendar);
+  gint i;
+
+  for (i = 0; i < 4; i++)
+    {
+      if (priv->arrow_win[i])
+        {
+          gtk_widget_unregister_window (GTK_WIDGET (calendar), priv->arrow_win[i]);
+          gdk_window_destroy (priv->arrow_win[i]);
+          priv->arrow_win[i] = NULL;
+        }
+    }
+
+}
+
+static gint
+calendar_get_inner_border (GtkCalendar *calendar)
+{
+  gint inner_border;
+
+  gtk_widget_style_get (GTK_WIDGET (calendar),
+                        "inner-border", &inner_border,
+                        NULL);
+
+  return inner_border;
+}
+
+static gint
+calendar_get_xsep (GtkCalendar *calendar)
+{
+  gint xsep;
+
+  gtk_widget_style_get (GTK_WIDGET (calendar),
+                        "horizontal-separation", &xsep,
+                        NULL);
+
+  return xsep;
+}
+
+static gint
+calendar_get_ysep (GtkCalendar *calendar)
+{
+  gint ysep;
+
+  gtk_widget_style_get (GTK_WIDGET (calendar),
+                        "vertical-separation", &ysep,
+                        NULL);
+
+  return ysep;
+}
+
 static void
 gtk_calendar_realize (GtkWidget *widget)
 {
-  GtkCalendar *calendar;
-  GtkCalendarPrivateData *private_data;
+  GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (widget);
   GdkWindowAttr attributes;
   gint attributes_mask;
-  GdkGCValues values;
-
-  calendar = GTK_CALENDAR (widget);
-  private_data = GTK_CALENDAR_PRIVATE_DATA (widget);
-  
-  GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
-  gtk_calendar_compute_days (calendar);
-  
-  attributes.x = widget->allocation.x;
-  attributes.y = widget->allocation.y;
-  attributes.width = widget->allocation.width;
-  attributes.height = widget->allocation.height;
-  attributes.wclass = GDK_INPUT_OUTPUT;
+  gint inner_border = calendar_get_inner_border (GTK_CALENDAR (widget));
+  GtkStyleContext *context;
+  GtkAllocation allocation;
+  GtkStateFlags state = 0;
+  GtkBorder padding;
+
+  context = gtk_widget_get_style_context (widget);
+  state = gtk_widget_get_state_flags (widget);
+  gtk_style_context_get_padding (context, state, &padding);
+
+  gtk_widget_get_allocation (widget, &allocation);
+
+  GTK_WIDGET_CLASS (gtk_calendar_parent_class)->realize (widget);
+
+  attributes.wclass = GDK_INPUT_ONLY;
   attributes.window_type = GDK_WINDOW_CHILD;
-  attributes.event_mask =  (gtk_widget_get_events (widget) 
-                           | GDK_EXPOSURE_MASK |GDK_KEY_PRESS_MASK | GDK_SCROLL_MASK);
-  attributes.visual = gtk_widget_get_visual (widget);
-  attributes.colormap = gtk_widget_get_colormap (widget);
-  
-  attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
-  widget->window = gdk_window_new (widget->parent->window,
-                                  &attributes, attributes_mask);
-  
-  widget->style = gtk_style_attach (widget->style, widget->window);
-  
-  /* Header window ------------------------------------- */
-  gtk_calendar_realize_header (widget);
-  /* Day names window --------------------------------- */
-  gtk_calendar_realize_day_names (widget);
-  /* Week number window -------------------------------- */
-  gtk_calendar_realize_week_numbers (widget);
-  /* Main Window --------------------------------------         */
-  attributes.event_mask =  (gtk_widget_get_events (widget) | GDK_EXPOSURE_MASK
-                           | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-                           | GDK_POINTER_MOTION_MASK | GDK_LEAVE_NOTIFY_MASK);
-  
-  attributes.x = private_data->week_width + (widget->style->ythickness + INNER_BORDER);
-  attributes.y = (private_data->header_h + private_data->day_name_h 
-                 + (widget->style->ythickness + INNER_BORDER));
-  attributes.width = (widget->allocation.width - attributes.x 
-                     - (widget->style->xthickness + INNER_BORDER));
-  attributes.height = private_data->main_h;
-  private_data->main_win = gdk_window_new (widget->window,
-                                          &attributes, attributes_mask);
-  gdk_window_set_background (private_data->main_win, 
-                            BACKGROUND_COLOR ( GTK_WIDGET ( calendar)));
-  gdk_window_show (private_data->main_win);
-  gdk_window_set_user_data (private_data->main_win, widget);
-  gdk_window_set_background (widget->window, BACKGROUND_COLOR (widget));
-  gdk_window_show (widget->window);
-  gdk_window_set_user_data (widget->window, widget);
-  
-  /* Set widgets gc */
-  calendar->gc = gdk_gc_new (widget->window);
-
-  values.foreground = widget->style->white;
-  values.function = GDK_XOR;
-  calendar->xor_gc = gdk_gc_new_with_values (widget->window,
-                                            &values,
-                                            GDK_GC_FOREGROUND |
-                                            GDK_GC_FUNCTION);
+  attributes.event_mask = (gtk_widget_get_events (widget) | GDK_EXPOSURE_MASK
+                           | GDK_SCROLL_MASK
+                           | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+                           | GDK_POINTER_MOTION_MASK | GDK_LEAVE_NOTIFY_MASK);
+
+  if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR)
+    attributes.x = priv->week_width + padding.left + inner_border;
+  else
+    attributes.x = padding.left + inner_border;
+
+  attributes.y = priv->header_h + priv->day_name_h + padding.top + inner_border;
+  attributes.width = allocation.width - attributes.x - (padding.right + inner_border);
+
+  if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
+    attributes.width -= priv->week_width;
+
+  attributes.height = priv->main_h;
+  attributes_mask = GDK_WA_X | GDK_WA_Y;
+
+  attributes.x += allocation.x;
+  attributes.y += allocation.y;
+
+  priv->main_win = gdk_window_new (gtk_widget_get_window (widget),
+                                   &attributes, attributes_mask);
+  gtk_widget_register_window (widget, priv->main_win);
+
+  calendar_realize_arrows (GTK_CALENDAR (widget));
 }
 
 static void
 gtk_calendar_unrealize (GtkWidget *widget)
 {
-  GtkCalendar *calendar;
-  GtkCalendarPrivateData *private_data;
+  GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (widget);
+
+  calendar_unrealize_arrows (GTK_CALENDAR (widget));
+
+  if (priv->main_win)
+    {
+      gtk_widget_unregister_window (widget, priv->main_win);
+      gdk_window_destroy (priv->main_win);
+      priv->main_win = NULL;
+    }
+
+  GTK_WIDGET_CLASS (gtk_calendar_parent_class)->unrealize (widget);
+}
+
+static void
+calendar_map_arrows (GtkCalendar *calendar)
+{
+  GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (calendar);
   gint i;
-  
-  calendar = GTK_CALENDAR (widget);
-  private_data = GTK_CALENDAR_PRIVATE_DATA (widget);
-  
-  if (private_data->header_win)
+
+  for (i = 0; i < 4; i++)
     {
-      for (i = 0; i < 4; i++)
-       {
-         if (private_data->arrow_win[i])
-           {
-             gdk_window_set_user_data (private_data->arrow_win[i], NULL);
-             gdk_window_destroy (private_data->arrow_win[i]);
-             private_data->arrow_win[i] = NULL;
-           }
-       }
-      gdk_window_set_user_data (private_data->header_win, NULL);
-      gdk_window_destroy (private_data->header_win);
-      private_data->header_win = NULL;
-    }
-  
-  if (private_data->week_win)
-    {
-      gdk_window_set_user_data (private_data->week_win, NULL);
-      gdk_window_destroy (private_data->week_win);
-      private_data->week_win = NULL;      
-    }
-  
-  if (private_data->main_win)
-    {
-      gdk_window_set_user_data (private_data->main_win, NULL);
-      gdk_window_destroy (private_data->main_win);
-      private_data->main_win = NULL;      
-    }
-  if (private_data->day_name_win)
-    {
-      gdk_window_set_user_data (private_data->day_name_win, NULL);
-      gdk_window_destroy (private_data->day_name_win);
-      private_data->day_name_win = NULL;      
-    }
-  if (calendar->xor_gc)
-    g_object_unref (calendar->xor_gc);
-  if (calendar->gc)
-    g_object_unref (calendar->gc);
-  
-  if (GTK_WIDGET_CLASS (parent_class)->unrealize)
-    (* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget);
+      if (priv->arrow_win[i])
+        gdk_window_show (priv->arrow_win[i]);
+    }
+}
+
+static void
+calendar_unmap_arrows (GtkCalendar *calendar)
+{
+  GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (calendar);
+  gint i;
+
+  for (i = 0; i < 4; i++)
+    {
+      if (priv->arrow_win[i])
+        gdk_window_hide (priv->arrow_win[i]);
+    }
 }
 
 static void
-gtk_calendar_size_request (GtkWidget     *widget,
-                          GtkRequisition *requisition)
+gtk_calendar_map (GtkWidget *widget)
 {
-  GtkCalendar *calendar;
-  GtkCalendarPrivateData *private_data;
+  GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (widget);
+
+  GTK_WIDGET_CLASS (gtk_calendar_parent_class)->map (widget);
+
+  gdk_window_show (priv->main_win);
+
+  calendar_map_arrows (GTK_CALENDAR (widget));
+}
+
+static void
+gtk_calendar_unmap (GtkWidget *widget)
+{
+  GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (widget);
+
+  calendar_unmap_arrows (GTK_CALENDAR (widget));
+
+  gdk_window_hide (priv->main_win);
+
+  GTK_WIDGET_CLASS (gtk_calendar_parent_class)->unmap (widget);
+}
+
+static gchar*
+gtk_calendar_get_detail (GtkCalendar *calendar,
+                         gint         row,
+                         gint         column)
+{
+  GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (calendar);
+  gint year, month;
+
+  if (priv->detail_func == NULL)
+    return NULL;
+
+  year = priv->year;
+  month = priv->month + priv->day_month[row][column] - MONTH_CURRENT;
+
+  if (month < 0)
+    {
+      month += 12;
+      year -= 1;
+    }
+  else if (month > 11)
+    {
+      month -= 12;
+      year += 1;
+    }
+
+  return priv->detail_func (calendar,
+                            year, month,
+                            priv->day[row][column],
+                            priv->detail_func_user_data);
+}
+
+static gboolean
+gtk_calendar_query_tooltip (GtkWidget  *widget,
+                            gint        x,
+                            gint        y,
+                            gboolean    keyboard_mode,
+                            GtkTooltip *tooltip)
+{
+  GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (widget);
+  GtkCalendar *calendar = GTK_CALENDAR (widget);
+  gchar *detail = NULL;
+  GdkRectangle day_rect;
+  gint row, col;
+
+  col = calendar_column_from_x (calendar, x);
+  row = calendar_row_from_y (calendar, y);
+
+  if (col != -1 && row != -1 &&
+      (0 != (priv->detail_overflow[row] & (1 << col)) ||
+      0 == (priv->display_flags & GTK_CALENDAR_SHOW_DETAILS)))
+    {
+      detail = gtk_calendar_get_detail (calendar, row, col);
+      calendar_day_rectangle (calendar, row, col, &day_rect);
+    }
+
+  if (detail)
+    {
+      gtk_tooltip_set_tip_area (tooltip, &day_rect);
+      gtk_tooltip_set_markup (tooltip, detail);
+
+      g_free (detail);
+
+      return TRUE;
+    }
+
+  if (GTK_WIDGET_CLASS (gtk_calendar_parent_class)->query_tooltip)
+    return GTK_WIDGET_CLASS (gtk_calendar_parent_class)->query_tooltip (widget, x, y, keyboard_mode, tooltip);
+
+  return FALSE;
+}
+
+\f
+/****************************************
+ *       Size Request and Allocate      *
+ ****************************************/
+
+static void
+gtk_calendar_size_request (GtkWidget      *widget,
+                           GtkRequisition *requisition)
+{
+  GtkCalendar *calendar = GTK_CALENDAR (widget);
+  GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (widget);
+  GtkStyleContext *context;
+  GtkStateFlags state;
+  GtkBorder padding;
   PangoLayout *layout;
   PangoRectangle logical_rect;
 
   gint height;
-  gint i;
-  gchar buffer[255];
+  gint i, r, c;
   gint calendar_margin = CALENDAR_MARGIN;
   gint header_width, main_width;
   gint max_header_height = 0;
   gint focus_width;
   gint focus_padding;
-  
-  calendar = GTK_CALENDAR (widget);
-  private_data = GTK_CALENDAR_PRIVATE_DATA (widget);
+  gint max_detail_height;
+  gint inner_border = calendar_get_inner_border (calendar);
+  gint calendar_ysep = calendar_get_ysep (calendar);
+  gint calendar_xsep = calendar_get_xsep (calendar);
+
   gtk_widget_style_get (GTK_WIDGET (widget),
-                       "focus-line-width", &focus_width,
-                       "focus-padding", &focus_padding,
-                       NULL);
+                        "focus-line-width", &focus_width,
+                        "focus-padding", &focus_padding,
+                        NULL);
 
   layout = gtk_widget_create_pango_layout (widget, NULL);
-  
+
   /*
-   * Calculate the requisition width for the widget.
+   * Calculate the requisition  width for the widget.
    */
-  
+
   /* Header width */
-  
-  if (calendar->display_flags & GTK_CALENDAR_SHOW_HEADING)
+
+  if (priv->display_flags & GTK_CALENDAR_SHOW_HEADING)
     {
-      private_data->max_month_width = 0;
+      priv->max_month_width = 0;
       for (i = 0; i < 12; i++)
-       {
-         pango_layout_set_text (layout, default_monthname[i], -1);
-         pango_layout_get_pixel_extents (layout, NULL, &logical_rect);
-         private_data->max_month_width = MAX (private_data->max_month_width,
-                                              logical_rect.width + 8);
-         max_header_height = MAX (max_header_height, logical_rect.height); 
-       }
-      private_data->max_year_width = 0;
-      for (i=0; i<10; i++)
-       {
-         g_snprintf (buffer, sizeof (buffer), "%d%d%d%d", i,i,i,i);
-         pango_layout_set_text (layout, buffer, -1);     
-         pango_layout_get_pixel_extents (layout, NULL, &logical_rect);
-         private_data->max_year_width = MAX (private_data->max_year_width,
-                                             logical_rect.width + 8);
-         max_header_height = MAX (max_header_height, logical_rect.height); 
-       }
-    } 
-  else 
-    {
-      private_data->max_month_width = 0;
-      private_data->max_year_width = 0;
-    }
-  
-  if (calendar->display_flags & GTK_CALENDAR_NO_MONTH_CHANGE)
-    header_width = (private_data->max_month_width 
-                   + private_data->max_year_width
-                   + 3 * 3);
+        {
+          pango_layout_set_text (layout, default_monthname[i], -1);
+          pango_layout_get_pixel_extents (layout, NULL, &logical_rect);
+          priv->max_month_width = MAX (priv->max_month_width,
+                                               logical_rect.width + 8);
+          max_header_height = MAX (max_header_height, logical_rect.height);
+        }
+
+      priv->max_year_width = 0;
+      /* Translators:  This is a text measurement template.
+       * Translate it to the widest year text
+       *
+       * If you don't understand this, leave it as "2000"
+       */
+      pango_layout_set_text (layout, C_("year measurement template", "2000"), -1);
+      pango_layout_get_pixel_extents (layout, NULL, &logical_rect);
+      priv->max_year_width = MAX (priv->max_year_width,
+                                  logical_rect.width + 8);
+      max_header_height = MAX (max_header_height, logical_rect.height);
+    }
+  else
+    {
+      priv->max_month_width = 0;
+      priv->max_year_width = 0;
+    }
+
+  if (priv->display_flags & GTK_CALENDAR_NO_MONTH_CHANGE)
+    header_width = (priv->max_month_width
+                    + priv->max_year_width
+                    + 3 * 3);
   else
-    header_width = (private_data->max_month_width 
-                   + private_data->max_year_width
-                   + 4 * private_data->arrow_width + 3 * 3);
+    header_width = (priv->max_month_width
+                    + priv->max_year_width
+                    + 4 * priv->arrow_width + 3 * 3);
 
   /* Mainwindow labels width */
-  
-  private_data->max_day_char_width = 0;
-  private_data->min_day_width = 0;
-  private_data->max_label_char_ascent = 0;
-  private_data->max_label_char_descent = 0;
+
+  priv->max_day_char_width = 0;
+  priv->max_day_char_ascent = 0;
+  priv->max_day_char_descent = 0;
+  priv->min_day_width = 0;
 
   for (i = 0; i < 9; i++)
     {
-      g_snprintf (buffer, sizeof (buffer), "%d%d", i, i);
-      pango_layout_set_text (layout, buffer, -1);        
+      gchar buffer[32];
+      g_snprintf (buffer, sizeof (buffer), C_("calendar:day:digits", "%d"), i * 11);
+      pango_layout_set_text (layout, buffer, -1);
       pango_layout_get_pixel_extents (layout, NULL, &logical_rect);
-      private_data->min_day_width = MAX (private_data->min_day_width,
-                                        logical_rect.width);
+      priv->min_day_width = MAX (priv->min_day_width,
+                                         logical_rect.width);
+
+      priv->max_day_char_ascent = MAX (priv->max_day_char_ascent,
+                                               PANGO_ASCENT (logical_rect));
+      priv->max_day_char_descent = MAX (priv->max_day_char_descent,
+                                                PANGO_DESCENT (logical_rect));
+    }
+
+  priv->max_label_char_ascent = 0;
+  priv->max_label_char_descent = 0;
+  if (priv->display_flags & GTK_CALENDAR_SHOW_DAY_NAMES)
+    for (i = 0; i < 7; i++)
+      {
+        pango_layout_set_text (layout, default_abbreviated_dayname[i], -1);
+        pango_layout_line_get_pixel_extents (pango_layout_get_lines_readonly (layout)->data, NULL, &logical_rect);
+
+        priv->min_day_width = MAX (priv->min_day_width, logical_rect.width);
+        priv->max_label_char_ascent = MAX (priv->max_label_char_ascent,
+                                                   PANGO_ASCENT (logical_rect));
+        priv->max_label_char_descent = MAX (priv->max_label_char_descent,
+                                                    PANGO_DESCENT (logical_rect));
+      }
+
+  priv->max_week_char_width = 0;
+  if (priv->display_flags & GTK_CALENDAR_SHOW_WEEK_NUMBERS)
+    for (i = 0; i < 9; i++)
+      {
+        gchar buffer[32];
+        g_snprintf (buffer, sizeof (buffer), C_("calendar:week:digits", "%d"), i * 11);
+        pango_layout_set_text (layout, buffer, -1);
+        pango_layout_get_pixel_extents (layout, NULL, &logical_rect);
+        priv->max_week_char_width = MAX (priv->max_week_char_width,
+                                           logical_rect.width / 2);
+      }
+
+  /* Calculate detail extents. Do this as late as possible since
+   * pango_layout_set_markup is called which alters font settings. */
+  max_detail_height = 0;
+
+  if (priv->detail_func && (priv->display_flags & GTK_CALENDAR_SHOW_DETAILS))
+    {
+      gchar *markup, *tail;
+
+      if (priv->detail_width_chars || priv->detail_height_rows)
+        {
+          gint rows = MAX (1, priv->detail_height_rows) - 1;
+          gsize len = priv->detail_width_chars + rows + 16;
+
+          markup = tail = g_alloca (len);
+
+          memcpy (tail,     "<small>", 7);
+          tail += 7;
+
+          memset (tail, 'm', priv->detail_width_chars);
+          tail += priv->detail_width_chars;
+
+          memset (tail, '\n', rows);
+          tail += rows;
+
+          memcpy (tail,     "</small>", 9);
+          tail += 9;
+
+          g_assert (len == (tail - markup));
+
+          pango_layout_set_markup (layout, markup, -1);
+          pango_layout_get_pixel_extents (layout, NULL, &logical_rect);
+
+          if (priv->detail_width_chars)
+            priv->min_day_width = MAX (priv->min_day_width, logical_rect.width);
+          if (priv->detail_height_rows)
+            max_detail_height = MAX (max_detail_height, logical_rect.height);
+        }
+
+      if (!priv->detail_width_chars || !priv->detail_height_rows)
+        for (r = 0; r < 6; r++)
+          for (c = 0; c < 7; c++)
+            {
+              gchar *detail = gtk_calendar_get_detail (calendar, r, c);
+
+              if (detail)
+                {
+                  markup = g_strconcat ("<small>", detail, "</small>", NULL);
+                  pango_layout_set_markup (layout, markup, -1);
+
+                  if (priv->detail_width_chars)
+                    {
+                      pango_layout_set_wrap (layout, PANGO_WRAP_WORD_CHAR);
+                      pango_layout_set_width (layout, PANGO_SCALE * priv->min_day_width);
+                    }
+
+                  pango_layout_get_pixel_extents (layout, NULL, &logical_rect);
+
+                  if (!priv->detail_width_chars)
+                    priv->min_day_width = MAX (priv->min_day_width, logical_rect.width);
+                  if (!priv->detail_height_rows)
+                    max_detail_height = MAX (max_detail_height, logical_rect.height);
+
+                  g_free (markup);
+                  g_free (detail);
+                }
+            }
+    }
+
+  /* We add one to max_day_char_width to be able to make the marked day "bold" */
+  priv->max_day_char_width = priv->min_day_width / 2 + 1;
+
+  main_width = (7 * (priv->min_day_width + (focus_padding + focus_width) * 2) + (DAY_XSEP * 6) + CALENDAR_MARGIN * 2
+                + (priv->max_week_char_width
+                   ? priv->max_week_char_width * 2 + (focus_padding + focus_width) * 2 + calendar_xsep * 2
+                   : 0));
+
+  context = gtk_widget_get_style_context (widget);
+  state = gtk_widget_get_state_flags (widget);
+  gtk_style_context_get_padding (context, state, &padding);
+
+  requisition->width = MAX (header_width, main_width + inner_border * 2) + padding.left + padding.right;
 
-      private_data->max_day_char_ascent = MAX (private_data->max_label_char_ascent,
-                                              PANGO_ASCENT (logical_rect));
-      private_data->max_day_char_descent = MAX (private_data->max_label_char_descent, 
-                                               PANGO_DESCENT (logical_rect));
-    }
-  /* We add one to max_day_char_width to be able to make the marked day "bold" */
-  private_data->max_day_char_width = private_data->min_day_width / 2 + 1;
-  
-  if (calendar->display_flags & GTK_CALENDAR_SHOW_DAY_NAMES)
-    for (i = 0; i < 7; i++)
-      {
-       pango_layout_set_text (layout, default_abbreviated_dayname[i], -1);
-       pango_layout_line_get_pixel_extents (pango_layout_get_lines (layout)->data, NULL, &logical_rect);
-
-       private_data->min_day_width = MAX (private_data->min_day_width, logical_rect.width);
-       private_data->max_label_char_ascent = MAX (private_data->max_label_char_ascent,
-                                                  PANGO_ASCENT (logical_rect));
-       private_data->max_label_char_descent = MAX (private_data->max_label_char_descent, 
-                                                   PANGO_DESCENT (logical_rect));
-      }
-  
-  private_data->max_week_char_width = 0;
-  if (calendar->display_flags & GTK_CALENDAR_SHOW_WEEK_NUMBERS)
-    for (i = 0; i < 9; i++)
-      {
-       g_snprintf (buffer, sizeof (buffer), "%d%d", i, i);
-       pango_layout_set_text (layout, buffer, -1);       
-       pango_layout_get_pixel_extents (layout, NULL, &logical_rect);
-       private_data->max_week_char_width = MAX (private_data->max_week_char_width,
-                                                logical_rect.width / 2);
-      }
-  
-  main_width = (7 * (private_data->min_day_width + (focus_padding + focus_width) * 2) + (DAY_XSEP * 6) + CALENDAR_MARGIN * 2
-               + (private_data->max_week_char_width
-                  ? private_data->max_week_char_width * 2 + (focus_padding + focus_width) * 2 + CALENDAR_XSEP * 2
-                  : 0));
-  
-  
-  requisition->width = MAX (header_width, main_width + INNER_BORDER * 2) + widget->style->xthickness * 2;
-  
   /*
    * Calculate the requisition height for the widget.
    */
-  
-  if (calendar->display_flags & GTK_CALENDAR_SHOW_HEADING)
+
+  if (priv->display_flags & GTK_CALENDAR_SHOW_HEADING)
     {
-      private_data->header_h = (max_header_height + CALENDAR_YSEP * 2);
+      priv->header_h = (max_header_height + calendar_ysep * 2);
     }
   else
     {
-      private_data->header_h = 0;
+      priv->header_h = 0;
     }
-  
-  if (calendar->display_flags & GTK_CALENDAR_SHOW_DAY_NAMES)
+
+  if (priv->display_flags & GTK_CALENDAR_SHOW_DAY_NAMES)
     {
-      private_data->day_name_h = (private_data->max_label_char_ascent
-                                 + private_data->max_label_char_descent
-                                 + 2 * (focus_padding + focus_width) + calendar_margin);
-      calendar_margin = CALENDAR_YSEP;
-    } 
+      priv->day_name_h = (priv->max_label_char_ascent
+                                  + priv->max_label_char_descent
+                                  + 2 * (focus_padding + focus_width) + calendar_margin);
+      calendar_margin = calendar_ysep;
+    }
   else
     {
-      private_data->day_name_h = 0;
+      priv->day_name_h = 0;
     }
 
-  private_data->main_h = (CALENDAR_MARGIN + calendar_margin
-                         + 6 * (private_data->max_day_char_ascent
-                                + private_data->max_day_char_descent 
-                                + 2 * (focus_padding + focus_width))
-                         + DAY_YSEP * 5);
-  
-  height = (private_data->header_h + private_data->day_name_h 
-           + private_data->main_h);
-  
-  requisition->height = height + (widget->style->ythickness + INNER_BORDER) * 2;
+  priv->main_h = (CALENDAR_MARGIN + calendar_margin
+                          + 6 * (priv->max_day_char_ascent
+                                 + priv->max_day_char_descent
+                                 + max_detail_height
+                                 + 2 * (focus_padding + focus_width))
+                          + DAY_YSEP * 5);
+
+  height = priv->header_h + priv->day_name_h + priv->main_h;
+
+  requisition->height = height + padding.top + padding.bottom + (inner_border * 2);
 
   g_object_unref (layout);
 }
 
 static void
-gtk_calendar_size_allocate (GtkWidget    *widget,
-                           GtkAllocation *allocation)
+gtk_calendar_get_preferred_width (GtkWidget *widget,
+                                  gint      *minimum,
+                                  gint      *natural)
 {
-  GtkCalendar *calendar;
-  GtkCalendarPrivateData *private_data;
-  gint xthickness = widget->style->xthickness;
-  gint ythickness = widget->style->xthickness;
-  gboolean year_left;
-  
-  widget->allocation = *allocation;
-  
-  calendar = GTK_CALENDAR (widget);
-  private_data = GTK_CALENDAR_PRIVATE_DATA (widget);
-
-  if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR) 
-    year_left = private_data->year_before;
-  else
-    year_left = !private_data->year_before;
-  
-  if (calendar->display_flags & GTK_CALENDAR_SHOW_WEEK_NUMBERS)
-    {
-      private_data->day_width = (private_data->min_day_width
-                            * ((allocation->width - (xthickness + INNER_BORDER) * 2
-                                - (CALENDAR_MARGIN * 2) -  (DAY_XSEP * 6) - CALENDAR_XSEP * 2))
-                            / (7 * private_data->min_day_width + private_data->max_week_char_width * 2));
-      private_data->week_width = ((allocation->width - (xthickness + INNER_BORDER) * 2
-                              - (CALENDAR_MARGIN * 2) - (DAY_XSEP * 6) - CALENDAR_XSEP * 2 )
-                             - private_data->day_width * 7 + CALENDAR_MARGIN + CALENDAR_XSEP);
-    } 
-  else 
-    {
-      private_data->day_width = (allocation->width
-                            - (xthickness + INNER_BORDER) * 2
-                            - (CALENDAR_MARGIN * 2)
-                            - (DAY_XSEP * 6))/7;
-      private_data->week_width = 0;
-    }
-  
-  if (GTK_WIDGET_REALIZED (widget))
-    {
-      gdk_window_move_resize (widget->window,
-                             allocation->x, allocation->y,
-                             allocation->width, allocation->height);
-      if (private_data->header_win)
-       gdk_window_move_resize (private_data->header_win,
-                               xthickness, ythickness,
-                               allocation->width - 2 * xthickness, private_data->header_h);
-      if (private_data->arrow_win[ARROW_MONTH_LEFT])
-       {
-         if (year_left)
-           gdk_window_move_resize (private_data->arrow_win[ARROW_MONTH_LEFT],
-                                   (allocation->width - 2 * xthickness
-                                    - (3 + 2*private_data->arrow_width 
-                                       + private_data->max_month_width)),
-                                   3,
-                                   private_data->arrow_width,
-                                   private_data->header_h - 7);
-         else
-           gdk_window_move_resize (private_data->arrow_win[ARROW_MONTH_LEFT],
-                                   3, 3,
-                                   private_data->arrow_width,
-                                   private_data->header_h - 7);
-       }
-      if (private_data->arrow_win[ARROW_MONTH_RIGHT])
-       {
-         if (year_left)
-           gdk_window_move_resize (private_data->arrow_win[ARROW_MONTH_RIGHT],
-                                   (allocation->width - 2 * xthickness 
-                                    - 3 - private_data->arrow_width), 
-                                   3,
-                                   private_data->arrow_width,
-                                   private_data->header_h - 7);
-         else
-           gdk_window_move_resize (private_data->arrow_win[ARROW_MONTH_RIGHT],
-                                   (private_data->arrow_width 
-                                    + private_data->max_month_width), 
-                                   3,
-                                   private_data->arrow_width,
-                                   private_data->header_h - 7);
-       }
-      if (private_data->arrow_win[ARROW_YEAR_LEFT])
-       {
-         if (year_left)
-           gdk_window_move_resize (private_data->arrow_win[ARROW_YEAR_LEFT],
-                                   3, 3,
-                                   private_data->arrow_width,
-                                   private_data->header_h - 7);
-         else
-           gdk_window_move_resize (private_data->arrow_win[ARROW_YEAR_LEFT],
-                                   (allocation->width - 2 * xthickness
-                                    - (3 + 2*private_data->arrow_width 
-                                       + private_data->max_year_width)),
-                                   3,
-                                   private_data->arrow_width,
-                                   private_data->header_h - 7);
-       }
-      if (private_data->arrow_win[ARROW_YEAR_RIGHT])
-       {
-         if (year_left)
-           gdk_window_move_resize (private_data->arrow_win[ARROW_YEAR_RIGHT],
-                                   (private_data->arrow_width 
-                                    + private_data->max_year_width), 
-                                   3,
-                                   private_data->arrow_width,
-                                   private_data->header_h - 7);
-         else
-           gdk_window_move_resize (private_data->arrow_win[ARROW_YEAR_RIGHT],
-                                   (allocation->width - 2 * xthickness 
-                                    - 3 - private_data->arrow_width), 
-                                   3,
-                                   private_data->arrow_width,
-                                   private_data->header_h - 7);
-       }
-      if (private_data->day_name_win)
-       gdk_window_move_resize (private_data->day_name_win,
-                               xthickness + INNER_BORDER,
-                               private_data->header_h + (widget->style->ythickness + INNER_BORDER),
-                               allocation->width - (xthickness + INNER_BORDER) * 2,
-                               private_data->day_name_h);
-      if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR) 
-       {
-         if (private_data->week_win)
-           gdk_window_move_resize (private_data->week_win,
-                                   (xthickness + INNER_BORDER),
-                                   private_data->header_h + private_data->day_name_h
-                                   + (widget->style->ythickness + INNER_BORDER),
-                                   private_data->week_width,
-                                   private_data->main_h);
-         gdk_window_move_resize (private_data->main_win,
-                                 private_data->week_width + (xthickness + INNER_BORDER),
-                                 private_data->header_h + private_data->day_name_h
-                                 + (widget->style->ythickness + INNER_BORDER),
-                                 allocation->width 
-                                 - private_data->week_width 
-                                 - (xthickness + INNER_BORDER) * 2,
-                                 private_data->main_h);
-       }
-      else 
-       {
-         gdk_window_move_resize (private_data->main_win,
-                                 (xthickness + INNER_BORDER),
-                                 private_data->header_h + private_data->day_name_h
-                                 + (widget->style->ythickness + INNER_BORDER),
-                                 allocation->width 
-                                 - private_data->week_width 
-                                 - (xthickness + INNER_BORDER) * 2,
-                                 private_data->main_h);
-         if (private_data->week_win)
-           gdk_window_move_resize (private_data->week_win,
-                                   allocation->width 
-                                   - private_data->week_width 
-                                   - (xthickness + INNER_BORDER),
-                                   private_data->header_h + private_data->day_name_h
-                                   + (widget->style->ythickness + INNER_BORDER),
-                                   private_data->week_width,
-                                   private_data->main_h);
-       }
-    }
+  GtkRequisition requisition;
+
+  gtk_calendar_size_request (widget, &requisition);
+
+  *minimum = *natural = requisition.width;
 }
 
-static gboolean
-gtk_calendar_expose (GtkWidget     *widget,
-                    GdkEventExpose *event)
-{
-  GtkCalendar *calendar;
-  GtkCalendarPrivateData *private_data;
-
-  calendar = GTK_CALENDAR (widget);
-  private_data = GTK_CALENDAR_PRIVATE_DATA (widget);
-  
-  if (GTK_WIDGET_DRAWABLE (widget))
-    {
-      if (event->window == private_data->main_win)
-       gtk_calendar_paint_main (widget);
-      
-      if (event->window == private_data->header_win)
-       gtk_calendar_paint_header (widget);
-      
-      if (event->window == private_data->day_name_win)
-       gtk_calendar_paint_day_names (widget);
-      
-      if (event->window == private_data->week_win)
-       gtk_calendar_paint_week_numbers (widget);
-      if (event->window == widget->window)
-       {
-         gtk_paint_shadow (widget->style, widget->window, GTK_WIDGET_STATE (widget),
-                           GTK_SHADOW_IN, NULL, widget, "calendar",
-                           0, 0, widget->allocation.width, widget->allocation.height);
-       }
-    }
-  
-  return FALSE;
+static void
+gtk_calendar_get_preferred_height (GtkWidget *widget,
+                                   gint      *minimum,
+                                   gint      *natural)
+{
+  GtkRequisition requisition;
+
+  gtk_calendar_size_request (widget, &requisition);
+
+  *minimum = *natural = requisition.height;
 }
 
 static void
-gtk_calendar_paint_header (GtkWidget *widget)
+gtk_calendar_size_allocate (GtkWidget     *widget,
+                            GtkAllocation *allocation)
 {
-  GtkCalendar *calendar;
-  GdkGC *gc;
+  GtkCalendar *calendar = GTK_CALENDAR (widget);
+  GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (widget);
+  GtkStyleContext *context;
+  GtkStateFlags state;
+  GtkBorder padding;
+  guint i;
+  gint inner_border = calendar_get_inner_border (calendar);
+  gint calendar_xsep = calendar_get_xsep (calendar);
+
+  context = gtk_widget_get_style_context (widget);
+  state = gtk_widget_get_state_flags (widget);
+  gtk_style_context_get_padding (context, state, &padding);
+
+  gtk_widget_set_allocation (widget, allocation);
+
+  if (priv->display_flags & GTK_CALENDAR_SHOW_WEEK_NUMBERS)
+    {
+      priv->day_width = (priv->min_day_width
+                         * ((allocation->width - (inner_border * 2) - padding.left - padding.right
+                             - (CALENDAR_MARGIN * 2) -  (DAY_XSEP * 6) - calendar_xsep * 2))
+                         / (7 * priv->min_day_width + priv->max_week_char_width * 2));
+      priv->week_width = ((allocation->width - (inner_border * 2) - padding.left - padding.right
+                           - (CALENDAR_MARGIN * 2) - (DAY_XSEP * 6) - calendar_xsep * 2 )
+                          - priv->day_width * 7 + CALENDAR_MARGIN + calendar_xsep);
+    }
+  else
+    {
+      priv->day_width = (allocation->width
+                         - (inner_border * 2)
+                         - padding.left - padding.right
+                         - (CALENDAR_MARGIN * 2)
+                         - (DAY_XSEP * 6))/7;
+      priv->week_width = 0;
+    }
+
+  if (gtk_widget_get_realized (widget))
+    {
+      if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR)
+        gdk_window_move_resize (priv->main_win,
+                                allocation->x
+                                 + priv->week_width + padding.left + inner_border,
+                                allocation->y
+                                 + priv->header_h + priv->day_name_h
+                                 + (padding.top + inner_border),
+                                allocation->width - priv->week_width
+                                - (inner_border * 2) - padding.left - padding.right,
+                                priv->main_h);
+      else
+        gdk_window_move_resize (priv->main_win,
+                                allocation->x
+                                 + padding.left + inner_border,
+                                allocation->y
+                                 + priv->header_h + priv->day_name_h
+                                 + padding.top + inner_border,
+                                allocation->width - priv->week_width
+                                - (inner_border * 2) - padding.left - padding.right,
+                                priv->main_h);
+
+      for (i = 0 ; i < 4 ; i++)
+        {
+          if (priv->arrow_win[i])
+            {
+              GdkRectangle rect;
+              calendar_arrow_rectangle (calendar, i, &rect);
+
+              gdk_window_move_resize (priv->arrow_win[i],
+                                      allocation->x + rect.x,
+                                      allocation->y + rect.y,
+                                      rect.width, rect.height);
+            }
+        }
+    }
+}
+
+\f
+/****************************************
+ *              Repainting              *
+ ****************************************/
+
+static void
+calendar_paint_header (GtkCalendar *calendar, cairo_t *cr)
+{
+  GtkWidget *widget = GTK_WIDGET (calendar);
+  GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (calendar);
+  GtkAllocation allocation;
+  GtkStyleContext *context;
+  GtkStateFlags state;
+  GtkBorder padding;
   char buffer[255];
-  int x, y;
-  gint header_width, cal_height;
+  gint x, y;
+  gint header_width;
   gint max_month_width;
   gint max_year_width;
-  GtkCalendarPrivateData *private_data;
   PangoLayout *layout;
   PangoRectangle logical_rect;
   gboolean year_left;
+  time_t tmp_time;
+  struct tm *tm;
+  gchar *str;
 
-  calendar = GTK_CALENDAR (widget);
-  private_data = GTK_CALENDAR_PRIVATE_DATA (widget);
+  context = gtk_widget_get_style_context (widget);
+  state = gtk_widget_get_state_flags (widget);
+  gtk_style_context_get_padding (context, state, &padding);
 
-  if (private_data->freeze_count)
-    {
-      private_data->dirty_header = 1;
-      return;
-    }
+  cairo_save (cr);
+  cairo_translate (cr, padding.left, padding.top);
 
-  if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR) 
-    year_left = private_data->year_before;
+  if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR)
+    year_left = priv->year_before;
   else
-    year_left = !private_data->year_before;
-
-  private_data->dirty_header = 0;
-  gc = calendar->gc;
-  
-  /* Clear window */
-  gdk_window_clear (private_data->header_win);
-  
-  header_width = widget->allocation.width - 2 * widget->style->xthickness;
-  cal_height = widget->allocation.height;
-  
-  max_month_width = private_data->max_month_width;
-  max_year_width = private_data->max_year_width;
-  
-  gdk_gc_set_foreground (gc, BACKGROUND_COLOR (GTK_WIDGET (calendar)));
-  gtk_paint_shadow (widget->style, private_data->header_win,
-                   GTK_STATE_NORMAL, GTK_SHADOW_OUT,
-                   NULL, widget, "calendar",
-                   0, 0, header_width, private_data->header_h);
-  
-  
-  g_snprintf (buffer, sizeof (buffer), "%d", calendar->year);
-  layout = gtk_widget_create_pango_layout (widget, buffer);
+    year_left = !priv->year_before;
+
+  gtk_widget_get_allocation (widget, &allocation);
+
+  header_width = allocation.width - padding.left - padding.right;
+
+  max_month_width = priv->max_month_width;
+  max_year_width = priv->max_year_width;
+
+  gtk_style_context_save (context);
+  gtk_style_context_add_class (context, GTK_STYLE_CLASS_HEADER);
+
+  gtk_render_background (context, cr, 0, 0, header_width, priv->header_h);
+  gtk_render_frame (context, cr, 0, 0, header_width, priv->header_h);
+
+  tmp_time = 1;  /* Jan 1 1970, 00:00:01 UTC */
+  tm = gmtime (&tmp_time);
+  tm->tm_year = priv->year - 1900;
+
+  /* Translators: This dictates how the year is displayed in
+   * gtkcalendar widget.  See strftime() manual for the format.
+   * Use only ASCII in the translation.
+   *
+   * Also look for the msgid "2000".
+   * Translate that entry to a year with the widest output of this
+   * msgid.
+   *
+   * "%Y" is appropriate for most locales.
+   */
+  strftime (buffer, sizeof (buffer), C_("calendar year format", "%Y"), tm);
+  str = g_locale_to_utf8 (buffer, -1, NULL, NULL, NULL);
+  layout = gtk_widget_create_pango_layout (widget, str);
+  g_free (str);
+
   pango_layout_get_pixel_extents (layout, NULL, &logical_rect);
-  
+
   /* Draw title */
-  y = (private_data->header_h - logical_rect.height) / 2;
-  
+  y = (priv->header_h - logical_rect.height) / 2;
+
   /* Draw year and its arrows */
-  
-  if (calendar->display_flags & GTK_CALENDAR_NO_MONTH_CHANGE)
+
+  if (priv->display_flags & GTK_CALENDAR_NO_MONTH_CHANGE)
     if (year_left)
       x = 3 + (max_year_width - logical_rect.width)/2;
     else
       x = header_width - (3 + max_year_width
-                         - (max_year_width - logical_rect.width)/2);
+                          - (max_year_width - logical_rect.width)/2);
   else
     if (year_left)
-      x = 3 + private_data->arrow_width + (max_year_width - logical_rect.width)/2;
+      x = 3 + priv->arrow_width + (max_year_width - logical_rect.width)/2;
     else
-      x = header_width - (3 + private_data->arrow_width + max_year_width
-                         - (max_year_width - logical_rect.width)/2);
-  
-  
-  gdk_gc_set_foreground (gc, HEADER_FG_COLOR (GTK_WIDGET (calendar)));
-  gdk_draw_layout (private_data->header_win, gc, x, y, layout);
-  
+      x = header_width - (3 + priv->arrow_width + max_year_width
+                          - (max_year_width - logical_rect.width)/2);
+
+  gtk_render_layout (context, cr, x, y, layout);
+
   /* Draw month */
-  g_snprintf (buffer, sizeof (buffer), "%s", default_monthname[calendar->month]);
+  g_snprintf (buffer, sizeof (buffer), "%s", default_monthname[priv->month]);
   pango_layout_set_text (layout, buffer, -1);
   pango_layout_get_pixel_extents (layout, NULL, &logical_rect);
 
-  if (calendar->display_flags & GTK_CALENDAR_NO_MONTH_CHANGE)
+  if (priv->display_flags & GTK_CALENDAR_NO_MONTH_CHANGE)
     if (year_left)
       x = header_width - (3 + max_month_width
-                         - (max_month_width - logical_rect.width)/2);      
+                          - (max_month_width - logical_rect.width)/2);
     else
     x = 3 + (max_month_width - logical_rect.width) / 2;
   else
     if (year_left)
-      x = header_width - (3 + private_data->arrow_width + max_month_width
-                         - (max_month_width - logical_rect.width)/2);
+      x = header_width - (3 + priv->arrow_width + max_month_width
+                          - (max_month_width - logical_rect.width)/2);
     else
-    x = 3 + private_data->arrow_width + (max_month_width - logical_rect.width)/2;
-
-  gdk_draw_layout (private_data->header_win, gc, x, y, layout);
-  
-  gdk_gc_set_foreground (gc, BACKGROUND_COLOR (GTK_WIDGET (calendar)));
-  
-  gtk_calendar_paint_arrow (widget, ARROW_MONTH_LEFT);
-  gtk_calendar_paint_arrow (widget, ARROW_MONTH_RIGHT);
-  gtk_calendar_paint_arrow (widget, ARROW_YEAR_LEFT);
-  gtk_calendar_paint_arrow (widget, ARROW_YEAR_RIGHT);
+    x = 3 + priv->arrow_width + (max_month_width - logical_rect.width)/2;
 
+  gtk_render_layout (context, cr, x, y, layout);
   g_object_unref (layout);
+
+  gtk_style_context_restore (context);
+  cairo_restore (cr);
 }
 
 static void
-gtk_calendar_paint_day_names (GtkWidget *widget)
-{
-  GtkCalendar *calendar;
-  GdkGC *gc;
+calendar_paint_day_names (GtkCalendar *calendar,
+                          cairo_t     *cr)
+{
+  GtkWidget *widget = GTK_WIDGET (calendar);
+  GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (calendar);
+  GtkStyleContext *context;
+  GtkStateFlags state;
+  GtkBorder padding;
+  GtkAllocation allocation;
   char buffer[255];
   int day,i;
   int day_width, cal_width;
-  gint cal_height;
   int day_wid_sep;
   PangoLayout *layout;
   PangoRectangle logical_rect;
-  GtkCalendarPrivateData *private_data;
   gint focus_padding;
   gint focus_width;
-  
-  g_return_if_fail (GTK_IS_CALENDAR (widget));
-  calendar = GTK_CALENDAR (widget);
-  private_data = GTK_CALENDAR_PRIVATE_DATA (widget);
-  gc = calendar->gc;
-  
+  gint calendar_ysep = calendar_get_ysep (calendar);
+  gint calendar_xsep = calendar_get_xsep (calendar);
+  gint inner_border = calendar_get_inner_border (calendar);
+
+  context = gtk_widget_get_style_context (widget);
+  state = gtk_widget_get_state_flags (widget);
+  gtk_style_context_get_padding (context, state, &padding);
+
+  cairo_save (cr);
+
+  cairo_translate (cr,
+                   padding.left + inner_border,
+                   priv->header_h + padding.top + inner_border);
+
   gtk_widget_style_get (GTK_WIDGET (widget),
-                       "focus-line-width", &focus_width,
-                       "focus-padding", &focus_padding,
-                       NULL);
-  /*
-   * Handle freeze/thaw functionality
-   */
-  
-  if (private_data->freeze_count)
-    {
-      private_data->dirty_day_names = 1;
-      return;
-    }
-  private_data->dirty_day_names = 0;
-  
-  /*
-   * Clear the window
-   */
-  
-  gdk_window_clear (private_data->day_name_win);
-  
-  day_width = private_data->day_width;
-  cal_width = widget->allocation.width;
-  cal_height = widget->allocation.height;
+                        "focus-line-width", &focus_width,
+                        "focus-padding", &focus_padding,
+                        NULL);
+
+  gtk_widget_get_allocation (widget, &allocation);
+
+  day_width = priv->day_width;
+  cal_width = allocation.width - (inner_border * 2) - padding.left - padding.right;
   day_wid_sep = day_width + DAY_XSEP;
-  
+
   /*
    * Draw rectangles as inverted background for the labels.
    */
-  
-  gdk_gc_set_foreground (gc, SELECTED_BG_COLOR (widget));
-  gdk_draw_rectangle (private_data->day_name_win, gc, TRUE,
-                     CALENDAR_MARGIN, CALENDAR_MARGIN,
-                     cal_width-CALENDAR_MARGIN * 2,
-                     private_data->day_name_h - CALENDAR_MARGIN);
-  
-  if (calendar->display_flags & GTK_CALENDAR_SHOW_WEEK_NUMBERS)
-    gdk_draw_rectangle (private_data->day_name_win, gc, TRUE,
-                       CALENDAR_MARGIN,
-                       private_data->day_name_h - CALENDAR_YSEP,
-                       private_data->week_width - CALENDAR_YSEP - CALENDAR_MARGIN,
-                       CALENDAR_YSEP);
-  
+
+  gtk_style_context_save (context);
+  gtk_style_context_add_class (context, GTK_STYLE_CLASS_HIGHLIGHT);
+
+  gtk_render_background (context, cr,
+                         CALENDAR_MARGIN, CALENDAR_MARGIN,
+                         cal_width - CALENDAR_MARGIN * 2,
+                         priv->day_name_h - CALENDAR_MARGIN);
+
+  if (priv->display_flags & GTK_CALENDAR_SHOW_WEEK_NUMBERS)
+    gtk_render_background (context, cr,
+                           CALENDAR_MARGIN,
+                           priv->day_name_h - calendar_ysep,
+                           priv->week_width - calendar_ysep - CALENDAR_MARGIN,
+                           calendar_ysep);
+
   /*
    * Write the labels
    */
-
   layout = gtk_widget_create_pango_layout (widget, NULL);
-  
-  gdk_gc_set_foreground (gc, SELECTED_FG_COLOR (widget));
+
   for (i = 0; i < 7; i++)
     {
       if (gtk_widget_get_direction (GTK_WIDGET (calendar)) == GTK_TEXT_DIR_RTL)
-       day = 6 - i;
+        day = 6 - i;
       else
-       day = i;
-      if (private_data->week_start == 1) 
-       day= (day+1)%7;
+        day = i;
+      day = (day + priv->week_start) % 7;
       g_snprintf (buffer, sizeof (buffer), "%s", default_abbreviated_dayname[day]);
 
       pango_layout_set_text (layout, buffer, -1);
       pango_layout_get_pixel_extents (layout, NULL, &logical_rect);
 
-      gdk_draw_layout (private_data->day_name_win, gc, 
-                      (CALENDAR_MARGIN +
-                       + (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR ?
-                          (private_data->week_width + (private_data->week_width ? CALENDAR_XSEP : 0))
-                          : 0)
-                       + day_wid_sep * i
-                       + (day_width - logical_rect.width)/2),
-                      CALENDAR_MARGIN + focus_width + focus_padding + logical_rect.y,
-                      layout);
-    }
-  
+      gtk_render_layout (context, cr,
+                         (CALENDAR_MARGIN +
+                          + (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR ?
+                             (priv->week_width + (priv->week_width ? calendar_xsep : 0))
+                             : 0)
+                          + day_wid_sep * i
+                          + (day_width - logical_rect.width)/2),
+                         CALENDAR_MARGIN + focus_width + focus_padding + logical_rect.y,
+                         layout);
+    }
+
   g_object_unref (layout);
+
+  gtk_style_context_restore (context);
+  cairo_restore (cr);
 }
 
 static void
-gtk_calendar_paint_week_numbers (GtkWidget *widget)
-{
-  GtkCalendar *calendar;
-  GdkGC *gc;
-  gint row, week = 0, year;
-  gint x_loc;
-  char buffer[3];
-  gint y_loc, day_height;
-  GtkCalendarPrivateData *private_data;
+calendar_paint_week_numbers (GtkCalendar *calendar,
+                             cairo_t     *cr)
+{
+  GtkWidget *widget = GTK_WIDGET (calendar);
+  GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (calendar);
+  GtkStyleContext *context;
+  GtkStateFlags state;
+  GtkBorder padding;
+  guint week = 0, year;
+  gint row, x_loc, y_loc;
+  gint day_height;
+  char buffer[32];
   PangoLayout *layout;
   PangoRectangle logical_rect;
   gint focus_padding;
   gint focus_width;
-  
-  g_return_if_fail (GTK_IS_CALENDAR (widget));
-  g_return_if_fail (widget->window != NULL);
-  calendar = GTK_CALENDAR (widget);
-  private_data = GTK_CALENDAR_PRIVATE_DATA (widget);
-  gc = calendar->gc;
-  
-  /*
-   * Handle freeze/thaw functionality
-   */
-  
-  if (private_data->freeze_count)
-    {
-      private_data->dirty_week = 1;
-      return;
-    }
-  private_data->dirty_week = 0;
-  
+  gint calendar_xsep = calendar_get_xsep (calendar);
+  gint inner_border = calendar_get_inner_border (calendar);
+  gint x, y;
+
+  context = gtk_widget_get_style_context (widget);
+  state = gtk_widget_get_state_flags (widget);
+  gtk_style_context_get_padding (context, state, &padding);
+
+  cairo_save (cr);
+
+  y = priv->header_h + priv->day_name_h + (padding.top + inner_border);
+  if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR)
+    x = padding.left + inner_border;
+  else
+    x = gtk_widget_get_allocated_width (widget) - priv->week_width - (padding.right + inner_border);
+
   gtk_widget_style_get (GTK_WIDGET (widget),
-                       "focus-line-width", &focus_width,
-                       "focus-padding", &focus_padding,
-                       NULL);
-  
-  /*
-   * Clear the window
-   */
-  
-  gdk_window_clear (private_data->week_win);
-  
-  /*
-   * Draw a rectangle as inverted background for the labels.
-   */
-  
-  gdk_gc_set_foreground (gc, SELECTED_BG_COLOR (widget));
-  if (private_data->day_name_win)
-    gdk_draw_rectangle (private_data->week_win, gc, TRUE,
-                       CALENDAR_MARGIN,
-                       0,
-                       private_data->week_width - CALENDAR_MARGIN,
-                       private_data->main_h - CALENDAR_MARGIN);
+                        "focus-line-width", &focus_width,
+                        "focus-padding", &focus_padding,
+                        NULL);
+
+  gtk_style_context_save (context);
+  gtk_style_context_add_class (context, GTK_STYLE_CLASS_HIGHLIGHT);
+
+  if (priv->display_flags & GTK_CALENDAR_SHOW_DAY_NAMES)
+    gtk_render_background (context, cr,
+                           x + CALENDAR_MARGIN, y,
+                           priv->week_width - CALENDAR_MARGIN,
+                           priv->main_h - CALENDAR_MARGIN);
   else
-    gdk_draw_rectangle (private_data->week_win, gc, TRUE,
-                       CALENDAR_MARGIN,
-                       CALENDAR_MARGIN,
-                       private_data->week_width - CALENDAR_MARGIN,
-                       private_data->main_h - 2 * CALENDAR_MARGIN);
-  
+    gtk_render_background (context, cr,
+                           x + CALENDAR_MARGIN,
+                           y + CALENDAR_MARGIN,
+                           priv->week_width - CALENDAR_MARGIN,
+                           priv->main_h - 2 * CALENDAR_MARGIN);
+
   /*
    * Write the labels
    */
-  
+
   layout = gtk_widget_create_pango_layout (widget, NULL);
-  
-  gdk_gc_set_foreground (gc, SELECTED_FG_COLOR (widget));
-  day_height = row_height (calendar);
+  day_height = calendar_row_height (calendar);
+
   for (row = 0; row < 6; row++)
     {
-      year = calendar->year;
-      if (calendar->day[row][6] < 15 && row > 3 && calendar->month == 11)
-       year++;
-
-      g_return_if_fail (week_of_year (&week, &year,            
-                                     ((calendar->day[row][6] < 15 && row > 3 ? 1 : 0)
-                                      + calendar->month) % 12 + 1, calendar->day[row][6]));
-
-      g_snprintf (buffer, sizeof (buffer), "%d", week);
+      gboolean result;
+
+      year = priv->year;
+      if (priv->day[row][6] < 15 && row > 3 && priv->month == 11)
+        year++;
+
+      result = week_of_year (&week, &year,
+                             ((priv->day[row][6] < 15 && row > 3 ? 1 : 0)
+                              + priv->month) % 12 + 1, priv->day[row][6]);
+      g_return_if_fail (result);
+
+      /* Translators: this defines whether the week numbers should use
+       * localized digits or the ones used in English (0123...).
+       *
+       * Translate to "%Id" if you want to use localized digits, or
+       * translate to "%d" otherwise.
+       *
+       * Note that translating this doesn't guarantee that you get localized
+       * digits. That needs support from your system and locale definition
+       * too.
+       */
+      g_snprintf (buffer, sizeof (buffer), C_("calendar:week:digits", "%d"), week);
       pango_layout_set_text (layout, buffer, -1);
       pango_layout_get_pixel_extents (layout, NULL, &logical_rect);
 
-      y_loc = top_y_for_row (calendar, row) + (day_height - logical_rect.height) / 2;
+      y_loc = calendar_top_y_for_row (calendar, row) + (day_height - logical_rect.height) / 2;
 
-      x_loc = (private_data->week_width
-              - logical_rect.width
-              - CALENDAR_XSEP - focus_padding - focus_width);
+      x_loc = x + (priv->week_width
+                   - logical_rect.width
+                   - calendar_xsep - focus_padding - focus_width);
 
-      gdk_draw_layout (private_data->week_win, gc, x_loc, y_loc, layout);
+      gtk_render_layout (context, cr, x_loc, y_loc, layout);
     }
-  
+
   g_object_unref (layout);
+
+  gtk_style_context_restore (context);
+  cairo_restore (cr);
 }
 
 static void
-gtk_calendar_paint_day_num (GtkWidget *widget,
-                           gint       day)
+calendar_invalidate_day_num (GtkCalendar *calendar,
+                             gint         day)
 {
-  GtkCalendar *calendar;
+  GtkCalendarPrivate *priv = calendar->priv;
   gint r, c, row, col;
-  
-  g_return_if_fail (GTK_IS_CALENDAR (widget));
-  
-  calendar = GTK_CALENDAR (widget);
-  
+
   row = -1;
   col = -1;
   for (r = 0; r < 6; r++)
     for (c = 0; c < 7; c++)
-      if (calendar->day_month[r][c] == MONTH_CURRENT &&
-         calendar->day[r][c] == day)
-       {
-         row = r;
-         col = c;
-       }
-  
+      if (priv->day_month[r][c] == MONTH_CURRENT &&
+          priv->day[r][c] == day)
+        {
+          row = r;
+          col = c;
+        }
+
   g_return_if_fail (row != -1);
   g_return_if_fail (col != -1);
-  
-  gtk_calendar_paint_day (widget, row, col);
+
+  calendar_invalidate_day (calendar, row, col);
 }
 
 static void
-gtk_calendar_paint_day (GtkWidget *widget,
-                       gint       row,
-                       gint       col)
+calendar_invalidate_day (GtkCalendar *calendar,
+                         gint         row,
+                         gint         col)
+{
+  GdkRectangle day_rect;
+  GtkAllocation allocation;
+
+  gtk_widget_get_allocation (GTK_WIDGET (calendar), &allocation);
+  calendar_day_rectangle (calendar, row, col, &day_rect);
+  gtk_widget_queue_draw_area (GTK_WIDGET (calendar),
+                              allocation.x + day_rect.x,
+                              allocation.y + day_rect.y,
+                              day_rect.width, day_rect.height);
+}
+
+static gboolean
+is_color_attribute (PangoAttribute *attribute,
+                    gpointer        data)
 {
-  GtkCalendar *calendar;
-  GdkGC *gc;
-  gchar buffer[255];
+  return (attribute->klass->type == PANGO_ATTR_FOREGROUND ||
+          attribute->klass->type == PANGO_ATTR_BACKGROUND);
+}
+
+static void
+calendar_paint_day (GtkCalendar *calendar,
+                    cairo_t     *cr,
+                    gint         row,
+                    gint         col)
+{
+  GtkWidget *widget = GTK_WIDGET (calendar);
+  GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (calendar);
+  GtkStyleContext *context;
+  GtkStateFlags state = 0;
+  gchar *detail;
+  gchar buffer[32];
   gint day;
-  gint day_height;
-  gint x_left;
-  gint x_loc;
-  gint y_top;
-  gint y_loc;
-  gint day_xspace;
-  gint focus_width;
+  gint x_loc, y_loc;
+  GdkRectangle day_rect;
 
-  GtkCalendarPrivateData *private_data;
   PangoLayout *layout;
   PangoRectangle logical_rect;
-  
-  g_return_if_fail (GTK_IS_CALENDAR (widget));
+  gboolean overflow = FALSE;
+  gboolean show_details;
+
   g_return_if_fail (row < 6);
   g_return_if_fail (col < 7);
-  calendar = GTK_CALENDAR (widget);
-  private_data = GTK_CALENDAR_PRIVATE_DATA (widget);
 
-  /*
-   * Handle freeze/thaw functionality
-   */
-  
-  if (private_data->freeze_count)
+  context = gtk_widget_get_style_context (widget);
+  state = gtk_widget_get_state_flags (widget);
+
+  day = priv->day[row][col];
+  show_details = (priv->display_flags & GTK_CALENDAR_SHOW_DETAILS);
+
+  calendar_day_rectangle (calendar, row, col, &day_rect);
+
+  gtk_style_context_save (context);
+
+  state &= ~(GTK_STATE_FLAG_INCONSISTENT | GTK_STATE_FLAG_ACTIVE | GTK_STATE_FLAG_SELECTED);
+
+  if (priv->day_month[row][col] == MONTH_PREV ||
+      priv->day_month[row][col] == MONTH_NEXT)
+    state |= GTK_STATE_FLAG_INCONSISTENT;
+  else
     {
-      private_data->dirty_main = 1;
-      return;
-    }
-  
-  gtk_widget_style_get (widget, "focus-line-width", &focus_width, NULL);
-
-  day_height = row_height (calendar);
-  
-  day_xspace = private_data->day_width - private_data->max_day_char_width*2;
-  
-  day = calendar->day[row][col];
-  
-  x_left = left_x_for_column (calendar, col);
-  x_loc = x_left + private_data->day_width / 2 + private_data->max_day_char_width;
-  
-  y_top = top_y_for_row (calendar, row);
-  
-  gdk_window_clear_area (private_data->main_win, x_left, y_top,
-                        private_data->day_width, day_height);
-  
-  gc = calendar->gc;
-  
-  if (calendar->day_month[row][col] == MONTH_PREV)
-    {
-      gdk_gc_set_foreground (gc, PREV_MONTH_COLOR (GTK_WIDGET (calendar)));
-    } 
-  else if (calendar->day_month[row][col] == MONTH_NEXT)
-    {
-      gdk_gc_set_foreground (gc, NEXT_MONTH_COLOR (GTK_WIDGET (calendar)));
-    } 
-  else 
-    {
-      /*
-      if (calendar->highlight_row == row && calendar->highlight_col == col)
-       {
-         gdk_gc_set_foreground (gc, HIGHLIGHT_BACK_COLOR (GTK_WIDGET (calendar)));
-         gdk_draw_rectangle (private_data->main_win, gc, TRUE, x_left, y_top,
-                             private_data->day_width, day_height);
-       }
-      */
-      if (calendar->selected_day == day)
-       {
-         gdk_gc_set_foreground (gc, SELECTED_BG_COLOR (GTK_WIDGET (calendar)));
-         gdk_draw_rectangle (private_data->main_win, gc, TRUE, x_left, y_top,
-                             private_data->day_width, day_height);
-       }
-      
-      if (calendar->marked_date[day-1])
-       gdk_gc_set_foreground (gc, MARKED_COLOR  (GTK_WIDGET (calendar)));
-      else
-       gdk_gc_set_foreground (gc, NORMAL_DAY_COLOR (GTK_WIDGET (calendar)));
-  
-      if (calendar->selected_day == day)
-       gdk_gc_set_foreground (gc, SELECTED_FG_COLOR (GTK_WIDGET (calendar)));
-      else
-       gdk_gc_set_foreground (gc, & (GTK_WIDGET (calendar)->style->fg[GTK_WIDGET_STATE (calendar)]));
+      if (priv->marked_date[day-1])
+        state |= GTK_STATE_FLAG_ACTIVE;
+
+      if (priv->selected_day == day)
+        {
+          state |= GTK_STATE_FLAG_SELECTED;
+
+          gtk_style_context_set_state (context, state);
+          gtk_render_background (context, cr,
+                                 day_rect.x, day_rect.y,
+                                 day_rect.width, day_rect.height);
+        }
     }
-    
 
-  g_snprintf (buffer, sizeof (buffer), "%d", day);
+  gtk_style_context_set_state (context, state);
+
+  /* Translators: this defines whether the day numbers should use
+   * localized digits or the ones used in English (0123...).
+   *
+   * Translate to "%Id" if you want to use localized digits, or
+   * translate to "%d" otherwise.
+   *
+   * Note that translating this doesn't guarantee that you get localized
+   * digits. That needs support from your system and locale definition
+   * too.
+   */
+  g_snprintf (buffer, sizeof (buffer), C_("calendar:day:digits", "%d"), day);
+
+  /* Get extra information to show, if any: */
+
+  detail = gtk_calendar_get_detail (calendar, row, col);
+
   layout = gtk_widget_create_pango_layout (widget, buffer);
+  pango_layout_set_alignment (layout, PANGO_ALIGN_CENTER);
   pango_layout_get_pixel_extents (layout, NULL, &logical_rect);
-  
-  x_loc -= logical_rect.width;
 
-  y_loc = y_top + (day_height - logical_rect.height) / 2;
-  gdk_draw_layout (private_data->main_win, gc,
-                  x_loc, y_loc, layout);
-  if (calendar->marked_date[day-1]
-      && calendar->day_month[row][col] == MONTH_CURRENT)
-    gdk_draw_layout (private_data->main_win, gc,
-                    x_loc-1, y_loc, layout);
+  x_loc = day_rect.x + (day_rect.width - logical_rect.width) / 2;
+  y_loc = day_rect.y;
 
-  if (GTK_WIDGET_HAS_FOCUS (calendar) 
-      && calendar->focus_row == row && calendar->focus_col == col)
-    {
-      GtkStateType state;
+  gtk_render_layout (context, cr, x_loc, y_loc, layout);
 
-      if (calendar->selected_day == day)
-       state = GTK_WIDGET_HAS_FOCUS (widget) ? GTK_STATE_SELECTED : GTK_STATE_ACTIVE;
-      else
-       state = GTK_STATE_NORMAL;
-      
-      gtk_paint_focus (widget->style, 
-                      private_data->main_win,
-                      (calendar->selected_day == day) 
-                         ? GTK_STATE_SELECTED : GTK_STATE_NORMAL, 
-                      NULL, widget, "calendar-day",
-                      x_left, y_top, 
-                      private_data->day_width, 
-                      day_height);
-    }
+  if (priv->day_month[row][col] == MONTH_CURRENT &&
+     (priv->marked_date[day-1] || (detail && !show_details)))
+    gtk_render_layout (context, cr, x_loc - 1, y_loc, layout);
 
-  g_object_unref (layout);
-}
+  y_loc += priv->max_day_char_descent;
 
+  if (priv->detail_func && show_details)
+    {
+      GdkRGBA color;
 
-static void
-gtk_calendar_paint_main (GtkWidget *widget)
-{
-  GtkCalendar *calendar;
-  GtkCalendarPrivateData *private_data;
-  gint row, col;
-  
-  g_return_if_fail (GTK_IS_CALENDAR (widget));
-  g_return_if_fail (widget->window != NULL);
-  
-  calendar = GTK_CALENDAR (widget);
-  private_data = GTK_CALENDAR_PRIVATE_DATA (widget);
+      cairo_save (cr);
 
-  if (private_data->freeze_count)
-    {
-      private_data->dirty_main = 1;
-      return;
-    }
-  private_data->dirty_main = 0;
-  gdk_window_clear (private_data->main_win);
-  
-  /* gtk_calendar_compute_days (calendar); */ /* REMOVE later */
-  
-  for (col = 0; col < 7; col++)
-    for (row = 0; row < 6; row++)
-      gtk_calendar_paint_day (widget, row, col);
-}
+      gtk_style_context_get_color (context, state, &color);
+      gdk_cairo_set_source_rgba (cr, &color);
 
-static void
-gtk_calendar_compute_days (GtkCalendar *calendar)
-{
-  GtkCalendarPrivateData *private_data;
-  gint month;
-  gint year;
-  gint ndays_in_month;
-  gint ndays_in_prev_month;
-  gint first_day;
-  gint row;
-  gint col;
-  gint day;
-  
-  g_return_if_fail (GTK_IS_CALENDAR (calendar));
+      cairo_set_line_width (cr, 1);
+      cairo_move_to (cr, day_rect.x + 2, y_loc + 0.5);
+      cairo_line_to (cr, day_rect.x + day_rect.width - 2, y_loc + 0.5);
+      cairo_stroke (cr);
 
-  private_data = GTK_CALENDAR_PRIVATE_DATA (GTK_WIDGET (calendar));
-  
-  year = calendar->year;
-  month = calendar->month + 1;
-  
-  ndays_in_month = month_length[leap (year)][month];
-  
-  first_day = day_of_week (year, month, 1);
-  
-  if (private_data->week_start == 1)
-    first_day--;
-  else
-    first_day %= 7;
-  
-  
-  /* Compute days of previous month */
-  if (month > 1)
-    ndays_in_prev_month = month_length[leap (year)][month-1];
-  else
-    ndays_in_prev_month = month_length[leap (year)][12];
-  day = ndays_in_prev_month - first_day + 1;
-  
-  row = 0;
-  if (first_day > 0)
-    {
-      for (col = 0; col < first_day; col++)
-       {
-         calendar->day[row][col] = day;
-         calendar->day_month[row][col] = MONTH_PREV;
-         day++;
-       }
-    }
-  
-  /* Compute days of current month */
-  col = first_day;
-  for (day = 1; day <= ndays_in_month; day++)
-    {
-      calendar->day[row][col] = day;
-      calendar->day_month[row][col] = MONTH_CURRENT;
-      
-      col++;
-      if (col == 7)
-       {
-         row++;
-         col = 0;
-       }
-    }
-  
-  /* Compute days of next month */
-  day = 1;
-  for (; row <= 5; row++)
-    {
-      for (; col <= 6; col++)
-       {
-         calendar->day[row][col] = day;
-         calendar->day_month[row][col] = MONTH_NEXT;
-         day++;
-       }
-      col = 0;
-    }
-}
+      cairo_restore (cr);
 
-void
-gtk_calendar_display_options (GtkCalendar             *calendar,
-                             GtkCalendarDisplayOptions flags)
-{
-  gtk_calendar_set_display_options (calendar, flags);
-}
+      y_loc += 2;
+    }
 
-/**
- * gtk_calendar_get_display_options:
- * @calendar: a #GtkCalendar
- * 
- * Returns the current display options of @calendar. 
- * 
- * Return value: the display options.
- *
- * Since: 2.4
- **/
-GtkCalendarDisplayOptions 
-gtk_calendar_get_display_options (GtkCalendar         *calendar)
-{
-  g_return_val_if_fail (GTK_IS_CALENDAR (calendar), 0);
+  if (detail && show_details)
+    {
+      gchar *markup = g_strconcat ("<small>", detail, "</small>", NULL);
+      pango_layout_set_markup (layout, markup, -1);
+      g_free (markup);
 
-  return calendar->display_flags;
-}
+      if (day == priv->selected_day)
+        {
+          /* Stripping colors as they conflict with selection marking. */
 
-/**
- * gtk_calendar_set_display_options:
- * @calendar: a #GtkCalendar
- * @flags: the display options to set
- * 
- * Sets display options (whether to display the heading and the month  
- * headings).
- *
- * Since: 2.4
- **/
-void
-gtk_calendar_set_display_options (GtkCalendar         *calendar,
-                                 GtkCalendarDisplayOptions flags)
-{
-  GtkCalendarPrivateData *private_data;
-  gint resize = 0;
-  GtkWidget *widget;
-  gint i;
-  GtkCalendarDisplayOptions old_flags;
-  
-  g_return_if_fail (GTK_IS_CALENDAR (calendar));
-  
-  widget = GTK_WIDGET (calendar);
-  private_data = GTK_CALENDAR_PRIVATE_DATA (calendar);
-  old_flags = calendar->display_flags;
-  
-  if (GTK_WIDGET_REALIZED (widget))
-    {
-      if ((flags ^ calendar->display_flags) & GTK_CALENDAR_NO_MONTH_CHANGE)
-       {
-         resize ++;
-         if (! (flags & GTK_CALENDAR_NO_MONTH_CHANGE)
-             && (private_data->header_win))
-           {
-             calendar->display_flags &= ~GTK_CALENDAR_NO_MONTH_CHANGE;
-             gtk_calendar_realize_arrows (widget);
-           }
-         else
-           {
-             for (i = 0; i < 4; i++)
-               {
-                 if (private_data->arrow_win[i])
-                   {
-                     gdk_window_set_user_data (private_data->arrow_win[i], 
-                                               NULL);
-                     gdk_window_destroy (private_data->arrow_win[i]);
-                     private_data->arrow_win[i] = NULL;
-                   }
-               }
-           }
-       }
-      
-      if ((flags ^ calendar->display_flags) & GTK_CALENDAR_SHOW_HEADING)
-       {
-         resize++;
-         
-         if (flags & GTK_CALENDAR_SHOW_HEADING)
-           {
-             calendar->display_flags |= GTK_CALENDAR_SHOW_HEADING;
-             gtk_calendar_realize_header (widget);
-           }
-         else
-           {
-             for (i = 0; i < 4; i++)
-               {
-                 if (private_data->arrow_win[i])
-                   {
-                     gdk_window_set_user_data (private_data->arrow_win[i], 
-                                               NULL);
-                     gdk_window_destroy (private_data->arrow_win[i]);
-                     private_data->arrow_win[i] = NULL;
-                   }
-               }
-             gdk_window_set_user_data (private_data->header_win, NULL);
-             gdk_window_destroy (private_data->header_win);
-             private_data->header_win = NULL;
-           }
-       }
-      
-      
-      if ((flags ^ calendar->display_flags) & GTK_CALENDAR_SHOW_DAY_NAMES)
-       {
-         resize++;
-         
-         if (flags & GTK_CALENDAR_SHOW_DAY_NAMES)
-           {
-             calendar->display_flags |= GTK_CALENDAR_SHOW_DAY_NAMES;
-             gtk_calendar_realize_day_names (widget);
-           }
-         else
-           {
-             gdk_window_set_user_data (private_data->day_name_win, NULL);
-             gdk_window_destroy (private_data->day_name_win);
-             private_data->day_name_win = NULL;
-           }
-       }
-      
-      if ((flags ^ calendar->display_flags) & GTK_CALENDAR_SHOW_WEEK_NUMBERS)
-       {
-         resize++;
-         
-         if (flags & GTK_CALENDAR_SHOW_WEEK_NUMBERS)
-           {
-             calendar->display_flags |= GTK_CALENDAR_SHOW_WEEK_NUMBERS;
-             gtk_calendar_realize_week_numbers (widget);
-           }
-         else
-           {
-             gdk_window_set_user_data (private_data->week_win, NULL);
-             gdk_window_destroy (private_data->week_win);
-             private_data->week_win = NULL;
-           }
-       }
-
-      if ((flags ^ calendar->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");
-      
-      calendar->display_flags = flags;
-      if (resize)
-       gtk_widget_queue_resize (GTK_WIDGET (calendar));
-      
-    } 
-  else
-    calendar->display_flags = flags;
-  
-  g_object_freeze_notify (G_OBJECT (calendar));
-  if ((old_flags ^ calendar->display_flags) & GTK_CALENDAR_SHOW_HEADING)
-    g_object_notify (G_OBJECT (calendar), "show_heading");
-  if ((old_flags ^ calendar->display_flags) & GTK_CALENDAR_SHOW_DAY_NAMES)
-    g_object_notify (G_OBJECT (calendar), "show_day_names");
-  if ((old_flags ^ calendar->display_flags) & GTK_CALENDAR_NO_MONTH_CHANGE)
-    g_object_notify (G_OBJECT (calendar), "no_month_change");
-  if ((old_flags ^ calendar->display_flags) & GTK_CALENDAR_SHOW_WEEK_NUMBERS)
-    g_object_notify (G_OBJECT (calendar), "show_week_numbers");
-  g_object_thaw_notify (G_OBJECT (calendar));
-}
+          PangoAttrList *attrs = pango_layout_get_attributes (layout);
+          PangoAttrList *colors = NULL;
 
-gboolean
-gtk_calendar_select_month (GtkCalendar *calendar,
-                          guint        month,
-                          guint        year)
-{
-  g_return_val_if_fail (GTK_IS_CALENDAR (calendar), FALSE);
-  g_return_val_if_fail (month <= 11, FALSE);
-  
-  calendar->month = month;
-  calendar->year  = year;
-  
-  gtk_calendar_compute_days (calendar);
-  
-  gtk_widget_queue_draw (GTK_WIDGET (calendar));
+          if (attrs)
+            colors = pango_attr_list_filter (attrs, is_color_attribute, NULL);
+          if (colors)
+            pango_attr_list_unref (colors);
+        }
 
-  g_object_freeze_notify (G_OBJECT (calendar));
-  g_object_notify (G_OBJECT (calendar), "month");
-  g_object_notify (G_OBJECT (calendar), "year");
-  g_object_thaw_notify (G_OBJECT (calendar));
+      pango_layout_set_wrap (layout, PANGO_WRAP_WORD_CHAR);
+      pango_layout_set_width (layout, PANGO_SCALE * day_rect.width);
 
-  g_signal_emit (calendar,
-                gtk_calendar_signals[MONTH_CHANGED_SIGNAL],
-                0);
-  return TRUE;
-}
+      if (priv->detail_height_rows)
+        {
+          gint dy = day_rect.height - (y_loc - day_rect.y);
+          pango_layout_set_height (layout, PANGO_SCALE * dy);
+          pango_layout_set_ellipsize (layout, PANGO_ELLIPSIZE_END);
+        }
 
-void
-gtk_calendar_select_day (GtkCalendar *calendar,
-                        guint        day)
-{
-  g_return_if_fail (GTK_IS_CALENDAR (calendar));
-  g_return_if_fail (day <= 31);
-  
-  /* gtk_calendar_compute_days (calendar); */
-  
-  /* Deselect the old day */
-  if (calendar->selected_day > 0)
-    {
-      gint selected_day;
-      
-      selected_day = calendar->selected_day;
-      calendar->selected_day = 0;
-      if (GTK_WIDGET_DRAWABLE (GTK_WIDGET (calendar)))
-       gtk_calendar_paint_day_num (GTK_WIDGET (calendar), selected_day);
-    }
-  
-  calendar->selected_day = day;
-  
-  /* Select the new day */
-  if (day != 0)
-    {
-      if (GTK_WIDGET_DRAWABLE (GTK_WIDGET (calendar)))
-       gtk_calendar_paint_day_num (GTK_WIDGET (calendar), day);
+      cairo_move_to (cr, day_rect.x, y_loc);
+      pango_cairo_show_layout (cr, layout);
     }
-  
-  g_object_notify (G_OBJECT (calendar), "day");
 
-  g_signal_emit (calendar,
-                gtk_calendar_signals[DAY_SELECTED_SIGNAL],
-                0);
+  if (gtk_widget_has_visible_focus (widget) &&
+      priv->focus_row == row && priv->focus_col == col)
+    gtk_render_focus (context, cr,
+                      day_rect.x, day_rect.y,
+                      day_rect.width, day_rect.height);
+
+  if (overflow)
+    priv->detail_overflow[row] |= (1 << col);
+  else
+    priv->detail_overflow[row] &= ~(1 << col);
+
+  gtk_style_context_restore (context);
+  g_object_unref (layout);
+  g_free (detail);
 }
 
 static void
-gtk_calendar_select_and_focus_day (GtkCalendar *calendar,
-                                  guint        day)
+calendar_paint_main (GtkCalendar *calendar,
+                     cairo_t     *cr)
 {
-  gint old_focus_row = calendar->focus_row;
-  gint old_focus_col = calendar->focus_col;
-  gint row;
-  gint col;
-  
-  for (row = 0; row < 6; row ++)
-    for (col = 0; col < 7; col++)
-      {
-       if (calendar->day_month[row][col] == MONTH_CURRENT 
-           && calendar->day[row][col] == day)
-         {
-           calendar->focus_row = row;
-           calendar->focus_col = col;
-         }
-      }
+  gint row, col;
 
-  if (old_focus_row != -1 && old_focus_col != -1)
-    gtk_calendar_paint_day (GTK_WIDGET (calendar), old_focus_row, old_focus_col);
-  
-  gtk_calendar_select_day (calendar, day);
+  cairo_save (cr);
+
+  for (col = 0; col < 7; col++)
+    for (row = 0; row < 6; row++)
+      calendar_paint_day (calendar, cr, row, col);
+
+  cairo_restore (cr);
 }
 
-void
-gtk_calendar_clear_marks (GtkCalendar *calendar)
+static void
+calendar_invalidate_arrow (GtkCalendar *calendar,
+                           guint        arrow)
 {
-  guint day;
-  
-  g_return_if_fail (GTK_IS_CALENDAR (calendar));
-  
-  for (day = 0; day < 31; day++)
-    {
-      calendar->marked_date[day] = FALSE;
-    }
-  calendar->num_marked_dates = 0;
-  if (GTK_WIDGET_DRAWABLE (calendar))
+  GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (calendar);
+
+  if (priv->display_flags & GTK_CALENDAR_SHOW_HEADING &&
+      priv->arrow_win[arrow])
     {
-      gtk_calendar_paint_main (GTK_WIDGET (calendar));
+      GdkRectangle rect;
+      GtkAllocation allocation;
+
+      calendar_arrow_rectangle (calendar, arrow, &rect);
+      gtk_widget_get_allocation (GTK_WIDGET (calendar), &allocation);
+      gtk_widget_queue_draw_area (GTK_WIDGET (calendar),
+                                  allocation.x + rect.x,
+                                  allocation.y + rect.y,
+                                  rect.width, rect.height);
     }
 }
 
-gboolean
-gtk_calendar_mark_day (GtkCalendar *calendar,
-                      guint        day)
-{
-  g_return_val_if_fail (GTK_IS_CALENDAR (calendar), FALSE);
-  
-  if (day >= 1 && day <= 31 && calendar->marked_date[day-1] == FALSE)
-    {
-      calendar->marked_date[day - 1] = TRUE;
-      calendar->num_marked_dates++;
-    }
-  if (GTK_WIDGET_DRAWABLE (GTK_WIDGET (calendar)))
-    {
-      gtk_calendar_paint_main (GTK_WIDGET (calendar));
-    }
-  
-  return TRUE;
+static void
+calendar_paint_arrow (GtkCalendar *calendar,
+                      cairo_t     *cr,
+                      guint        arrow)
+{
+  GtkWidget *widget = GTK_WIDGET (calendar);
+  GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (widget);
+  GtkStyleContext *context;
+  GtkStateFlags state;
+  GdkRectangle rect;
+  gdouble angle;
+
+  if (!priv->arrow_win[arrow])
+    return;
+
+  calendar_arrow_rectangle (calendar, arrow, &rect);
+
+  cairo_save (cr);
+
+  context = gtk_widget_get_style_context (widget);
+  state = gtk_widget_get_state_flags (widget);
+
+  if (priv->arrow_prelight & (1 << arrow))
+    state |= GTK_STATE_FLAG_PRELIGHT;
+  else
+    state &= ~(GTK_STATE_FLAG_PRELIGHT);
+
+  gtk_style_context_save (context);
+  gtk_style_context_set_state (context, state);
+  gtk_style_context_add_class (context, GTK_STYLE_CLASS_BUTTON);
+
+  gtk_render_background (context, cr,
+                         rect.x, rect.y,
+                         rect.width, rect.height);
+
+  if (arrow == ARROW_MONTH_LEFT || arrow == ARROW_YEAR_LEFT)
+    angle = 3 * (G_PI / 2);
+  else
+    angle = G_PI / 2;
+
+  gtk_render_arrow (context, cr, angle,
+                    rect.x + (rect.width - 8) / 2,
+                    rect.y + (rect.height - 8) / 2,
+                    8);
+
+  gtk_style_context_restore (context);
+  cairo_restore (cr);
 }
 
-gboolean
-gtk_calendar_unmark_day (GtkCalendar *calendar,
-                        guint        day)
+static gboolean
+gtk_calendar_draw (GtkWidget *widget,
+                   cairo_t   *cr)
 {
-  g_return_val_if_fail (GTK_IS_CALENDAR (calendar), FALSE);
-  
-  if (day >= 1 && day <= 31 && calendar->marked_date[day-1] == TRUE)
+  GtkCalendar *calendar = GTK_CALENDAR (widget);
+  GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (widget);
+  int i;
+
+  if (gtk_cairo_should_draw_window (cr, gtk_widget_get_window (widget)))
     {
-      calendar->marked_date[day - 1] = FALSE;
-      calendar->num_marked_dates--;
+      GtkStyleContext *context;
+
+      context = gtk_widget_get_style_context (widget);
+
+      gtk_style_context_save (context);
+      gtk_style_context_add_class (context, GTK_STYLE_CLASS_VIEW);
+
+      gtk_render_background (context, cr, 0, 0,
+                             gtk_widget_get_allocated_width (widget),
+                             gtk_widget_get_allocated_height (widget));
+      gtk_render_frame (context, cr, 0, 0,
+                        gtk_widget_get_allocated_width (widget),
+                        gtk_widget_get_allocated_height (widget));
+
+      gtk_style_context_restore (context);
     }
-  
-  if (GTK_WIDGET_DRAWABLE (GTK_WIDGET (calendar)))
+
+  calendar_paint_main (calendar, cr);
+
+  if (priv->display_flags & GTK_CALENDAR_SHOW_HEADING)
     {
-      gtk_calendar_paint_main (GTK_WIDGET (calendar));
+      calendar_paint_header (calendar, cr);
+      for (i = 0; i < 4; i++)
+        calendar_paint_arrow (calendar, cr, i);
     }
-  
-  return TRUE;
-}
 
-void
-gtk_calendar_get_date (GtkCalendar *calendar,
-                      guint       *year,
-                      guint       *month,
-                      guint       *day)
-{
-  g_return_if_fail (GTK_IS_CALENDAR (calendar));
-  
-  if (year)
-    *year = calendar->year;
-  
-  if (month)
-    *month = calendar->month;
-  
-  if (day)
-    *day = calendar->selected_day;
+  if (priv->display_flags & GTK_CALENDAR_SHOW_DAY_NAMES)
+    calendar_paint_day_names (calendar, cr);
+
+  if (priv->display_flags & GTK_CALENDAR_SHOW_WEEK_NUMBERS)
+    calendar_paint_week_numbers (calendar, cr);
+
+  return FALSE;
 }
 
-#define CALENDAR_INITIAL_TIMER_DELAY    200
-#define CALENDAR_TIMER_DELAY            20
+
+/****************************************
+ *           Mouse handling             *
+ ****************************************/
 
 static void
-arrow_action (GtkCalendar *calendar,
-             guint        arrow)
+calendar_arrow_action (GtkCalendar *calendar,
+                       guint        arrow)
 {
   switch (arrow)
     {
     case ARROW_YEAR_LEFT:
-      gtk_calendar_set_year_prev (calendar);
+      calendar_set_year_prev (calendar);
       break;
     case ARROW_YEAR_RIGHT:
-      gtk_calendar_set_year_next (calendar);
+      calendar_set_year_next (calendar);
       break;
     case ARROW_MONTH_LEFT:
-      gtk_calendar_set_month_prev (calendar);
+      calendar_set_month_prev (calendar);
       break;
     case ARROW_MONTH_RIGHT:
-      gtk_calendar_set_month_next (calendar);
+      calendar_set_month_next (calendar);
       break;
     default:;
-      // do nothing
+      /* do nothing */
     }
 }
 
@@ -2690,450 +2881,295 @@ static gboolean
 calendar_timer (gpointer data)
 {
   GtkCalendar *calendar = data;
-  GtkCalendarPrivateData *private_data = GTK_CALENDAR_PRIVATE_DATA (calendar);
+  GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (calendar);
   gboolean retval = FALSE;
-  
-  GDK_THREADS_ENTER ();
 
-  if (private_data->timer)
+  if (priv->timer)
     {
-      arrow_action (calendar, private_data->click_child);
+      calendar_arrow_action (calendar, priv->click_child);
 
-      if (private_data->need_timer)
-       {
-         private_data->need_timer = FALSE;
-         private_data->timer = g_timeout_add (CALENDAR_TIMER_DELAY, 
-                                              (GtkFunction) calendar_timer, 
-                                              (gpointer) calendar);
-       }
-      else 
-       retval = TRUE;
-    }
+      if (priv->need_timer)
+        {
+          GtkSettings *settings;
+          guint        timeout;
 
-  GDK_THREADS_LEAVE ();
+          settings = gtk_widget_get_settings (GTK_WIDGET (calendar));
+          g_object_get (settings, "gtk-timeout-repeat", &timeout, NULL);
+
+          priv->need_timer = FALSE;
+          priv->timer = gdk_threads_add_timeout_full (G_PRIORITY_DEFAULT_IDLE,
+                                            timeout * SCROLL_DELAY_FACTOR,
+                                            (GSourceFunc) calendar_timer,
+                                            (gpointer) calendar, NULL);
+        }
+      else
+        retval = TRUE;
+    }
 
   return retval;
 }
 
 static void
-start_spinning (GtkWidget *widget,
-               gint       click_child)
+calendar_start_spinning (GtkCalendar *calendar,
+                         gint         click_child)
 {
-  GtkCalendarPrivateData *private_data = GTK_CALENDAR_PRIVATE_DATA (widget);
+  GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (calendar);
+
+  priv->click_child = click_child;
 
-  private_data->click_child = click_child;
-  
-  if (!private_data->timer)
+  if (!priv->timer)
     {
-      private_data->need_timer = TRUE;
-      private_data->timer = g_timeout_add (CALENDAR_INITIAL_TIMER_DELAY, 
-                                          calendar_timer,
-                                          (gpointer) widget);
+      GtkSettings *settings;
+      guint        timeout;
+
+      settings = gtk_widget_get_settings (GTK_WIDGET (calendar));
+      g_object_get (settings, "gtk-timeout-initial", &timeout, NULL);
+
+      priv->need_timer = TRUE;
+      priv->timer = gdk_threads_add_timeout_full (G_PRIORITY_DEFAULT_IDLE,
+                                        timeout,
+                                        (GSourceFunc) calendar_timer,
+                                        (gpointer) calendar, NULL);
     }
 }
 
 static void
-stop_spinning (GtkWidget *widget)
+calendar_stop_spinning (GtkCalendar *calendar)
 {
-  GtkCalendarPrivateData *private_data;
+  GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (calendar);
 
-  private_data = GTK_CALENDAR_PRIVATE_DATA (widget);
-
-  if (private_data->timer)
+  if (priv->timer)
     {
-      g_source_remove (private_data->timer);
-      private_data->timer = 0;
-      private_data->need_timer = FALSE;
+      g_source_remove (priv->timer);
+      priv->timer = 0;
+      priv->need_timer = FALSE;
     }
 }
 
 static void
-gtk_calendar_destroy (GtkObject *object)
+calendar_main_button_press (GtkCalendar    *calendar,
+                            GdkEventButton *event)
 {
-  stop_spinning (GTK_WIDGET (object));
-  
-  GTK_OBJECT_CLASS (parent_class)->destroy (object);
-}
+  GtkWidget *widget = GTK_WIDGET (calendar);
+  GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (calendar);
+  gint x, y;
+  gint win_x, win_y;
+  gint row, col;
+  gint day_month;
+  gint day;
+  GtkAllocation allocation;
 
-static void
-gtk_calendar_grab_notify (GtkWidget *widget,
-                         gboolean   was_grabbed)
-{
-  if (!was_grabbed)
-    stop_spinning (widget);
+  x = (gint) (event->x);
+  y = (gint) (event->y);
+
+  gdk_window_get_position (priv->main_win, &win_x, &win_y);
+  gtk_widget_get_allocation (widget, &allocation);
+
+  row = calendar_row_from_y (calendar, y + win_y - allocation.y);
+  col = calendar_column_from_x (calendar, x + win_x - allocation.x);
+
+  /* If row or column isn't found, just return. */
+  if (row == -1 || col == -1)
+    return;
+
+  day_month = priv->day_month[row][col];
+
+  if (event->type == GDK_BUTTON_PRESS)
+    {
+      day = priv->day[row][col];
+
+      if (day_month == MONTH_PREV)
+        calendar_set_month_prev (calendar);
+      else if (day_month == MONTH_NEXT)
+        calendar_set_month_next (calendar);
+
+      if (!gtk_widget_has_focus (widget))
+        gtk_widget_grab_focus (widget);
+
+      if (event->button == GDK_BUTTON_PRIMARY)
+        {
+          priv->in_drag = 1;
+          priv->drag_start_x = x;
+          priv->drag_start_y = y;
+        }
+
+      calendar_select_and_focus_day (calendar, day);
+    }
+  else if (event->type == GDK_2BUTTON_PRESS)
+    {
+      priv->in_drag = 0;
+      if (day_month == MONTH_CURRENT)
+        g_signal_emit (calendar,
+                       gtk_calendar_signals[DAY_SELECTED_DOUBLE_CLICK_SIGNAL],
+                       0);
+    }
 }
 
 static gboolean
-gtk_calendar_button_press (GtkWidget     *widget,
-                          GdkEventButton *event)
+gtk_calendar_button_press (GtkWidget      *widget,
+                           GdkEventButton *event)
 {
-  GtkCalendar *calendar;
-  GtkCalendarPrivateData *private_data;
+  GtkCalendar *calendar = GTK_CALENDAR (widget);
+  GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (widget);
   gint arrow = -1;
-  
-  calendar = GTK_CALENDAR (widget);
-  private_data = GTK_CALENDAR_PRIVATE_DATA (widget);
-  
-  if (event->window == private_data->main_win)
-    gtk_calendar_main_button (widget, event);
-
-  if (!GTK_WIDGET_HAS_FOCUS (widget))
+
+  if (event->window == priv->main_win)
+    calendar_main_button_press (calendar, event);
+
+  if (!gtk_widget_has_focus (widget))
     gtk_widget_grab_focus (widget);
 
   for (arrow = ARROW_YEAR_LEFT; arrow <= ARROW_MONTH_RIGHT; arrow++)
     {
-      if (event->window == private_data->arrow_win[arrow])
-       {
-         
-         /* only call the action on single click, not double */
-         if (event->type == GDK_BUTTON_PRESS)
-           {
-             arrow_action (calendar, arrow);
-             
-             if (event->button == 1)
-               start_spinning (widget, arrow);
-           }
+      if (event->window == priv->arrow_win[arrow])
+        {
+
+          /* only call the action on single click, not double */
+          if (event->type == GDK_BUTTON_PRESS)
+            {
+              if (event->button == GDK_BUTTON_PRIMARY)
+                calendar_start_spinning (calendar, arrow);
+
+              calendar_arrow_action (calendar, arrow);
+            }
 
-         return TRUE;
-       }
+          return TRUE;
+        }
     }
 
   return FALSE;
 }
 
 static gboolean
-gtk_calendar_button_release (GtkWidget   *widget,
-                            GdkEventButton *event)
+gtk_calendar_button_release (GtkWidget    *widget,
+                             GdkEventButton *event)
 {
-  GtkCalendar *calendar;
-  GtkCalendarPrivateData *private_data;
-
-  calendar = GTK_CALENDAR (widget);
-  private_data = GTK_CALENDAR_PRIVATE_DATA (widget);
+  GtkCalendar *calendar = GTK_CALENDAR (widget);
+  GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (widget);
 
-  if (event->button == 1) 
+  if (event->button == GDK_BUTTON_PRIMARY)
     {
-      stop_spinning (widget);
+      calendar_stop_spinning (calendar);
 
-      if (private_data->in_drag)
-       private_data->in_drag = 0;
+      if (priv->in_drag)
+        priv->in_drag = 0;
     }
 
   return TRUE;
 }
 
 static gboolean
-gtk_calendar_motion_notify (GtkWidget     *widget,
-                           GdkEventMotion *event)
+gtk_calendar_motion_notify (GtkWidget      *widget,
+                            GdkEventMotion *event)
 {
-  GtkCalendar *calendar;
-  GtkCalendarPrivateData *private_data;
-  gint event_x, event_y;
-  gint row, col;
-  gint old_row, old_col;
-  
-  calendar = GTK_CALENDAR (widget);
-  private_data = GTK_CALENDAR_PRIVATE_DATA (widget);
-  event_x = (gint) (event->x);
-  event_y = (gint) (event->y);
-  
-  if (event->window == private_data->main_win)
-    {
-      
-      if (private_data->in_drag) 
-       {
-         if (gtk_drag_check_threshold (widget,
-                                       private_data->drag_start_x, private_data->drag_start_y,
-                                       event->x, event->y))
-           {
-             GdkDragContext *context;
-             GtkTargetList *target_list = gtk_target_list_new (target_table, G_N_ELEMENTS (target_table));
-             context = gtk_drag_begin (widget, target_list, GDK_ACTION_COPY,
-                                       1, (GdkEvent *)event);
-
-         
-             private_data->in_drag = 0;
-             
-             gtk_target_list_unref (target_list);
-             gtk_drag_set_icon_default (context);
-           }
-       }
-      else 
-       {
-         row = row_from_y (calendar, event_y);
-         col = column_from_x (calendar, event_x);
-         
-         if (row != calendar->highlight_row || calendar->highlight_col != col)
-           {
-             old_row = calendar->highlight_row;
-             old_col = calendar->highlight_col;
-             if (old_row > -1 && old_col > -1)
-               {
-                 calendar->highlight_row = -1;
-                 calendar->highlight_col = -1;
-                 gtk_calendar_paint_day (widget, old_row, old_col);
-               }
-             
-             calendar->highlight_row = row;
-             calendar->highlight_col = col;
-             
-             if (row > -1 && col > -1)
-               gtk_calendar_paint_day (widget, row, col);
-           }
-       }
+  GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (widget);
+
+  if (priv->in_drag)
+    {
+      if (gtk_drag_check_threshold (widget,
+                                    priv->drag_start_x, priv->drag_start_y,
+                                    event->x, event->y))
+        {
+          GdkDragContext *context;
+          GtkTargetList *target_list = gtk_target_list_new (NULL, 0);
+          gtk_target_list_add_text_targets (target_list, 0);
+          context = gtk_drag_begin (widget, target_list, GDK_ACTION_COPY,
+                                    1, (GdkEvent *)event);
+
+          priv->in_drag = 0;
+          gtk_target_list_unref (target_list);
+          gtk_drag_set_icon_default (context);
+        }
     }
+
   return TRUE;
 }
 
 static gboolean
-gtk_calendar_enter_notify (GtkWidget       *widget,
-                          GdkEventCrossing *event)
+gtk_calendar_enter_notify (GtkWidget        *widget,
+                           GdkEventCrossing *event)
 {
-  GtkCalendar *calendar;
-  GtkCalendarPrivateData *private_data;
-  
-  calendar = GTK_CALENDAR (widget);
-  private_data = GTK_CALENDAR_PRIVATE_DATA (widget);
-  
-  if (event->window == private_data->arrow_win[ARROW_MONTH_LEFT])
+  GtkCalendar *calendar = GTK_CALENDAR (widget);
+  GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (widget);
+
+  if (event->window == priv->arrow_win[ARROW_MONTH_LEFT])
     {
-      private_data->arrow_state[ARROW_MONTH_LEFT] = GTK_STATE_PRELIGHT;
-      gtk_calendar_paint_arrow (widget, ARROW_MONTH_LEFT);
+      priv->arrow_prelight |= (1 << ARROW_MONTH_LEFT);
+      calendar_invalidate_arrow (calendar, ARROW_MONTH_LEFT);
     }
-  
-  if (event->window == private_data->arrow_win[ARROW_MONTH_RIGHT])
+
+  if (event->window == priv->arrow_win[ARROW_MONTH_RIGHT])
     {
-      private_data->arrow_state[ARROW_MONTH_RIGHT] = GTK_STATE_PRELIGHT;
-      gtk_calendar_paint_arrow (widget, ARROW_MONTH_RIGHT);
+      priv->arrow_prelight |= (1 << ARROW_MONTH_RIGHT);
+      calendar_invalidate_arrow (calendar, ARROW_MONTH_RIGHT);
     }
-  
-  if (event->window == private_data->arrow_win[ARROW_YEAR_LEFT])
+
+  if (event->window == priv->arrow_win[ARROW_YEAR_LEFT])
     {
-      private_data->arrow_state[ARROW_YEAR_LEFT] = GTK_STATE_PRELIGHT;
-      gtk_calendar_paint_arrow (widget, ARROW_YEAR_LEFT);
+      priv->arrow_prelight |= (1 << ARROW_YEAR_LEFT);
+      calendar_invalidate_arrow (calendar, ARROW_YEAR_LEFT);
     }
-  
-  if (event->window == private_data->arrow_win[ARROW_YEAR_RIGHT])
+
+  if (event->window == priv->arrow_win[ARROW_YEAR_RIGHT])
     {
-      private_data->arrow_state[ARROW_YEAR_RIGHT] = GTK_STATE_PRELIGHT;
-      gtk_calendar_paint_arrow (widget, ARROW_YEAR_RIGHT);
+      priv->arrow_prelight |= (1 << ARROW_YEAR_RIGHT);
+      calendar_invalidate_arrow (calendar, ARROW_YEAR_RIGHT);
     }
-  
+
   return TRUE;
 }
 
 static gboolean
-gtk_calendar_leave_notify (GtkWidget       *widget,
-                          GdkEventCrossing *event)
+gtk_calendar_leave_notify (GtkWidget        *widget,
+                           GdkEventCrossing *event)
 {
-  GtkCalendar *calendar;
-  GtkCalendarPrivateData *private_data;
-  gint row;
-  gint col;
-  
-  calendar = GTK_CALENDAR (widget);
-  private_data = GTK_CALENDAR_PRIVATE_DATA (widget);
-  
-  if (event->window == private_data->main_win)
-    {
-      row = calendar->highlight_row;
-      col = calendar->highlight_col;
-      calendar->highlight_row = -1;
-      calendar->highlight_col = -1;
-      if (row > -1 && col > -1)
-       gtk_calendar_paint_day (widget, row, col);
-    }
-  
-  if (event->window == private_data->arrow_win[ARROW_MONTH_LEFT])
-    {
-      private_data->arrow_state[ARROW_MONTH_LEFT] = GTK_STATE_NORMAL;
-      gtk_calendar_paint_arrow (widget, ARROW_MONTH_LEFT);
-    }
-  
-  if (event->window == private_data->arrow_win[ARROW_MONTH_RIGHT])
-    {
-      private_data->arrow_state[ARROW_MONTH_RIGHT] = GTK_STATE_NORMAL;
-      gtk_calendar_paint_arrow (widget, ARROW_MONTH_RIGHT);
-    }
-  
-  if (event->window == private_data->arrow_win[ARROW_YEAR_LEFT])
+  GtkCalendar *calendar = GTK_CALENDAR (widget);
+  GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (widget);
+
+  if (event->window == priv->arrow_win[ARROW_MONTH_LEFT])
     {
-      private_data->arrow_state[ARROW_YEAR_LEFT] = GTK_STATE_NORMAL;
-      gtk_calendar_paint_arrow (widget, ARROW_YEAR_LEFT);
+      priv->arrow_prelight &= ~(1 << ARROW_MONTH_LEFT);
+      calendar_invalidate_arrow (calendar, ARROW_MONTH_LEFT);
     }
-  
-  if (event->window == private_data->arrow_win[ARROW_YEAR_RIGHT])
+
+  if (event->window == priv->arrow_win[ARROW_MONTH_RIGHT])
     {
-      private_data->arrow_state[ARROW_YEAR_RIGHT] = GTK_STATE_NORMAL;
-      gtk_calendar_paint_arrow (widget, ARROW_YEAR_RIGHT);
+      priv->arrow_prelight &= ~(1 << ARROW_MONTH_RIGHT);
+      calendar_invalidate_arrow (calendar, ARROW_MONTH_RIGHT);
     }
-  
-  return TRUE;
-}
 
-static void
-gtk_calendar_paint_arrow (GtkWidget *widget,
-                         guint      arrow)
-{
-  GtkCalendarPrivateData *private_data;
-  GdkWindow *window;
-  GdkGC *gc;
-  GtkCalendar *calendar;
-  gint state;
-  gint width, height;
-  
-  calendar = GTK_CALENDAR (widget);
-  private_data = GTK_CALENDAR_PRIVATE_DATA (widget);
-
-  if (private_data->freeze_count)
-    {
-      private_data->dirty_header = 1;
-      return;
-    }
-  window = private_data->arrow_win[arrow];
-  if (window)
-    {
-      state = private_data->arrow_state[arrow];
-      gc = calendar->gc;
-      
-      gdk_window_clear (window);
-      gdk_window_set_background (window, &(widget)->style->bg[state]);
-      gdk_drawable_get_size (window, &width, &height);
-      gdk_window_clear_area (window,
-                            0,0,
-                            width,height);
-      
-      gdk_gc_set_foreground (gc, & (widget)->style->fg[state]);
-      
-      if (arrow == ARROW_MONTH_LEFT || arrow == ARROW_YEAR_LEFT)
-       draw_arrow_left (window, gc, width/2 - 3, height/2 - 4, 8);
-      else 
-       draw_arrow_right (window, gc, width/2 - 2, height/2 - 4, 8);
-      return;
+  if (event->window == priv->arrow_win[ARROW_YEAR_LEFT])
+    {
+      priv->arrow_prelight &= ~(1 << ARROW_YEAR_LEFT);
+      calendar_invalidate_arrow (calendar, ARROW_YEAR_LEFT);
     }
-}
-
-void
-gtk_calendar_freeze (GtkCalendar *calendar)
-{
-  g_return_if_fail (GTK_IS_CALENDAR (calendar));
-  
-  GTK_CALENDAR_PRIVATE_DATA (calendar)->freeze_count++;
-}
-
-void
-gtk_calendar_thaw (GtkCalendar *calendar)
-{
-  GtkCalendarPrivateData *private_data;
 
-  g_return_if_fail (GTK_IS_CALENDAR (calendar));
-  
-  private_data = GTK_CALENDAR_PRIVATE_DATA (calendar);
-  
-  if (private_data->freeze_count)
-    if (!(--private_data->freeze_count))
-      {
-       if (private_data->dirty_header)
-         if (GTK_WIDGET_DRAWABLE (calendar))
-           gtk_calendar_paint_header (GTK_WIDGET (calendar));
-       
-       if (private_data->dirty_day_names)
-         if (GTK_WIDGET_DRAWABLE (calendar))
-           gtk_calendar_paint_day_names (GTK_WIDGET (calendar));
-       
-       if (private_data->dirty_week)
-         if (GTK_WIDGET_DRAWABLE (calendar))
-           gtk_calendar_paint_week_numbers (GTK_WIDGET (calendar));
-       
-       if (private_data->dirty_main)
-         if (GTK_WIDGET_DRAWABLE (calendar))
-           gtk_calendar_paint_main (GTK_WIDGET (calendar));
-      }
-}
-
-static void
-gtk_calendar_set_background (GtkWidget *widget)
-{
-  GtkCalendar *calendar;
-  GtkCalendarPrivateData *private_data;
-  gint i;
-  
-  calendar = GTK_CALENDAR (widget);
-  private_data = GTK_CALENDAR_PRIVATE_DATA (widget);
-
-  if (GTK_WIDGET_REALIZED (widget))
+  if (event->window == priv->arrow_win[ARROW_YEAR_RIGHT])
     {
-      for (i = 0; i < 4; i++)
-       {
-         if (private_data->arrow_win[i])
-           gdk_window_set_background (private_data->arrow_win[i], 
-                                      HEADER_BG_COLOR (widget));
-       }
-      if (private_data->header_win)
-       gdk_window_set_background (private_data->header_win, 
-                                  HEADER_BG_COLOR (widget));
-      if (private_data->day_name_win)
-       gdk_window_set_background (private_data->day_name_win, 
-                                  BACKGROUND_COLOR (widget));
-      if (private_data->week_win)
-       gdk_window_set_background (private_data->week_win,
-                                  BACKGROUND_COLOR (widget));
-      if (private_data->main_win)
-       gdk_window_set_background (private_data->main_win,
-                                  BACKGROUND_COLOR (widget));
-      if (widget->window)
-       gdk_window_set_background (widget->window,
-                                  BACKGROUND_COLOR (widget)); 
+      priv->arrow_prelight &= ~(1 << ARROW_YEAR_RIGHT);
+      calendar_invalidate_arrow (calendar, ARROW_YEAR_RIGHT);
     }
-}
-
-static void
-gtk_calendar_style_set (GtkWidget *widget,
-                       GtkStyle  *previous_style)
-{
-  if (previous_style && GTK_WIDGET_REALIZED (widget))
-    gtk_calendar_set_background(widget);
-}
-
-static void
-gtk_calendar_state_changed (GtkWidget     *widget,
-                           GtkStateType    previous_state)
-{
-  if (!GTK_WIDGET_IS_SENSITIVE (widget))
-    stop_spinning (widget);    
-
-  gtk_calendar_set_background (widget);
-}
 
-static void
-gtk_calendar_finalize (GObject *object)
-{
-  GtkCalendarPrivateData *private_data;
-  private_data = GTK_CALENDAR_PRIVATE_DATA (object);
-  
-  g_free (private_data);
-  
-  if (G_OBJECT_CLASS (parent_class)->finalize)
-    (* G_OBJECT_CLASS (parent_class)->finalize) (object);
+  return TRUE;
 }
 
 static gboolean
 gtk_calendar_scroll (GtkWidget      *widget,
-                    GdkEventScroll *event)
+                     GdkEventScroll *event)
 {
   GtkCalendar *calendar = GTK_CALENDAR (widget);
 
-  if (event->direction == GDK_SCROLL_UP) 
+  if (event->direction == GDK_SCROLL_UP)
     {
-      if (!GTK_WIDGET_HAS_FOCUS (widget))
-       gtk_widget_grab_focus (widget);
-      gtk_calendar_set_month_prev (calendar);
+      if (!gtk_widget_has_focus (widget))
+        gtk_widget_grab_focus (widget);
+      calendar_set_month_prev (calendar);
     }
-  else if (event->direction == GDK_SCROLL_DOWN) 
+  else if (event->direction == GDK_SCROLL_DOWN)
     {
-      if (!GTK_WIDGET_HAS_FOCUS (widget))
-       gtk_widget_grab_focus (widget);
-      gtk_calendar_set_month_next (calendar);
+      if (!gtk_widget_has_focus (widget))
+        gtk_widget_grab_focus (widget);
+      calendar_set_month_next (calendar);
     }
   else
     return FALSE;
@@ -3141,265 +3177,215 @@ gtk_calendar_scroll (GtkWidget      *widget,
   return TRUE;
 }
 
-static void 
-move_focus (GtkCalendar *calendar, 
-           gint direction)
+\f
+/****************************************
+ *             Key handling              *
+ ****************************************/
+
+static void
+move_focus (GtkCalendar *calendar,
+            gint         direction)
 {
+  GtkCalendarPrivate *priv = calendar->priv;
   GtkTextDirection text_dir = gtk_widget_get_direction (GTK_WIDGET (calendar));
 
   if ((text_dir == GTK_TEXT_DIR_LTR && direction == -1) ||
-      (text_dir == GTK_TEXT_DIR_RTL && direction == 1)) 
+      (text_dir == GTK_TEXT_DIR_RTL && direction == 1))
     {
-      if (calendar->focus_col > 0)
-         calendar->focus_col--;
-      else if (calendar->focus_row > 0)
-       {
-         calendar->focus_col = 6;
-         calendar->focus_row--;
-       }
+      if (priv->focus_col > 0)
+          priv->focus_col--;
+      else if (priv->focus_row > 0)
+        {
+          priv->focus_col = 6;
+          priv->focus_row--;
+        }
+
+      if (priv->focus_col < 0)
+        priv->focus_col = 6;
+      if (priv->focus_row < 0)
+        priv->focus_row = 5;
     }
-  else 
+  else
     {
-      if (calendar->focus_col < 6)
-       calendar->focus_col++;
-      else if (calendar->focus_row < 5)
-       {
-         calendar->focus_col = 0;
-         calendar->focus_row++;
-       }
+      if (priv->focus_col < 6)
+        priv->focus_col++;
+      else if (priv->focus_row < 5)
+        {
+          priv->focus_col = 0;
+          priv->focus_row++;
+        }
+
+      if (priv->focus_col < 0)
+        priv->focus_col = 0;
+      if (priv->focus_row < 0)
+        priv->focus_row = 0;
     }
 }
 
 static gboolean
 gtk_calendar_key_press (GtkWidget   *widget,
-                       GdkEventKey *event)
+                        GdkEventKey *event)
 {
-  GtkCalendar *calendar;
+  GtkCalendar *calendar = GTK_CALENDAR (widget);
+  GtkCalendarPrivate *priv = calendar->priv;
   gint return_val;
   gint old_focus_row;
   gint old_focus_col;
   gint row, col, day;
-  
-  calendar = GTK_CALENDAR (widget);
+
   return_val = FALSE;
-  
-  old_focus_row = calendar->focus_row;
-  old_focus_col = calendar->focus_col;
+
+  old_focus_row = priv->focus_row;
+  old_focus_col = priv->focus_col;
 
   switch (event->keyval)
     {
-    case GDK_KP_Left:
-    case GDK_Left:
+    case GDK_KEY_KP_Left:
+    case GDK_KEY_Left:
       return_val = TRUE;
       if (event->state & GDK_CONTROL_MASK)
-       gtk_calendar_set_month_prev (calendar);
+        calendar_set_month_prev (calendar);
       else
-       {
-         move_focus (calendar, -1);
-         gtk_calendar_paint_day (widget, old_focus_row, old_focus_col);
-         gtk_calendar_paint_day (widget, calendar->focus_row,
-                                 calendar->focus_col);
-       }
+        {
+          move_focus (calendar, -1);
+          calendar_invalidate_day (calendar, old_focus_row, old_focus_col);
+          calendar_invalidate_day (calendar, priv->focus_row,
+                                   priv->focus_col);
+        }
       break;
-    case GDK_KP_Right:
-    case GDK_Right:
+    case GDK_KEY_KP_Right:
+    case GDK_KEY_Right:
       return_val = TRUE;
       if (event->state & GDK_CONTROL_MASK)
-       gtk_calendar_set_month_next (calendar);
+        calendar_set_month_next (calendar);
       else
-       {
-         move_focus (calendar, 1);
-         gtk_calendar_paint_day (widget, old_focus_row, old_focus_col);
-         gtk_calendar_paint_day (widget, calendar->focus_row,
-                                 calendar->focus_col);
-       }
+        {
+          move_focus (calendar, 1);
+          calendar_invalidate_day (calendar, old_focus_row, old_focus_col);
+          calendar_invalidate_day (calendar, priv->focus_row,
+                                   priv->focus_col);
+        }
       break;
-    case GDK_KP_Up:
-    case GDK_Up:
+    case GDK_KEY_KP_Up:
+    case GDK_KEY_Up:
       return_val = TRUE;
       if (event->state & GDK_CONTROL_MASK)
-       gtk_calendar_set_year_prev (calendar);
+        calendar_set_year_prev (calendar);
       else
-       {
-         if (calendar->focus_row > 0)
-           calendar->focus_row--;
-         gtk_calendar_paint_day (widget, old_focus_row, old_focus_col);
-         gtk_calendar_paint_day (widget, calendar->focus_row,
-                                 calendar->focus_col);
-       }
+        {
+          if (priv->focus_row > 0)
+            priv->focus_row--;
+          if (priv->focus_row < 0)
+            priv->focus_row = 5;
+          if (priv->focus_col < 0)
+            priv->focus_col = 6;
+          calendar_invalidate_day (calendar, old_focus_row, old_focus_col);
+          calendar_invalidate_day (calendar, priv->focus_row,
+                                   priv->focus_col);
+        }
       break;
-    case GDK_KP_Down:
-    case GDK_Down:
+    case GDK_KEY_KP_Down:
+    case GDK_KEY_Down:
       return_val = TRUE;
       if (event->state & GDK_CONTROL_MASK)
-       gtk_calendar_set_year_next (calendar);
+        calendar_set_year_next (calendar);
       else
-       {
-         if (calendar->focus_row < 5)
-           calendar->focus_row++;
-         gtk_calendar_paint_day (widget, old_focus_row, old_focus_col);
-         gtk_calendar_paint_day (widget, calendar->focus_row,
-                                 calendar->focus_col);
-       }
+        {
+          if (priv->focus_row < 5)
+            priv->focus_row++;
+          if (priv->focus_col < 0)
+            priv->focus_col = 0;
+          calendar_invalidate_day (calendar, old_focus_row, old_focus_col);
+          calendar_invalidate_day (calendar, priv->focus_row,
+                                   priv->focus_col);
+        }
       break;
-    case GDK_KP_Space:
-    case GDK_space:
-      row = calendar->focus_row;
-      col = calendar->focus_col;
-      day = calendar->day[row][col];
-      
+    case GDK_KEY_KP_Space:
+    case GDK_KEY_space:
+      row = priv->focus_row;
+      col = priv->focus_col;
+
       if (row > -1 && col > -1)
-       {
-         return_val = TRUE;
-         gtk_calendar_freeze (calendar);         
-
-         if (calendar->day_month[row][col] == MONTH_PREV)
-           gtk_calendar_set_month_prev (calendar);
-         else if (calendar->day_month[row][col] == MONTH_NEXT)
-           gtk_calendar_set_month_next (calendar);
-
-         gtk_calendar_select_and_focus_day (calendar, day);
-         
-         gtk_calendar_thaw (calendar);   
-       }
-    }  
-  
-  return return_val;
-}
+        {
+          return_val = TRUE;
 
-static void
-gtk_calendar_set_display_option (GtkCalendar              *calendar,
-                                GtkCalendarDisplayOptions flag,
-                                gboolean                  setting)
-{
-  GtkCalendarDisplayOptions flags;
-  if (setting) 
-    flags = calendar->display_flags | flag;
-  else
-    flags = calendar->display_flags & ~flag; 
-  gtk_calendar_display_options (calendar, flags);
-}
+          day = priv->day[row][col];
+          if (priv->day_month[row][col] == MONTH_PREV)
+            calendar_set_month_prev (calendar);
+          else if (priv->day_month[row][col] == MONTH_NEXT)
+            calendar_set_month_next (calendar);
 
-static gboolean
-gtk_calendar_get_display_option (GtkCalendar              *calendar,
-                                GtkCalendarDisplayOptions flag)
-{
-  return (calendar->display_flags & flag) != 0;
+          calendar_select_and_focus_day (calendar, day);
+        }
+    }
+
+  return return_val;
 }
 
+\f
+/****************************************
+ *           Misc widget methods        *
+ ****************************************/
 
-static void 
-gtk_calendar_set_property (GObject      *object,
-                          guint         prop_id,
-                          const GValue *value,
-                          GParamSpec   *pspec)
+static void
+gtk_calendar_state_flags_changed (GtkWidget     *widget,
+                                  GtkStateFlags  previous_state)
 {
-  GtkCalendar *calendar;
-
-  calendar = GTK_CALENDAR (object);
+  GtkCalendar *calendar = GTK_CALENDAR (widget);
+  GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (widget);
 
-  switch (prop_id) 
+  if (!gtk_widget_is_sensitive (widget))
     {
-    case PROP_YEAR:
-      gtk_calendar_select_month (calendar,
-                                calendar->month,
-                                g_value_get_int (value));
-      break;
-    case PROP_MONTH:
-      gtk_calendar_select_month (calendar,
-                                g_value_get_int (value),
-                                calendar->year);
-      break;
-    case PROP_DAY:
-      gtk_calendar_select_day (calendar,
-                              g_value_get_int (value));
-      break;
-    case PROP_SHOW_HEADING:
-      gtk_calendar_set_display_option (calendar,
-                                      GTK_CALENDAR_SHOW_HEADING,
-                                      g_value_get_boolean (value));
-      break;
-    case PROP_SHOW_DAY_NAMES:
-      gtk_calendar_set_display_option (calendar,
-                                      GTK_CALENDAR_SHOW_DAY_NAMES,
-                                      g_value_get_boolean (value));
-      break;
-    case PROP_NO_MONTH_CHANGE:
-      gtk_calendar_set_display_option (calendar,
-                                      GTK_CALENDAR_NO_MONTH_CHANGE,
-                                      g_value_get_boolean (value));
-      break;
-    case PROP_SHOW_WEEK_NUMBERS:
-      gtk_calendar_set_display_option (calendar,
-                                      GTK_CALENDAR_SHOW_WEEK_NUMBERS,
-                                      g_value_get_boolean (value));
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
+      priv->in_drag = 0;
+      calendar_stop_spinning (calendar);
     }
 }
 
-static void 
-gtk_calendar_get_property (GObject      *object,
-                          guint         prop_id,
-                          GValue       *value,
-                          GParamSpec   *pspec)
+static void
+gtk_calendar_grab_notify (GtkWidget *widget,
+                          gboolean   was_grabbed)
 {
-  GtkCalendar *calendar;
+  if (!was_grabbed)
+    calendar_stop_spinning (GTK_CALENDAR (widget));
+}
 
-  calendar = GTK_CALENDAR (object);
+static gboolean
+gtk_calendar_focus_out (GtkWidget     *widget,
+                        GdkEventFocus *event)
+{
+  GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (widget);
+  GtkCalendar *calendar = GTK_CALENDAR (widget);
 
-  switch (prop_id) 
-    {
-    case PROP_YEAR:
-      g_value_set_int (value, calendar->year);
-      break;
-    case PROP_MONTH:
-      g_value_set_int (value, calendar->month);
-      break;
-    case PROP_DAY:
-      g_value_set_int (value, calendar->selected_day);
-      break;
-    case PROP_SHOW_HEADING:
-      g_value_set_boolean (value, gtk_calendar_get_display_option (calendar,
-                                                                  GTK_CALENDAR_SHOW_HEADING));
-      break;
-    case PROP_SHOW_DAY_NAMES:
-      g_value_set_boolean (value, gtk_calendar_get_display_option (calendar,
-                                                                  GTK_CALENDAR_SHOW_DAY_NAMES));
-      break;
-    case PROP_NO_MONTH_CHANGE:
-      g_value_set_boolean (value, gtk_calendar_get_display_option (calendar,
-                                                                  GTK_CALENDAR_NO_MONTH_CHANGE));
-      break;
-    case PROP_SHOW_WEEK_NUMBERS:
-      g_value_set_boolean (value, gtk_calendar_get_display_option (calendar,
-                                                                  GTK_CALENDAR_SHOW_WEEK_NUMBERS));
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
+  calendar_queue_refresh (calendar);
+  calendar_stop_spinning (calendar);
 
+  priv->in_drag = 0;
+
+  return FALSE;
 }
 
+\f
+/****************************************
+ *          Drag and Drop               *
+ ****************************************/
+
 static void
 gtk_calendar_drag_data_get (GtkWidget        *widget,
-                           GdkDragContext   *context,
-                           GtkSelectionData *selection_data,
-                           guint             info,
-                           guint             time)
+                            GdkDragContext   *context,
+                            GtkSelectionData *selection_data,
+                            guint             info,
+                            guint             time)
 {
   GtkCalendar *calendar = GTK_CALENDAR (widget);
+  GtkCalendarPrivate *priv = calendar->priv;
   GDate *date;
   gchar str[128];
   gsize len;
 
-  date = g_date_new_dmy (calendar->selected_day, calendar->month, calendar->year);
+  date = g_date_new_dmy (priv->selected_day, priv->month + 1, priv->year);
   len = g_date_strftime (str, 127, "%x", date);
   gtk_selection_data_set_text (selection_data, str, len);
-  
+
   g_free (date);
 }
 
@@ -3412,7 +3398,7 @@ set_status_pending (GdkDragContext *context,
                     GdkDragAction   suggested_action)
 {
   g_object_set_data (G_OBJECT (context),
-                     "gtk-calendar-status-pending",
+                     I_("gtk-calendar-status-pending"),
                      GINT_TO_POINTER (suggested_action));
 }
 
@@ -3424,62 +3410,60 @@ get_status_pending (GdkDragContext *context)
 }
 
 static void
-gtk_calendar_drag_leave (GtkWidget *widget,
-                        GdkDragContext *context,
-                        guint time)
+gtk_calendar_drag_leave (GtkWidget      *widget,
+                         GdkDragContext *context,
+                         guint           time)
 {
-  GtkCalendarPrivateData *private_data;
+  GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (widget);
 
-  private_data = GTK_CALENDAR_PRIVATE_DATA (widget);
-  private_data->drag_highlight = 0;
+  priv->drag_highlight = 0;
   gtk_drag_unhighlight (widget);
-  
+
 }
 
 static gboolean
-gtk_calendar_drag_motion (GtkWidget *widget,
-                         GdkDragContext *context,
-                         gint x,
-                         gint y,
-                         guint time)
+gtk_calendar_drag_motion (GtkWidget      *widget,
+                          GdkDragContext *context,
+                          gint            x,
+                          gint            y,
+                          guint           time)
 {
-  GtkCalendarPrivateData *private_data;
+  GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (widget);
   GdkAtom target;
-  
-  private_data = GTK_CALENDAR_PRIVATE_DATA (widget);
 
-  if (!private_data->drag_highlight) 
+  if (!priv->drag_highlight)
     {
-      private_data->drag_highlight = 1;
+      priv->drag_highlight = 1;
       gtk_drag_highlight (widget);
     }
-  
+
   target = gtk_drag_dest_find_target (widget, context, NULL);
-  if (target == GDK_NONE)
+  if (target == GDK_NONE || gdk_drag_context_get_suggested_action (context) == 0)
     gdk_drag_status (context, 0, time);
-  else {
-    set_status_pending (context, context->suggested_action);
-    gtk_drag_get_data (widget, context, target, time);
-  }
-  
+  else
+    {
+      set_status_pending (context, gdk_drag_context_get_suggested_action (context));
+      gtk_drag_get_data (widget, context, target, time);
+    }
+
   return TRUE;
 }
 
 static gboolean
-gtk_calendar_drag_drop (GtkWidget *widget,
-                       GdkDragContext *context,
-                       gint x,
-                       gint y,
-                       guint time)
+gtk_calendar_drag_drop (GtkWidget      *widget,
+                        GdkDragContext *context,
+                        gint            x,
+                        gint            y,
+                        guint           time)
 {
   GdkAtom target;
 
-  target = gtk_drag_dest_find_target (widget, context, NULL);  
+  target = gtk_drag_dest_find_target (widget, context, NULL);
   if (target != GDK_NONE)
     {
-      gtk_drag_get_data (widget, context, 
-                        target, 
-                        time);
+      gtk_drag_get_data (widget, context,
+                         target,
+                         time);
       return TRUE;
     }
 
@@ -3488,14 +3472,15 @@ gtk_calendar_drag_drop (GtkWidget *widget,
 
 static void
 gtk_calendar_drag_data_received (GtkWidget        *widget,
-                                GdkDragContext   *context,
-                                gint              x,
-                                gint              y,
-                                GtkSelectionData *selection_data,
-                                guint             info,
-                                guint             time)
+                                 GdkDragContext   *context,
+                                 gint              x,
+                                 gint              y,
+                                 GtkSelectionData *selection_data,
+                                 guint             info,
+                                 guint             time)
 {
   GtkCalendar *calendar = GTK_CALENDAR (widget);
+  GtkCalendarPrivate *priv = calendar->priv;
   guint day, month, year;
   gchar *str;
   GDate *date;
@@ -3503,27 +3488,28 @@ gtk_calendar_drag_data_received (GtkWidget        *widget,
 
   suggested_action = get_status_pending (context);
 
-  if (suggested_action) 
+  if (suggested_action)
     {
       set_status_pending (context, 0);
-     
+
       /* We are getting this data due to a request in drag_motion,
        * rather than due to a request in drag_drop, so we are just
        * supposed to call drag_status, not actually paste in the
        * data.
        */
-      str = gtk_selection_data_get_text (selection_data);
-      if (str) 
-       {
-         date = g_date_new ();
-         g_date_set_parse (date, str);
-         if (!g_date_valid (date)) 
-             suggested_action = 0;
-         g_date_free (date);
-         g_free (str);
-       }
+      str = (gchar*) gtk_selection_data_get_text (selection_data);
+
+      if (str)
+        {
+          date = g_date_new ();
+          g_date_set_parse (date, str);
+          if (!g_date_valid (date))
+              suggested_action = 0;
+          g_date_free (date);
+          g_free (str);
+        }
       else
-       suggested_action = 0;
+        suggested_action = 0;
 
       gdk_drag_status (context, suggested_action, time);
 
@@ -3531,17 +3517,17 @@ gtk_calendar_drag_data_received (GtkWidget        *widget,
     }
 
   date = g_date_new ();
-  str = gtk_selection_data_get_text (selection_data);
-  if (str) 
+  str = (gchar*) gtk_selection_data_get_text (selection_data);
+  if (str)
     {
       g_date_set_parse (date, str);
       g_free (str);
     }
-  
-  if (!g_date_valid (date)) 
+
+  if (!g_date_valid (date))
     {
       g_warning ("Received invalid date data\n");
-      g_date_free (date);      
+      g_date_free (date);
       gtk_drag_finish (context, FALSE, FALSE, time);
       return;
     }
@@ -3549,15 +3535,502 @@ gtk_calendar_drag_data_received (GtkWidget        *widget,
   day = g_date_get_day (date);
   month = g_date_get_month (date);
   year = g_date_get_year (date);
-  g_date_free (date);  
+  g_date_free (date);
 
   gtk_drag_finish (context, TRUE, FALSE, time);
 
-  
+
   g_object_freeze_notify (G_OBJECT (calendar));
-  if (!(calendar->display_flags & GTK_CALENDAR_NO_MONTH_CHANGE)
-      && (calendar->display_flags & GTK_CALENDAR_SHOW_HEADING))
-    gtk_calendar_select_month (calendar, month, year);
+  if (!(priv->display_flags & GTK_CALENDAR_NO_MONTH_CHANGE)
+      && (priv->display_flags & GTK_CALENDAR_SHOW_HEADING))
+    gtk_calendar_select_month (calendar, month - 1, year);
   gtk_calendar_select_day (calendar, day);
-  g_object_thaw_notify (G_OBJECT (calendar));  
+  g_object_thaw_notify (G_OBJECT (calendar));
+}
+
+\f
+/****************************************
+ *              Public API              *
+ ****************************************/
+
+/**
+ * gtk_calendar_new:
+ *
+ * Creates a new calendar, with the current date being selected.
+ *
+ * Return value: a newly #GtkCalendar widget
+ **/
+GtkWidget*
+gtk_calendar_new (void)
+{
+  return g_object_new (GTK_TYPE_CALENDAR, NULL);
+}
+
+/**
+ * gtk_calendar_get_display_options:
+ * @calendar: a #GtkCalendar
+ *
+ * Returns the current display options of @calendar.
+ *
+ * Return value: the display options.
+ *
+ * Since: 2.4
+ **/
+GtkCalendarDisplayOptions
+gtk_calendar_get_display_options (GtkCalendar         *calendar)
+{
+  g_return_val_if_fail (GTK_IS_CALENDAR (calendar), 0);
+
+  return calendar->priv->display_flags;
+}
+
+/**
+ * gtk_calendar_set_display_options:
+ * @calendar: a #GtkCalendar
+ * @flags: the display options to set
+ *
+ * Sets display options (whether to display the heading and the month
+ * headings).
+ *
+ * Since: 2.4
+ **/
+void
+gtk_calendar_set_display_options (GtkCalendar          *calendar,
+                                  GtkCalendarDisplayOptions flags)
+{
+  GtkWidget *widget = GTK_WIDGET (calendar);
+  GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (calendar);
+  gint resize = 0;
+  GtkCalendarDisplayOptions old_flags;
+
+  g_return_if_fail (GTK_IS_CALENDAR (calendar));
+
+  old_flags = priv->display_flags;
+
+  if (gtk_widget_get_realized (widget))
+    {
+      if ((flags ^ priv->display_flags) & GTK_CALENDAR_NO_MONTH_CHANGE)
+        {
+          resize ++;
+          if (! (flags & GTK_CALENDAR_NO_MONTH_CHANGE)
+              && (priv->display_flags & GTK_CALENDAR_SHOW_HEADING))
+            {
+              priv->display_flags &= ~GTK_CALENDAR_NO_MONTH_CHANGE;
+              calendar_realize_arrows (calendar);
+              if (gtk_widget_get_mapped (widget))
+                calendar_map_arrows (calendar);
+            }
+          else
+            {
+              calendar_unrealize_arrows (calendar);
+            }
+        }
+
+      if ((flags ^ priv->display_flags) & GTK_CALENDAR_SHOW_HEADING)
+        {
+          resize++;
+
+          if (flags & GTK_CALENDAR_SHOW_HEADING)
+            {
+              priv->display_flags |= GTK_CALENDAR_SHOW_HEADING;
+              calendar_realize_arrows (calendar);
+              if (gtk_widget_get_mapped (widget))
+                calendar_map_arrows (calendar);
+            }
+          else
+            {
+              calendar_unrealize_arrows (calendar);
+            }
+        }
+
+      if ((flags ^ priv->display_flags) & GTK_CALENDAR_SHOW_DAY_NAMES)
+        {
+          resize++;
+
+          if (flags & GTK_CALENDAR_SHOW_DAY_NAMES)
+            priv->display_flags |= GTK_CALENDAR_SHOW_DAY_NAMES;
+        }
+
+      if ((flags ^ priv->display_flags) & GTK_CALENDAR_SHOW_WEEK_NUMBERS)
+        {
+          resize++;
+
+          if (flags & GTK_CALENDAR_SHOW_WEEK_NUMBERS)
+            priv->display_flags |= GTK_CALENDAR_SHOW_WEEK_NUMBERS;
+        }
+
+      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");
+  if ((old_flags ^ priv->display_flags) & GTK_CALENDAR_SHOW_DAY_NAMES)
+    g_object_notify (G_OBJECT (calendar), "show-day-names");
+  if ((old_flags ^ priv->display_flags) & GTK_CALENDAR_NO_MONTH_CHANGE)
+    g_object_notify (G_OBJECT (calendar), "no-month-change");
+  if ((old_flags ^ priv->display_flags) & GTK_CALENDAR_SHOW_WEEK_NUMBERS)
+    g_object_notify (G_OBJECT (calendar), "show-week-numbers");
+  g_object_thaw_notify (G_OBJECT (calendar));
+}
+
+/**
+ * gtk_calendar_select_month:
+ * @calendar: a #GtkCalendar
+ * @month: a month number between 0 and 11.
+ * @year: the year the month is in.
+ *
+ * Shifts the calendar to a different month.
+ **/
+void
+gtk_calendar_select_month (GtkCalendar *calendar,
+                           guint        month,
+                           guint        year)
+{
+  GtkCalendarPrivate *priv;
+
+  g_return_if_fail (GTK_IS_CALENDAR (calendar));
+  g_return_if_fail (month <= 11);
+
+  priv = calendar->priv;
+
+  priv->month = month;
+  priv->year  = year;
+
+  calendar_compute_days (calendar);
+  calendar_queue_refresh (calendar);
+
+  g_object_freeze_notify (G_OBJECT (calendar));
+  g_object_notify (G_OBJECT (calendar), "month");
+  g_object_notify (G_OBJECT (calendar), "year");
+  g_object_thaw_notify (G_OBJECT (calendar));
+
+  g_signal_emit (calendar,
+                 gtk_calendar_signals[MONTH_CHANGED_SIGNAL],
+                 0);
+}
+
+/**
+ * gtk_calendar_select_day:
+ * @calendar: a #GtkCalendar.
+ * @day: the day number between 1 and 31, or 0 to unselect
+ *   the currently selected day.
+ *
+ * Selects a day from the current month.
+ **/
+void
+gtk_calendar_select_day (GtkCalendar *calendar,
+                         guint        day)
+{
+  GtkCalendarPrivate *priv;
+
+  g_return_if_fail (GTK_IS_CALENDAR (calendar));
+  g_return_if_fail (day <= 31);
+
+  priv = calendar->priv;
+
+  /* Deselect the old day */
+  if (priv->selected_day > 0)
+    {
+      gint selected_day;
+
+      selected_day = priv->selected_day;
+      priv->selected_day = 0;
+      if (gtk_widget_is_drawable (GTK_WIDGET (calendar)))
+        calendar_invalidate_day_num (calendar, selected_day);
+    }
+
+  priv->selected_day = day;
+
+  /* Select the new day */
+  if (day != 0)
+    {
+      if (gtk_widget_is_drawable (GTK_WIDGET (calendar)))
+        calendar_invalidate_day_num (calendar, day);
+    }
+
+  g_object_notify (G_OBJECT (calendar), "day");
+
+  g_signal_emit (calendar,
+                 gtk_calendar_signals[DAY_SELECTED_SIGNAL],
+                 0);
+}
+
+/**
+ * gtk_calendar_clear_marks:
+ * @calendar: a #GtkCalendar
+ *
+ * Remove all visual markers.
+ **/
+void
+gtk_calendar_clear_marks (GtkCalendar *calendar)
+{
+  GtkCalendarPrivate *priv;
+  guint day;
+
+  g_return_if_fail (GTK_IS_CALENDAR (calendar));
+
+  priv = calendar->priv;
+
+  for (day = 0; day < 31; day++)
+    {
+      priv->marked_date[day] = FALSE;
+    }
+
+  priv->num_marked_dates = 0;
+  calendar_queue_refresh (calendar);
+}
+
+/**
+ * gtk_calendar_mark_day:
+ * @calendar: a #GtkCalendar
+ * @day: the day number to mark between 1 and 31.
+ *
+ * Places a visual marker on a particular day.
+ */
+void
+gtk_calendar_mark_day (GtkCalendar *calendar,
+                       guint        day)
+{
+  GtkCalendarPrivate *priv;
+
+  g_return_if_fail (GTK_IS_CALENDAR (calendar));
+
+  priv = calendar->priv;
+
+  if (day >= 1 && day <= 31 && !priv->marked_date[day-1])
+    {
+      priv->marked_date[day - 1] = TRUE;
+      priv->num_marked_dates++;
+      calendar_invalidate_day_num (calendar, day);
+    }
+}
+
+/**
+ * gtk_calendar_get_day_is_marked:
+ * @calendar: a #GtkCalendar
+ * @day: the day number between 1 and 31.
+ *
+ * Returns if the @day of the @calendar is already marked.
+ *
+ * Returns: whether the day is marked.
+ *
+ * Since: 3.0
+ */
+gboolean
+gtk_calendar_get_day_is_marked (GtkCalendar *calendar,
+                                guint        day)
+{
+  GtkCalendarPrivate *priv;
+
+  g_return_val_if_fail (GTK_IS_CALENDAR (calendar), FALSE);
+
+  priv = calendar->priv;
+
+  if (day >= 1 && day <= 31)
+    return priv->marked_date[day - 1];
+
+  return FALSE;
+}
+
+/**
+ * gtk_calendar_unmark_day:
+ * @calendar: a #GtkCalendar.
+ * @day: the day number to unmark between 1 and 31.
+ *
+ * Removes the visual marker from a particular day.
+ */
+void
+gtk_calendar_unmark_day (GtkCalendar *calendar,
+                         guint        day)
+{
+  GtkCalendarPrivate *priv;
+
+  g_return_if_fail (GTK_IS_CALENDAR (calendar));
+
+  priv = calendar->priv;
+
+  if (day >= 1 && day <= 31 && priv->marked_date[day-1])
+    {
+      priv->marked_date[day - 1] = FALSE;
+      priv->num_marked_dates--;
+      calendar_invalidate_day_num (calendar, day);
+    }
+}
+
+/**
+ * gtk_calendar_get_date:
+ * @calendar: a #GtkCalendar
+ * @year: (out) (allow-none): location to store the year as a decimal
+ *     number (e.g. 2011), or %NULL
+ * @month: (out) (allow-none): location to store the month number
+ *     (between 0 and 11), or %NULL
+ * @day: (out) (allow-none): location to store the day number (between
+ *     1 and 31), or %NULL
+ *
+ * Obtains the selected date from a #GtkCalendar.
+ */
+void
+gtk_calendar_get_date (GtkCalendar *calendar,
+                       guint       *year,
+                       guint       *month,
+                       guint       *day)
+{
+  GtkCalendarPrivate *priv;
+
+  g_return_if_fail (GTK_IS_CALENDAR (calendar));
+
+  priv = calendar->priv;
+
+  if (year)
+    *year = priv->year;
+
+  if (month)
+    *month = priv->month;
+
+  if (day)
+    *day = priv->selected_day;
+}
+
+/**
+ * gtk_calendar_set_detail_func:
+ * @calendar: a #GtkCalendar.
+ * @func: a function providing details for each day.
+ * @data: data to pass to @func invokations.
+ * @destroy: a function for releasing @data.
+ *
+ * Installs a function which provides Pango markup with detail information
+ * for each day. Examples for such details are holidays or appointments. That
+ * information is shown below each day when #GtkCalendar:show-details is set.
+ * A tooltip containing with full detail information is provided, if the entire
+ * text should not fit into the details area, or if #GtkCalendar:show-details
+ * is not set.
+ *
+ * The size of the details area can be restricted by setting the
+ * #GtkCalendar:detail-width-chars and #GtkCalendar:detail-height-rows
+ * properties.
+ *
+ * Since: 2.14
+ */
+void
+gtk_calendar_set_detail_func (GtkCalendar           *calendar,
+                              GtkCalendarDetailFunc  func,
+                              gpointer               data,
+                              GDestroyNotify         destroy)
+{
+  GtkCalendarPrivate *priv;
+
+  g_return_if_fail (GTK_IS_CALENDAR (calendar));
+
+  priv = GTK_CALENDAR_GET_PRIVATE (calendar);
+
+  if (priv->detail_func_destroy)
+    priv->detail_func_destroy (priv->detail_func_user_data);
+
+  priv->detail_func = func;
+  priv->detail_func_user_data = data;
+  priv->detail_func_destroy = destroy;
+
+  gtk_widget_set_has_tooltip (GTK_WIDGET (calendar),
+                              NULL != priv->detail_func);
+  gtk_widget_queue_resize (GTK_WIDGET (calendar));
+}
+
+/**
+ * gtk_calendar_set_detail_width_chars:
+ * @calendar: a #GtkCalendar.
+ * @chars: detail width in characters.
+ *
+ * Updates the width of detail cells.
+ * See #GtkCalendar:detail-width-chars.
+ *
+ * Since: 2.14
+ */
+void
+gtk_calendar_set_detail_width_chars (GtkCalendar *calendar,
+                                     gint         chars)
+{
+  GtkCalendarPrivate *priv;
+
+  g_return_if_fail (GTK_IS_CALENDAR (calendar));
+
+  priv = GTK_CALENDAR_GET_PRIVATE (calendar);
+
+  if (chars != priv->detail_width_chars)
+    {
+      priv->detail_width_chars = chars;
+      g_object_notify (G_OBJECT (calendar), "detail-width-chars");
+      gtk_widget_queue_resize_no_redraw (GTK_WIDGET (calendar));
+    }
+}
+
+/**
+ * gtk_calendar_set_detail_height_rows:
+ * @calendar: a #GtkCalendar.
+ * @rows: detail height in rows.
+ *
+ * Updates the height of detail cells.
+ * See #GtkCalendar:detail-height-rows.
+ *
+ * Since: 2.14
+ */
+void
+gtk_calendar_set_detail_height_rows (GtkCalendar *calendar,
+                                     gint         rows)
+{
+  GtkCalendarPrivate *priv;
+
+  g_return_if_fail (GTK_IS_CALENDAR (calendar));
+
+  priv = GTK_CALENDAR_GET_PRIVATE (calendar);
+
+  if (rows != priv->detail_height_rows)
+    {
+      priv->detail_height_rows = rows;
+      g_object_notify (G_OBJECT (calendar), "detail-height-rows");
+      gtk_widget_queue_resize_no_redraw (GTK_WIDGET (calendar));
+    }
+}
+
+/**
+ * gtk_calendar_get_detail_width_chars:
+ * @calendar: a #GtkCalendar.
+ *
+ * Queries the width of detail cells, in characters.
+ * See #GtkCalendar:detail-width-chars.
+ *
+ * Since: 2.14
+ *
+ * Return value: The width of detail cells, in characters.
+ */
+gint
+gtk_calendar_get_detail_width_chars (GtkCalendar *calendar)
+{
+  g_return_val_if_fail (GTK_IS_CALENDAR (calendar), 0);
+  return GTK_CALENDAR_GET_PRIVATE (calendar)->detail_width_chars;
+}
+
+/**
+ * gtk_calendar_get_detail_height_rows:
+ * @calendar: a #GtkCalendar.
+ *
+ * Queries the height of detail cells, in rows.
+ * See #GtkCalendar:detail-width-chars.
+ *
+ * Since: 2.14
+ *
+ * Return value: The height of detail cells, in rows.
+ */
+gint
+gtk_calendar_get_detail_height_rows (GtkCalendar *calendar)
+{
+  g_return_val_if_fail (GTK_IS_CALENDAR (calendar), 0);
+  return GTK_CALENDAR_GET_PRIVATE (calendar)->detail_height_rows;
 }