gnomemm r1304 - in cluttermm/trunk: . clutter/src

[murrayc svn gnome org]

Author: murrayc
Date: Sat Jan 26 11:34:34 2008
New Revision: 1304
URL: http://svn.gnome.org/viewvc/gnomemm?rev=1304&view=rev

Log:
2008-01-26  Murray Cumming  <murrayc murrayc com>

* clutter/src/media.hg:
* clutter/src/stage.hg: Added ustring conversions for signals, to fix the build.

Modified:
   cluttermm/trunk/ChangeLog
   cluttermm/trunk/clutter/src/media.hg
   cluttermm/trunk/clutter/src/stage.hg

Modified: cluttermm/trunk/clutter/src/media.hg
==============================================================================
--- cluttermm/trunk/clutter/src/media.hg	(original)
+++ cluttermm/trunk/clutter/src/media.hg	Sat Jan 26 11:34:34 2008
@@ -52,7 +52,10 @@
   //_WRAP_SIGNAL(void error(GError* error), "error")
 
 protected:
+
+#m4 _CONVERSION(`const char*',`const Glib::ustring&',__GCHARP_TO_USTRING)
   _WRAP_VFUNC(void set_uri(const Glib::ustring& uri), set_uri)
+
   // TODO: error "No conversion from Glib::ustring to const char* defined", even
   // though it works above in get_uri
   //_WRAP_VFUNC(Glib::ustring get_uri() const, get_uri)

Modified: cluttermm/trunk/clutter/src/stage.hg
==============================================================================
--- cluttermm/trunk/clutter/src/stage.hg	(original)
+++ cluttermm/trunk/clutter/src/stage.hg	Sat Jan 26 11:34:34 2008
@@ -87,6 +87,8 @@
   _WRAP_VFUNC(void set_cursor_visible(bool visible), set_cursor_visible)
   _WRAP_VFUNC(void set_offscreen(bool offscreen), set_offscreen)
   _WRAP_VFUNC(Glib::RefPtr<Gdk::Pixbuf> draw_to_pixbuf(int x, int y, int width, int height), draw_to_pixbuf)
+
+#m4 _CONVERSION(`const char*',`const Glib::ustring&',__GCHARP_TO_USTRING)
   _WRAP_VFUNC(void set_title(const Glib::ustring& title), set_title)
   _WRAP_VFUNC(void set_user_resize(bool value), set_user_resize)
 };