[gtkmm] Added some methods.

[Murray Cumming <murrayc src gnome org>]

commit b3d21f34c39d91e10ac3f1a9a2d4b941ae99de6a
Author: Murray Cumming <murrayc murrayc com>
Date:   Wed Mar 17 09:33:23 2010 +0100

    Added some methods.
    
    * gdk/src/gdk_pixbuf.defs: Regenerated and moved to gdk_pixbuf_methods.defs.
        * gdk/src/filelist.am:
        * gdk/src/gdk.defs: Updated appropriately.
        * gdk/src/gdk_methods.defs: Regenerated with h2defs.py.
        * gdk/src/window.hg: Added flush().
        * gtk/src/statusbar.hg: Added get_message_area().
        * gtk/src/toolitem.hg: Added get_ellipsize_mode().
        * gtk/src/toolitemgroup.hg: Added get_label_widget().

 ChangeLog                |   13 +
 gdk/src/filelist.am      |    2 +-
 gdk/src/gdk.defs         |    2 +-
 gdk/src/gdk_methods.defs | 1077 ++--------------------------------------------
 gdk/src/gdk_pixbuf.defs  | 1018 -------------------------------------------
 gdk/src/window.hg        |    1 +
 gtk/src/statusbar.hg     |    5 +
 gtk/src/toolitem.hg      |    1 +
 gtk/src/toolitemgroup.hg |    4 +-
 9 files changed, 63 insertions(+), 2060 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 84f2c1f..db3b3e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2010-03-17  Murray Cumming  <murrayc murrayc com>
+
+    Added some methods.
+
+	* gdk/src/gdk_pixbuf.defs: Regenerated and moved to gdk_pixbuf_methods.defs.
+    * gdk/src/filelist.am:
+    * gdk/src/gdk.defs: Updated appropriately.
+    * gdk/src/gdk_methods.defs: Regenerated with h2defs.py.
+    * gdk/src/window.hg: Added flush().
+    * gtk/src/statusbar.hg: Added get_message_area().
+    * gtk/src/toolitem.hg: Added get_ellipsize_mode().
+    * gtk/src/toolitemgroup.hg: Added get_label_widget().
+
 2010-03-16  Murray Cumming  <murrayc murrayc com>
 
 	ToolItem, ToolShell: Wrapped new C functions.
diff --git a/gdk/src/filelist.am b/gdk/src/filelist.am
index 28557f5..b148adb 100644
--- a/gdk/src/filelist.am
+++ b/gdk/src/filelist.am
@@ -5,7 +5,7 @@ gdkmm_files_defs =		\
 	gdk_enums.defs		\
 	gdk_extra.defs		\
 	gdk_methods.defs	\
-	gdk_pixbuf.defs		\
+	gdk_pixbuf_methods.defs		\
 	gdk_pixbuf_enums.defs	\
 	gdk_signals.defs	\
 	gdk_docs.xml		\
diff --git a/gdk/src/gdk.defs b/gdk/src/gdk.defs
index ce06839..4f833a8 100644
--- a/gdk/src/gdk.defs
+++ b/gdk/src/gdk.defs
@@ -1,5 +1,5 @@
 (include gdk_methods.defs)
-(include gdk_pixbuf.defs)
+(include gdk_pixbuf_methods.defs)
 (include gdk_pixbuf_enums.defs)
 (include gdk_signals.defs)
 (include gdk_extra.defs)
diff --git a/gdk/src/gdk_methods.defs b/gdk/src/gdk_methods.defs
index bcf1684..550e958 100644
--- a/gdk/src/gdk_methods.defs
+++ b/gdk/src/gdk_methods.defs
@@ -62,34 +62,6 @@
   (gtype-id "GDK_TYPE_PANGO_RENDERER")
 )
 
-(define-object Pixbuf
-  (in-module "Gdk")
-  (parent "GObject")
-  (c-name "GdkPixbuf")
-  (gtype-id "GDK_TYPE_PIXBUF")
-)
-
-(define-object PixbufAnimation
-  (in-module "Gdk")
-  (parent "GObject")
-  (c-name "GdkPixbufAnimation")
-  (gtype-id "GDK_TYPE_PIXBUF_ANIMATION")
-)
-
-(define-object PixbufAnimationIter
-  (in-module "Gdk")
-  (parent "GObject")
-  (c-name "GdkPixbufAnimationIter")
-  (gtype-id "GDK_TYPE_PIXBUF_ANIMATION_ITER")
-)
-
-(define-object PixbufLoader
-  (in-module "Gdk")
-  (parent "GObject")
-  (c-name "GdkPixbufLoader")
-  (gtype-id "GDK_TYPE_PIXBUF_LOADER")
-)
-
 (define-object PixmapObject
   (in-module "Gdk")
   (parent "GdkDrawable")
@@ -840,106 +812,6 @@
   )
 )
 
-(define-enum PixbufAlphaMode
-  (in-module "Gdk")
-  (c-name "GdkPixbufAlphaMode")
-  (gtype-id "GDK_TYPE_PIXBUF_ALPHA_MODE")
-  (values
-    '("bilevel" "GDK_PIXBUF_ALPHA_BILEVEL")
-    '("full" "GDK_PIXBUF_ALPHA_FULL")
-  )
-)
-
-(define-enum Colorspace
-  (in-module "Gdk")
-  (c-name "GdkColorspace")
-  (gtype-id "GDK_TYPE_COLORSPACE")
-  (values
-    '("rgb" "GDK_COLORSPACE_RGB")
-  )
-)
-
-(define-enum PixbufError
-  (in-module "Gdk")
-  (c-name "GdkPixbufError")
-  (gtype-id "GDK_TYPE_PIXBUF_ERROR")
-  (values
-    '("corrupt-image" "GDK_PIXBUF_ERROR_CORRUPT_IMAGE")
-    '("insufficient-memory" "GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY")
-    '("bad-option" "GDK_PIXBUF_ERROR_BAD_OPTION")
-    '("unknown-type" "GDK_PIXBUF_ERROR_UNKNOWN_TYPE")
-    '("unsupported-operation" "GDK_PIXBUF_ERROR_UNSUPPORTED_OPERATION")
-    '("failed" "GDK_PIXBUF_ERROR_FAILED")
-  )
-)
-
-(define-flags PixbufFormatFlags
-  (in-module "Gdk")
-  (c-name "GdkPixbufFormatFlags")
-  (gtype-id "GDK_TYPE_PIXBUF_FORMAT_FLAGS")
-  (values
-    '("writable" "GDK_PIXBUF_FORMAT_WRITABLE")
-    '("scalable" "GDK_PIXBUF_FORMAT_SCALABLE")
-    '("threadsafe" "GDK_PIXBUF_FORMAT_THREADSAFE")
-  )
-)
-
-(define-enum InterpType
-  (in-module "Gdk")
-  (c-name "GdkInterpType")
-  (gtype-id "GDK_TYPE_INTERP_TYPE")
-  (values
-    '("nearest" "GDK_INTERP_NEAREST")
-    '("tiles" "GDK_INTERP_TILES")
-    '("bilinear" "GDK_INTERP_BILINEAR")
-    '("hyper" "GDK_INTERP_HYPER")
-  )
-)
-
-(define-enum PixbufRotation
-  (in-module "Gdk")
-  (c-name "GdkPixbufRotation")
-  (gtype-id "GDK_TYPE_PIXBUF_ROTATION")
-  (values
-    '("none" "GDK_PIXBUF_ROTATE_NONE")
-    '("counterclockwise" "GDK_PIXBUF_ROTATE_COUNTERCLOCKWISE")
-    '("upsidedown" "GDK_PIXBUF_ROTATE_UPSIDEDOWN")
-    '("clockwise" "GDK_PIXBUF_ROTATE_CLOCKWISE")
-  )
-)
-
-(define-flags PixdataType
-  (in-module "Gdk")
-  (c-name "GdkPixdataType")
-  (gtype-id "GDK_TYPE_PIXDATA_TYPE")
-  (values
-    '("color-type-rgb" "GDK_PIXDATA_COLOR_TYPE_RGB")
-    '("color-type-rgba" "GDK_PIXDATA_COLOR_TYPE_RGBA")
-    '("color-type-mask" "GDK_PIXDATA_COLOR_TYPE_MASK")
-    '("sample-width-8" "GDK_PIXDATA_SAMPLE_WIDTH_8")
-    '("sample-width-mask" "GDK_PIXDATA_SAMPLE_WIDTH_MASK")
-    '("encoding-raw" "GDK_PIXDATA_ENCODING_RAW")
-    '("encoding-rle" "GDK_PIXDATA_ENCODING_RLE")
-    '("encoding-mask" "GDK_PIXDATA_ENCODING_MASK")
-  )
-)
-
-(define-flags PixdataDumpType
-  (in-module "Gdk")
-  (c-name "GdkPixdataDumpType")
-  (gtype-id "GDK_TYPE_PIXDATA_DUMP_TYPE")
-  (values
-    '("pixdata-stream" "GDK_PIXDATA_DUMP_PIXDATA_STREAM")
-    '("pixdata-struct" "GDK_PIXDATA_DUMP_PIXDATA_STRUCT")
-    '("macros" "GDK_PIXDATA_DUMP_MACROS")
-    '("gtypes" "GDK_PIXDATA_DUMP_GTYPES")
-    '("ctypes" "GDK_PIXDATA_DUMP_CTYPES")
-    '("static" "GDK_PIXDATA_DUMP_STATIC")
-    '("const" "GDK_PIXDATA_DUMP_CONST")
-    '("rle-decoder" "GDK_PIXDATA_DUMP_RLE_DECODER")
-  )
-)
-
 
 ;; From gdkalias.h
 
@@ -3924,6 +3796,24 @@
   (return-type "gboolean")
 )
 
+(define-method add_virtual_modifiers
+  (of-object "GdkKeymap")
+  (c-name "gdk_keymap_add_virtual_modifiers")
+  (return-type "none")
+  (parameters
+    '("GdkModifierType*" "state")
+  )
+)
+
+(define-method map_virtual_modifiers
+  (of-object "GdkKeymap")
+  (c-name "gdk_keymap_map_virtual_modifiers")
+  (return-type "gboolean")
+  (parameters
+    '("GdkModifierType*" "state")
+  )
+)
+
 (define-function gdk_keyval_name
   (c-name "gdk_keyval_name")
   (return-type "gchar*")
@@ -5139,6 +5029,12 @@
   (return-type "gint")
 )
 
+(define-method get_primary_monitor
+  (of-object "GdkScreen")
+  (c-name "gdk_screen_get_primary_monitor")
+  (return-type "gint")
+)
+
 (define-method get_monitor_geometry
   (of-object "GdkScreen")
   (c-name "gdk_screen_get_monitor_geometry")
@@ -6030,6 +5926,12 @@
   (return-type "none")
 )
 
+(define-method flush
+  (of-object "GdkWindow")
+  (c-name "gdk_window_flush")
+  (return-type "none")
+)
+
 (define-method set_title
   (of-object "GdkWindow")
   (c-name "gdk_window_set_title")
@@ -6441,15 +6343,15 @@
   )
 )
 
-;;(define-method invalidate_maybe_recurse
-;;  (of-object "GdkWindow")
-;; (c-name "gdk_window_invalidate_maybe_recurse")
-;;  (return-type "none")
-;;  (parameters
-;;    '("const-GdkRegion*" "region")
-;;    '("gboolean-(*" "child_func")
-;;  )
-;;)
+(define-method invalidate_maybe_recurse
+  (of-object "GdkWindow")
+  (c-name "gdk_window_invalidate_maybe_recurse")
+  (return-type "none")
+  (parameters
+    '("const-GdkRegion*" "region")
+    '("gboolean-(*" "child_func")
+  )
+)
 
 (define-method get_update_area
   (of-object "GdkWindow")
@@ -6614,904 +6516,3 @@
 )
 
 
-
-;; From gdk-pixbuf-alias.h
-
-
-
-;; From gdk-pixbuf-animation.h
-
-(define-function gdk_pixbuf_animation_get_type
-  (c-name "gdk_pixbuf_animation_get_type")
-  (return-type "GType")
-)
-
-(define-function gdk_pixbuf_animation_new_from_file
-  (c-name "gdk_pixbuf_animation_new_from_file")
-  (return-type "GdkPixbufAnimation*")
-  (parameters
-    '("const-char*" "filename")
-    '("GError**" "error")
-  )
-)
-
-(define-method ref
-  (of-object "GdkPixbufAnimation")
-  (c-name "gdk_pixbuf_animation_ref")
-  (return-type "GdkPixbufAnimation*")
-)
-
-(define-method unref
-  (of-object "GdkPixbufAnimation")
-  (c-name "gdk_pixbuf_animation_unref")
-  (return-type "none")
-)
-
-(define-method get_width
-  (of-object "GdkPixbufAnimation")
-  (c-name "gdk_pixbuf_animation_get_width")
-  (return-type "int")
-)
-
-(define-method get_height
-  (of-object "GdkPixbufAnimation")
-  (c-name "gdk_pixbuf_animation_get_height")
-  (return-type "int")
-)
-
-(define-method is_static_image
-  (of-object "GdkPixbufAnimation")
-  (c-name "gdk_pixbuf_animation_is_static_image")
-  (return-type "gboolean")
-)
-
-(define-method get_static_image
-  (of-object "GdkPixbufAnimation")
-  (c-name "gdk_pixbuf_animation_get_static_image")
-  (return-type "GdkPixbuf*")
-)
-
-(define-method get_iter
-  (of-object "GdkPixbufAnimation")
-  (c-name "gdk_pixbuf_animation_get_iter")
-  (return-type "GdkPixbufAnimationIter*")
-  (parameters
-    '("const-GTimeVal*" "start_time")
-  )
-)
-
-(define-function gdk_pixbuf_animation_iter_get_type
-  (c-name "gdk_pixbuf_animation_iter_get_type")
-  (return-type "GType")
-)
-
-(define-method get_delay_time
-  (of-object "GdkPixbufAnimationIter")
-  (c-name "gdk_pixbuf_animation_iter_get_delay_time")
-  (return-type "int")
-)
-
-(define-method get_pixbuf
-  (of-object "GdkPixbufAnimationIter")
-  (c-name "gdk_pixbuf_animation_iter_get_pixbuf")
-  (return-type "GdkPixbuf*")
-)
-
-(define-method on_currently_loading_frame
-  (of-object "GdkPixbufAnimationIter")
-  (c-name "gdk_pixbuf_animation_iter_on_currently_loading_frame")
-  (return-type "gboolean")
-)
-
-(define-method advance
-  (of-object "GdkPixbufAnimationIter")
-  (c-name "gdk_pixbuf_animation_iter_advance")
-  (return-type "gboolean")
-  (parameters
-    '("const-GTimeVal*" "current_time")
-  )
-)
-
-(define-function gdk_pixbuf_non_anim_get_type
-  (c-name "gdk_pixbuf_non_anim_get_type")
-  (return-type "GType")
-)
-
-(define-method non_anim_new
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_non_anim_new")
-  (return-type "GdkPixbufAnimation*")
-)
-
-
-
-;; From gdk-pixbuf-core.h
-
-(define-function gdk_pixbuf_error_quark
-  (c-name "gdk_pixbuf_error_quark")
-  (return-type "GQuark")
-)
-
-(define-function gdk_pixbuf_get_type
-  (c-name "gdk_pixbuf_get_type")
-  (return-type "GType")
-)
-
-(define-method ref
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_ref")
-  (return-type "GdkPixbuf*")
-)
-
-(define-method unref
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_unref")
-  (return-type "none")
-)
-
-(define-method get_colorspace
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_get_colorspace")
-  (return-type "GdkColorspace")
-)
-
-(define-method get_n_channels
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_get_n_channels")
-  (return-type "int")
-)
-
-(define-method get_has_alpha
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_get_has_alpha")
-  (return-type "gboolean")
-)
-
-(define-method get_bits_per_sample
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_get_bits_per_sample")
-  (return-type "int")
-)
-
-(define-method get_pixels
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_get_pixels")
-  (return-type "guchar*")
-)
-
-(define-method get_width
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_get_width")
-  (return-type "int")
-)
-
-(define-method get_height
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_get_height")
-  (return-type "int")
-)
-
-(define-method get_rowstride
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_get_rowstride")
-  (return-type "int")
-)
-
-(define-function gdk_pixbuf_new
-  (c-name "gdk_pixbuf_new")
-  (is-constructor-of "GdkPixbuf")
-  (return-type "GdkPixbuf*")
-  (parameters
-    '("GdkColorspace" "colorspace")
-    '("gboolean" "has_alpha")
-    '("int" "bits_per_sample")
-    '("int" "width")
-    '("int" "height")
-  )
-)
-
-(define-method copy
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_copy")
-  (return-type "GdkPixbuf*")
-)
-
-(define-method new_subpixbuf
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_new_subpixbuf")
-  (return-type "GdkPixbuf*")
-  (parameters
-    '("int" "src_x")
-    '("int" "src_y")
-    '("int" "width")
-    '("int" "height")
-  )
-)
-
-(define-function gdk_pixbuf_new_from_file
-  (c-name "gdk_pixbuf_new_from_file")
-  (return-type "GdkPixbuf*")
-  (parameters
-    '("const-char*" "filename")
-    '("GError**" "error")
-  )
-)
-
-(define-function gdk_pixbuf_new_from_file_at_size
-  (c-name "gdk_pixbuf_new_from_file_at_size")
-  (return-type "GdkPixbuf*")
-  (parameters
-    '("const-char*" "filename")
-    '("int" "width")
-    '("int" "height")
-    '("GError**" "error")
-  )
-)
-
-(define-function gdk_pixbuf_new_from_file_at_scale
-  (c-name "gdk_pixbuf_new_from_file_at_scale")
-  (return-type "GdkPixbuf*")
-  (parameters
-    '("const-char*" "filename")
-    '("int" "width")
-    '("int" "height")
-    '("gboolean" "preserve_aspect_ratio")
-    '("GError**" "error")
-  )
-)
-
-(define-function gdk_pixbuf_new_from_data
-  (c-name "gdk_pixbuf_new_from_data")
-  (return-type "GdkPixbuf*")
-  (parameters
-    '("const-guchar*" "data")
-    '("GdkColorspace" "colorspace")
-    '("gboolean" "has_alpha")
-    '("int" "bits_per_sample")
-    '("int" "width")
-    '("int" "height")
-    '("int" "rowstride")
-    '("GdkPixbufDestroyNotify" "destroy_fn")
-    '("gpointer" "destroy_fn_data")
-  )
-)
-
-(define-function gdk_pixbuf_new_from_xpm_data
-  (c-name "gdk_pixbuf_new_from_xpm_data")
-  (return-type "GdkPixbuf*")
-  (parameters
-    '("const-char**" "data")
-  )
-)
-
-(define-function gdk_pixbuf_new_from_inline
-  (c-name "gdk_pixbuf_new_from_inline")
-  (return-type "GdkPixbuf*")
-  (parameters
-    '("gint" "data_length")
-    '("const-guint8*" "data")
-    '("gboolean" "copy_pixels")
-    '("GError**" "error")
-  )
-)
-
-(define-method fill
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_fill")
-  (return-type "none")
-  (parameters
-    '("guint32" "pixel")
-  )
-)
-
-(define-method save
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_save")
-  (return-type "gboolean")
-  (parameters
-    '("const-char*" "filename")
-    '("const-char*" "type")
-    '("GError**" "error")
-  )
-  (varargs #t)
-)
-
-(define-method savev
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_savev")
-  (return-type "gboolean")
-  (parameters
-    '("const-char*" "filename")
-    '("const-char*" "type")
-    '("char**" "option_keys")
-    '("char**" "option_values")
-    '("GError**" "error")
-  )
-)
-
-(define-method save_to_callback
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_save_to_callback")
-  (return-type "gboolean")
-  (parameters
-    '("GdkPixbufSaveFunc" "save_func")
-    '("gpointer" "user_data")
-    '("const-char*" "type")
-    '("GError**" "error")
-  )
-  (varargs #t)
-)
-
-(define-method save_to_callbackv
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_save_to_callbackv")
-  (return-type "gboolean")
-  (parameters
-    '("GdkPixbufSaveFunc" "save_func")
-    '("gpointer" "user_data")
-    '("const-char*" "type")
-    '("char**" "option_keys")
-    '("char**" "option_values")
-    '("GError**" "error")
-  )
-)
-
-(define-method save_to_buffer
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_save_to_buffer")
-  (return-type "gboolean")
-  (parameters
-    '("gchar**" "buffer")
-    '("gsize*" "buffer_size")
-    '("const-char*" "type")
-    '("GError**" "error")
-  )
-  (varargs #t)
-)
-
-(define-method save_to_bufferv
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_save_to_bufferv")
-  (return-type "gboolean")
-  (parameters
-    '("gchar**" "buffer")
-    '("gsize*" "buffer_size")
-    '("const-char*" "type")
-    '("char**" "option_keys")
-    '("char**" "option_values")
-    '("GError**" "error")
-  )
-)
-
-(define-function gdk_pixbuf_new_from_stream
-  (c-name "gdk_pixbuf_new_from_stream")
-  (return-type "GdkPixbuf*")
-  (parameters
-    '("GInputStream*" "stream")
-    '("GCancellable*" "cancellable")
-    '("GError**" "error")
-  )
-)
-
-(define-function gdk_pixbuf_new_from_stream_at_scale
-  (c-name "gdk_pixbuf_new_from_stream_at_scale")
-  (return-type "GdkPixbuf*")
-  (parameters
-    '("GInputStream*" "stream")
-    '("gint" "width")
-    '("gint" "height")
-    '("gboolean" "preserve_aspect_ratio")
-    '("GCancellable*" "cancellable")
-    '("GError**" "error")
-  )
-)
-
-(define-method save_to_stream
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_save_to_stream")
-  (return-type "gboolean")
-  (parameters
-    '("GOutputStream*" "stream")
-    '("const-char*" "type")
-    '("GCancellable*" "cancellable")
-    '("GError**" "error")
-  )
-  (varargs #t)
-)
-
-(define-method add_alpha
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_add_alpha")
-  (return-type "GdkPixbuf*")
-  (parameters
-    '("gboolean" "substitute_color")
-    '("guchar" "r")
-    '("guchar" "g")
-    '("guchar" "b")
-  )
-)
-
-(define-method copy_area
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_copy_area")
-  (return-type "none")
-  (parameters
-    '("int" "src_x")
-    '("int" "src_y")
-    '("int" "width")
-    '("int" "height")
-    '("GdkPixbuf*" "dest_pixbuf")
-    '("int" "dest_x")
-    '("int" "dest_y")
-  )
-)
-
-(define-method saturate_and_pixelate
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_saturate_and_pixelate")
-  (return-type "none")
-  (parameters
-    '("GdkPixbuf*" "dest")
-    '("gfloat" "saturation")
-    '("gboolean" "pixelate")
-  )
-)
-
-(define-method apply_embedded_orientation
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_apply_embedded_orientation")
-  (return-type "GdkPixbuf*")
-)
-
-(define-method get_option
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_get_option")
-  (return-type "const-gchar*")
-  (parameters
-    '("const-gchar*" "key")
-  )
-)
-
-
-
-;; From gdk-pixbuf-enum-types.h
-
-(define-function gdk_pixbuf_alpha_mode_get_type
-  (c-name "gdk_pixbuf_alpha_mode_get_type")
-  (return-type "GType")
-)
-
-(define-function gdk_colorspace_get_type
-  (c-name "gdk_colorspace_get_type")
-  (return-type "GType")
-)
-
-(define-function gdk_pixbuf_error_get_type
-  (c-name "gdk_pixbuf_error_get_type")
-  (return-type "GType")
-)
-
-(define-function gdk_interp_type_get_type
-  (c-name "gdk_interp_type_get_type")
-  (return-type "GType")
-)
-
-(define-function gdk_pixbuf_rotation_get_type
-  (c-name "gdk_pixbuf_rotation_get_type")
-  (return-type "GType")
-)
-
-
-
-;; From gdk-pixbuf-features.h
-
-
-
-;; From gdk-pixbuf.h
-
-
-
-;; From gdk-pixbuf-i18n.h
-
-
-
-;; From gdk-pixbuf-io.h
-
-(define-function gdk_pixbuf_get_formats
-  (c-name "gdk_pixbuf_get_formats")
-  (return-type "GSList*")
-)
-
-(define-method get_name
-  (of-object "GdkPixbufFormat")
-  (c-name "gdk_pixbuf_format_get_name")
-  (return-type "gchar*")
-)
-
-(define-method get_description
-  (of-object "GdkPixbufFormat")
-  (c-name "gdk_pixbuf_format_get_description")
-  (return-type "gchar*")
-)
-
-(define-method get_mime_types
-  (of-object "GdkPixbufFormat")
-  (c-name "gdk_pixbuf_format_get_mime_types")
-  (return-type "gchar**")
-)
-
-(define-method get_extensions
-  (of-object "GdkPixbufFormat")
-  (c-name "gdk_pixbuf_format_get_extensions")
-  (return-type "gchar**")
-)
-
-(define-method is_writable
-  (of-object "GdkPixbufFormat")
-  (c-name "gdk_pixbuf_format_is_writable")
-  (return-type "gboolean")
-)
-
-(define-method is_scalable
-  (of-object "GdkPixbufFormat")
-  (c-name "gdk_pixbuf_format_is_scalable")
-  (return-type "gboolean")
-)
-
-(define-method is_disabled
-  (of-object "GdkPixbufFormat")
-  (c-name "gdk_pixbuf_format_is_disabled")
-  (return-type "gboolean")
-)
-
-(define-method set_disabled
-  (of-object "GdkPixbufFormat")
-  (c-name "gdk_pixbuf_format_set_disabled")
-  (return-type "none")
-  (parameters
-    '("gboolean" "disabled")
-  )
-)
-
-(define-method get_license
-  (of-object "GdkPixbufFormat")
-  (c-name "gdk_pixbuf_format_get_license")
-  (return-type "gchar*")
-)
-
-(define-function gdk_pixbuf_get_file_info
-  (c-name "gdk_pixbuf_get_file_info")
-  (return-type "GdkPixbufFormat*")
-  (parameters
-    '("const-gchar*" "filename")
-    '("gint*" "width")
-    '("gint*" "height")
-  )
-)
-
-(define-method set_option
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_set_option")
-  (return-type "gboolean")
-  (parameters
-    '("const-gchar*" "key")
-    '("const-gchar*" "value")
-  )
-)
-
-
-
-;; From gdk-pixbuf-loader.h
-
-(define-function gdk_pixbuf_loader_get_type
-  (c-name "gdk_pixbuf_loader_get_type")
-  (return-type "GType")
-)
-
-(define-function gdk_pixbuf_loader_new
-  (c-name "gdk_pixbuf_loader_new")
-  (is-constructor-of "GdkPixbufLoader")
-  (return-type "GdkPixbufLoader*")
-)
-
-(define-function gdk_pixbuf_loader_new_with_type
-  (c-name "gdk_pixbuf_loader_new_with_type")
-  (return-type "GdkPixbufLoader*")
-  (parameters
-    '("const-char*" "image_type")
-    '("GError**" "error")
-  )
-)
-
-(define-function gdk_pixbuf_loader_new_with_mime_type
-  (c-name "gdk_pixbuf_loader_new_with_mime_type")
-  (return-type "GdkPixbufLoader*")
-  (parameters
-    '("const-char*" "mime_type")
-    '("GError**" "error")
-  )
-)
-
-(define-method set_size
-  (of-object "GdkPixbufLoader")
-  (c-name "gdk_pixbuf_loader_set_size")
-  (return-type "none")
-  (parameters
-    '("int" "width")
-    '("int" "height")
-  )
-)
-
-(define-method write
-  (of-object "GdkPixbufLoader")
-  (c-name "gdk_pixbuf_loader_write")
-  (return-type "gboolean")
-  (parameters
-    '("const-guchar*" "buf")
-    '("gsize" "count")
-    '("GError**" "error")
-  )
-)
-
-(define-method get_pixbuf
-  (of-object "GdkPixbufLoader")
-  (c-name "gdk_pixbuf_loader_get_pixbuf")
-  (return-type "GdkPixbuf*")
-)
-
-(define-method get_animation
-  (of-object "GdkPixbufLoader")
-  (c-name "gdk_pixbuf_loader_get_animation")
-  (return-type "GdkPixbufAnimation*")
-)
-
-(define-method close
-  (of-object "GdkPixbufLoader")
-  (c-name "gdk_pixbuf_loader_close")
-  (return-type "gboolean")
-  (parameters
-    '("GError**" "error")
-  )
-)
-
-(define-method get_format
-  (of-object "GdkPixbufLoader")
-  (c-name "gdk_pixbuf_loader_get_format")
-  (return-type "GdkPixbufFormat*")
-)
-
-
-
-;; From gdk-pixbuf-marshal.h
-
-
-
-;; From gdk-pixbuf-private.h
-
-
-
-;; From gdk-pixbuf-scaled-anim.h
-
-(define-function gdk_pixbuf_scaled_anim_get_type
-  (c-name "gdk_pixbuf_scaled_anim_get_type")
-  (return-type "GType")
-)
-
-(define-function gdk_pixbuf_scaled_anim_iter_get_type
-  (c-name "gdk_pixbuf_scaled_anim_iter_get_type")
-  (return-type "GType")
-)
-
-
-
-;; From gdk-pixbuf-simple-anim.h
-
-(define-function gdk_pixbuf_simple_anim_get_type
-  (c-name "gdk_pixbuf_simple_anim_get_type")
-  (return-type "GType")
-)
-
-(define-function gdk_pixbuf_simple_anim_iter_get_type
-  (c-name "gdk_pixbuf_simple_anim_iter_get_type")
-  (return-type "GType")
-)
-
-(define-function gdk_pixbuf_simple_anim_new
-  (c-name "gdk_pixbuf_simple_anim_new")
-  (is-constructor-of "GdkPixbufSimpleAnim")
-  (return-type "GdkPixbufSimpleAnim*")
-  (parameters
-    '("gint" "width")
-    '("gint" "height")
-    '("gfloat" "rate")
-  )
-)
-
-(define-method add_frame
-  (of-object "GdkPixbufSimpleAnim")
-  (c-name "gdk_pixbuf_simple_anim_add_frame")
-  (return-type "none")
-  (parameters
-    '("GdkPixbuf*" "pixbuf")
-  )
-)
-
-(define-method set_loop
-  (of-object "GdkPixbufSimpleAnim")
-  (c-name "gdk_pixbuf_simple_anim_set_loop")
-  (return-type "none")
-  (parameters
-    '("gboolean" "loop")
-  )
-)
-
-(define-method get_loop
-  (of-object "GdkPixbufSimpleAnim")
-  (c-name "gdk_pixbuf_simple_anim_get_loop")
-  (return-type "gboolean")
-)
-
-
-
-;; From gdk-pixbuf-transform.h
-
-(define-method scale
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_scale")
-  (return-type "none")
-  (parameters
-    '("GdkPixbuf*" "dest")
-    '("int" "dest_x")
-    '("int" "dest_y")
-    '("int" "dest_width")
-    '("int" "dest_height")
-    '("double" "offset_x")
-    '("double" "offset_y")
-    '("double" "scale_x")
-    '("double" "scale_y")
-    '("GdkInterpType" "interp_type")
-  )
-)
-
-(define-method composite
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_composite")
-  (return-type "none")
-  (parameters
-    '("GdkPixbuf*" "dest")
-    '("int" "dest_x")
-    '("int" "dest_y")
-    '("int" "dest_width")
-    '("int" "dest_height")
-    '("double" "offset_x")
-    '("double" "offset_y")
-    '("double" "scale_x")
-    '("double" "scale_y")
-    '("GdkInterpType" "interp_type")
-    '("int" "overall_alpha")
-  )
-)
-
-(define-method composite_color
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_composite_color")
-  (return-type "none")
-  (parameters
-    '("GdkPixbuf*" "dest")
-    '("int" "dest_x")
-    '("int" "dest_y")
-    '("int" "dest_width")
-    '("int" "dest_height")
-    '("double" "offset_x")
-    '("double" "offset_y")
-    '("double" "scale_x")
-    '("double" "scale_y")
-    '("GdkInterpType" "interp_type")
-    '("int" "overall_alpha")
-    '("int" "check_x")
-    '("int" "check_y")
-    '("int" "check_size")
-    '("guint32" "color1")
-    '("guint32" "color2")
-  )
-)
-
-(define-method scale_simple
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_scale_simple")
-  (return-type "GdkPixbuf*")
-  (parameters
-    '("int" "dest_width")
-    '("int" "dest_height")
-    '("GdkInterpType" "interp_type")
-  )
-)
-
-(define-method composite_color_simple
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_composite_color_simple")
-  (return-type "GdkPixbuf*")
-  (parameters
-    '("int" "dest_width")
-    '("int" "dest_height")
-    '("GdkInterpType" "interp_type")
-    '("int" "overall_alpha")
-    '("int" "check_size")
-    '("guint32" "color1")
-    '("guint32" "color2")
-  )
-)
-
-(define-method rotate_simple
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_rotate_simple")
-  (return-type "GdkPixbuf*")
-  (parameters
-    '("GdkPixbufRotation" "angle")
-  )
-)
-
-(define-method flip
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_flip")
-  (return-type "GdkPixbuf*")
-  (parameters
-    '("gboolean" "horizontal")
-  )
-)
-
-
-
-;; From gdk-pixdata.h
-
-(define-method serialize
-  (of-object "GdkPixdata")
-  (c-name "gdk_pixdata_serialize")
-  (return-type "guint8*")
-  (parameters
-    '("guint*" "stream_length_p")
-  )
-)
-
-(define-method deserialize
-  (of-object "GdkPixdata")
-  (c-name "gdk_pixdata_deserialize")
-  (return-type "gboolean")
-  (parameters
-    '("guint" "stream_length")
-    '("const-guint8*" "stream")
-    '("GError**" "error")
-  )
-)
-
-(define-method from_pixbuf
-  (of-object "GdkPixdata")
-  (c-name "gdk_pixdata_from_pixbuf")
-  (return-type "gpointer")
-  (parameters
-    '("const-GdkPixbuf*" "pixbuf")
-    '("gboolean" "use_rle")
-  )
-)
-
-(define-function gdk_pixbuf_from_pixdata
-  (c-name "gdk_pixbuf_from_pixdata")
-  (return-type "GdkPixbuf*")
-  (parameters
-    '("const-GdkPixdata*" "pixdata")
-    '("gboolean" "copy_pixels")
-    '("GError**" "error")
-  )
-)
-
-(define-method to_csource
-  (of-object "GdkPixdata")
-  (c-name "gdk_pixdata_to_csource")
-  (return-type "GString*")
-  (parameters
-    '("const-gchar*" "name")
-    '("GdkPixdataDumpType" "dump_type")
-  )
-)
-
-
diff --git a/gdk/src/window.hg b/gdk/src/window.hg
index c12010f..c65daec 100644
--- a/gdk/src/window.hg
+++ b/gdk/src/window.hg
@@ -144,6 +144,7 @@ public:
   _WRAP_METHOD(void begin_paint_rect(Rectangle& rectangle), gdk_window_begin_paint_rect)
   _WRAP_METHOD(void begin_paint_region(const Region& region), gdk_window_begin_paint_region)
   _WRAP_METHOD(void end_paint(), gdk_window_end_paint)
+  _WRAP_METHOD(void flush(), gdk_window_flush)
   _WRAP_METHOD(void set_title(const Glib::ustring& title), gdk_window_set_title)
   _WRAP_METHOD(void set_role(const Glib::ustring& role), gdk_window_set_role)
   _WRAP_METHOD(void set_startup_id(const Glib::ustring& startup_id), gdk_window_set_startup_id)
diff --git a/gtk/src/statusbar.hg b/gtk/src/statusbar.hg
index 155f959..a409fb7 100644
--- a/gtk/src/statusbar.hg
+++ b/gtk/src/statusbar.hg
@@ -55,6 +55,11 @@ public:
   _WRAP_METHOD(void set_has_resize_grip(bool setting = true), gtk_statusbar_set_has_resize_grip)
   _WRAP_METHOD(bool get_has_resize_grip() const, gtk_statusbar_get_has_resize_grip)
 
+  //This actually returns a GtkFrame, though the documentation describes it as "box".
+  //I'm not generally happy about API that returns an unknown type. murrayc.
+  _WRAP_METHOD(Gtk::Widget* get_message_area(), gtk_statusbar_get_message_area)
+  _WRAP_METHOD(const Gtk::Widget* get_message_area() const, gtk_statusbar_get_message_area, constversion)
+
 #m4 _CONVERSION(`const char*',`const Glib::ustring&',__GCHARP_TO_USTRING)
   _WRAP_SIGNAL(void text_pushed(guint context_id, const Glib::ustring& text), "text_pushed")
   _WRAP_SIGNAL(void text_popped(guint context_id, const Glib::ustring& text), "text_popped")
diff --git a/gtk/src/toolitem.hg b/gtk/src/toolitem.hg
index ba13036..b3262bb 100644
--- a/gtk/src/toolitem.hg
+++ b/gtk/src/toolitem.hg
@@ -64,6 +64,7 @@ public:
   _WRAP_METHOD(bool get_is_important() const, gtk_tool_item_get_is_important)
   _WRAP_METHOD(void set_is_important(bool is_important = true), gtk_tool_item_set_is_important)
 
+  _WRAP_METHOD(Pango::EllipsizeMode get_ellipsize_mode() const, gtk_tool_item_get_ellipsize_mode)
   _WRAP_METHOD(IconSize get_icon_size () const, gtk_tool_item_get_icon_size)
   _WRAP_METHOD(Orientation get_orientation() const, gtk_tool_item_get_orientation)
   _WRAP_METHOD(ToolbarStyle get_toolbar_style() const, gtk_tool_item_get_toolbar_style)
diff --git a/gtk/src/toolitemgroup.hg b/gtk/src/toolitemgroup.hg
index b27dcde..6ca7468 100644
--- a/gtk/src/toolitemgroup.hg
+++ b/gtk/src/toolitemgroup.hg
@@ -45,8 +45,8 @@ public:
 
   _WRAP_METHOD(Glib::ustring get_label() const, gtk_tool_item_group_get_label)
 
-  _WRAP_METHOD(Widget* get_label_widget(), get_label_widget)
-  _WRAP_METHOD(const Widget* get_label_widget() const, get_label_widget, constversion)
+  _WRAP_METHOD(Widget* get_label_widget(), gtk_tool_item_group_get_label_widget)
+  _WRAP_METHOD(const Widget* get_label_widget() const, gtk_tool_item_group_get_label_widget, constversion)
 
   _WRAP_METHOD(bool get_collapsed() const, gtk_tool_item_group_get_collapsed)
   _WRAP_METHOD(Pango::EllipsizeMode get_ellipsize() const, gtk_tool_item_group_get_ellipsize)