[clutter-gtkmm] Updated for latest clutter-gtk.

[Murray Cumming <murrayc src gnome org>]

commit 3f5e8172eab19db1d9ab617239e7d318b1c294fc
Author: Murray Cumming <murrayc murrayc com>
Date:   Wed May 5 23:29:14 2010 +0200

    Updated for latest clutter-gtk.
    
    * configure.ac: Depend on latest clutter-gtk and cluttermm.
    * clutter-gtk/src/clutter-gtk_methods.defs: Regenerated.
    * clutter-gtk/src/embed.hg: Now derives from Gtk::Container, since it has
    changed in clutter-gtk.
    * clutter-gtk/clutter-gtkmm.h: Improved main page text.
    * clutter-gtk/clutter-gtkmm.pc.in: Corrected htmlrefpub.

 ChangeLog                                |   11 ++++++
 clutter-gtk/clutter-gtkmm.h              |    6 ++--
 clutter-gtk/clutter-gtkmm.pc.in          |    2 +-
 clutter-gtk/src/clutter-gtk_methods.defs |   57 +++++++++++++++++++++++++++--
 clutter-gtk/src/embed.hg                 |   17 ++++++---
 configure.ac                             |    2 +-
 6 files changed, 81 insertions(+), 14 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 634f5af..1b8b7b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2010-05-05  Murray Cumming  <murrayc murrayc com>
+
+	Updated for latest clutter-gtk.
+
+	* configure.ac: Depend on latest clutter-gtk and cluttermm.
+	* clutter-gtk/src/clutter-gtk_methods.defs: Regenerated.
+	* clutter-gtk/src/embed.hg: Now derives from Gtk::Container, since it has 
+	changed in clutter-gtk.
+	* clutter-gtk/clutter-gtkmm.h: Improved main page text.
+	* clutter-gtk/clutter-gtkmm.pc.in: Corrected htmlrefpub.
+
 2010-04-28  David King  <davidk openismus com>
 
 	Add main page to Doxygen documentation
diff --git a/clutter-gtk/clutter-gtkmm.h b/clutter-gtk/clutter-gtkmm.h
index 55583da..d16b7f4 100644
--- a/clutter-gtk/clutter-gtkmm.h
+++ b/clutter-gtk/clutter-gtkmm.h
@@ -24,9 +24,9 @@
  *
  * @section description Description
  *
- * clutter-gtkmm is a C++ wrapper for clutter-gtk.
- *
- * See also the <a href="http://www.clutter-project.org/";>clutter website</a>.
+ * clutter-gtkmm is a C++ wrapper for <a href="http://www.clutter-project.org/";>clutter-gtk</a>, 
+ * allowing you to use cluttermm with <a href="http://www.gtkmm.org";>gtkmm</a> windows and widgets.
+ * See the Clutter::Gtk::Embed widget.
  *
  * @section basics Basic Usage
  *
diff --git a/clutter-gtk/clutter-gtkmm.pc.in b/clutter-gtk/clutter-gtkmm.pc.in
index 9bf781b..aef3fd7 100644
--- a/clutter-gtk/clutter-gtkmm.pc.in
+++ b/clutter-gtk/clutter-gtkmm.pc.in
@@ -8,7 +8,7 @@ includedir= includedir@
 docdir=${datarootdir}/doc/@CLUTTER_GTKMM_MODULE_NAME@
 doxytagfile=${docdir}/reference/@CLUTTER_GTKMM_MODULE_NAME  tag
 htmlrefdir=${docdir}/reference/html
-htmlrefpub=http://library.gnome.org/@PACKAGE_TARNAME@/unstable/
+htmlrefpub=http://library.gnome.org/devel/@PACKAGE_TARNAME@/unstable/
 
 Name: clutter-gtkmm
 Description: C++ binding for clutter-gtk
diff --git a/clutter-gtk/src/clutter-gtk_methods.defs b/clutter-gtk/src/clutter-gtk_methods.defs
index 2a95a1c..afc1ac6 100644
--- a/clutter-gtk/src/clutter-gtk_methods.defs
+++ b/clutter-gtk/src/clutter-gtk_methods.defs
@@ -2,7 +2,7 @@
 ; object definitions ...
 (define-object ClutterEmbed
   (in-module "Gtk")
-  (parent "GtkWidget")
+  (parent "GtkContainer")
   (c-name "GtkClutterEmbed")
   (gtype-id "GTK_TYPE_CLUTTER_EMBED")
 )
@@ -20,6 +20,12 @@
   (gtype-id "GTK_TYPE_CLUTTER_VIEWPORT")
 )
 
+(define-object ClutterZoomable
+  (in-module "Gtk")
+  (c-name "GtkClutterZoomable")
+  (gtype-id "GTK_TYPE_CLUTTER_ZOOMABLE")
+)
+
 ;; Enumerations and flags ...
 
 (define-enum GtkInitError
@@ -32,6 +38,16 @@
   )
 )
 
+(define-enum GtkTextureError
+  (in-module "Clutter")
+  (c-name "ClutterGtkTextureError")
+  (gtype-id "CLUTTER_TYPE_GTK_TEXTURE_ERROR")
+  (values
+    '("invalid-stock-id" "CLUTTER_GTK_TEXTURE_INVALID_STOCK_ID")
+    '("error-last" "CLUTTER_GTK_TEXTURE_ERROR_LAST")
+  )
+)
+
 
 ;; From clutter-gtk.h
 
@@ -219,34 +235,42 @@
   )
 )
 
+(define-function gtk_clutter_texture_error_quark
+  (c-name "gtk_clutter_texture_error_quark")
+  (return-type "GQuark")
+)
+
 (define-function gtk_clutter_texture_set_from_pixbuf
   (c-name "gtk_clutter_texture_set_from_pixbuf")
-  (return-type "none")
+  (return-type "gboolean")
   (parameters
     '("ClutterTexture*" "texture")
     '("GdkPixbuf*" "pixbuf")
+    '("GError**" "error")
   )
 )
 
 (define-function gtk_clutter_texture_set_from_stock
   (c-name "gtk_clutter_texture_set_from_stock")
-  (return-type "none")
+  (return-type "gboolean")
   (parameters
     '("ClutterTexture*" "texture")
     '("GtkWidget*" "widget")
     '("const-gchar*" "stock_id")
     '("GtkIconSize" "size")
+    '("GError**" "error")
   )
 )
 
 (define-function gtk_clutter_texture_set_from_icon_name
   (c-name "gtk_clutter_texture_set_from_icon_name")
-  (return-type "none")
+  (return-type "gboolean")
   (parameters
     '("ClutterTexture*" "texture")
     '("GtkWidget*" "widget")
     '("const-gchar*" "icon_name")
     '("GtkIconSize" "size")
+    '("GError**" "error")
   )
 )
 
@@ -266,6 +290,7 @@
   (parameters
     '("GtkAdjustment*" "h_adjust")
     '("GtkAdjustment*" "v_adjust")
+    '("GtkAdjustment*" "z_adjust")
   )
 )
 
@@ -281,3 +306,27 @@
 )
 
 
+
+;; From gtk-clutter-zoomable.h
+
+(define-function gtk_clutter_zoomable_get_type
+  (c-name "gtk_clutter_zoomable_get_type")
+  (return-type "GType")
+)
+
+(define-method set_adjustment
+  (of-object "GtkClutterZoomable")
+  (c-name "gtk_clutter_zoomable_set_adjustment")
+  (return-type "none")
+  (parameters
+    '("GtkAdjustment*" "z_adjust")
+  )
+)
+
+(define-method get_adjustment
+  (of-object "GtkClutterZoomable")
+  (c-name "gtk_clutter_zoomable_get_adjustment")
+  (return-type "GtkAdjustment*")
+)
+
+
diff --git a/clutter-gtk/src/embed.hg b/clutter-gtk/src/embed.hg
index b99bd7f..21d34c6 100644
--- a/clutter-gtk/src/embed.hg
+++ b/clutter-gtk/src/embed.hg
@@ -16,11 +16,11 @@
  */
 
 #include <cluttermm/stage.h>
-#include <gtkmm/widget.h>
+#include <gtkmm/container.h>
  
 _DEFS(clutter-gtkmm,clutter-gtk)
 _PINCLUDE(cluttermm/private/stage_p.h)
-_PINCLUDE(gtkmm/private/widget_p.h)
+_PINCLUDE(gtkmm/private/container_p.h)
 
 
 namespace Clutter
@@ -28,11 +28,18 @@ namespace Clutter
 namespace Gtk
 {
 
-//TODO: Documentation.
+/** This widget embeds a Clutter::Stage, allowing you to build, show and 
+ * interact with a scene built using Clutter, inside a gtkmm application.
+ *
+ * @note To avoid flickering on show(), you should call Gtk::Widget::show() 
+ * or Gtk::Widget::realize() before calling Clutter::Actor::show() on the 
+ * embedded Clutter::Stage actor. This is needed for Clutter to be able to 
+ * paint on the Clutter::Gtk::Embed widget.
+ */ 
 class Embed :
-  public ::Gtk::Widget
+  public ::Gtk::Container
 {
-  _CLASS_GTKOBJECT(Embed, GtkClutterEmbed, GTK_CLUTTER_EMBED, ::Gtk::Widget, GtkWidget)
+  _CLASS_GTKOBJECT(Embed, GtkClutterEmbed, GTK_CLUTTER_EMBED, ::Gtk::Container, GtkContainer)
 
 public:
   _CTOR_DEFAULT
diff --git a/configure.ac b/configure.ac
index 754ca95..bdd0d19 100644
--- a/configure.ac
+++ b/configure.ac
@@ -41,7 +41,7 @@ AC_DISABLE_STATIC
 AC_LIBTOOL_WIN32_DLL
 AC_PROG_LIBTOOL
 
-AC_SUBST([CLUTTER_GTKMM_MODULES], ['clutter-gtk-0.10 >= 0.10.2 cluttermm-1.0 >= 0.9 gtkmm-2.4 >= 2.18'])
+AC_SUBST([CLUTTER_GTKMM_MODULES], ['clutter-gtk-0.10 >= 0.10.4 cluttermm-1.0 >= 0.9.6 gtkmm-2.4 >= 2.18'])
 PKG_CHECK_MODULES([CLUTTER_GTKMM], [$CLUTTER_GTKMM_MODULES])
 
 MM_PKG_CONFIG_SUBST([GMMPROC_DIR], [--variable=gmmprocdir glibmm-2.4])