[clutter-gtkmm] [Build] Fixed build issues.

[Chris Kühl <chriskuehl src gnome org>]

commit ba5de7c59aa22c279776e4bda9896cd377c5e035
Author: Chris Kühl <chrisk openismus com>
Date:   Mon Mar 7 00:52:16 2011 +0100

    [Build] Fixed build issues.
    
    * clutter-gtk/clutter-gtkmm/utility.[h|cc]: Removed functions no longer
    in clutter-gtkmm or moved to own object (ie. ClutterGtkTexture).
    * clutter-gtk/src/embed.hg: Changed GtkObject to GObject

 ChangeLog                            |    8 ++
 clutter-gtk/clutter-gtkmm/utility.cc |  176 +++++++++++++---------------------
 clutter-gtk/clutter-gtkmm/utility.h  |   21 +---
 clutter-gtk/src/embed.hg             |    9 +-
 4 files changed, 86 insertions(+), 128 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 36cc8a3..9a5837b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-03-07  Chris Kühl  <chrisk openismus com>
+
+	[Build] Fixed build issues.
+
+	* clutter-gtk/clutter-gtkmm/utility.[h|cc]: Removed functions no longer
+	in clutter-gtkmm or moved to own object (ie. ClutterGtkTexture).
+	* clutter-gtk/src/embed.hg: Changed GtkObject to GObject
+
 2011-03-06  Chris Kühl  <chrisk openismus com>
 	Regenerated *def files.
 
diff --git a/clutter-gtk/clutter-gtkmm/utility.cc b/clutter-gtk/clutter-gtkmm/utility.cc
index 0c4b62e..f022e90 100644
--- a/clutter-gtk/clutter-gtkmm/utility.cc
+++ b/clutter-gtk/clutter-gtkmm/utility.cc
@@ -25,114 +25,74 @@ namespace Clutter
 namespace Gtk
 {
 
-void get_fg_color(::Gtk::Widget& widget, ::Gtk::StateType state, Color& color)
-{
-  gtk_clutter_get_fg_color(widget.gobj(), GtkStateType(state), color.gobj());
-}
-
-void get_bg_color(::Gtk::Widget& widget, ::Gtk::StateType state, Color& color)
-{
-  gtk_clutter_get_bg_color(widget.gobj(), GtkStateType(state), color.gobj());
-}
-
-void get_text_color(::Gtk::Widget& widget, ::Gtk::StateType state, Color& color)
-{
-  gtk_clutter_get_text_color(widget.gobj(), GtkStateType(state), color.gobj());
-}
-
-void get_base_color(::Gtk::Widget& widget, ::Gtk::StateType state, Color& color)
-{
-  gtk_clutter_get_base_color(widget.gobj(), GtkStateType(state), color.gobj());
-}
-
-void get_text_aa_color(::Gtk::Widget& widget, ::Gtk::StateType state, Color& color)
-{
-  gtk_clutter_get_text_aa_color(widget.gobj(), GtkStateType(state), color.gobj());
-}
-
-void get_light_color(::Gtk::Widget& widget, ::Gtk::StateType state, Color& color)
-{
-  gtk_clutter_get_light_color(widget.gobj(), GtkStateType(state), color.gobj());
-}
-
-void get_mid_color(::Gtk::Widget& widget, ::Gtk::StateType state, Color& color)
-{
-  gtk_clutter_get_mid_color(widget.gobj(), GtkStateType(state), color.gobj());
-}
-
-void get_dark_color(::Gtk::Widget& widget, ::Gtk::StateType state, Color& color)
-{
-  gtk_clutter_get_dark_color(widget.gobj(), GtkStateType(state), color.gobj());
-}
-
-Glib::RefPtr<Texture> create_texture_from_pixbuf(const Glib::RefPtr<Gdk::Pixbuf>& pixbuf)
-{
-  return Glib::wrap(CLUTTER_TEXTURE(gtk_clutter_texture_new_from_pixbuf(pixbuf->gobj())));
-}
-
-Glib::RefPtr<Texture> create_texture_from_stock(::Gtk::Widget& widget, const Glib::ustring& stock_id, ::Gtk::IconSize size)
-{
-  return Glib::wrap(CLUTTER_TEXTURE(gtk_clutter_texture_new_from_stock(widget.gobj(), stock_id.c_str(), GtkIconSize(int(size)))));
-}
-
-Glib::RefPtr<Texture> create_texture_from_icon_name(::Gtk::Widget& widget, const Glib::ustring& icon_name, ::Gtk::IconSize size)
-{
-  return Glib::wrap(CLUTTER_TEXTURE(gtk_clutter_texture_new_from_icon_name(widget.gobj(), icon_name.c_str(), GtkIconSize(int(size)))));
-}
-
-#ifdef GLIBMM_EXCEPTIONS_ENABLED
-void set_texture_from_pixbuf(const Glib::RefPtr<Texture>& texture, const Glib::RefPtr<Gdk::Pixbuf>& pixbuf)
-#else
-void set_texture_from_pixbuf(const Glib::RefPtr<Texture>& texture, const Glib::RefPtr<Gdk::Pixbuf>& pixbuf, std::auto_ptr<Glib::Error>& error)
-#endif
-{
-  GError* gerror = 0;
-  gtk_clutter_texture_set_from_pixbuf(texture->gobj(), pixbuf->gobj(), &gerror);
-
-#ifdef GLIBMM_EXCEPTIONS_ENABLED
-  if(gerror)
-    ::Glib::Error::throw_exception(gerror);
-#else
-  if(gerror)
-    error = ::Glib::Error::throw_exception(gerror);
-#endif // GLIBMM_EXCEPTIONS_ENABLED
-}
-
-#ifdef GLIBMM_EXCEPTIONS_ENABLED
-void set_texture_from_stock(const Glib::RefPtr<Texture>& texture, ::Gtk::Widget& widget, const Glib::ustring& stock_id, ::Gtk::IconSize size)
-#else
-void set_texture_from_stock(const Glib::RefPtr<Texture>& texture, ::Gtk::Widget& widget, const Glib::ustring& stock_id, ::Gtk::IconSize size, std::auto_ptr<Glib::Error>& error)
-#endif
-{
-  GError* gerror = 0;
-  gtk_clutter_texture_set_from_stock(texture->gobj(), widget.gobj(), stock_id.c_str(), GtkIconSize(int(size)), &gerror);
-
-#ifdef GLIBMM_EXCEPTIONS_ENABLED
-  if(gerror)
-    ::Glib::Error::throw_exception(gerror);
-#else
-  if(gerror)
-    error = ::Glib::Error::throw_exception(gerror);
-#endif // GLIBMM_EXCEPTIONS_ENABLED
-}
-
-#ifdef GLIBMM_EXCEPTIONS_ENABLED
-void set_texture_from_icon_name(const Glib::RefPtr<Texture>& texture, ::Gtk::Widget& widget, const Glib::ustring& icon_name, ::Gtk::IconSize size)
-#else
-void set_texture_from_icon_name(const Glib::RefPtr<Texture>& texture, ::Gtk::Widget& widget, const Glib::ustring& icon_name, ::Gtk::IconSize size, std::auto_ptr<Glib::Error>& error)
-#endif
-{
-  GError* gerror = 0;
-  gtk_clutter_texture_set_from_icon_name(texture->gobj(), widget.gobj(), icon_name.c_str(), GtkIconSize(int(size)), &gerror);
-
-#ifdef GLIBMM_EXCEPTIONS_ENABLED
-  if(gerror)
-    ::Glib::Error::throw_exception(gerror);
-#else
-  if(gerror)
-    error = ::Glib::Error::throw_exception(gerror);
-#endif // GLIBMM_EXCEPTIONS_ENABLED
-}
+// Glib::RefPtr<Texture> create_texture_from_pixbuf(const Glib::RefPtr<Gdk::Pixbuf>& pixbuf)
+// {
+//   return Glib::wrap(CLUTTER_TEXTURE(gtk_clutter_texture_new_from_pixbuf(pixbuf->gobj())));
+// }
+
+// Glib::RefPtr<Texture> create_texture_from_stock(::Gtk::Widget& widget, const Glib::ustring& stock_id, ::Gtk::IconSize size)
+// {
+//   return Glib::wrap(CLUTTER_TEXTURE(gtk_clutter_texture_new_from_stock(widget.gobj(), stock_id.c_str(), GtkIconSize(int(size)))));
+// }
+
+// Glib::RefPtr<Texture> create_texture_from_icon_name(::Gtk::Widget& widget, const Glib::ustring& icon_name, ::Gtk::IconSize size)
+// {
+//   return Glib::wrap(CLUTTER_TEXTURE(gtk_clutter_texture_new_from_icon_name(widget.gobj(), icon_name.c_str(), GtkIconSize(int(size)))));
+// }
+
+// #ifdef GLIBMM_EXCEPTIONS_ENABLED
+// void set_texture_from_pixbuf(const Glib::RefPtr<Texture>& texture, const Glib::RefPtr<Gdk::Pixbuf>& pixbuf)
+// #else
+// void set_texture_from_pixbuf(const Glib::RefPtr<Texture>& texture, const Glib::RefPtr<Gdk::Pixbuf>& pixbuf, std::auto_ptr<Glib::Error>& error)
+// #endif
+// {
+//   GError* gerror = 0;
+//   gtk_clutter_texture_set_from_pixbuf(texture->gobj(), pixbuf->gobj(), &gerror);
+
+// #ifdef GLIBMM_EXCEPTIONS_ENABLED
+//   if(gerror)
+//     ::Glib::Error::throw_exception(gerror);
+// #else
+//   if(gerror)
+//     error = ::Glib::Error::throw_exception(gerror);
+// #endif // GLIBMM_EXCEPTIONS_ENABLED
+// }
+
+// #ifdef GLIBMM_EXCEPTIONS_ENABLED
+// void set_texture_from_stock(const Glib::RefPtr<Texture>& texture, ::Gtk::Widget& widget, const Glib::ustring& stock_id, ::Gtk::IconSize size)
+// #else
+// void set_texture_from_stock(const Glib::RefPtr<Texture>& texture, ::Gtk::Widget& widget, const Glib::ustring& stock_id, ::Gtk::IconSize size, std::auto_ptr<Glib::Error>& error)
+// #endif
+// {
+//   GError* gerror = 0;
+//   gtk_clutter_texture_set_from_stock(texture->gobj(), widget.gobj(), stock_id.c_str(), GtkIconSize(int(size)), &gerror);
+
+// #ifdef GLIBMM_EXCEPTIONS_ENABLED
+//   if(gerror)
+//     ::Glib::Error::throw_exception(gerror);
+// #else
+//   if(gerror)
+//     error = ::Glib::Error::throw_exception(gerror);
+// #endif // GLIBMM_EXCEPTIONS_ENABLED
+// }
+
+// #ifdef GLIBMM_EXCEPTIONS_ENABLED
+// void set_texture_from_icon_name(const Glib::RefPtr<Texture>& texture, ::Gtk::Widget& widget, const Glib::ustring& icon_name, ::Gtk::IconSize size)
+// #else
+// void set_texture_from_icon_name(const Glib::RefPtr<Texture>& texture, ::Gtk::Widget& widget, const Glib::ustring& icon_name, ::Gtk::IconSize size, std::auto_ptr<Glib::Error>& error)
+// #endif
+// {
+//   GError* gerror = 0;
+//   gtk_clutter_texture_set_from_icon_name(texture->gobj(), widget.gobj(), icon_name.c_str(), GtkIconSize(int(size)), &gerror);
+
+// #ifdef GLIBMM_EXCEPTIONS_ENABLED
+//   if(gerror)
+//     ::Glib::Error::throw_exception(gerror);
+// #else
+//   if(gerror)
+//     error = ::Glib::Error::throw_exception(gerror);
+// #endif // GLIBMM_EXCEPTIONS_ENABLED
+// }
 
 } //namespace Gtk
 } //namespace Clutter
diff --git a/clutter-gtk/clutter-gtkmm/utility.h b/clutter-gtk/clutter-gtkmm/utility.h
index 7382666..cfb61d6 100644
--- a/clutter-gtk/clutter-gtkmm/utility.h
+++ b/clutter-gtk/clutter-gtkmm/utility.h
@@ -26,21 +26,12 @@ namespace Clutter
 {
 namespace Gtk
 {
-
-void get_fg_color(::Gtk::Widget& widget, ::Gtk::StateType state, Color& color);
-void get_bg_color(::Gtk::Widget& widget, ::Gtk::StateType state, Color& color);
-void get_text_color(::Gtk::Widget& widget, ::Gtk::StateType state, Color& color);
-void get_base_color(::Gtk::Widget& widget, ::Gtk::StateType state, Color& color);
-void get_text_aa_color(::Gtk::Widget& widget, ::Gtk::StateType state, Color& color);
-void get_light_color(::Gtk::Widget& widget, ::Gtk::StateType state, Color& color);
-void get_mid_color(::Gtk::Widget& widget, ::Gtk::StateType state, Color& color);
-void get_dark_color(::Gtk::Widget& widget, ::Gtk::StateType state, Color& color);
-Glib::RefPtr<Texture> create_texture_from_pixbuf(const Glib::RefPtr<Gdk::Pixbuf>& pixbuf);
-Glib::RefPtr<Texture> create_texture_from_stock(::Gtk::Widget& widget, const Glib::ustring& stock_id, ::Gtk::IconSize size);
-Glib::RefPtr<Texture> create_texture_from_icon_name(::Gtk::Widget& widget, const Glib::ustring& icon_name, ::Gtk::IconSize size);
-void set_texture_from_pixbuf(const Glib::RefPtr<Texture>& texture, const Glib::RefPtr<Gdk::Pixbuf>& pixbuf);
-void set_texture_from_stock(const Glib::RefPtr<Texture>& texture, ::Gtk::Widget& widget, const Glib::ustring& stock_id, ::Gtk::IconSize size);
-void set_texture_from_icon_name(const Glib::RefPtr<Texture>& texture, ::Gtk::Widget& widget, const Glib::ustring& icon_name, ::Gtk::IconSize size);
+// Glib::RefPtr<Texture> create_texture_from_pixbuf(const Glib::RefPtr<Gdk::Pixbuf>& pixbuf);
+// Glib::RefPtr<Texture> create_texture_from_stock(::Gtk::Widget& widget, const Glib::ustring& stock_id, ::Gtk::IconSize size);
+// Glib::RefPtr<Texture> create_texture_from_icon_name(::Gtk::Widget& widget, const Glib::ustring& icon_name, ::Gtk::IconSize size);
+// void set_texture_from_pixbuf(const Glib::RefPtr<Texture>& texture, const Glib::RefPtr<Gdk::Pixbuf>& pixbuf);
+// void set_texture_from_stock(const Glib::RefPtr<Texture>& texture, ::Gtk::Widget& widget, const Glib::ustring& stock_id, ::Gtk::IconSize size);
+// void set_texture_from_icon_name(const Glib::RefPtr<Texture>& texture, ::Gtk::Widget& widget, const Glib::ustring& icon_name, ::Gtk::IconSize size);
 
 } //namespace Gtk
 } //namespace Clutter
diff --git a/clutter-gtk/src/embed.hg b/clutter-gtk/src/embed.hg
index 85c7380..508ae16 100644
--- a/clutter-gtk/src/embed.hg
+++ b/clutter-gtk/src/embed.hg
@@ -36,16 +36,15 @@ namespace Gtk
  * embedded Clutter::Stage actor. This is needed for Clutter to be able to
  * paint on the Clutter::Gtk::Embed widget.
  */
-class Embed :
-  public ::Gtk::Container
+class Embed : public ::Gtk::Container
 {
-  _CLASS_GTKOBJECT(Embed, GtkClutterEmbed, GTK_CLUTTER_EMBED, ::Gtk::Container, GtkContainer)
+  _CLASS_GOBJECT(Embed, GtkClutterEmbed, GTK_CLUTTER_EMBED, ::Gtk::Container, GtkContainer)
 
 public:
   _CTOR_DEFAULT
 
-#m4 _CONVERSION(`ClutterActor*',`Glib::RefPtr<Stage>',`Glib::wrap(CLUTTER_STAGE($3), false)')
-#m4 _CONVERSION(`ClutterActor*',`Glib::RefPtr<const Stage>',`Glib::wrap(CLUTTER_STAGE($3), false)')
+#m4 _CONVERSION(`ClutterActor*',`Glib::RefPtr<Stage>',`Glib::wrap(CLUTTER_STAGE(($3)), false)')
+#m4 _CONVERSION(`ClutterActor*',`Glib::RefPtr<const Stage>',`Glib::wrap(CLUTTER_STAGE(($3)), false)')
   _WRAP_METHOD(Glib::RefPtr<Stage> get_stage(), gtk_clutter_embed_get_stage, refreturn)
   _WRAP_METHOD(Glib::RefPtr<const Stage> get_stage() const, gtk_clutter_embed_get_stage, refreturn, constversion)
 };