GNOME.org
 

[gtkmm] Fix the build with latest GTK+ from git master.

commit d4b63ce4f79f16b397391e354161bd9fe82d2271
Author: Murray Cumming <murrayc murrayc com>
Date:   Mon Dec 20 11:57:51 2010 +0100

    Fix the build with latest GTK+ from git master.
    
    * gtk/src/gtk_methods.defs: Regenerated with h2defs.py.
    * gtk/src/widget.hg: set/get_extension_events() removed, because they were
    removed from GTK+, apparently because they are now unnecessary.
    * gtk/src/widgetpath.hg: get_widget_type() renamed to get_object_type().
    iter_get/set_widget_type() renamed to iter_get/set_object_type().

 ChangeLog                |   10 +
 gtk/src/gtk_methods.defs | 1573 +++++++++++++++++++++++++++++++---------------
 gtk/src/widget.hg        |    4 -
 gtk/src/widgetpath.hg    |    6 +-
 4 files changed, 1070 insertions(+), 523 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 232c585..1cfdc38 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-12-20  Murray Cumming  <murrayc murrayc com>
+
+	Fix the build with latest GTK+ from git master.
+
+	* gtk/src/gtk_methods.defs: Regenerated with h2defs.py.
+	* gtk/src/widget.hg: set/get_extension_events() removed, because they were 
+	removed from GTK+, apparently because they are now unnecessary.
+	* gtk/src/widgetpath.hg: get_widget_type() renamed to get_object_type().
+	iter_get/set_widget_type() renamed to iter_get/set_object_type(). 
+
 2010-12-17  Murray Cumming  <murrayc murrayc com>
 
 	Application: Use _WRAP_CTOR() and _WRAP_CREATE() instead of _WRAP_METHOD().
diff --git a/gtk/src/gtk_methods.defs b/gtk/src/gtk_methods.defs
index ce732e0..29a4bea 100644
--- a/gtk/src/gtk_methods.defs
+++ b/gtk/src/gtk_methods.defs
@@ -61,6 +61,34 @@
   (gtype-id "GTK_TYPE_BUILDER")
 )
 
+(define-object CellArea
+  (in-module "Gtk")
+  (parent "GInitiallyUnowned")
+  (c-name "GtkCellArea")
+  (gtype-id "GTK_TYPE_CELL_AREA")
+)
+
+(define-object CellAreaBox
+  (in-module "Gtk")
+  (parent "GtkCellArea")
+  (c-name "GtkCellAreaBox")
+  (gtype-id "GTK_TYPE_CELL_AREA_BOX")
+)
+
+(define-object CellAreaContext
+  (in-module "Gtk")
+  (parent "GObject")
+  (c-name "GtkCellAreaContext")
+  (gtype-id "GTK_TYPE_CELL_AREA_CONTEXT")
+)
+
+(define-object CellAreaBoxContext
+  (in-module "Gtk")
+  (parent "GtkCellAreaContext")
+  (c-name "GtkCellAreaBoxContext")
+  (gtype-id "GTK_TYPE_CELL_AREA_BOX_CONTEXT")
+)
+
 (define-object CellEditable
   (in-module "Gtk")
   (c-name "GtkCellEditable")
@@ -136,12 +164,6 @@
   (gtype-id "GTK_TYPE_CELL_RENDERER_TOGGLE")
 )
 
-(define-object CellSizeRequest
-  (in-module "Gtk")
-  (c-name "GtkCellSizeRequest")
-  (gtype-id "GTK_TYPE_CELL_SIZE_REQUEST")
-)
-
 (define-object CssProvider
   (in-module "Gtk")
   (parent "GObject")
@@ -212,13 +234,6 @@
   (gtype-id "GTK_TYPE_MOUNT_OPERATION")
 )
 
-(define-object Object
-  (in-module "Gtk")
-  (parent "GInitiallyUnowned")
-  (c-name "GtkObject")
-  (gtype-id "GTK_TYPE_OBJECT")
-)
-
 (define-object Orientable
   (in-module "Gtk")
   (c-name "GtkOrientable")
@@ -504,27 +519,6 @@
   (gtype-id "GTK_TYPE_HSEPARATOR")
 )
 
-(define-object Ruler
-  (in-module "Gtk")
-  (parent "GtkWidget")
-  (c-name "GtkRuler")
-  (gtype-id "GTK_TYPE_RULER")
-)
-
-(define-object VRuler
-  (in-module "Gtk")
-  (parent "GtkRuler")
-  (c-name "GtkVRuler")
-  (gtype-id "GTK_TYPE_VRULER")
-)
-
-(define-object HRuler
-  (in-module "Gtk")
-  (parent "GtkRuler")
-  (c-name "GtkHRuler")
-  (gtype-id "GTK_TYPE_HRULER")
-)
-
 (define-object Range
   (in-module "Gtk")
   (parent "GtkWidget")
@@ -896,13 +890,6 @@
   (gtype-id "GTK_TYPE_IMAGE_MENU_ITEM")
 )
 
-(define-object Item
-  (in-module "Gtk")
-  (parent "GtkBin")
-  (c-name "GtkItem")
-  (gtype-id "GTK_TYPE_ITEM")
-)
-
 (define-object HandleBox
   (in-module "Gtk")
   (parent "GtkBin")
@@ -1022,13 +1009,6 @@
   (gtype-id "GTK_TYPE_APP_CHOOSER_BUTTON")
 )
 
-(define-object ComboBoxEntry
-  (in-module "Gtk")
-  (parent "GtkComboBox")
-  (c-name "GtkComboBoxEntry")
-  (gtype-id "GTK_TYPE_COMBO_BOX_ENTRY")
-)
-
 (define-object ComboBoxText
   (in-module "Gtk")
   (parent "GtkComboBox")
@@ -1253,13 +1233,6 @@
   (gtype-id "GTK_TYPE_WINDOW_GROUP")
 )
 
-(define-object WrapBox
-  (in-module "Gtk")
-  (parent "GtkContainer")
-  (c-name "GtkWrapBox")
-  (gtype-id "GTK_TYPE_WRAP_BOX")
-)
-
 ;; Enumerations and flags ...
 
 (define-enum License
@@ -2248,17 +2221,6 @@
   )
 )
 
-(define-flags ObjectFlags
-  (in-module "Gtk")
-  (c-name "GtkObjectFlags")
-  (gtype-id "GTK_TYPE_OBJECT_FLAGS")
-  (values
-    '("in-destruction" "GTK_IN_DESTRUCTION")
-    '("reserved-1" "GTK_RESERVED_1")
-    '("reserved-2" "GTK_RESERVED_2")
-  )
-)
-
 (define-enum PrintStatus
   (in-module "Gtk")
   (c-name "GtkPrintStatus")
@@ -5492,6 +5454,803 @@
 
 
 
+;; From gtkcellareaboxcontext.h
+
+(define-function gtk_cell_area_box_context_get_type
+  (c-name "gtk_cell_area_box_context_get_type")
+  (return-type "GType")
+)
+
+(define-method context_copy
+  (of-object "GtkCellAreaBox")
+  (c-name "gtk_cell_area_box_context_copy")
+  (return-type "GtkCellAreaBoxContext*")
+  (parameters
+    '("GtkCellAreaBoxContext*" "box_context")
+  )
+)
+
+(define-function gtk_cell_area_box_init_groups
+  (c-name "gtk_cell_area_box_init_groups")
+  (return-type "none")
+  (parameters
+    '("GtkCellAreaBoxContext*" "box_context")
+    '("guint" "n_groups")
+    '("gboolean*" "expand_groups")
+  )
+)
+
+(define-method push_group_width
+  (of-object "GtkCellAreaBoxContext")
+  (c-name "gtk_cell_area_box_context_push_group_width")
+  (return-type "none")
+  (parameters
+    '("gint" "group_idx")
+    '("gint" "minimum_width")
+    '("gint" "natural_width")
+  )
+)
+
+(define-method push_group_height_for_width
+  (of-object "GtkCellAreaBoxContext")
+  (c-name "gtk_cell_area_box_context_push_group_height_for_width")
+  (return-type "none")
+  (parameters
+    '("gint" "group_idx")
+    '("gint" "for_width")
+    '("gint" "minimum_height")
+    '("gint" "natural_height")
+  )
+)
+
+(define-method push_group_height
+  (of-object "GtkCellAreaBoxContext")
+  (c-name "gtk_cell_area_box_context_push_group_height")
+  (return-type "none")
+  (parameters
+    '("gint" "group_idx")
+    '("gint" "minimum_height")
+    '("gint" "natural_height")
+  )
+)
+
+(define-method push_group_width_for_height
+  (of-object "GtkCellAreaBoxContext")
+  (c-name "gtk_cell_area_box_context_push_group_width_for_height")
+  (return-type "none")
+  (parameters
+    '("gint" "group_idx")
+    '("gint" "for_height")
+    '("gint" "minimum_width")
+    '("gint" "natural_width")
+  )
+)
+
+(define-method get_group_width
+  (of-object "GtkCellAreaBoxContext")
+  (c-name "gtk_cell_area_box_context_get_group_width")
+  (return-type "none")
+  (parameters
+    '("gint" "group_idx")
+    '("gint*" "minimum_width")
+    '("gint*" "natural_width")
+  )
+)
+
+(define-method get_group_height_for_width
+  (of-object "GtkCellAreaBoxContext")
+  (c-name "gtk_cell_area_box_context_get_group_height_for_width")
+  (return-type "none")
+  (parameters
+    '("gint" "group_idx")
+    '("gint" "for_width")
+    '("gint*" "minimum_height")
+    '("gint*" "natural_height")
+  )
+)
+
+(define-method get_group_height
+  (of-object "GtkCellAreaBoxContext")
+  (c-name "gtk_cell_area_box_context_get_group_height")
+  (return-type "none")
+  (parameters
+    '("gint" "group_idx")
+    '("gint*" "minimum_height")
+    '("gint*" "natural_height")
+  )
+)
+
+(define-method get_group_width_for_height
+  (of-object "GtkCellAreaBoxContext")
+  (c-name "gtk_cell_area_box_context_get_group_width_for_height")
+  (return-type "none")
+  (parameters
+    '("gint" "group_idx")
+    '("gint" "for_height")
+    '("gint*" "minimum_width")
+    '("gint*" "natural_width")
+  )
+)
+
+(define-method get_widths
+  (of-object "GtkCellAreaBoxContext")
+  (c-name "gtk_cell_area_box_context_get_widths")
+  (return-type "GtkRequestedSize*")
+  (parameters
+    '("gint*" "n_widths")
+  )
+)
+
+(define-method get_heights
+  (of-object "GtkCellAreaBoxContext")
+  (c-name "gtk_cell_area_box_context_get_heights")
+  (return-type "GtkRequestedSize*")
+  (parameters
+    '("gint*" "n_heights")
+  )
+)
+
+(define-method get_orientation_allocs
+  (of-object "GtkCellAreaBoxContext")
+  (c-name "gtk_cell_area_box_context_get_orientation_allocs")
+  (return-type "GtkCellAreaBoxAllocation*")
+  (parameters
+    '("gint*" "n_allocs")
+  )
+)
+
+
+
+;; From gtkcellareabox.h
+
+(define-function gtk_cell_area_box_get_type
+  (c-name "gtk_cell_area_box_get_type")
+  (return-type "GType")
+)
+
+(define-function gtk_cell_area_box_new
+  (c-name "gtk_cell_area_box_new")
+  (is-constructor-of "GtkCellAreaBox")
+  (return-type "GtkCellArea*")
+)
+
+(define-method pack_start
+  (of-object "GtkCellAreaBox")
+  (c-name "gtk_cell_area_box_pack_start")
+  (return-type "none")
+  (parameters
+    '("GtkCellRenderer*" "renderer")
+    '("gboolean" "expand")
+    '("gboolean" "align")
+  )
+)
+
+(define-method pack_end
+  (of-object "GtkCellAreaBox")
+  (c-name "gtk_cell_area_box_pack_end")
+  (return-type "none")
+  (parameters
+    '("GtkCellRenderer*" "renderer")
+    '("gboolean" "expand")
+    '("gboolean" "align")
+  )
+)
+
+(define-method get_spacing
+  (of-object "GtkCellAreaBox")
+  (c-name "gtk_cell_area_box_get_spacing")
+  (return-type "gint")
+)
+
+(define-method set_spacing
+  (of-object "GtkCellAreaBox")
+  (c-name "gtk_cell_area_box_set_spacing")
+  (return-type "none")
+  (parameters
+    '("gint" "spacing")
+  )
+)
+
+
+
+;; From gtkcellareacontext.h
+
+(define-function gtk_cell_area_context_get_type
+  (c-name "gtk_cell_area_context_get_type")
+  (return-type "GType")
+)
+
+(define-method get_area
+  (of-object "GtkCellAreaContext")
+  (c-name "gtk_cell_area_context_get_area")
+  (return-type "GtkCellArea*")
+)
+
+(define-method allocate
+  (of-object "GtkCellAreaContext")
+  (c-name "gtk_cell_area_context_allocate")
+  (return-type "none")
+  (parameters
+    '("gint" "width")
+    '("gint" "height")
+  )
+)
+
+(define-method reset
+  (of-object "GtkCellAreaContext")
+  (c-name "gtk_cell_area_context_reset")
+  (return-type "none")
+)
+
+(define-method get_preferred_width
+  (of-object "GtkCellAreaContext")
+  (c-name "gtk_cell_area_context_get_preferred_width")
+  (return-type "none")
+  (parameters
+    '("gint*" "minimum_width")
+    '("gint*" "natural_width")
+  )
+)
+
+(define-method get_preferred_height
+  (of-object "GtkCellAreaContext")
+  (c-name "gtk_cell_area_context_get_preferred_height")
+  (return-type "none")
+  (parameters
+    '("gint*" "minimum_height")
+    '("gint*" "natural_height")
+  )
+)
+
+(define-method get_preferred_height_for_width
+  (of-object "GtkCellAreaContext")
+  (c-name "gtk_cell_area_context_get_preferred_height_for_width")
+  (return-type "none")
+  (parameters
+    '("gint" "width")
+    '("gint*" "minimum_height")
+    '("gint*" "natural_height")
+  )
+)
+
+(define-method get_preferred_width_for_height
+  (of-object "GtkCellAreaContext")
+  (c-name "gtk_cell_area_context_get_preferred_width_for_height")
+  (return-type "none")
+  (parameters
+    '("gint" "height")
+    '("gint*" "minimum_width")
+    '("gint*" "natural_width")
+  )
+)
+
+(define-method get_allocation
+  (of-object "GtkCellAreaContext")
+  (c-name "gtk_cell_area_context_get_allocation")
+  (return-type "none")
+  (parameters
+    '("gint*" "width")
+    '("gint*" "height")
+  )
+)
+
+(define-method push_preferred_width
+  (of-object "GtkCellAreaContext")
+  (c-name "gtk_cell_area_context_push_preferred_width")
+  (return-type "none")
+  (parameters
+    '("gint" "minimum_width")
+    '("gint" "natural_width")
+  )
+)
+
+(define-method push_preferred_height
+  (of-object "GtkCellAreaContext")
+  (c-name "gtk_cell_area_context_push_preferred_height")
+  (return-type "none")
+  (parameters
+    '("gint" "minimum_height")
+    '("gint" "natural_height")
+  )
+)
+
+
+
+;; From gtkcellarea.h
+
+(define-function gtk_cell_area_get_type
+  (c-name "gtk_cell_area_get_type")
+  (return-type "GType")
+)
+
+(define-method add
+  (of-object "GtkCellArea")
+  (c-name "gtk_cell_area_add")
+  (return-type "none")
+  (parameters
+    '("GtkCellRenderer*" "renderer")
+  )
+)
+
+(define-method remove
+  (of-object "GtkCellArea")
+  (c-name "gtk_cell_area_remove")
+  (return-type "none")
+  (parameters
+    '("GtkCellRenderer*" "renderer")
+  )
+)
+
+(define-method has_renderer
+  (of-object "GtkCellArea")
+  (c-name "gtk_cell_area_has_renderer")
+  (return-type "gboolean")
+  (parameters
+    '("GtkCellRenderer*" "renderer")
+  )
+)
+
+(define-method foreach
+  (of-object "GtkCellArea")
+  (c-name "gtk_cell_area_foreach")
+  (return-type "none")
+  (parameters
+    '("GtkCellCallback" "callback")
+    '("gpointer" "callback_data")
+  )
+)
+
+(define-method foreach_alloc
+  (of-object "GtkCellArea")
+  (c-name "gtk_cell_area_foreach_alloc")
+  (return-type "none")
+  (parameters
+    '("GtkCellAreaContext*" "context")
+    '("GtkWidget*" "widget")
+    '("const-GdkRectangle*" "cell_area")
+    '("const-GdkRectangle*" "background_area")
+    '("GtkCellAllocCallback" "callback")
+    '("gpointer" "callback_data")
+  )
+)
+
+(define-method event
+  (of-object "GtkCellArea")
+  (c-name "gtk_cell_area_event")
+  (return-type "gint")
+  (parameters
+    '("GtkCellAreaContext*" "context")
+    '("GtkWidget*" "widget")
+    '("GdkEvent*" "event")
+    '("const-GdkRectangle*" "cell_area")
+    '("GtkCellRendererState" "flags")
+  )
+)
+
+(define-method render
+  (of-object "GtkCellArea")
+  (c-name "gtk_cell_area_render")
+  (return-type "none")
+  (parameters
+    '("GtkCellAreaContext*" "context")
+    '("GtkWidget*" "widget")
+    '("cairo_t*" "cr")
+    '("const-GdkRectangle*" "background_area")
+    '("const-GdkRectangle*" "cell_area")
+    '("GtkCellRendererState" "flags")
+    '("gboolean" "paint_focus")
+  )
+)
+
+(define-method set_style_detail
+  (of-object "GtkCellArea")
+  (c-name "gtk_cell_area_set_style_detail")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "detail")
+  )
+)
+
+(define-method get_style_detail
+  (of-object "GtkCellArea")
+  (c-name "gtk_cell_area_get_style_detail")
+  (return-type "const-gchar*")
+)
+
+(define-method get_cell_allocation
+  (of-object "GtkCellArea")
+  (c-name "gtk_cell_area_get_cell_allocation")
+  (return-type "none")
+  (parameters
+    '("GtkCellAreaContext*" "context")
+    '("GtkWidget*" "widget")
+    '("GtkCellRenderer*" "renderer")
+    '("const-GdkRectangle*" "cell_area")
+    '("GdkRectangle*" "allocation")
+  )
+)
+
+(define-method get_cell_at_position
+  (of-object "GtkCellArea")
+  (c-name "gtk_cell_area_get_cell_at_position")
+  (return-type "GtkCellRenderer*")
+  (parameters
+    '("GtkCellAreaContext*" "context")
+    '("GtkWidget*" "widget")
+    '("const-GdkRectangle*" "cell_area")
+    '("gint" "x")
+    '("gint" "y")
+    '("GdkRectangle*" "alloc_area")
+  )
+)
+
+(define-method create_context
+  (of-object "GtkCellArea")
+  (c-name "gtk_cell_area_create_context")
+  (return-type "GtkCellAreaContext*")
+)
+
+(define-method copy_context
+  (of-object "GtkCellArea")
+  (c-name "gtk_cell_area_copy_context")
+  (return-type "GtkCellAreaContext*")
+  (parameters
+    '("GtkCellAreaContext*" "context")
+  )
+)
+
+(define-method get_request_mode
+  (of-object "GtkCellArea")
+  (c-name "gtk_cell_area_get_request_mode")
+  (return-type "GtkSizeRequestMode")
+)
+
+(define-method get_preferred_width
+  (of-object "GtkCellArea")
+  (c-name "gtk_cell_area_get_preferred_width")
+  (return-type "none")
+  (parameters
+    '("GtkCellAreaContext*" "context")
+    '("GtkWidget*" "widget")
+    '("gint*" "minimum_width")
+    '("gint*" "natural_width")
+  )
+)
+
+(define-method get_preferred_height_for_width
+  (of-object "GtkCellArea")
+  (c-name "gtk_cell_area_get_preferred_height_for_width")
+  (return-type "none")
+  (parameters
+    '("GtkCellAreaContext*" "context")
+    '("GtkWidget*" "widget")
+    '("gint" "width")
+    '("gint*" "minimum_height")
+    '("gint*" "natural_height")
+  )
+)
+
+(define-method get_preferred_height
+  (of-object "GtkCellArea")
+  (c-name "gtk_cell_area_get_preferred_height")
+  (return-type "none")
+  (parameters
+    '("GtkCellAreaContext*" "context")
+    '("GtkWidget*" "widget")
+    '("gint*" "minimum_height")
+    '("gint*" "natural_height")
+  )
+)
+
+(define-method get_preferred_width_for_height
+  (of-object "GtkCellArea")
+  (c-name "gtk_cell_area_get_preferred_width_for_height")
+  (return-type "none")
+  (parameters
+    '("GtkCellAreaContext*" "context")
+    '("GtkWidget*" "widget")
+    '("gint" "height")
+    '("gint*" "minimum_width")
+    '("gint*" "natural_width")
+  )
+)
+
+(define-method get_current_path_string
+  (of-object "GtkCellArea")
+  (c-name "gtk_cell_area_get_current_path_string")
+  (return-type "const-gchar*")
+)
+
+(define-method apply_attributes
+  (of-object "GtkCellArea")
+  (c-name "gtk_cell_area_apply_attributes")
+  (return-type "none")
+  (parameters
+    '("GtkTreeModel*" "tree_model")
+    '("GtkTreeIter*" "iter")
+    '("gboolean" "is_expander")
+    '("gboolean" "is_expanded")
+  )
+)
+
+(define-method attribute_connect
+  (of-object "GtkCellArea")
+  (c-name "gtk_cell_area_attribute_connect")
+  (return-type "none")
+  (parameters
+    '("GtkCellRenderer*" "renderer")
+    '("const-gchar*" "attribute")
+    '("gint" "column")
+  )
+)
+
+(define-method attribute_disconnect
+  (of-object "GtkCellArea")
+  (c-name "gtk_cell_area_attribute_disconnect")
+  (return-type "none")
+  (parameters
+    '("GtkCellRenderer*" "renderer")
+    '("const-gchar*" "attribute")
+  )
+)
+
+(define-method install_cell_property
+  (of-object "GtkCellAreaClass")
+  (c-name "gtk_cell_area_class_install_cell_property")
+  (return-type "none")
+  (parameters
+    '("guint" "property_id")
+    '("GParamSpec*" "pspec")
+  )
+)
+
+(define-method find_cell_property
+  (of-object "GtkCellAreaClass")
+  (c-name "gtk_cell_area_class_find_cell_property")
+  (return-type "GParamSpec*")
+  (parameters
+    '("const-gchar*" "property_name")
+  )
+)
+
+(define-method list_cell_properties
+  (of-object "GtkCellAreaClass")
+  (c-name "gtk_cell_area_class_list_cell_properties")
+  (return-type "GParamSpec**")
+  (parameters
+    '("guint*" "n_properties")
+  )
+)
+
+(define-method add_with_properties
+  (of-object "GtkCellArea")
+  (c-name "gtk_cell_area_add_with_properties")
+  (return-type "none")
+  (parameters
+    '("GtkCellRenderer*" "renderer")
+    '("const-gchar*" "first_prop_name")
+  )
+  (varargs #t)
+)
+
+(define-method cell_set
+  (of-object "GtkCellArea")
+  (c-name "gtk_cell_area_cell_set")
+  (return-type "none")
+  (parameters
+    '("GtkCellRenderer*" "renderer")
+    '("const-gchar*" "first_prop_name")
+  )
+  (varargs #t)
+)
+
+(define-method cell_get
+  (of-object "GtkCellArea")
+  (c-name "gtk_cell_area_cell_get")
+  (return-type "none")
+  (parameters
+    '("GtkCellRenderer*" "renderer")
+    '("const-gchar*" "first_prop_name")
+  )
+  (varargs #t)
+)
+
+(define-method cell_set_valist
+  (of-object "GtkCellArea")
+  (c-name "gtk_cell_area_cell_set_valist")
+  (return-type "none")
+  (parameters
+    '("GtkCellRenderer*" "renderer")
+    '("const-gchar*" "first_property_name")
+    '("va_list" "var_args")
+  )
+)
+
+(define-method cell_get_valist
+  (of-object "GtkCellArea")
+  (c-name "gtk_cell_area_cell_get_valist")
+  (return-type "none")
+  (parameters
+    '("GtkCellRenderer*" "renderer")
+    '("const-gchar*" "first_property_name")
+    '("va_list" "var_args")
+  )
+)
+
+(define-method cell_set_property
+  (of-object "GtkCellArea")
+  (c-name "gtk_cell_area_cell_set_property")
+  (return-type "none")
+  (parameters
+    '("GtkCellRenderer*" "renderer")
+    '("const-gchar*" "property_name")
+    '("const-GValue*" "value")
+  )
+)
+
+(define-method cell_get_property
+  (of-object "GtkCellArea")
+  (c-name "gtk_cell_area_cell_get_property")
+  (return-type "none")
+  (parameters
+    '("GtkCellRenderer*" "renderer")
+    '("const-gchar*" "property_name")
+    '("GValue*" "value")
+  )
+)
+
+(define-method is_activatable
+  (of-object "GtkCellArea")
+  (c-name "gtk_cell_area_is_activatable")
+  (return-type "gboolean")
+)
+
+(define-method activate
+  (of-object "GtkCellArea")
+  (c-name "gtk_cell_area_activate")
+  (return-type "gboolean")
+  (parameters
+    '("GtkCellAreaContext*" "context")
+    '("GtkWidget*" "widget")
+    '("const-GdkRectangle*" "cell_area")
+    '("GtkCellRendererState" "flags")
+    '("gboolean" "edit_only")
+  )
+)
+
+(define-method focus
+  (of-object "GtkCellArea")
+  (c-name "gtk_cell_area_focus")
+  (return-type "gboolean")
+  (parameters
+    '("GtkDirectionType" "direction")
+  )
+)
+
+(define-method set_focus_cell
+  (of-object "GtkCellArea")
+  (c-name "gtk_cell_area_set_focus_cell")
+  (return-type "none")
+  (parameters
+    '("GtkCellRenderer*" "renderer")
+  )
+)
+
+(define-method get_focus_cell
+  (of-object "GtkCellArea")
+  (c-name "gtk_cell_area_get_focus_cell")
+  (return-type "GtkCellRenderer*")
+)
+
+(define-method add_focus_sibling
+  (of-object "GtkCellArea")
+  (c-name "gtk_cell_area_add_focus_sibling")
+  (return-type "none")
+  (parameters
+    '("GtkCellRenderer*" "renderer")
+    '("GtkCellRenderer*" "sibling")
+  )
+)
+
+(define-method remove_focus_sibling
+  (of-object "GtkCellArea")
+  (c-name "gtk_cell_area_remove_focus_sibling")
+  (return-type "none")
+  (parameters
+    '("GtkCellRenderer*" "renderer")
+    '("GtkCellRenderer*" "sibling")
+  )
+)
+
+(define-method is_focus_sibling
+  (of-object "GtkCellArea")
+  (c-name "gtk_cell_area_is_focus_sibling")
+  (return-type "gboolean")
+  (parameters
+    '("GtkCellRenderer*" "renderer")
+    '("GtkCellRenderer*" "sibling")
+  )
+)
+
+(define-method get_focus_siblings
+  (of-object "GtkCellArea")
+  (c-name "gtk_cell_area_get_focus_siblings")
+  (return-type "const-GList*")
+  (parameters
+    '("GtkCellRenderer*" "renderer")
+  )
+)
+
+(define-method get_focus_from_sibling
+  (of-object "GtkCellArea")
+  (c-name "gtk_cell_area_get_focus_from_sibling")
+  (return-type "GtkCellRenderer*")
+  (parameters
+    '("GtkCellRenderer*" "renderer")
+  )
+)
+
+(define-method get_edited_cell
+  (of-object "GtkCellArea")
+  (c-name "gtk_cell_area_get_edited_cell")
+  (return-type "GtkCellRenderer*")
+)
+
+(define-method get_edit_widget
+  (of-object "GtkCellArea")
+  (c-name "gtk_cell_area_get_edit_widget")
+  (return-type "GtkCellEditable*")
+)
+
+(define-method activate_cell
+  (of-object "GtkCellArea")
+  (c-name "gtk_cell_area_activate_cell")
+  (return-type "gboolean")
+  (parameters
+    '("GtkWidget*" "widget")
+    '("GtkCellRenderer*" "renderer")
+    '("GdkEvent*" "event")
+    '("const-GdkRectangle*" "cell_area")
+    '("GtkCellRendererState" "flags")
+  )
+)
+
+(define-method stop_editing
+  (of-object "GtkCellArea")
+  (c-name "gtk_cell_area_stop_editing")
+  (return-type "none")
+  (parameters
+    '("gboolean" "canceled")
+  )
+)
+
+(define-method inner_cell_area
+  (of-object "GtkCellArea")
+  (c-name "gtk_cell_area_inner_cell_area")
+  (return-type "none")
+  (parameters
+    '("GtkWidget*" "widget")
+    '("const-GdkRectangle*" "cell_area")
+    '("GdkRectangle*" "inner_area")
+  )
+)
+
+(define-method request_renderer
+  (of-object "GtkCellArea")
+  (c-name "gtk_cell_area_request_renderer")
+  (return-type "none")
+  (parameters
+    '("GtkCellRenderer*" "renderer")
+    '("GtkOrientation" "orientation")
+    '("GtkWidget*" "widget")
+    '("gint" "for_size")
+    '("gint*" "minimum_size")
+    '("gint*" "natural_size")
+  )
+)
+
+
+
 ;; From gtkcelleditable.h
 
 (define-function gtk_cell_editable_get_type
@@ -5613,6 +6372,12 @@
   )
 )
 
+(define-method get_area
+  (of-object "GtkCellLayout")
+  (c-name "gtk_cell_layout_get_area")
+  (return-type "GtkCellArea*")
+)
+
 
 
 ;; From gtkcellrendereraccel.h
@@ -5715,6 +6480,18 @@
   )
 )
 
+(define-method get_aligned_area
+  (of-object "GtkCellRenderer")
+  (c-name "gtk_cell_renderer_get_aligned_area")
+  (return-type "none")
+  (parameters
+    '("GtkWidget*" "widget")
+    '("GtkCellRendererState" "flags")
+    '("const-GdkRectangle*" "cell_area")
+    '("GdkRectangle*" "aligned_area")
+  )
+)
+
 (define-method get_size
   (of-object "GtkCellRenderer")
   (c-name "gtk_cell_renderer_get_size")
@@ -5860,6 +6637,12 @@
   (return-type "gboolean")
 )
 
+(define-method is_activatable
+  (of-object "GtkCellRenderer")
+  (c-name "gtk_cell_renderer_is_activatable")
+  (return-type "gboolean")
+)
+
 (define-method stop_editing
   (of-object "GtkCellRenderer")
   (c-name "gtk_cell_renderer_stop_editing")
@@ -6015,78 +6798,6 @@
 
 
 
-;; From gtkcellsizerequest.h
-
-(define-function gtk_cell_size_request_get_type
-  (c-name "gtk_cell_size_request_get_type")
-  (return-type "GType")
-)
-
-(define-method get_request_mode
-  (of-object "GtkCellSizeRequest")
-  (c-name "gtk_cell_size_request_get_request_mode")
-  (return-type "GtkSizeRequestMode")
-)
-
-(define-method get_width
-  (of-object "GtkCellSizeRequest")
-  (c-name "gtk_cell_size_request_get_width")
-  (return-type "none")
-  (parameters
-    '("GtkWidget*" "widget")
-    '("gint*" "minimum_size")
-    '("gint*" "natural_size")
-  )
-)
-
-(define-method get_height_for_width
-  (of-object "GtkCellSizeRequest")
-  (c-name "gtk_cell_size_request_get_height_for_width")
-  (return-type "none")
-  (parameters
-    '("GtkWidget*" "widget")
-    '("gint" "width")
-    '("gint*" "minimum_height")
-    '("gint*" "natural_height")
-  )
-)
-
-(define-method get_height
-  (of-object "GtkCellSizeRequest")
-  (c-name "gtk_cell_size_request_get_height")
-  (return-type "none")
-  (parameters
-    '("GtkWidget*" "widget")
-    '("gint*" "minimum_size")
-    '("gint*" "natural_size")
-  )
-)
-
-(define-method get_width_for_height
-  (of-object "GtkCellSizeRequest")
-  (c-name "gtk_cell_size_request_get_width_for_height")
-  (return-type "none")
-  (parameters
-    '("GtkWidget*" "widget")
-    '("gint" "height")
-    '("gint*" "minimum_width")
-    '("gint*" "natural_width")
-  )
-)
-
-(define-method get_size
-  (of-object "GtkCellSizeRequest")
-  (c-name "gtk_cell_size_request_get_size")
-  (return-type "none")
-  (parameters
-    '("GtkWidget*" "widget")
-    '("GtkRequisition*" "minimum_size")
-    '("GtkRequisition*" "natural_size")
-  )
-)
-
-
-
 ;; From gtkcellview.h
 
 (define-function gtk_cell_view_get_type
@@ -6887,50 +7598,6 @@
 
 
 
-;; From gtkcomboboxentry.h
-
-(define-function gtk_combo_box_entry_get_type
-  (c-name "gtk_combo_box_entry_get_type")
-  (return-type "GType")
-)
-
-(define-function gtk_combo_box_entry_new
-  (c-name "gtk_combo_box_entry_new")
-  (is-constructor-of "GtkComboBoxEntry")
-  (return-type "GtkWidget*")
-)
-
-(define-function gtk_combo_box_entry_new_with_model
-  (c-name "gtk_combo_box_entry_new_with_model")
-  (return-type "GtkWidget*")
-  (parameters
-    '("GtkTreeModel*" "model")
-    '("gint" "text_column")
-  )
-)
-
-(define-method set_text_column
-  (of-object "GtkComboBoxEntry")
-  (c-name "gtk_combo_box_entry_set_text_column")
-  (return-type "none")
-  (parameters
-    '("gint" "text_column")
-  )
-)
-
-(define-method get_text_column
-  (of-object "GtkComboBoxEntry")
-  (c-name "gtk_combo_box_entry_get_text_column")
-  (return-type "gint")
-)
-
-(define-function gtk_combo_box_entry_new_text
-  (c-name "gtk_combo_box_entry_new_text")
-  (return-type "GtkWidget*")
-)
-
-
-
 ;; From gtkcombobox.h
 
 (define-function gtk_combo_box_get_type
@@ -8438,6 +9105,14 @@
   (return-type "GtkEntryCompletion*")
 )
 
+(define-function gtk_entry_completion_new_with_area
+  (c-name "gtk_entry_completion_new_with_area")
+  (return-type "GtkEntryCompletion*")
+  (parameters
+    '("GtkCellArea*" "area")
+  )
+)
+
 (define-method get_entry
   (of-object "GtkEntryCompletion")
   (c-name "gtk_entry_completion_get_entry")
@@ -10651,21 +11326,6 @@
 
 
 
-;; From gtkhruler.h
-
-(define-function gtk_hruler_get_type
-  (c-name "gtk_hruler_get_type")
-  (return-type "GType")
-)
-
-(define-function gtk_hruler_new
-  (c-name "gtk_hruler_new")
-  (is-constructor-of "GtkHruler")
-  (return-type "GtkWidget*")
-)
-
-
-
 ;; From gtkhscale.h
 
 (define-function gtk_hscale_get_type
@@ -10969,7 +11629,7 @@
     '("GtkStateType" "state")
     '("GtkIconSize" "size")
     '("GtkWidget*" "widget")
-    '("const-char*" "detail")
+    '("const-gchar*" "detail")
   )
 )
 
@@ -12619,33 +13279,6 @@
 
 
 
-;; From gtkitem.h
-
-(define-function gtk_item_get_type
-  (c-name "gtk_item_get_type")
-  (return-type "GType")
-)
-
-(define-method select
-  (of-object "GtkItem")
-  (c-name "gtk_item_select")
-  (return-type "none")
-)
-
-(define-method deselect
-  (of-object "GtkItem")
-  (c-name "gtk_item_deselect")
-  (return-type "none")
-)
-
-(define-method toggle
-  (of-object "GtkItem")
-  (c-name "gtk_item_toggle")
-  (return-type "none")
-)
-
-
-
 ;; From gtklabel.h
 
 (define-function gtk_label_get_type
@@ -14831,21 +15464,6 @@
 
 
 
-;; From gtkobject.h
-
-(define-function gtk_object_get_type
-  (c-name "gtk_object_get_type")
-  (return-type "GType")
-)
-
-(define-method destroy
-  (of-object "GtkObject")
-  (c-name "gtk_object_destroy")
-  (return-type "none")
-)
-
-
-
 ;; From gtkoffscreenwindow.h
 
 (define-function gtk_offscreen_window_get_type
@@ -16476,10 +17094,6 @@
 
 
 
-;; From gtkprivate.h
-
-
-
 ;; From gtkprogressbar.h
 
 (define-function gtk_progress_bar_get_type
@@ -18060,63 +18674,6 @@
 
 
 
-;; From gtkruler.h
-
-(define-function gtk_ruler_get_type
-  (c-name "gtk_ruler_get_type")
-  (return-type "GType")
-)
-
-(define-function gtk_ruler_new
-  (c-name "gtk_ruler_new")
-  (is-constructor-of "GtkRuler")
-  (return-type "GtkWidget*")
-  (parameters
-    '("GtkOrientation" "orientation")
-  )
-)
-
-(define-method set_metric
-  (of-object "GtkRuler")
-  (c-name "gtk_ruler_set_metric")
-  (return-type "none")
-  (parameters
-    '("GtkMetricType" "metric")
-  )
-)
-
-(define-method get_metric
-  (of-object "GtkRuler")
-  (c-name "gtk_ruler_get_metric")
-  (return-type "GtkMetricType")
-)
-
-(define-method set_range
-  (of-object "GtkRuler")
-  (c-name "gtk_ruler_set_range")
-  (return-type "none")
-  (parameters
-    '("gdouble" "lower")
-    '("gdouble" "upper")
-    '("gdouble" "position")
-    '("gdouble" "max_size")
-  )
-)
-
-(define-method get_range
-  (of-object "GtkRuler")
-  (c-name "gtk_ruler_get_range")
-  (return-type "none")
-  (parameters
-    '("gdouble*" "lower")
-    '("gdouble*" "upper")
-    '("gdouble*" "position")
-    '("gdouble*" "max_size")
-  )
-)
-
-
-
 ;; From gtkscalebutton.h
 
 (define-function gtk_scale_button_get_type
@@ -20295,6 +20852,15 @@
   )
 )
 
+(define-method get_font
+  (of-object "GtkStyleContext")
+  (c-name "gtk_style_context_get_font")
+  (return-type "const-PangoFontDescription*")
+  (parameters
+    '("GtkStateFlags" "state")
+  )
+)
+
 (define-method get_border
   (of-object "GtkStyleContext")
   (c-name "gtk_style_context_get_border")
@@ -24462,6 +25028,15 @@
   )
 )
 
+(define-method get_font
+  (of-object "GtkThemingEngine")
+  (c-name "gtk_theming_engine_get_font")
+  (return-type "const-PangoFontDescription*")
+  (parameters
+    '("GtkStateFlags" "state")
+  )
+)
+
 (define-function gtk_theming_engine_load
   (c-name "gtk_theming_engine_load")
   (return-type "GtkThemingEngine*")
@@ -26849,6 +27424,14 @@
   (return-type "GtkTreeViewColumn*")
 )
 
+(define-function gtk_tree_view_column_new_with_area
+  (c-name "gtk_tree_view_column_new_with_area")
+  (return-type "GtkTreeViewColumn*")
+  (parameters
+    '("GtkCellArea*" "area")
+  )
+)
+
 (define-function gtk_tree_view_column_new_with_attributes
   (c-name "gtk_tree_view_column_new_with_attributes")
   (return-type "GtkTreeViewColumn*")
@@ -27225,7 +27808,7 @@
   (return-type "gboolean")
   (parameters
     '("GtkCellRenderer*" "cell_renderer")
-    '("gint*" "start_pos")
+    '("gint*" "x_offset")
     '("gint*" "width")
   )
 )
@@ -27242,6 +27825,12 @@
   (return-type "GtkWidget*")
 )
 
+(define-method get_button
+  (of-object "GtkTreeViewColumn")
+  (c-name "gtk_tree_view_column_get_button")
+  (return-type "GtkWidget*")
+)
+
 
 
 ;; From gtktreeview.h
@@ -28919,21 +29508,6 @@
 
 
 
-;; From gtkvruler.h
-
-(define-function gtk_vruler_get_type
-  (c-name "gtk_vruler_get_type")
-  (return-type "GType")
-)
-
-(define-function gtk_vruler_new
-  (c-name "gtk_vruler_new")
-  (is-constructor-of "GtkVruler")
-  (return-type "GtkWidget*")
-)
-
-
-
 ;; From gtkvscale.h
 
 (define-function gtk_vscale_get_type
@@ -29828,21 +30402,6 @@
   )
 )
 
-(define-method set_extension_events
-  (of-object "GtkWidget")
-  (c-name "gtk_widget_set_extension_events")
-  (return-type "none")
-  (parameters
-    '("GdkExtensionMode" "mode")
-  )
-)
-
-(define-method get_extension_events
-  (of-object "GtkWidget")
-  (c-name "gtk_widget_get_extension_events")
-  (return-type "GdkExtensionMode")
-)
-
 (define-method get_toplevel
   (of-object "GtkWidget")
   (c-name "gtk_widget_get_toplevel")
@@ -30532,12 +31091,6 @@
   )
 )
 
-(define-method reset_shapes
-  (of-object "GtkWidget")
-  (c-name "gtk_widget_reset_shapes")
-  (return-type "none")
-)
-
 (define-method list_mnemonic_labels
   (of-object "GtkWidget")
   (c-name "gtk_widget_list_mnemonic_labels")
@@ -30739,18 +31292,18 @@
   )
 )
 
-(define-method iter_get_widget_type
+(define-method iter_get_object_type
   (of-object "GtkWidgetPath")
-  (c-name "gtk_widget_path_iter_get_widget_type")
+  (c-name "gtk_widget_path_iter_get_object_type")
   (return-type "GType")
   (parameters
     '("gint" "pos")
   )
 )
 
-(define-method iter_set_widget_type
+(define-method iter_set_object_type
   (of-object "GtkWidgetPath")
-  (c-name "gtk_widget_path_iter_set_widget_type")
+  (c-name "gtk_widget_path_iter_set_object_type")
   (return-type "none")
   (parameters
     '("gint" "pos")
@@ -30916,9 +31469,9 @@
   )
 )
 
-(define-method get_widget_type
+(define-method get_object_type
   (of-object "GtkWidgetPath")
-  (c-name "gtk_widget_path_get_widget_type")
+  (c-name "gtk_widget_path_get_object_type")
   (return-type "GType")
 )
 
@@ -31806,6 +32359,12 @@
   (return-type "GList*")
 )
 
+(define-method get_current_grab
+  (of-object "GtkWindowGroup")
+  (c-name "gtk_window_group_get_current_grab")
+  (return-type "GtkWidget*")
+)
+
 (define-method get_current_device_grab
   (of-object "GtkWindowGroup")
   (c-name "gtk_window_group_get_current_device_grab")
@@ -31860,178 +32419,6 @@
   )
 )
 
-(define-method remove_embedded_xid
-  (of-object "GtkWindow")
-  (c-name "gtk_window_remove_embedded_xid")
-  (return-type "none")
-  (parameters
-    '("GdkNativeWindow" "xid")
-  )
-)
-
-(define-method add_embedded_xid
-  (of-object "GtkWindow")
-  (c-name "gtk_window_add_embedded_xid")
-  (return-type "none")
-  (parameters
-    '("GdkNativeWindow" "xid")
-  )
-)
-
-(define-method get_current_grab
-  (of-object "GtkWindowGroup")
-  (c-name "gtk_window_group_get_current_grab")
-  (return-type "GtkWidget*")
-)
-
-
-
-;; From gtkwrapbox.h
-
-(define-function gtk_wrap_box_get_type
-  (c-name "gtk_wrap_box_get_type")
-  (return-type "GType")
-)
-
-(define-function gtk_wrap_box_new
-  (c-name "gtk_wrap_box_new")
-  (is-constructor-of "GtkWrapBox")
-  (return-type "GtkWidget*")
-  (parameters
-    '("GtkWrapAllocationMode" "mode")
-    '("GtkWrapBoxSpreading" "horizontal_spreading")
-    '("GtkWrapBoxSpreading" "vertical_spreading")
-    '("guint" "horizontal_spacing")
-    '("guint" "vertical_spacing")
-  )
-)
-
-(define-method set_allocation_mode
-  (of-object "GtkWrapBox")
-  (c-name "gtk_wrap_box_set_allocation_mode")
-  (return-type "none")
-  (parameters
-    '("GtkWrapAllocationMode" "mode")
-  )
-)
-
-(define-method get_allocation_mode
-  (of-object "GtkWrapBox")
-  (c-name "gtk_wrap_box_get_allocation_mode")
-  (return-type "GtkWrapAllocationMode")
-)
-
-(define-method set_horizontal_spreading
-  (of-object "GtkWrapBox")
-  (c-name "gtk_wrap_box_set_horizontal_spreading")
-  (return-type "none")
-  (parameters
-    '("GtkWrapBoxSpreading" "spreading")
-  )
-)
-
-(define-method get_horizontal_spreading
-  (of-object "GtkWrapBox")
-  (c-name "gtk_wrap_box_get_horizontal_spreading")
-  (return-type "GtkWrapBoxSpreading")
-)
-
-(define-method set_vertical_spreading
-  (of-object "GtkWrapBox")
-  (c-name "gtk_wrap_box_set_vertical_spreading")
-  (return-type "none")
-  (parameters
-    '("GtkWrapBoxSpreading" "spreading")
-  )
-)
-
-(define-method get_vertical_spreading
-  (of-object "GtkWrapBox")
-  (c-name "gtk_wrap_box_get_vertical_spreading")
-  (return-type "GtkWrapBoxSpreading")
-)
-
-(define-method set_vertical_spacing
-  (of-object "GtkWrapBox")
-  (c-name "gtk_wrap_box_set_vertical_spacing")
-  (return-type "none")
-  (parameters
-    '("guint" "spacing")
-  )
-)
-
-(define-method get_vertical_spacing
-  (of-object "GtkWrapBox")
-  (c-name "gtk_wrap_box_get_vertical_spacing")
-  (return-type "guint")
-)
-
-(define-method set_horizontal_spacing
-  (of-object "GtkWrapBox")
-  (c-name "gtk_wrap_box_set_horizontal_spacing")
-  (return-type "none")
-  (parameters
-    '("guint" "spacing")
-  )
-)
-
-(define-method get_horizontal_spacing
-  (of-object "GtkWrapBox")
-  (c-name "gtk_wrap_box_get_horizontal_spacing")
-  (return-type "guint")
-)
-
-(define-method set_minimum_line_children
-  (of-object "GtkWrapBox")
-  (c-name "gtk_wrap_box_set_minimum_line_children")
-  (return-type "none")
-  (parameters
-    '("guint" "n_children")
-  )
-)
-
-(define-method get_minimum_line_children
-  (of-object "GtkWrapBox")
-  (c-name "gtk_wrap_box_get_minimum_line_children")
-  (return-type "guint")
-)
-
-(define-method set_natural_line_children
-  (of-object "GtkWrapBox")
-  (c-name "gtk_wrap_box_set_natural_line_children")
-  (return-type "none")
-  (parameters
-    '("guint" "n_children")
-  )
-)
-
-(define-method get_natural_line_children
-  (of-object "GtkWrapBox")
-  (c-name "gtk_wrap_box_get_natural_line_children")
-  (return-type "guint")
-)
-
-(define-method insert_child
-  (of-object "GtkWrapBox")
-  (c-name "gtk_wrap_box_insert_child")
-  (return-type "none")
-  (parameters
-    '("GtkWidget*" "widget")
-    '("gint" "index")
-    '("GtkWrapBoxPacking" "packing")
-  )
-)
-
-(define-method reorder_child
-  (of-object "GtkWrapBox")
-  (c-name "gtk_wrap_box_reorder_child")
-  (return-type "none")
-  (parameters
-    '("GtkWidget*" "widget")
-    '("guint" "index")
-  )
-)
-
 
 
 ;; From gtkpagesetupunixdialog.h
@@ -32342,6 +32729,160 @@
   )
 )
 
+(define-method get_pages
+  (of-object "GtkPrintJob")
+  (c-name "gtk_print_job_get_pages")
+  (return-type "GtkPrintPages")
+)
+
+(define-method set_pages
+  (of-object "GtkPrintJob")
+  (c-name "gtk_print_job_set_pages")
+  (return-type "none")
+  (parameters
+    '("GtkPrintPages" "pages")
+  )
+)
+
+(define-method get_page_ranges
+  (of-object "GtkPrintJob")
+  (c-name "gtk_print_job_get_page_ranges")
+  (return-type "GtkPageRange*")
+  (parameters
+    '("gint*" "n_ranges")
+  )
+)
+
+(define-method set_page_ranges
+  (of-object "GtkPrintJob")
+  (c-name "gtk_print_job_set_page_ranges")
+  (return-type "none")
+  (parameters
+    '("GtkPageRange*" "ranges")
+    '("gint" "n_ranges")
+  )
+)
+
+(define-method get_page_set
+  (of-object "GtkPrintJob")
+  (c-name "gtk_print_job_get_page_set")
+  (return-type "GtkPageSet")
+)
+
+(define-method set_page_set
+  (of-object "GtkPrintJob")
+  (c-name "gtk_print_job_set_page_set")
+  (return-type "none")
+  (parameters
+    '("GtkPageSet" "page_set")
+  )
+)
+
+(define-method get_num_copies
+  (of-object "GtkPrintJob")
+  (c-name "gtk_print_job_get_num_copies")
+  (return-type "gint")
+)
+
+(define-method set_num_copies
+  (of-object "GtkPrintJob")
+  (c-name "gtk_print_job_set_num_copies")
+  (return-type "none")
+  (parameters
+    '("gint" "num_copies")
+  )
+)
+
+(define-method get_scale
+  (of-object "GtkPrintJob")
+  (c-name "gtk_print_job_get_scale")
+  (return-type "gdouble")
+)
+
+(define-method set_scale
+  (of-object "GtkPrintJob")
+  (c-name "gtk_print_job_set_scale")
+  (return-type "none")
+  (parameters
+    '("gdouble" "scale")
+  )
+)
+
+(define-method get_n_up
+  (of-object "GtkPrintJob")
+  (c-name "gtk_print_job_get_n_up")
+  (return-type "guint")
+)
+
+(define-method set_n_up
+  (of-object "GtkPrintJob")
+  (c-name "gtk_print_job_set_n_up")
+  (return-type "none")
+  (parameters
+    '("guint" "n_up")
+  )
+)
+
+(define-method get_n_up_layout
+  (of-object "GtkPrintJob")
+  (c-name "gtk_print_job_get_n_up_layout")
+  (return-type "GtkNumberUpLayout")
+)
+
+(define-method set_n_up_layout
+  (of-object "GtkPrintJob")
+  (c-name "gtk_print_job_set_n_up_layout")
+  (return-type "none")
+  (parameters
+    '("GtkNumberUpLayout" "layout")
+  )
+)
+
+(define-method get_rotate
+  (of-object "GtkPrintJob")
+  (c-name "gtk_print_job_get_rotate")
+  (return-type "gboolean")
+)
+
+(define-method set_rotate
+  (of-object "GtkPrintJob")
+  (c-name "gtk_print_job_set_rotate")
+  (return-type "none")
+  (parameters
+    '("gboolean" "rotate")
+  )
+)
+
+(define-method get_collate
+  (of-object "GtkPrintJob")
+  (c-name "gtk_print_job_get_collate")
+  (return-type "gboolean")
+)
+
+(define-method set_collate
+  (of-object "GtkPrintJob")
+  (c-name "gtk_print_job_set_collate")
+  (return-type "none")
+  (parameters
+    '("gboolean" "collate")
+  )
+)
+
+(define-method get_reverse
+  (of-object "GtkPrintJob")
+  (c-name "gtk_print_job_get_reverse")
+  (return-type "gboolean")
+)
+
+(define-method set_reverse
+  (of-object "GtkPrintJob")
+  (c-name "gtk_print_job_set_reverse")
+  (return-type "none")
+  (parameters
+    '("gboolean" "reverse")
+  )
+)
+
 
 
 ;; From gtkprintunixdialog.h
diff --git a/gtk/src/widget.hg b/gtk/src/widget.hg
index eb3a9d7..8cf7725 100644
--- a/gtk/src/widget.hg
+++ b/gtk/src/widget.hg
@@ -279,10 +279,6 @@ public:
   _WRAP_METHOD(void set_device_events(const Glib::RefPtr<const Gdk::Device>& device, Gdk::EventMask events), gtk_widget_set_device_events)
   _WRAP_METHOD(void add_device_events(const Glib::RefPtr<const Gdk::Device>& device, Gdk::EventMask events), gtk_widget_add_device_events)
 
-  _WRAP_METHOD(void set_extension_events(Gdk::ExtensionMode mode), gtk_widget_set_extension_events)
-
-  _WRAP_METHOD(Gdk::ExtensionMode get_extension_events() const, gtk_widget_get_extension_events)
-
   _WRAP_METHOD(Container* get_toplevel(), gtk_widget_get_toplevel)
   _WRAP_METHOD(const Container* get_toplevel() const, gtk_widget_get_toplevel, constversion)
 
diff --git a/gtk/src/widgetpath.hg b/gtk/src/widgetpath.hg
index 690594b..8652d36 100644
--- a/gtk/src/widgetpath.hg
+++ b/gtk/src/widgetpath.hg
@@ -37,8 +37,8 @@ public:
   _WRAP_METHOD(int path_append_type(GType type), gtk_widget_path_append_type)
   _WRAP_METHOD(void prepend_type(GType type), gtk_widget_path_prepend_type)
 
-  _WRAP_METHOD(GType get_widget_type(int pos) const, gtk_widget_path_iter_get_widget_type)
-  _WRAP_METHOD(void set_widget_type(int pos, GType type), gtk_widget_path_iter_set_widget_type)
+  _WRAP_METHOD(GType iter_get_object_type(int pos) const, gtk_widget_path_iter_get_object_type)
+  _WRAP_METHOD(void iter_set_object_type(int pos, GType type), gtk_widget_path_iter_set_object_type)
 
   _WRAP_METHOD(Glib::ustring iter_get_name(int pos) const, gtk_widget_path_iter_get_name)
   _WRAP_METHOD(void iter_set_name(int pos, const Glib::ustring& name), gtk_widget_path_iter_set_name)
@@ -61,7 +61,7 @@ public:
   _WRAP_METHOD(bool iter_has_region(int pos, const Glib::ustring& name, RegionFlags& flags) const, gtk_widget_path_iter_has_region)
   //TODO: _WRAP_METHOD(bool iter_has_qregion(int pos, GQuark qname,  RegionFlags& flags), gtk_widget_path_iter_has_qregion)
 
-  _WRAP_METHOD(GType get_widget_type() const,  gtk_widget_path_get_widget_type)
+  _WRAP_METHOD(GType get_object_type() const,  gtk_widget_path_get_object_type)
 
   _WRAP_METHOD(bool is_type(GType type) const, gtk_widget_path_is_type)
   _WRAP_METHOD(bool has_parent(GType type) const, gtk_widget_path_has_parent)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]