[gtkmm/2.14] Change return type of Gtk::Dialog::get_action_area(), bug #597779

[David King <davidk src gnome org>]

commit 76cf8bf95ecfbdab12e9453a61dafa55466d25fb
Author: David King <davidk openismus com>
Date:   Tue Oct 13 11:21:02 2009 +0200

    Change return type of Gtk::Dialog::get_action_area(), bug #597779
    
    * gtk/src/dialog.hg: Change return type of
    Gtk::Dialog::get_action_area() to Gtk::ButtonBox* from Gtk::HButtonBox*
    to fix breakage on Maemo Fremantle. Fixes bug #597779.
    * tools/m4/convert_gtk.m4: New conversion from GtkWidget* to
    Gtk::ButtonBox*.

 ChangeLog               |    8 ++++++++
 gtk/src/dialog.hg       |    6 ++++--
 tools/m4/convert_gtk.m4 |    1 +
 3 files changed, 13 insertions(+), 2 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index ce8121f..b160c90 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-10-13  David King  <davidk openismus com>
+
+	* gtk/src/dialog.hg: Change return type of
+	Gtk::Dialog::get_action_area() to Gtk::ButtonBox* from Gtk::HButtonBox*
+	to fix breakage on Maemo Fremantle. Fixes bug #597779.
+	* tools/m4/convert_gtk.m4: New conversion from GtkWidget* to
+	Gtk::ButtonBox*.
+
 2009-09-07  Murray Cumming  <murrayc murrayc com>
 
 	* gtk/src/enums.hg: Include gtkmmconfig.h because we use 
diff --git a/gtk/src/dialog.hg b/gtk/src/dialog.hg
index 57b5ed6..6929880 100644
--- a/gtk/src/dialog.hg
+++ b/gtk/src/dialog.hg
@@ -109,8 +109,10 @@ public:
   _WRAP_METHOD(void response(int response_id), gtk_dialog_response)
   _WRAP_METHOD(int run(), gtk_dialog_run)
 
-  _WRAP_METHOD(HButtonBox* get_action_area(), gtk_dialog_get_action_area)
-  _WRAP_METHOD(const HButtonBox* get_action_area() const, gtk_dialog_get_action_area, constversion)
+  // This previously returned an HButtonBox*, which broke on Maemo Fremantle.
+  // Changed post-2.18.2
+  _WRAP_METHOD(ButtonBox* get_action_area(), gtk_dialog_get_action_area)
+  _WRAP_METHOD(const ButtonBox* get_action_area() const, gtk_dialog_get_action_area, constversion)
 
   //TODO: Rename to get_content_area() when we do an ABI break.
   //We kept it as get_vbox() when reimplementing a MEMBER_GET with this new C function:
diff --git a/tools/m4/convert_gtk.m4 b/tools/m4/convert_gtk.m4
index 3c7f260..8ec7255 100644
--- a/tools/m4/convert_gtk.m4
+++ b/tools/m4/convert_gtk.m4
@@ -224,6 +224,7 @@ _CONVERSION(`GtkWidget*',`Gtk::Tree*',__RP2PD)
 _CONVERSION(`GtkWidget*',`ScrolledWindow*',`Glib::wrap((GtkScrolledWindow*)($3))')
 _CONVERSION(`GtkWidget*',`Window*',`Glib::wrap((GtkWindow*)($3))')
 _CONVERSION(`GtkWidget*',`TreeView*',`Glib::wrap((GtkTreeView*)($3))')
+_CONVERSION(`GtkWidget*',`ButtonBox*',`Glib::wrap((GtkButtonBox*)($3))')
 _CONVERSION(`GtkWidget*',`HButtonBox*',`Glib::wrap((GtkHButtonBox*)($3))')
 _CONVERSION(`GtkWidget*',`ComboDropDown*',`Glib::wrap((GtkList*)($3))')
 _CONVERSION(`GtkWidget*',`Image*',`Glib::wrap((GtkImage*)($3))')