texture: Deprecate the new_from_actor() function

Now that we have proper offscreen and shader handling using the
ClutterEffect API, we can finally deprecate this hard to bind, easy
to break function.
This commit is contained in:
Emmanuele Bassi 2011-07-08 12:08:19 +01:00
parent e677ebc3e8
commit 96440acffe
4 changed files with 10 additions and 0 deletions

View File

@ -2541,6 +2541,10 @@ fbo_source_queue_relayout_cb (ClutterActor *source,
* *
* Return value: A newly created #ClutterTexture object, or %NULL on failure. * Return value: A newly created #ClutterTexture object, or %NULL on failure.
* *
* Deprecated: 1.8: Use the #ClutterOffscreenEffect and #ClutterShaderEffect
* directly on the intended #ClutterActor to replace the functionality of
* this function.
*
* Since: 0.6 * Since: 0.6
*/ */
ClutterActor * ClutterActor *

View File

@ -166,7 +166,11 @@ GType clutter_texture_get_type (void) G_GNUC_CONST;
ClutterActor * clutter_texture_new (void); ClutterActor * clutter_texture_new (void);
ClutterActor * clutter_texture_new_from_file (const gchar *filename, ClutterActor * clutter_texture_new_from_file (const gchar *filename,
GError **error); GError **error);
#ifndef CLUTTER_DISABLE_DEPRECATED
ClutterActor * clutter_texture_new_from_actor (ClutterActor *actor); ClutterActor * clutter_texture_new_from_actor (ClutterActor *actor);
#endif /* CLUTTER_DISABLE_DEPRECATED */
gboolean clutter_texture_set_from_file (ClutterTexture *texture, gboolean clutter_texture_set_from_file (ClutterTexture *texture,
const gchar *filename, const gchar *filename,
GError **error); GError **error);

View File

@ -1,3 +1,4 @@
#undef CLUTTER_DISABLE_DEPRECATED
#include <clutter/clutter.h> #include <clutter/clutter.h>
#include <cogl/cogl.h> #include <cogl/cogl.h>

View File

@ -1,3 +1,4 @@
#undef CLUTTER_DISABLE_DEPRECATED
#include <clutter/clutter.h> #include <clutter/clutter.h>