[gtkmm] Change an m4 conversion to fix the build with latest glibmm.



commit 9058148577bb09f1577b9ad7d5eff1963fb6a899
Author: Murray Cumming <murrayc murrayc com>
Date:   Fri Dec 10 09:35:42 2010 +0100

    Change an m4 conversion to fix the build with latest glibmm.
    
    * tools/m4/convert_gtk.m4: For some reason, using __FR2P leaves a
     in the .cc file, though similar conversions work fine. Changed it to
    a normal conversion.

 ChangeLog               |    8 ++++++++
 tools/m4/convert_gtk.m4 |    2 +-
 2 files changed, 9 insertions(+), 1 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 6091b12..d5954f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-12-10  Murray Cumming  <murrayc murrayc com>
+
+	Change an m4 conversion to fix the build with latest glibmm.
+
+	* tools/m4/convert_gtk.m4: For some reason, using __FR2P leaves a 
+	$3 in the .cc file, though similar conversions work fine. Changed it to 
+	a normal conversion.
+
 2010-12-09  Murray Cumming  <murrayc murrayc com>
 
 	Added class_gtkobject.m4, previously in glibmm.
diff --git a/tools/m4/convert_gtk.m4 b/tools/m4/convert_gtk.m4
index 9566db0..ba853b9 100644
--- a/tools/m4/convert_gtk.m4
+++ b/tools/m4/convert_gtk.m4
@@ -282,7 +282,7 @@ _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)
+_CONVERSION(`RadioButton&',`GtkRadioButton*',`($3).gobj()')
 
 # Ptr (gtk+) -> Ref (Gtkmm)
 _CONVERSION(`GtkWidget*', `Widget&', `*Glib::wrap($3)')



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]