Add GtkClutterTexture and rework texture integration

Instead of adding C functions for loading GdkPixbufs, named icons and
stock icons inside ClutterTextures, we should use a simple sub-class of
ClutterTexture and add new methods there.

The constructors should also go away, since they don't allow recoverable
error handling.

1 files changed, 0 insertions, 52 deletions

diff --git a/clutter-gtk/gtk-clutter-util.h b/clutter-gtk/gtk-clutter-util.h
index 167cb0c..c3cd51e 100644
--- a/clutter-gtk/gtk-clutter-util.h
+++ b/clutter-gtk/gtk-clutter-util.h
@@ -31,36 +31,6 @@
 
 G_BEGIN_DECLS
 
-/**
- * ClutterGtkInitError:
- * @CLUTTER_INIT_ERROR_LAST: Placeholder
- * @CLUTTER_INIT_ERROR_GTK: Unable to initialize GTK+
- *
- * Extension of the #ClutterInitError enumeration for the integration
- * with GTK+
- *
- * This enumeration might be extended at later date
- */
-typedef enum {
-  CLUTTER_INIT_ERROR_LAST = CLUTTER_INIT_ERROR_INTERNAL,
-
-  CLUTTER_INIT_ERROR_GTK  = (CLUTTER_INIT_ERROR_LAST - 1)
-} ClutterGtkInitError;
-
-/**
- * GtkClutterTextureError:
- * @GTK_CLUTTER_TEXTURE_INVALID_STOCK_ID: Invalid stock identifier
- *
- * An enumeration of error types used in ClutterGtk texture functions
- *
- * This enumeration might be extended at later date
- */
-typedef enum {
-  GTK_CLUTTER_TEXTURE_INVALID_STOCK_ID
-} GtkClutterTextureError;
-
-#define GTK_CLUTTER_TEXTURE_ERROR (gtk_clutter_texture_error_quark ())
-
 ClutterInitError gtk_clutter_init           (int            *argc,
                                              char         ***argv);
 ClutterInitError gtk_clutter_init_with_args (int            *argc,
@@ -96,28 +66,6 @@ void          gtk_clutter_get_mid_color              (GtkWidget      *widget,
                                                       GtkStateType    state,
                                                       ClutterColor   *color);
 
-ClutterActor *gtk_clutter_texture_new_from_pixbuf    (GdkPixbuf      *pixbuf);
-ClutterActor *gtk_clutter_texture_new_from_stock     (GtkWidget      *widget,
-                                                      const gchar    *stock_id,
-                                                      GtkIconSize     size);
-ClutterActor *gtk_clutter_texture_new_from_icon_name (GtkWidget      *widget,
-                                                      const gchar    *icon_name,
-                                                      GtkIconSize     size);
-GQuark        gtk_clutter_texture_error_quark        (void);
-gboolean      gtk_clutter_texture_set_from_pixbuf    (ClutterTexture *texture,
-                                                      GdkPixbuf      *pixbuf,
-                                                      GError        **error);
-gboolean      gtk_clutter_texture_set_from_stock     (ClutterTexture *texture,
-                                                      GtkWidget      *widget,
-                                                      const gchar    *stock_id,
-                                                      GtkIconSize     size,
-                                                      GError        **error);
-gboolean      gtk_clutter_texture_set_from_icon_name (ClutterTexture *texture,
-                                                      GtkWidget      *widget,
-                                                      const gchar    *icon_name,
-                                                      GtkIconSize     size,
-                                                      GError        **error);
-
 G_END_DECLS
 
 #endif /* __GTK_CLUTTER_UTIL_H__ */