remember the sensitivity of the steppers in GtkRangeLayout, update it in

[~andy/gtk] / gtk / gtkcalendar.h

diff --git a/gtk/gtkcalendar.h b/gtk/gtkcalendar.h
index 56eb007d692aaf01d1ef46c46bcd269db0cede0d..3115e0ee0a6ab8b24cd0b2964e6dd3130a7239c1 100644 (file)
--- a/gtk/gtkcalendar.h
+++ b/gtk/gtkcalendar.h
@@ -5,42 +5,52 @@
  * Copyright (C) 1998 Cesar Miquel and Shawn T. Amundson
  *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * 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
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
+ * 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.
  */
+
+/*
+ * 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/. 
+ */
+
 #ifndef __GTK_CALENDAR_H__
 #define __GTK_CALENDAR_H__
 
 #include <gdk/gdk.h>
-#include <gtk/gtksignal.h>
 #include <gtk/gtkwidget.h>
 
+/* Not needed, retained for compatibility -Yosh */
+#include <gtk/gtksignal.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
 
+G_BEGIN_DECLS
 
-#define GTK_TYPE_CALENDAR                 (gtk_calendar_get_type ())
-#define GTK_CALENDAR(obj)                 (GTK_CHECK_CAST ((obj), GTK_TYPE_CALENDAR, GtkCalendar))
-#define GTK_CALENDAR_CLASS(klass)         (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_CALENDAR, GtkCalendarClass))
-#define GTK_IS_CALENDAR(obj)              (GTK_CHECK_TYPE ((obj), GTK_TYPE_CALENDAR))
-#define GTK_IS_CALENDAR_CLASS(klass)      (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CALENDAR))
+#define GTK_TYPE_CALENDAR                  (gtk_calendar_get_type ())
+#define GTK_CALENDAR(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CALENDAR, GtkCalendar))
+#define GTK_CALENDAR_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_CALENDAR, GtkCalendarClass))
+#define GTK_IS_CALENDAR(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CALENDAR))
+#define GTK_IS_CALENDAR_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CALENDAR))
+#define GTK_CALENDAR_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_CALENDAR, GtkCalendarClass))
 
 
 typedef struct _GtkCalendar           GtkCalendar;
 typedef struct _GtkCalendarClass       GtkCalendarClass;
 
+typedef struct _GtkCalendarPrivate     GtkCalendarPrivate;
+
 typedef enum
 {
   GTK_CALENDAR_SHOW_HEADING            = 1 << 0,
@@ -69,8 +79,8 @@ struct _GtkCalendar
   GtkCalendarDisplayOptions  display_flags;
   GdkColor marked_date_color[31];
   
-  GdkGC *gc;
-  GdkGC *xor_gc;
+  GdkGC *gc;                   /* unused */
+  GdkGC *xor_gc;               /* unused */
 
   gint focus_row;
   gint focus_col;
@@ -78,8 +88,14 @@ struct _GtkCalendar
   gint highlight_row;
   gint highlight_col;
   
-  gpointer private_data;
+  GtkCalendarPrivate *priv;
   gchar grow_space [32];
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 struct _GtkCalendarClass
@@ -98,37 +114,40 @@ struct _GtkCalendarClass
 };
 
 
-GtkType           gtk_calendar_get_type        (void);
+GType     gtk_calendar_get_type        (void) G_GNUC_CONST;
 GtkWidget* gtk_calendar_new            (void);
 
-gint      gtk_calendar_select_month    (GtkCalendar *calendar, 
+gboolean   gtk_calendar_select_month   (GtkCalendar *calendar, 
                                         guint        month,
                                         guint        year);
 void      gtk_calendar_select_day      (GtkCalendar *calendar,
                                         guint        day);
 
-gint      gtk_calendar_mark_day        (GtkCalendar *calendar,
+gboolean   gtk_calendar_mark_day       (GtkCalendar *calendar,
                                         guint        day);
-gint      gtk_calendar_unmark_day      (GtkCalendar *calendar,
+gboolean   gtk_calendar_unmark_day     (GtkCalendar *calendar,
                                         guint        day);
 void      gtk_calendar_clear_marks     (GtkCalendar *calendar);
 
 
+void      gtk_calendar_set_display_options (GtkCalendar              *calendar,
+                                            GtkCalendarDisplayOptions flags);
+GtkCalendarDisplayOptions
+           gtk_calendar_get_display_options (GtkCalendar             *calendar);
+#ifndef GTK_DISABLE_DEPRECATED
 void      gtk_calendar_display_options (GtkCalendar              *calendar,
                                         GtkCalendarDisplayOptions flags);
+#endif
 
 void      gtk_calendar_get_date        (GtkCalendar *calendar, 
                                         guint       *year,
                                         guint       *month,
                                         guint       *day);
+#ifndef GTK_DISABLE_DEPRECATED
 void      gtk_calendar_freeze          (GtkCalendar *calendar);
 void      gtk_calendar_thaw            (GtkCalendar *calendar);
+#endif
 
-
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __GTK_CALENDAR_H__ */