[gtkmm] Added ComboBox::set_popup_fixed_width() and RadioButton::join_group().

[Murray Cumming <murrayc src gnome org>]

commit c9d213e21ee8e253ea2afb08d1913713b70dee50
Author: Murray Cumming <murrayc murrayc com>
Date:   Mon Oct 18 09:43:56 2010 +0200

    Added ComboBox::set_popup_fixed_width() and RadioButton::join_group().
    
    * gdk/src/gdk_methods.defs:
    * gtk/src/gtk_methods.defs: Regenerated with h2defs.py.
    * gtk/src/combobox.hg: Added get/set_popup_fixed_width().
    * gtk/src/radiobutton.hg: Added join_group().
    * tools/m4/convert_gtk.m4: Added a RadioButton conversion.

 ChangeLog                |   16 +-
 gdk/src/gdk_methods.defs |  621 +++++++++++++++++++++++-----------------------
 gtk/src/combobox.hg      |    4 +
 gtk/src/gtk_methods.defs |  115 +++++++++-
 gtk/src/radiobutton.hg   |   10 +-
 tools/m4/convert_gtk.m4  |    2 +
 6 files changed, 454 insertions(+), 314 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 441e203..5dce4f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,22 @@
+2010-10-18  Murray Cumming  <murrayc murrayc com>
+
+	Added ComboBox::set_popup_fixed_width() and RadioButton::join_group().
+
+	* gdk/src/gdk_methods.defs:
+	* gtk/src/gtk_methods.defs: Regenerated with h2defs.py.
+	* gtk/src/combobox.hg: Added get/set_popup_fixed_width().
+	* gtk/src/radiobutton.hg: Added join_group().
+	* tools/m4/convert_gtk.m4: Added a RadioButton conversion.
+
 2010-10-17  Murray Cumming  <murrayc murrayc com>
 
 	Fix the build with latest GTK+.
 
-	* gtk/gtkmm/comboboxtext.cc: Comment out (wrong anyway) use of 
+	* gtk/gtkmm/comboboxtext.cc: Comment out (wrong anyway) use of
 	deprecated gtk_combo_box_insert_text().
-	* gtk/src/combobox.[hg|ccg]: get_entry_text(): Reimplement without using 
+	* gtk/src/combobox.[hg|ccg]: get_entry_text(): Reimplement without using
 	the deprecated gtk_combo_box_get_active_text().
-	* gtk/src/main.[hg|ccg]: Remove signal_run() and signal_quit() because they 
+	* gtk/src/main.[hg|ccg]: Remove signal_run() and signal_quit() because they
 	used the deprecated gtk_init_add(), gtk_quit_add_full() and g
 	gtk_quit_remove() functions.
 
diff --git a/gdk/src/gdk_methods.defs b/gdk/src/gdk_methods.defs
index 8136507..f9c7290 100644
--- a/gdk/src/gdk_methods.defs
+++ b/gdk/src/gdk_methods.defs
@@ -2066,16 +2066,6 @@
   (return-type "gboolean")
 )
 
-(define-function gdk_add_client_message_filter
-  (c-name "gdk_add_client_message_filter")
-  (return-type "none")
-  (parameters
-    '("GdkAtom" "message_type")
-    '("GdkFilterFunc" "func")
-    '("gpointer" "data")
-  )
-)
-
 (define-function gdk_setting_get
   (c-name "gdk_setting_get")
   (return-type "gboolean")
@@ -2085,200 +2075,16 @@
   )
 )
 
-
-
-;; From gdk.h
-
-(define-function gdk_enable_multidevice
-  (c-name "gdk_enable_multidevice")
-  (return-type "none")
-)
-
-(define-function gdk_parse_args
-  (c-name "gdk_parse_args")
-  (return-type "none")
-  (parameters
-    '("gint*" "argc")
-    '("gchar***" "argv")
-  )
-)
-
-(define-function gdk_init
-  (c-name "gdk_init")
-  (return-type "none")
-  (parameters
-    '("gint*" "argc")
-    '("gchar***" "argv")
-  )
-)
-
-(define-function gdk_init_check
-  (c-name "gdk_init_check")
-  (return-type "gboolean")
-  (parameters
-    '("gint*" "argc")
-    '("gchar***" "argv")
-  )
-)
-
-(define-function gdk_add_option_entries_libgtk_only
-  (c-name "gdk_add_option_entries_libgtk_only")
-  (return-type "none")
-  (parameters
-    '("GOptionGroup*" "group")
-  )
-)
-
-(define-function gdk_pre_parse_libgtk_only
-  (c-name "gdk_pre_parse_libgtk_only")
-  (return-type "none")
-)
-
-(define-function gdk_set_locale
-  (c-name "gdk_set_locale")
-  (return-type "gchar*")
-)
-
-(define-function gdk_get_program_class
-  (c-name "gdk_get_program_class")
-  (return-type "const-char*")
-)
-
-(define-function gdk_set_program_class
-  (c-name "gdk_set_program_class")
-  (return-type "none")
-  (parameters
-    '("const-char*" "program_class")
-  )
-)
-
-(define-function gdk_error_trap_push
-  (c-name "gdk_error_trap_push")
-  (return-type "none")
-)
-
-(define-function gdk_error_trap_pop_ignored
-  (c-name "gdk_error_trap_pop_ignored")
-  (return-type "none")
-)
-
-(define-function gdk_get_display
-  (c-name "gdk_get_display")
-  (return-type "gchar*")
-)
-
-(define-function gdk_get_display_arg_name
-  (c-name "gdk_get_display_arg_name")
-  (return-type "const-gchar*")
-)
-
-(define-function gdk_pointer_grab
-  (c-name "gdk_pointer_grab")
-  (return-type "GdkGrabStatus")
-  (parameters
-    '("GdkWindow*" "window")
-    '("gboolean" "owner_events")
-    '("GdkEventMask" "event_mask")
-    '("GdkWindow*" "confine_to")
-    '("GdkCursor*" "cursor")
-    '("guint32" "time_")
-  )
-)
-
-(define-function gdk_keyboard_grab
-  (c-name "gdk_keyboard_grab")
-  (return-type "GdkGrabStatus")
-  (parameters
-    '("GdkWindow*" "window")
-    '("gboolean" "owner_events")
-    '("guint32" "time_")
-  )
-)
-
-(define-function gdk_pointer_ungrab
-  (c-name "gdk_pointer_ungrab")
-  (return-type "none")
-  (parameters
-    '("guint32" "time_")
-  )
-)
-
-(define-function gdk_keyboard_ungrab
-  (c-name "gdk_keyboard_ungrab")
-  (return-type "none")
-  (parameters
-    '("guint32" "time_")
-  )
-)
-
-(define-function gdk_pointer_is_grabbed
-  (c-name "gdk_pointer_is_grabbed")
-  (return-type "gboolean")
-)
-
-(define-function gdk_screen_width
-  (c-name "gdk_screen_width")
-  (return-type "gint")
-)
-
-(define-function gdk_screen_height
-  (c-name "gdk_screen_height")
-  (return-type "gint")
-)
-
-(define-function gdk_screen_width_mm
-  (c-name "gdk_screen_width_mm")
-  (return-type "gint")
-)
-
-(define-function gdk_screen_height_mm
-  (c-name "gdk_screen_height_mm")
-  (return-type "gint")
-)
-
-(define-function gdk_beep
-  (c-name "gdk_beep")
-  (return-type "none")
-)
-
-(define-function gdk_flush
-  (c-name "gdk_flush")
-  (return-type "none")
-)
-
-(define-function gdk_set_double_click_time
-  (c-name "gdk_set_double_click_time")
-  (return-type "none")
-  (parameters
-    '("guint" "msec")
-  )
-)
-
-(define-method intersect
-  (of-object "GdkRectangle")
-  (c-name "gdk_rectangle_intersect")
-  (return-type "gboolean")
-  (parameters
-    '("const-GdkRectangle*" "src2")
-    '("GdkRectangle*" "dest")
-  )
-)
-
-(define-method union
-  (of-object "GdkRectangle")
-  (c-name "gdk_rectangle_union")
+(define-function gdk_add_client_message_filter
+  (c-name "gdk_add_client_message_filter")
   (return-type "none")
   (parameters
-    '("const-GdkRectangle*" "src2")
-    '("GdkRectangle*" "dest")
+    '("GdkAtom" "message_type")
+    '("GdkFilterFunc" "func")
+    '("gpointer" "data")
   )
 )
 
-(define-function gdk_rectangle_get_type
-  (c-name "gdk_rectangle_get_type")
-  (return-type "GType")
-)
-
 (define-method send_client_message
   (of-object "GdkEvent")
   (c-name "gdk_event_send_client_message")
@@ -2304,106 +2110,9 @@
   )
 )
 
-(define-function gdk_notify_startup_complete
-  (c-name "gdk_notify_startup_complete")
-  (return-type "none")
-)
-
-(define-function gdk_notify_startup_complete_with_id
-  (c-name "gdk_notify_startup_complete_with_id")
-  (return-type "none")
-  (parameters
-    '("const-gchar*" "startup_id")
-  )
-)
-
-(define-function gdk_threads_enter
-  (c-name "gdk_threads_enter")
-  (return-type "none")
-)
 
-(define-function gdk_threads_leave
-  (c-name "gdk_threads_leave")
-  (return-type "none")
-)
 
-(define-function gdk_threads_init
-  (c-name "gdk_threads_init")
-  (return-type "none")
-)
-
-(define-function gdk_threads_set_lock_functions
-  (c-name "gdk_threads_set_lock_functions")
-  (return-type "none")
-  (parameters
-    '("GCallback" "enter_fn")
-    '("GCallback" "leave_fn")
-  )
-)
-
-(define-function gdk_threads_add_idle_full
-  (c-name "gdk_threads_add_idle_full")
-  (return-type "guint")
-  (parameters
-    '("gint" "priority")
-    '("GSourceFunc" "function")
-    '("gpointer" "data")
-    '("GDestroyNotify" "notify")
-  )
-)
-
-(define-function gdk_threads_add_idle
-  (c-name "gdk_threads_add_idle")
-  (return-type "guint")
-  (parameters
-    '("GSourceFunc" "function")
-    '("gpointer" "data")
-  )
-)
-
-(define-function gdk_threads_add_timeout_full
-  (c-name "gdk_threads_add_timeout_full")
-  (return-type "guint")
-  (parameters
-    '("gint" "priority")
-    '("guint" "interval")
-    '("GSourceFunc" "function")
-    '("gpointer" "data")
-    '("GDestroyNotify" "notify")
-  )
-)
-
-(define-function gdk_threads_add_timeout
-  (c-name "gdk_threads_add_timeout")
-  (return-type "guint")
-  (parameters
-    '("guint" "interval")
-    '("GSourceFunc" "function")
-    '("gpointer" "data")
-  )
-)
-
-(define-function gdk_threads_add_timeout_seconds_full
-  (c-name "gdk_threads_add_timeout_seconds_full")
-  (return-type "guint")
-  (parameters
-    '("gint" "priority")
-    '("guint" "interval")
-    '("GSourceFunc" "function")
-    '("gpointer" "data")
-    '("GDestroyNotify" "notify")
-  )
-)
-
-(define-function gdk_threads_add_timeout_seconds
-  (c-name "gdk_threads_add_timeout_seconds")
-  (return-type "guint")
-  (parameters
-    '("guint" "interval")
-    '("GSourceFunc" "function")
-    '("gpointer" "data")
-  )
-)
+;; From gdk.h
 
 
 
@@ -2624,6 +2333,188 @@
 
 
 
+;; From gdkmain.h
+
+(define-function gdk_parse_args
+  (c-name "gdk_parse_args")
+  (return-type "none")
+  (parameters
+    '("gint*" "argc")
+    '("gchar***" "argv")
+  )
+)
+
+(define-function gdk_init
+  (c-name "gdk_init")
+  (return-type "none")
+  (parameters
+    '("gint*" "argc")
+    '("gchar***" "argv")
+  )
+)
+
+(define-function gdk_init_check
+  (c-name "gdk_init_check")
+  (return-type "gboolean")
+  (parameters
+    '("gint*" "argc")
+    '("gchar***" "argv")
+  )
+)
+
+(define-function gdk_add_option_entries_libgtk_only
+  (c-name "gdk_add_option_entries_libgtk_only")
+  (return-type "none")
+  (parameters
+    '("GOptionGroup*" "group")
+  )
+)
+
+(define-function gdk_pre_parse_libgtk_only
+  (c-name "gdk_pre_parse_libgtk_only")
+  (return-type "none")
+)
+
+(define-function gdk_set_locale
+  (c-name "gdk_set_locale")
+  (return-type "gchar*")
+)
+
+(define-function gdk_enable_multidevice
+  (c-name "gdk_enable_multidevice")
+  (return-type "none")
+)
+
+(define-function gdk_get_program_class
+  (c-name "gdk_get_program_class")
+  (return-type "const-gchar*")
+)
+
+(define-function gdk_set_program_class
+  (c-name "gdk_set_program_class")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "program_class")
+  )
+)
+
+(define-function gdk_notify_startup_complete
+  (c-name "gdk_notify_startup_complete")
+  (return-type "none")
+)
+
+(define-function gdk_notify_startup_complete_with_id
+  (c-name "gdk_notify_startup_complete_with_id")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "startup_id")
+  )
+)
+
+(define-function gdk_error_trap_push
+  (c-name "gdk_error_trap_push")
+  (return-type "none")
+)
+
+(define-function gdk_error_trap_pop_ignored
+  (c-name "gdk_error_trap_pop_ignored")
+  (return-type "none")
+)
+
+(define-function gdk_get_display_arg_name
+  (c-name "gdk_get_display_arg_name")
+  (return-type "const-gchar*")
+)
+
+(define-function gdk_get_display
+  (c-name "gdk_get_display")
+  (return-type "gchar*")
+)
+
+(define-function gdk_pointer_grab
+  (c-name "gdk_pointer_grab")
+  (return-type "GdkGrabStatus")
+  (parameters
+    '("GdkWindow*" "window")
+    '("gboolean" "owner_events")
+    '("GdkEventMask" "event_mask")
+    '("GdkWindow*" "confine_to")
+    '("GdkCursor*" "cursor")
+    '("guint32" "time_")
+  )
+)
+
+(define-function gdk_keyboard_grab
+  (c-name "gdk_keyboard_grab")
+  (return-type "GdkGrabStatus")
+  (parameters
+    '("GdkWindow*" "window")
+    '("gboolean" "owner_events")
+    '("guint32" "time_")
+  )
+)
+
+(define-function gdk_pointer_ungrab
+  (c-name "gdk_pointer_ungrab")
+  (return-type "none")
+  (parameters
+    '("guint32" "time_")
+  )
+)
+
+(define-function gdk_keyboard_ungrab
+  (c-name "gdk_keyboard_ungrab")
+  (return-type "none")
+  (parameters
+    '("guint32" "time_")
+  )
+)
+
+(define-function gdk_pointer_is_grabbed
+  (c-name "gdk_pointer_is_grabbed")
+  (return-type "gboolean")
+)
+
+(define-function gdk_screen_width
+  (c-name "gdk_screen_width")
+  (return-type "gint")
+)
+
+(define-function gdk_screen_height
+  (c-name "gdk_screen_height")
+  (return-type "gint")
+)
+
+(define-function gdk_screen_width_mm
+  (c-name "gdk_screen_width_mm")
+  (return-type "gint")
+)
+
+(define-function gdk_screen_height_mm
+  (c-name "gdk_screen_height_mm")
+  (return-type "gint")
+)
+
+(define-function gdk_set_double_click_time
+  (c-name "gdk_set_double_click_time")
+  (return-type "none")
+  (parameters
+    '("guint" "msec")
+  )
+)
+
+(define-function gdk_beep
+  (c-name "gdk_beep")
+  (return-type "none")
+)
+
+(define-function gdk_flush
+  (c-name "gdk_flush")
+  (return-type "none")
+)
+
+
+
 ;; From gdkpango.h
 
 (define-function gdk_pango_context_get_for_screen
@@ -2667,31 +2558,25 @@
 
 ;; From gdkpixbuf.h
 
-(define-method get_from_window
-  (of-object "GdkPixbuf")
+(define-function gdk_pixbuf_get_from_window
   (c-name "gdk_pixbuf_get_from_window")
   (return-type "GdkPixbuf*")
   (parameters
     '("GdkWindow*" "window")
     '("int" "src_x")
     '("int" "src_y")
-    '("int" "dest_x")
-    '("int" "dest_y")
     '("int" "width")
     '("int" "height")
   )
 )
 
-(define-method get_from_surface
-  (of-object "GdkPixbuf")
+(define-function gdk_pixbuf_get_from_surface
   (c-name "gdk_pixbuf_get_from_surface")
   (return-type "GdkPixbuf*")
   (parameters
     '("cairo_surface_t*" "surface")
     '("int" "src_x")
     '("int" "src_y")
-    '("int" "dest_x")
-    '("int" "dest_y")
     '("int" "width")
     '("int" "height")
   )
@@ -2978,6 +2863,35 @@
 
 
 
+;; From gdkrectangle.h
+
+(define-method intersect
+  (of-object "GdkRectangle")
+  (c-name "gdk_rectangle_intersect")
+  (return-type "gboolean")
+  (parameters
+    '("const-GdkRectangle*" "src2")
+    '("GdkRectangle*" "dest")
+  )
+)
+
+(define-method union
+  (of-object "GdkRectangle")
+  (c-name "gdk_rectangle_union")
+  (return-type "none")
+  (parameters
+    '("const-GdkRectangle*" "src2")
+    '("GdkRectangle*" "dest")
+  )
+)
+
+(define-function gdk_rectangle_get_type
+  (c-name "gdk_rectangle_get_type")
+  (return-type "GType")
+)
+
+
+
 ;; From gdkscreen.h
 
 (define-function gdk_screen_get_type
@@ -3377,6 +3291,98 @@
 
 
 
+;; From gdkthreads.h
+
+(define-function gdk_threads_init
+  (c-name "gdk_threads_init")
+  (return-type "none")
+)
+
+(define-function gdk_threads_enter
+  (c-name "gdk_threads_enter")
+  (return-type "none")
+)
+
+(define-function gdk_threads_leave
+  (c-name "gdk_threads_leave")
+  (return-type "none")
+)
+
+(define-function gdk_threads_set_lock_functions
+  (c-name "gdk_threads_set_lock_functions")
+  (return-type "none")
+  (parameters
+    '("GCallback" "enter_fn")
+    '("GCallback" "leave_fn")
+  )
+)
+
+(define-function gdk_threads_add_idle_full
+  (c-name "gdk_threads_add_idle_full")
+  (return-type "guint")
+  (parameters
+    '("gint" "priority")
+    '("GSourceFunc" "function")
+    '("gpointer" "data")
+    '("GDestroyNotify" "notify")
+  )
+)
+
+(define-function gdk_threads_add_idle
+  (c-name "gdk_threads_add_idle")
+  (return-type "guint")
+  (parameters
+    '("GSourceFunc" "function")
+    '("gpointer" "data")
+  )
+)
+
+(define-function gdk_threads_add_timeout_full
+  (c-name "gdk_threads_add_timeout_full")
+  (return-type "guint")
+  (parameters
+    '("gint" "priority")
+    '("guint" "interval")
+    '("GSourceFunc" "function")
+    '("gpointer" "data")
+    '("GDestroyNotify" "notify")
+  )
+)
+
+(define-function gdk_threads_add_timeout
+  (c-name "gdk_threads_add_timeout")
+  (return-type "guint")
+  (parameters
+    '("guint" "interval")
+    '("GSourceFunc" "function")
+    '("gpointer" "data")
+  )
+)
+
+(define-function gdk_threads_add_timeout_seconds_full
+  (c-name "gdk_threads_add_timeout_seconds_full")
+  (return-type "guint")
+  (parameters
+    '("gint" "priority")
+    '("guint" "interval")
+    '("GSourceFunc" "function")
+    '("gpointer" "data")
+    '("GDestroyNotify" "notify")
+  )
+)
+
+(define-function gdk_threads_add_timeout_seconds
+  (c-name "gdk_threads_add_timeout_seconds")
+  (return-type "guint")
+  (parameters
+    '("guint" "interval")
+    '("GSourceFunc" "function")
+    '("gpointer" "data")
+  )
+)
+
+
+
 ;; From gdktypes.h
 
 
@@ -4533,7 +4539,8 @@
   (return-type "none")
   (parameters
     '("const-cairo_region_t*" "region")
-    '("somefunc" "child_func")
+    '("GdkWindowChildFunc" "child_func")
+    '("gpointer" "user_data")
   )
 )
 
@@ -5020,3 +5027,5 @@
     '("gint" "n_events")
   )
 )
+
+
diff --git a/gtk/src/combobox.hg b/gtk/src/combobox.hg
index d3616f0..0d1cc97 100644
--- a/gtk/src/combobox.hg
+++ b/gtk/src/combobox.hg
@@ -159,6 +159,9 @@ public:
 
   _WRAP_METHOD(int get_entry_text_column() const, gtk_combo_box_get_entry_text_column)
 
+  _WRAP_METHOD(void set_popup_fixed_width(bool fixed = true), gtk_combo_box_set_popup_fixed_width )
+  _WRAP_METHOD(bool get_popup_fixed_width() const, gtk_combo_box_get_popup_fixed_width)
+
   _WRAP_METHOD(void popup(), gtk_combo_box_popup)
   _WRAP_METHOD(void popup(const Glib::RefPtr<Gdk::Device>& device), gtk_combo_box_popup_for_device)
   _WRAP_METHOD(void popdown(), gtk_combo_box_popdown)
@@ -188,6 +191,7 @@ public:
   _WRAP_PROPERTY("tearoff-title", Glib::ustring)
   _WRAP_PROPERTY("popup-shown", bool)
   _WRAP_PROPERTY("button-sensitivity", SensitivityType)
+  _WRAP_PROPERTY("popup-fixed-width", bool)
 
   /** The changed signal gets emitted when the active
    * item is changed. This can be due to the user selecting
diff --git a/gtk/src/gtk_methods.defs b/gtk/src/gtk_methods.defs
index fa03f8a..dae3e24 100644
--- a/gtk/src/gtk_methods.defs
+++ b/gtk/src/gtk_methods.defs
@@ -981,6 +981,13 @@
   (gtype-id "GTK_TYPE_COMBO_BOX_ENTRY")
 )
 
+(define-object ComboBoxText
+  (in-module "Gtk")
+  (parent "GtkComboBox")
+  (c-name "GtkComboBoxText")
+  (gtype-id "GTK_TYPE_COMBO_BOX_TEXT")
+)
+
 (define-object Box
   (in-module "Gtk")
   (parent "GtkContainer")
@@ -2884,7 +2891,7 @@
 
 (define-function gtk_accelerator_get_default_mod_mask
   (c-name "gtk_accelerator_get_default_mod_mask")
-  (return-type "guint")
+  (return-type "GdkModifierType")
 )
 
 (define-method query
@@ -6697,6 +6704,21 @@
   (return-type "gint")
 )
 
+(define-method set_popup_fixed_width
+  (of-object "GtkComboBox")
+  (c-name "gtk_combo_box_set_popup_fixed_width")
+  (return-type "none")
+  (parameters
+    '("gboolean" "fixed")
+  )
+)
+
+(define-method get_popup_fixed_width
+  (of-object "GtkComboBox")
+  (c-name "gtk_combo_box_get_popup_fixed_width")
+  (return-type "gboolean")
+)
+
 (define-function gtk_combo_box_new_text
   (c-name "gtk_combo_box_new_text")
   (return-type "GtkWidget*")
@@ -6774,6 +6796,69 @@
 
 
 
+;; From gtkcomboboxtext.h
+
+(define-function gtk_combo_box_text_get_type
+  (c-name "gtk_combo_box_text_get_type")
+  (return-type "GType")
+)
+
+(define-function gtk_combo_box_text_new
+  (c-name "gtk_combo_box_text_new")
+  (is-constructor-of "GtkComboBoxText")
+  (return-type "GtkWidget*")
+)
+
+(define-function gtk_combo_box_text_new_with_entry
+  (c-name "gtk_combo_box_text_new_with_entry")
+  (return-type "GtkWidget*")
+)
+
+(define-method append_text
+  (of-object "GtkComboBoxText")
+  (c-name "gtk_combo_box_text_append_text")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "text")
+  )
+)
+
+(define-method insert_text
+  (of-object "GtkComboBoxText")
+  (c-name "gtk_combo_box_text_insert_text")
+  (return-type "none")
+  (parameters
+    '("gint" "position")
+    '("const-gchar*" "text")
+  )
+)
+
+(define-method prepend_text
+  (of-object "GtkComboBoxText")
+  (c-name "gtk_combo_box_text_prepend_text")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "text")
+  )
+)
+
+(define-method remove
+  (of-object "GtkComboBoxText")
+  (c-name "gtk_combo_box_text_remove")
+  (return-type "none")
+  (parameters
+    '("gint" "position")
+  )
+)
+
+(define-method get_active_text
+  (of-object "GtkComboBoxText")
+  (c-name "gtk_combo_box_text_get_active_text")
+  (return-type "gchar*")
+)
+
+
+
 ;; From gtkcontainer.h
 
 (define-function gtk_container_get_type
@@ -18018,6 +18103,34 @@
   (return-type "none")
 )
 
+(define-function gtk_target_entry_get_type
+  (c-name "gtk_target_entry_get_type")
+  (return-type "GType")
+)
+
+(define-function gtk_target_entry_new
+  (c-name "gtk_target_entry_new")
+  (is-constructor-of "GtkTargetEntry")
+  (return-type "GtkTargetEntry*")
+  (parameters
+    '("const-char*" "target")
+    '("guint" "flags")
+    '("guint" "info")
+  )
+)
+
+(define-method copy
+  (of-object "GtkTargetEntry")
+  (c-name "gtk_target_entry_copy")
+  (return-type "GtkTargetEntry*")
+)
+
+(define-method free
+  (of-object "GtkTargetEntry")
+  (c-name "gtk_target_entry_free")
+  (return-type "none")
+)
+
 (define-function gtk_target_list_get_type
   (c-name "gtk_target_list_get_type")
   (return-type "GType")
diff --git a/gtk/src/radiobutton.hg b/gtk/src/radiobutton.hg
index ca64a94..d259514 100644
--- a/gtk/src/radiobutton.hg
+++ b/gtk/src/radiobutton.hg
@@ -1,7 +1,7 @@
 /* $Id: radiobutton.hg,v 1.8 2006/01/24 14:55:50 murrayc Exp $ */
 
 /* radiobutton.h
- * 
+ *
  * Copyright (C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -62,7 +62,7 @@ public:
    * since it already contains a Gtk::Label.
    */
   RadioButton(Group& group, const Glib::ustring& label, bool mnemonic = false);
-  
+
 
   /** Get the radio button's group.
    * This group may be passed to the constructors of other radio buttons, or used with set_group().
@@ -71,6 +71,7 @@ public:
    */
   _WRAP_METHOD(Group get_group(), gtk_radio_button_get_group)
 
+ //TODO: Remove set/get_group() now that we have join_group()?
  /** Set the radio button's group.
    * You can obtain a suitable group from another radio button by using get_group().
    *
@@ -83,10 +84,11 @@ public:
   void reset_group();
   _IGNORE(gtk_radio_button_set_group)
 
+  _WRAP_METHOD(void join_group(RadioButton& group_source), gtk_radio_button_join_group)
+
   _WRAP_SIGNAL(void group_changed(), "group_changed")
-  
+
   //Probably wouldn't work: _WRAP_PROPERTY("group", Group)
 };
 
 } /* namespace Gtk */
-
diff --git a/tools/m4/convert_gtk.m4 b/tools/m4/convert_gtk.m4
index fdd8ded..633df2e 100644
--- a/tools/m4/convert_gtk.m4
+++ b/tools/m4/convert_gtk.m4
@@ -280,6 +280,8 @@ _CONVERSION(`GtkWidget*',`const HButtonBox*',`Glib::wrap((GtkHButtonBox*)($3))')
 _CONVERSION(`GtkWidget*',`const ComboDropDown*',`Glib::wrap((GtkList*)($3))')
 _CONVERSION(`GtkWidget*',`const FileChooserDialog*',`Glib::wrap((GtkFileChooserDialog*)($3))')
 
+_CONVERSION(`RadioButton&',`GtkRadioButton*',__FR2P)
+
 # Ptr (gtk+) -> Ref (Gtkmm)
 _CONVERSION(`GtkWidget*', `Widget&', `*Glib::wrap($3)')