[gtkmm] Fix build with latest GTK+.

[Murray Cumming <murrayc src gnome org>]

commit 8712e314ad541d5eb00f7d8361acb0caf170cabd
Author: Murray Cumming <murrayc murrayc com>
Date:   Thu Jan 14 11:10:49 2010 +0100

    Fix build with latest GTK+.
    
    * gtk/src/gtk_methods.defs: Regenerated with h2defs.py
    * gtk/src/toolpalette.hg: Fix the build with latest GTK+.
    * tools/m4/convert_gtk.m4: Added necessary conversions.

 ChangeLog                |    8 +++++
 gtk/src/gtk_methods.defs |   66 +++++++++++++++++++++++++++++++++++++++++----
 gtk/src/toolpalette.hg   |    3 +-
 tools/m4/convert_gtk.m4  |    2 +
 4 files changed, 71 insertions(+), 8 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 6f393ad..4cf2cf3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-01-14  Murray Cumming  <murrayc murrayc-desktop>
+
+	Fix build with latest GTK+.
+
+	* gtk/src/gtk_methods.defs: Regenerated with h2defs.py
+	* gtk/src/toolpalette.hg: Fix the build with latest GTK+.
+	* tools/m4/convert_gtk.m4: Added necessary conversions.
+
 2010-01-05  Murray Cumming  <murrayc murrayc com>
 
 	Deprecate some methods that wrap deprecated C functions.
diff --git a/gtk/src/gtk_methods.defs b/gtk/src/gtk_methods.defs
index 8042fcb..0fa1232 100644
--- a/gtk/src/gtk_methods.defs
+++ b/gtk/src/gtk_methods.defs
@@ -1315,6 +1315,13 @@
   (gtype-id "GTK_TYPE_TRAY_ICON")
 )
 
+(define-object OffscreenWindow
+  (in-module "Gtk")
+  (parent "GtkWindow")
+  (c-name "GtkOffscreenWindow")
+  (gtype-id "GTK_TYPE_OFFSCREEN_WINDOW")
+)
+
 (define-object Dialog
   (in-module "Gtk")
   (parent "GtkWindow")
@@ -17392,6 +17399,33 @@
 
 
 
+;; From gtkoffscreenwindow.h
+
+(define-function gtk_offscreen_window_get_type
+  (c-name "gtk_offscreen_window_get_type")
+  (return-type "GType")
+)
+
+(define-function gtk_offscreen_window_new
+  (c-name "gtk_offscreen_window_new")
+  (is-constructor-of "GtkOffscreenWindow")
+  (return-type "GtkWidget*")
+)
+
+(define-method get_pixmap
+  (of-object "GtkOffscreenWindow")
+  (c-name "gtk_offscreen_window_get_pixmap")
+  (return-type "GdkPixmap*")
+)
+
+(define-method get_pixbuf
+  (of-object "GtkOffscreenWindow")
+  (c-name "gtk_offscreen_window_get_pixbuf")
+  (return-type "GdkPixbuf*")
+)
+
+
+
 ;; From gtkoldeditable.h
 
 (define-function gtk_old_editable_get_type
@@ -28948,7 +28982,7 @@
   (c-name "gtk_tool_palette_set_group_position")
   (return-type "none")
   (parameters
-    '("GtkWidget*" "group")
+    '("GtkToolItemGroup*" "group")
     '("gint" "position")
   )
 )
@@ -28958,7 +28992,7 @@
   (c-name "gtk_tool_palette_set_exclusive")
   (return-type "none")
   (parameters
-    '("GtkWidget*" "group")
+    '("GtkToolItemGroup*" "group")
     '("gboolean" "exclusive")
   )
 )
@@ -28968,7 +29002,7 @@
   (c-name "gtk_tool_palette_set_expand")
   (return-type "none")
   (parameters
-    '("GtkWidget*" "group")
+    '("GtkToolItemGroup*" "group")
     '("gboolean" "expand")
   )
 )
@@ -28978,7 +29012,7 @@
   (c-name "gtk_tool_palette_get_group_position")
   (return-type "gint")
   (parameters
-    '("GtkWidget*" "group")
+    '("GtkToolItemGroup*" "group")
   )
 )
 
@@ -28987,7 +29021,7 @@
   (c-name "gtk_tool_palette_get_exclusive")
   (return-type "gboolean")
   (parameters
-    '("GtkWidget*" "group")
+    '("GtkToolItemGroup*" "group")
   )
 )
 
@@ -28996,7 +29030,7 @@
   (c-name "gtk_tool_palette_get_expand")
   (return-type "gboolean")
   (parameters
-    '("GtkWidget*" "group")
+    '("GtkToolItemGroup*" "group")
   )
 )
 
@@ -32608,6 +32642,11 @@
   (return-type "GType")
 )
 
+(define-function gtk_tool_palette_drag_targets_get_type
+  (c-name "gtk_tool_palette_drag_targets_get_type")
+  (return-type "GType")
+)
+
 (define-function gtk_tree_model_flags_get_type
   (c-name "gtk_tree_model_flags_get_type")
   (return-type "GType")
@@ -34796,6 +34835,21 @@
   (return-type "gboolean")
 )
 
+(define-method set_mnemonics_visible
+  (of-object "GtkWindow")
+  (c-name "gtk_window_set_mnemonics_visible")
+  (return-type "none")
+  (parameters
+    '("gboolean" "setting")
+  )
+)
+
+(define-method get_mnemonics_visible
+  (of-object "GtkWindow")
+  (c-name "gtk_window_get_mnemonics_visible")
+  (return-type "gboolean")
+)
+
 (define-method set_resizable
   (of-object "GtkWindow")
   (c-name "gtk_window_set_resizable")
diff --git a/gtk/src/toolpalette.hg b/gtk/src/toolpalette.hg
index e1d0af7..a99a8f3 100644
--- a/gtk/src/toolpalette.hg
+++ b/gtk/src/toolpalette.hg
@@ -53,8 +53,7 @@ class ToolPalette
 public:
   _CTOR_DEFAULT()
 
-//This conversion is needed because of https://bugzilla.gnome.org/show_bug.cgi?id=567729#c37
-#m4 _CONVERSION(`ToolItemGroup&',`GtkWidget*',`GTK_WIDGET(($3).gobj())')
+
   _WRAP_METHOD(void set_group_position(ToolItemGroup& group, int position), gtk_tool_palette_set_group_position)
   _WRAP_METHOD(void set_exclusive(ToolItemGroup& group, bool exclusive), gtk_tool_palette_set_exclusive)
   _WRAP_METHOD(void set_expand(ToolItemGroup& group, bool expand = true), gtk_tool_palette_set_expand)
diff --git a/tools/m4/convert_gtk.m4 b/tools/m4/convert_gtk.m4
index 27193a7..ef722d8 100644
--- a/tools/m4/convert_gtk.m4
+++ b/tools/m4/convert_gtk.m4
@@ -168,6 +168,7 @@ _CONVERSION(`GtkWidget*',`Widget*',__RP2P)
 _CONVERSION(`GtkWindow*',`Window*',__RP2P)
 _CONVERSION(`GtkMenu*',`Menu*',__RP2P)
 _CONVERSION(`GtkToolItem*',`ToolItem*',__RP2P)
+_CONVERSION(`GtkToolItemGroup*',`ToolItemGroup*',__RP2P)
 
 # Ptr (gtk+) -> const Ptr (gtkmm)
 _CONVERSION(`GtkAdjustment*',`const Gtk::Adjustment*',__RP2P)
@@ -283,6 +284,7 @@ _CONVERSION(`CellRenderer&',`GtkCellRenderer*',__FR2P)
 _CONVERSION(`const CellRenderer&',`GtkCellRenderer*',__FCR2P)
 _CONVERSION(`ToolItem&',`GtkToolItem*',__FR2P)
 _CONVERSION(`const ToolItem&',`GtkToolItem*',__FCR2P)
+_CONVERSION(`ToolItemGroup&',`GtkToolItemGroup*',__FR2P)
 
 # Glib::ListHandle<> (gtkmm) -> GList (gtk+)
 _CONVERSION(`const Glib::ListHandle<Glib::ustring>&',`GList*',`$3.data()')