gtkmm r952 - in trunk: . gtk/src

[murrayc svn gnome org]

Author: murrayc
Date: Mon Jan 14 19:41:31 2008
New Revision: 952
URL: http://svn.gnome.org/viewvc/gtkmm?rev=952&view=rev

Log:
2008-01-14  Murray Cumming  <murrayc murrayc com>

        * gtk/src/gtk_enums.defs: Regenerated with enums.pl.
        * gtk/src/gtk_methods.defs: Regenerated with h2defs.py
        * gtk/src/calendar.ccg:
        * gtk/src/calendar.hg: Added set_detail_func(), 
        set_detail_width_chars(), set_detail_height_rows(), 
        get_detail_width_chars(), and get_detail_height_rows(), 
        and these properties.


Modified:
   trunk/ChangeLog
   trunk/gtk/src/calendar.ccg
   trunk/gtk/src/calendar.hg
   trunk/gtk/src/gtk_enums.defs
   trunk/gtk/src/gtk_methods.defs

Modified: trunk/gtk/src/calendar.ccg
==============================================================================
--- trunk/gtk/src/calendar.ccg	(original)
+++ trunk/gtk/src/calendar.ccg	Mon Jan 14 19:41:31 2008
@@ -22,21 +22,56 @@
 
 #include <gtk/gtkcalendar.h>
 
+
+//TODO: This should have been changed to a non-const gchar* return in GTK+ by the time you read this. murrayc.
+static const gchar* SignalProxy_Details_gtk_callback(GtkCalendar* model, guint year, guint month, guint day, gpointer user_data)
+{
+  Gtk::Calendar::SlotDetails* the_slot = static_cast<Gtk::Calendar::SlotDetails*>(user_data);
+
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED
+  try
+  {
+  #endif //GLIBMM_EXCEPTIONS_ENABLED
+    const Glib::ustring temp = (*the_slot)(year, month, day);
+    return temp.c_str();
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED
+  }
+  catch(...)
+  {
+    Glib::exception_handlers_invoke();
+  }
+
+  return 0; // arbitrary value
+  #endif //GLIBMM_EXCEPTIONS_ENABLED
+}
+
+static void SignalProxy_Details_gtk_callback_destroy(void* data)
+{
+  delete static_cast<Gtk::Calendar::SlotDetails*>(data);
+}
+
 namespace Gtk
 {
 
 void Calendar::get_date(Glib::Date& date) const
 {
-	guint year = 0;
-	guint month = 0;
-	guint day = 0;
-	
-	get_date(year, month, day);
-	
-	date.set_year(year);
-	date.set_month(static_cast<Glib::Date::Month>(Glib::Date::JANUARY + month)); // Month from 1 to 12 instead from 0 to 11
-	date.set_day(day);	
+  guint year = 0;
+  guint month = 0;
+  guint day = 0;
+  
+  get_date(year, month, day);
+  
+  date.set_year(year);
+  date.set_month(static_cast<Glib::Date::Month>(Glib::Date::JANUARY + month)); // Month from 1 to 12 instead from 0 to 11
+  date.set_day(day);  
+}
+
+void Calendar::set_detail_func(const SlotDetails& slot)
+{
+  SlotDetails* slot_copy = new SlotDetails(slot);
+  gtk_calendar_set_detail_func(gobj(), &SignalProxy_Details_gtk_callback, slot_copy, &SignalProxy_Details_gtk_callback_destroy);
 }
 
+
 } //namespace Gtk
 

Modified: trunk/gtk/src/calendar.hg
==============================================================================
--- trunk/gtk/src/calendar.hg	(original)
+++ trunk/gtk/src/calendar.hg	Mon Jan 14 19:41:31 2008
@@ -74,6 +74,49 @@
    */
   void get_date(Glib::Date& date) const;
   
+
+  /** For instance,
+   * @code
+   * Glib::ustring on_calendar_details(guint year, guint month, guint day);
+   * @endcode
+   *
+   * @param year The year for which details are needed.
+   * @param month The month for which details are needed.
+   * @param day The day of @month for which details are needed.
+   * @result Pango markup with details for the specified day, or an empty string.
+   *
+   * This callback function provides Pango markup with detail information for the
+   * specified day. Examples for such details are holidays or appointments. The
+   * function should return an empty string when no information is available.
+   *
+   * @newin2p16 
+   */
+  typedef sigc::slot<Glib::ustring, guint, guint, guint> SlotDetails;
+
+
+  /** 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 show-details is set.
+   * A tooltip containing full detail information is provided if the entire
+   * text could not fit into the details area, or if the show-details property
+   * is not set.
+   *
+   * The size of the details area can be restricted by setting the
+   * detail-width-chars and detail-height-rows properties.
+   *
+   * @param slot A callback function providing details for each day.
+   *
+   * @newin2p16
+   */
+  void set_detail_func(const SlotDetails& slot);
+  _IGNORE(gtk_calendar_set_detail_func);
+  	 
+  _WRAP_METHOD(void set_detail_width_chars(int chars), gtk_calendar_set_detail_width_chars)
+  _WRAP_METHOD(void set_detail_height_rows(int rows), gtk_calendar_set_detail_height_rows)
+	  	 
+  _WRAP_METHOD(int get_detail_width_chars() const, gtk_calendar_get_detail_width_chars)
+  _WRAP_METHOD(int get_detail_height_rows() const, gtk_calendar_get_detail_height_rows)
+
   _WRAP_METHOD(void freeze(), gtk_calendar_freeze)
   _WRAP_METHOD(void thaw(), gtk_calendar_thaw)
 
@@ -84,6 +127,18 @@
   _WRAP_SIGNAL(void next_month(), "next_month")
   _WRAP_SIGNAL(void prev_year(), "prev_year")
   _WRAP_SIGNAL(void next_year(), "next_year")
+
+  _WRAP_PROPERTY("year", int)
+  _WRAP_PROPERTY("month", int)
+  _WRAP_PROPERTY("day", int)
+  _WRAP_PROPERTY("show-heading", bool)
+  _WRAP_PROPERTY("show-day-names", bool)
+  _WRAP_PROPERTY("no-month-change", bool)
+  _WRAP_PROPERTY("show-week-numbers", bool)
+  _WRAP_PROPERTY("show-details", bool);
+  _WRAP_PROPERTY("detail-width-chars", int);
+  _WRAP_PROPERTY("detail-height-chars", int);
+
 };
 
 } /* namespace Gtk */

Modified: trunk/gtk/src/gtk_enums.defs
==============================================================================
--- trunk/gtk/src/gtk_enums.defs	(original)
+++ trunk/gtk/src/gtk_enums.defs	Mon Jan 14 19:41:31 2008
@@ -1,4 +1,4 @@
-;; From /home/murrayc/svn/gnome218/gtk+/gtk/gtkaccelgroup.h
+;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtkaccelgroup.h
 
 (define-flags-extended AccelFlags
   (in-module "Gtk")
@@ -10,7 +10,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome218/gtk+/gtk/gtkassistant.h
+;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtkassistant.h
 
 (define-enum-extended AssistantPageType
   (in-module "Gtk")
@@ -24,7 +24,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome218/gtk+/gtk/gtkbuilder.h
+;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtkbuilder.h
 
 (define-enum-extended BuilderError
   (in-module "Gtk")
@@ -40,7 +40,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome218/gtk+/gtk/gtkcalendar.h
+;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtkcalendar.h
 
 (define-flags-extended CalendarDisplayOptions
   (in-module "Gtk")
@@ -51,10 +51,11 @@
     '("no-month-change" "GTK_CALENDAR_NO_MONTH_CHANGE" "1 << 2")
     '("show-week-numbers" "GTK_CALENDAR_SHOW_WEEK_NUMBERS" "1 << 3")
     '("week-start-monday" "GTK_CALENDAR_WEEK_START_MONDAY" "1 << 4")
+    '("show-details" "GTK_CALENDAR_SHOW_DETAILS" "1 << 5")
   )
 )
 
-;; From /home/murrayc/svn/gnome218/gtk+/gtk/gtkcellrendereraccel.h
+;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtkcellrendereraccel.h
 
 (define-enum-extended CellRendererAccelMode
   (in-module "Gtk")
@@ -65,7 +66,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome218/gtk+/gtk/gtkcellrenderer.h
+;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtkcellrenderer.h
 
 (define-flags-extended CellRendererState
   (in-module "Gtk")
@@ -89,7 +90,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome218/gtk+/gtk/gtkdebug.h
+;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtkdebug.h
 
 (define-flags-extended DebugFlag
   (in-module "Gtk")
@@ -110,7 +111,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome218/gtk+/gtk/gtkdialog.h
+;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtkdialog.h
 
 (define-flags-extended DialogFlags
   (in-module "Gtk")
@@ -140,7 +141,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome218/gtk+/gtk/gtkdnd.h
+;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtkdnd.h
 
 (define-flags-extended DestDefaults
   (in-module "Gtk")
@@ -164,7 +165,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome218/gtk+/gtk/gtkenums.h
+;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtkenums.h
 
 (define-enum-extended AnchorType
   (in-module "Gtk")
@@ -729,7 +730,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome218/gtk+/gtk/gtkfilechooser.h
+;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtkfilechooser.h
 
 (define-enum-extended FileChooserAction
   (in-module "Gtk")
@@ -762,7 +763,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome218/gtk+/gtk/gtkfilechooserprivate.h
+;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtkfilechooserprivate.h
 
 (define-enum-extended State
   (in-module "Load")
@@ -804,7 +805,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome218/gtk+/gtk/gtkfilechooserutils.h
+;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtkfilechooserutils.h
 
 (define-flags-extended FileChooserProp
   (in-module "Gtk")
@@ -826,7 +827,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome218/gtk+/gtk/gtkfilefilter.h
+;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtkfilefilter.h
 
 (define-flags-extended FileFilterFlags
   (in-module "Gtk")
@@ -839,7 +840,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome218/gtk+/gtk/gtkfilesystem.h
+;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtkfilesystem.h
 
 (define-flags-extended FileInfoType
   (in-module "Gtk")
@@ -868,7 +869,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome218/gtk+/gtk/gtkfilesystemmodel.h
+;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtkfilesystemmodel.h
 
 (define-enum-extended FileSystemModelColumns
   (in-module "Gtk")
@@ -880,7 +881,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome218/gtk+/gtk/gtkicontheme.h
+;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtkicontheme.h
 
 (define-flags-extended IconLookupFlags
   (in-module "Gtk")
@@ -902,7 +903,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome218/gtk+/gtk/gtkiconview.h
+;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtkiconview.h
 
 (define-enum-extended IconViewDropPosition
   (in-module "Gtk")
@@ -917,7 +918,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome218/gtk+/gtk/gtkimage.h
+;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtkimage.h
 
 (define-enum-extended ImageType
   (in-module "Gtk")
@@ -934,7 +935,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome218/gtk+/gtk/gtkmessagedialog.h
+;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtkmessagedialog.h
 
 (define-enum-extended MessageType
   (in-module "Gtk")
@@ -961,7 +962,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome218/gtk+/gtk/gtknotebook.h
+;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtknotebook.h
 
 (define-enum-extended NotebookTab
   (in-module "Gtk")
@@ -972,7 +973,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome218/gtk+/gtk/gtkobject.h
+;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtkobject.h
 
 (define-flags-extended ObjectFlags
   (in-module "Gtk")
@@ -983,7 +984,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome218/gtk+/gtk/gtkprintbackend.h
+;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtkprintbackend.h
 
 (define-enum-extended PrintBackendError
   (in-module "Gtk")
@@ -993,7 +994,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome218/gtk+/gtk/gtkprinter.h
+;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtkprinter.h
 
 (define-flags-extended PrintCapabilities
   (in-module "Gtk")
@@ -1011,7 +1012,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome218/gtk+/gtk/gtkprinteroption.h
+;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtkprinteroption.h
 
 (define-enum-extended PrinterOptionType
   (in-module "Gtk")
@@ -1030,7 +1031,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome218/gtk+/gtk/gtkprintoperation.h
+;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtkprintoperation.h
 
 (define-enum-extended PrintStatus
   (in-module "Gtk")
@@ -1081,7 +1082,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome218/gtk+/gtk/gtkprivate.h
+;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtkprivate.h
 
 (define-flags-extended PrivateFlags
   (in-module "Gtk")
@@ -1102,7 +1103,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome218/gtk+/gtk/gtkprogressbar.h
+;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtkprogressbar.h
 
 (define-enum-extended ProgressBarStyle
   (in-module "Gtk")
@@ -1124,7 +1125,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome218/gtk+/gtk/gtkrbtree.h
+;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtkrbtree.h
 
 (define-flags-extended RBNodeColor
   (in-module "Gtk")
@@ -1144,7 +1145,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome218/gtk+/gtk/gtkrc.h
+;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtkrc.h
 
 (define-flags-extended RcFlags
   (in-module "Gtk")
@@ -1204,7 +1205,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome218/gtk+/gtk/gtkrecentchooser.h
+;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtkrecentchooser.h
 
 (define-enum-extended RecentSortType
   (in-module "Gtk")
@@ -1226,7 +1227,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome218/gtk+/gtk/gtkrecentchooserutils.h
+;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtkrecentchooserutils.h
 
 (define-flags-extended RecentChooserProp
   (in-module "Gtk")
@@ -1247,7 +1248,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome218/gtk+/gtk/gtkrecentfilter.h
+;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtkrecentfilter.h
 
 (define-flags-extended RecentFilterFlags
   (in-module "Gtk")
@@ -1262,7 +1263,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome218/gtk+/gtk/gtkrecentmanager.h
+;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtkrecentmanager.h
 
 (define-enum-extended RecentManagerError
   (in-module "Gtk")
@@ -1278,7 +1279,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome218/gtk+/gtk/gtksizegroup.h
+;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtksizegroup.h
 
 (define-enum-extended SizeGroupMode
   (in-module "Gtk")
@@ -1291,7 +1292,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome218/gtk+/gtk/gtkspinbutton.h
+;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtkspinbutton.h
 
 (define-enum-extended SpinButtonUpdatePolicy
   (in-module "Gtk")
@@ -1316,7 +1317,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome218/gtk+/gtk/gtktextbuffer.h
+;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtktextbuffer.h
 
 (define-enum-extended TextBufferTargetInfo
   (in-module "Gtk")
@@ -1325,7 +1326,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome218/gtk+/gtk/gtktextiter.h
+;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtktextiter.h
 
 (define-flags-extended TextSearchFlags
   (in-module "Gtk")
@@ -1336,7 +1337,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome218/gtk+/gtk/gtktextview.h
+;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtktextview.h
 
 (define-enum-extended TextWindowType
   (in-module "Gtk")
@@ -1352,7 +1353,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome218/gtk+/gtk/gtktoolbar.h
+;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtktoolbar.h
 
 (define-enum-extended ToolbarSpaceStyle
   (in-module "Gtk")
@@ -1363,7 +1364,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome218/gtk+/gtk/gtktree.h
+;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtktree.h
 
 (define-enum-extended TreeViewMode
   (in-module "Gtk")
@@ -1374,7 +1375,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome218/gtk+/gtk/gtktreemodel.h
+;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtktreemodel.h
 
 (define-flags-extended TreeModelFlags
   (in-module "Gtk")
@@ -1385,7 +1386,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome218/gtk+/gtk/gtktreeprivate.h
+;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtktreeprivate.h
 
 (define-flags-extended TreeViewFlags
   (in-module "Gtk")
@@ -1402,7 +1403,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome218/gtk+/gtk/gtktreeviewcolumn.h
+;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtktreeviewcolumn.h
 
 (define-enum-extended TreeViewColumnSizing
   (in-module "Gtk")
@@ -1414,7 +1415,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome218/gtk+/gtk/gtktreeview.h
+;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtktreeview.h
 
 (define-enum-extended TreeViewDropPosition
   (in-module "Gtk")
@@ -1427,7 +1428,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome218/gtk+/gtk/gtkuimanager.h
+;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtkuimanager.h
 
 (define-flags-extended UIManagerItemType
   (in-module "Gtk")
@@ -1446,7 +1447,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome218/gtk+/gtk/gtkwidget.h
+;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtkwidget.h
 
 (define-flags-extended WidgetFlags
   (in-module "Gtk")
@@ -1483,7 +1484,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome218/gtk+/gtk/gtkwin32embed.h
+;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtkwin32embed.h
 
 (define-enum-extended Win32EmbedMessageType
   (in-module "Gtk")
@@ -1507,3 +1508,26 @@
   )
 )
 
+;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/xembed.h
+
+(define-enum-extended EmbedMessageType
+  (in-module "X")
+  (c-name "XEmbedMessageType")
+  (values
+    '("embedded-notify" "XEMBED_EMBEDDED_NOTIFY" "0")
+    '("window-activate" "XEMBED_WINDOW_ACTIVATE" "1")
+    '("window-deactivate" "XEMBED_WINDOW_DEACTIVATE" "2")
+    '("request-focus" "XEMBED_REQUEST_FOCUS" "3")
+    '("focus-in" "XEMBED_FOCUS_IN" "4")
+    '("focus-out" "XEMBED_FOCUS_OUT" "5")
+    '("focus-next" "XEMBED_FOCUS_NEXT" "6")
+    '("focus-prev" "XEMBED_FOCUS_PREV" "7")
+    '("grab-key" "XEMBED_GRAB_KEY" "8")
+    '("ungrab-key" "XEMBED_UNGRAB_KEY" "9")
+    '("modality-on" "XEMBED_MODALITY_ON" "10")
+    '("modality-off" "XEMBED_MODALITY_OFF" "11")
+    '("gtk-grab-key" "XEMBED_GTK_GRAB_KEY" "108")
+    '("gtk-ungrab-key" "XEMBED_GTK_UNGRAB_KEY" "109")
+  )
+)
+

Modified: trunk/gtk/src/gtk_methods.defs
==============================================================================
--- trunk/gtk/src/gtk_methods.defs	(original)
+++ trunk/gtk/src/gtk_methods.defs	Mon Jan 14 19:41:31 2008
@@ -417,6 +417,12 @@
   (gtype-id "GTK_TYPE_RADIO_ACTION")
 )
 
+(define-object ToolShell
+  (in-module "Gtk")
+  (c-name "GtkToolShell")
+  (gtype-id "GTK_TYPE_TOOL_SHELL")
+)
+
 (define-object Tooltips
   (in-module "Gtk")
   (parent "GtkObject")
@@ -1395,6 +1401,7 @@
     '("no-month-change" "GTK_CALENDAR_NO_MONTH_CHANGE")
     '("show-week-numbers" "GTK_CALENDAR_SHOW_WEEK_NUMBERS")
     '("week-start-monday" "GTK_CALENDAR_WEEK_START_MONDAY")
+    '("show-details" "GTK_CALENDAR_SHOW_DETAILS")
   )
 )
 
@@ -3030,28 +3037,6 @@
   )
 )
 
-(define-enum MessageType
-  (in-module "XEmbed")
-  (c-name "XEmbedMessageType")
-  (gtype-id "X_TYPE_EMBED_MESSAGE_TYPE")
-  (values
-    '("embedded-notify" "XEMBED_EMBEDDED_NOTIFY")
-    '("window-activate" "XEMBED_WINDOW_ACTIVATE")
-    '("window-deactivate" "XEMBED_WINDOW_DEACTIVATE")
-    '("request-focus" "XEMBED_REQUEST_FOCUS")
-    '("focus-in" "XEMBED_FOCUS_IN")
-    '("focus-out" "XEMBED_FOCUS_OUT")
-    '("focus-next" "XEMBED_FOCUS_NEXT")
-    '("focus-prev" "XEMBED_FOCUS_PREV")
-    '("grab-key" "XEMBED_GRAB_KEY")
-    '("ungrab-key" "XEMBED_UNGRAB_KEY")
-    '("modality-on" "XEMBED_MODALITY_ON")
-    '("modality-off" "XEMBED_MODALITY_OFF")
-    '("gtk-grab-key" "XEMBED_GTK_GRAB_KEY")
-    '("gtk-ungrab-key" "XEMBED_GTK_UNGRAB_KEY")
-  )
-)
-
 
 ;; From gtkaboutdialog.h
 
@@ -5331,6 +5316,47 @@
   )
 )
 
+(define-method set_detail_func
+  (of-object "GtkCalendar")
+  (c-name "gtk_calendar_set_detail_func")
+  (return-type "none")
+  (parameters
+    '("GtkCalendarDetailFunc" "func")
+    '("gpointer" "data")
+    '("GDestroyNotify" "destroy")
+  )
+)
+
+(define-method set_detail_width_chars
+  (of-object "GtkCalendar")
+  (c-name "gtk_calendar_set_detail_width_chars")
+  (return-type "none")
+  (parameters
+    '("gint" "chars")
+  )
+)
+
+(define-method set_detail_height_rows
+  (of-object "GtkCalendar")
+  (c-name "gtk_calendar_set_detail_height_rows")
+  (return-type "none")
+  (parameters
+    '("gint" "rows")
+  )
+)
+
+(define-method get_detail_width_chars
+  (of-object "GtkCalendar")
+  (c-name "gtk_calendar_get_detail_width_chars")
+  (return-type "gint")
+)
+
+(define-method get_detail_height_rows
+  (of-object "GtkCalendar")
+  (c-name "gtk_calendar_get_detail_height_rows")
+  (return-type "gint")
+)
+
 (define-method freeze
   (of-object "GtkCalendar")
   (c-name "gtk_calendar_freeze")
@@ -14604,7 +14630,7 @@
 
 (define-function gtk_check_version
   (c-name "gtk_check_version")
-  (return-type "gchar*")
+  (return-type "const-gchar*")
   (parameters
     '("guint" "required_major")
     '("guint" "required_minor")
@@ -16530,6 +16556,16 @@
   )
 )
 
+(define-method load_file
+  (of-object "GtkPageSetup")
+  (c-name "gtk_page_setup_load_file")
+  (return-type "gboolean")
+  (parameters
+    '("const-char*" "file_name")
+    '("GError**" "error")
+  )
+)
+
 (define-method to_file
   (of-object "GtkPageSetup")
   (c-name "gtk_page_setup_to_file")
@@ -16550,6 +16586,17 @@
   )
 )
 
+(define-method load_key_file
+  (of-object "GtkPageSetup")
+  (c-name "gtk_page_setup_load_key_file")
+  (return-type "gboolean")
+  (parameters
+    '("GKeyFile*" "key_file")
+    '("const-gchar*" "group_name")
+    '("GError**" "error")
+  )
+)
+
 (define-method to_key_file
   (of-object "GtkPageSetup")
   (c-name "gtk_page_setup_to_key_file")
@@ -18107,6 +18154,16 @@
   )
 )
 
+(define-method load_file
+  (of-object "GtkPrintSettings")
+  (c-name "gtk_print_settings_load_file")
+  (return-type "gboolean")
+  (parameters
+    '("const-gchar*" "file_name")
+    '("GError**" "error")
+  )
+)
+
 (define-method to_file
   (of-object "GtkPrintSettings")
   (c-name "gtk_print_settings_to_file")
@@ -18127,6 +18184,17 @@
   )
 )
 
+(define-method load_key_file
+  (of-object "GtkPrintSettings")
+  (c-name "gtk_print_settings_load_key_file")
+  (return-type "gboolean")
+  (parameters
+    '("GKeyFile*" "key_file")
+    '("const-gchar*" "group_name")
+    '("GError**" "error")
+  )
+)
+
 (define-method to_key_file
   (of-object "GtkPrintSettings")
   (c-name "gtk_print_settings_to_key_file")
@@ -22965,6 +23033,12 @@
   (return-type "GType")
 )
 
+(define-function gtk_border_new
+  (c-name "gtk_border_new")
+  (is-constructor-of "GtkBorder")
+  (return-type "GtkBorder*")
+)
+
 (define-method copy
   (of-object "GtkBorder")
   (c-name "gtk_border_copy")
@@ -23180,6 +23254,154 @@
 
 
 
+;; From gtktestutils.h
+
+(define-function gtk_test_init
+  (c-name "gtk_test_init")
+  (return-type "none")
+  (parameters
+    '("int*" "argcp")
+    '("char***" "argvp")
+  )
+  (varargs #t)
+)
+
+(define-function gtk_test_register_all_types
+  (c-name "gtk_test_register_all_types")
+  (return-type "none")
+)
+
+(define-function gtk_test_list_all_types
+  (c-name "gtk_test_list_all_types")
+  (return-type "const-GType*")
+  (parameters
+    '("guint*" "n_types")
+  )
+)
+
+(define-function gtk_test_find_widget
+  (c-name "gtk_test_find_widget")
+  (return-type "GtkWidget*")
+  (parameters
+    '("GtkWidget*" "widget")
+    '("const-gchar*" "label_pattern")
+    '("GType" "widget_type")
+  )
+)
+
+(define-function gtk_test_create_widget
+  (c-name "gtk_test_create_widget")
+  (return-type "GtkWidget*")
+  (parameters
+    '("GType" "widget_type")
+    '("const-gchar*" "first_property_name")
+  )
+  (varargs #t)
+)
+
+(define-function gtk_test_create_simple_window
+  (c-name "gtk_test_create_simple_window")
+  (return-type "GtkWidget*")
+  (parameters
+    '("const-gchar*" "window_title")
+    '("const-gchar*" "dialog_text")
+  )
+)
+
+(define-function gtk_test_display_button_window
+  (c-name "gtk_test_display_button_window")
+  (return-type "GtkWidget*")
+  (parameters
+    '("const-gchar*" "window_title")
+    '("const-gchar*" "dialog_text")
+  )
+  (varargs #t)
+)
+
+(define-function gtk_test_slider_set_perc
+  (c-name "gtk_test_slider_set_perc")
+  (return-type "none")
+  (parameters
+    '("GtkWidget*" "widget")
+    '("double" "percentage")
+  )
+)
+
+(define-function gtk_test_slider_get_value
+  (c-name "gtk_test_slider_get_value")
+  (return-type "double")
+  (parameters
+    '("GtkWidget*" "widget")
+  )
+)
+
+(define-function gtk_test_spin_button_click
+  (c-name "gtk_test_spin_button_click")
+  (return-type "gboolean")
+  (parameters
+    '("GtkSpinButton*" "widget")
+    '("guint" "button")
+    '("gboolean" "upwards")
+  )
+)
+
+(define-function gtk_test_widget_click
+  (c-name "gtk_test_widget_click")
+  (return-type "gboolean")
+  (parameters
+    '("GtkWidget*" "widget")
+    '("guint" "button")
+    '("GdkModifierType" "modifiers")
+  )
+)
+
+(define-function gtk_test_widget_send_key
+  (c-name "gtk_test_widget_send_key")
+  (return-type "gboolean")
+  (parameters
+    '("GtkWidget*" "widget")
+    '("guint" "keyval")
+    '("GdkModifierType" "modifiers")
+  )
+)
+
+(define-function gtk_test_text_set
+  (c-name "gtk_test_text_set")
+  (return-type "none")
+  (parameters
+    '("GtkWidget*" "widget")
+    '("const-gchar*" "string")
+  )
+)
+
+(define-function gtk_test_text_get
+  (c-name "gtk_test_text_get")
+  (return-type "gchar*")
+  (parameters
+    '("GtkWidget*" "widget")
+  )
+)
+
+(define-function gtk_test_find_sibling
+  (c-name "gtk_test_find_sibling")
+  (return-type "GtkWidget*")
+  (parameters
+    '("GtkWidget*" "base_widget")
+    '("GType" "widget_type")
+  )
+)
+
+(define-function gtk_test_find_label
+  (c-name "gtk_test_find_label")
+  (return-type "GtkWidget*")
+  (parameters
+    '("GtkWidget*" "widget")
+    '("const-gchar*" "label_pattern")
+  )
+)
+
+
+
 ;; From gtktextbtree.h
 
 
@@ -26845,6 +27067,51 @@
   (return-type "none")
 )
 
+(define-method toolbar_reconfigured
+  (of-object "GtkToolItem")
+  (c-name "gtk_tool_item_toolbar_reconfigured")
+  (return-type "none")
+)
+
+
+
+;; From gtktoolshell.h
+
+(define-function gtk_tool_shell_get_type
+  (c-name "gtk_tool_shell_get_type")
+  (return-type "GType")
+)
+
+(define-method get_icon_size
+  (of-object "GtkToolShell")
+  (c-name "gtk_tool_shell_get_icon_size")
+  (return-type "GtkIconSize")
+)
+
+(define-method get_orientation
+  (of-object "GtkToolShell")
+  (c-name "gtk_tool_shell_get_orientation")
+  (return-type "GtkOrientation")
+)
+
+(define-method get_style
+  (of-object "GtkToolShell")
+  (c-name "gtk_tool_shell_get_style")
+  (return-type "GtkToolbarStyle")
+)
+
+(define-method get_relief_style
+  (of-object "GtkToolShell")
+  (c-name "gtk_tool_shell_get_relief_style")
+  (return-type "GtkReliefStyle")
+)
+
+(define-method rebuild_menu
+  (of-object "GtkToolShell")
+  (c-name "gtk_tool_shell_rebuild_menu")
+  (return-type "none")
+)
+
 
 
 ;; From gtktooltip.h
@@ -26891,6 +27158,16 @@
   )
 )
 
+(define-method set_icon_from_icon_name
+  (of-object "GtkTooltip")
+  (c-name "gtk_tooltip_set_icon_from_icon_name")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "icon_name")
+    '("GtkIconSize" "size")
+  )
+)
+
 (define-method set_custom
   (of-object "GtkTooltip")
   (c-name "gtk_tooltip_set_custom")
@@ -32792,19 +33069,3 @@
 ;; From gtkxembed.h
 
 
-
-;; From stamp-gtkmarshalers.h
-
-
-
-;; From stamp-gtkmarshal.h
-
-
-
-;; From stamp-gtktypebuiltins.h
-
-
-
-;; From xembed.h
-
-