From e5e10b6a04486f6936265727b099390fd99f2f5a Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Fri, 16 Mar 2012 17:30:26 +0000 Subject: [PATCH] Annotate functionality added in 1.10 --- clutter/clutter-canvas.h | 3 +++ clutter/clutter-content.h | 3 +++ clutter/clutter-image.h | 6 ++++++ clutter/clutter-paint-node.h | 13 +++++++++++++ clutter/clutter-paint-nodes.h | 10 ++++++++++ clutter/clutter-property-transition.h | 4 ++++ clutter/clutter-transition.h | 7 +++++++ 7 files changed, 46 insertions(+) diff --git a/clutter/clutter-canvas.h b/clutter/clutter-canvas.h index c37d947..c0c27fd 100644 --- a/clutter/clutter-canvas.h +++ b/clutter/clutter-canvas.h @@ -85,9 +85,12 @@ struct _ClutterCanvasClass gpointer _padding[16]; }; +CLUTTER_AVAILABLE_IN_1_10 GType clutter_canvas_get_type (void) G_GNUC_CONST; +CLUTTER_AVAILABLE_IN_1_10 ClutterContent * clutter_canvas_new (void); +CLUTTER_AVAILABLE_IN_1_10 void clutter_canvas_set_size (ClutterCanvas *canvas, int width, int height); diff --git a/clutter/clutter-content.h b/clutter/clutter-content.h index e329f3f..df5aa83 100644 --- a/clutter/clutter-content.h +++ b/clutter/clutter-content.h @@ -88,11 +88,14 @@ struct _ClutterContentIface void (* invalidate) (ClutterContent *content); }; +CLUTTER_AVAILABLE_IN_1_10 GType clutter_content_get_type (void) G_GNUC_CONST; +CLUTTER_AVAILABLE_IN_1_10 gboolean clutter_content_get_preferred_size (ClutterContent *content, gfloat *width, gfloat *height); +CLUTTER_AVAILABLE_IN_1_10 void clutter_content_invalidate (ClutterContent *content); G_END_DECLS diff --git a/clutter/clutter-image.h b/clutter/clutter-image.h index 41c1fc4..178a2d3 100644 --- a/clutter/clutter-image.h +++ b/clutter/clutter-image.h @@ -100,10 +100,14 @@ struct _ClutterImageClass gpointer _padding[16]; }; +CLUTTER_AVAILABLE_IN_1_10 GQuark clutter_image_error_quark (void); +CLUTTER_AVAILABLE_IN_1_10 GType clutter_image_get_type (void) G_GNUC_CONST; +CLUTTER_AVAILABLE_IN_1_10 ClutterContent * clutter_image_new (void); +CLUTTER_AVAILABLE_IN_1_10 gboolean clutter_image_set_data (ClutterImage *image, const guint8 *data, CoglPixelFormat pixel_format, @@ -111,6 +115,7 @@ gboolean clutter_image_set_data (ClutterImage guint height, guint row_stride, GError **error); +CLUTTER_AVAILABLE_IN_1_10 gboolean clutter_image_set_area (ClutterImage *image, const guint8 *data, CoglPixelFormat pixel_format, @@ -119,6 +124,7 @@ gboolean clutter_image_set_area (ClutterImage GError **error); #if defined(COGL_ENABLE_EXPERIMENTAL_API) && defined(CLUTTER_ENABLE_EXPERIMENTAL_API) +CLUTTER_AVAILABLE_IN_1_10 CoglTexture * clutter_image_get_texture (ClutterImage *image); #endif diff --git a/clutter/clutter-paint-node.h b/clutter/clutter-paint-node.h index 2c95d25..29674bf 100644 --- a/clutter/clutter-paint-node.h +++ b/clutter/clutter-paint-node.h @@ -41,18 +41,25 @@ G_BEGIN_DECLS typedef struct _ClutterPaintNodePrivate ClutterPaintNodePrivate; typedef struct _ClutterPaintNodeClass ClutterPaintNodeClass; +CLUTTER_AVAILABLE_IN_1_10 GType clutter_paint_node_get_type (void) G_GNUC_CONST; +CLUTTER_AVAILABLE_IN_1_10 ClutterPaintNode * clutter_paint_node_ref (ClutterPaintNode *node); +CLUTTER_AVAILABLE_IN_1_10 void clutter_paint_node_unref (ClutterPaintNode *node); +CLUTTER_AVAILABLE_IN_1_10 void clutter_paint_node_set_name (ClutterPaintNode *node, const char *name); +CLUTTER_AVAILABLE_IN_1_10 void clutter_paint_node_add_child (ClutterPaintNode *node, ClutterPaintNode *child); +CLUTTER_AVAILABLE_IN_1_10 void clutter_paint_node_add_rectangle (ClutterPaintNode *node, const ClutterActorBox *rect); +CLUTTER_AVAILABLE_IN_1_10 void clutter_paint_node_add_texture_rectangle (ClutterPaintNode *node, const ClutterActorBox *rect, float x_1, @@ -60,19 +67,25 @@ void clutter_paint_node_add_texture_rectangle (Clutter float x_2, float y_2); #if defined(COGL_ENABLE_EXPERIMENTAL_2_0_API) && defined(CLUTTER_ENABLE_EXPERIMENTAL_API) +CLUTTER_AVAILABLE_IN_1_10 void clutter_paint_node_add_path (ClutterPaintNode *node, CoglPath *path); +CLUTTER_AVAILABLE_IN_1_10 void clutter_paint_node_add_primitive (ClutterPaintNode *node, CoglPrimitive *primitive); #endif /* COGL_ENABLE_EXPERIMENTAL_2_0_API && CLUTTER_ENABLE_EXPERIMENTAL_API */ #define CLUTTER_VALUE_HOLDS_PAINT_NODE(value) (G_VALUE_HOLDS (value, CLUTTER_TYPE_PAINT_NODE)) +CLUTTER_AVAILABLE_IN_1_10 void clutter_value_set_paint_node (GValue *value, gpointer node); +CLUTTER_AVAILABLE_IN_1_10 void clutter_value_take_paint_node (GValue *value, gpointer node); +CLUTTER_AVAILABLE_IN_1_10 gpointer clutter_value_get_paint_node (const GValue *value); +CLUTTER_AVAILABLE_IN_1_10 gpointer clutter_value_dup_paint_node (const GValue *value); G_END_DECLS diff --git a/clutter/clutter-paint-nodes.h b/clutter/clutter-paint-nodes.h index be40f56..75a1ee3 100644 --- a/clutter/clutter-paint-nodes.h +++ b/clutter/clutter-paint-nodes.h @@ -49,8 +49,10 @@ G_BEGIN_DECLS typedef struct _ClutterColorNode ClutterColorNode; typedef struct _ClutterColorNodeClass ClutterColorNodeClass; +CLUTTER_AVAILABLE_IN_1_10 GType clutter_color_node_get_type (void) G_GNUC_CONST; +CLUTTER_AVAILABLE_IN_1_10 ClutterPaintNode * clutter_color_node_new (const ClutterColor *color); #define CLUTTER_TYPE_TEXTURE_NODE (clutter_texture_node_get_type ()) @@ -68,8 +70,10 @@ ClutterPaintNode * clutter_color_node_new (const ClutterColor * typedef struct _ClutterTextureNode ClutterTextureNode; typedef struct _ClutterTextureNodeClass ClutterTextureNodeClass; +CLUTTER_AVAILABLE_IN_1_10 GType clutter_texture_node_get_type (void) G_GNUC_CONST; +CLUTTER_AVAILABLE_IN_1_10 ClutterPaintNode * clutter_texture_node_new (CoglTexture *texture, const ClutterColor *color, ClutterScalingFilter min_filter, @@ -90,8 +94,10 @@ ClutterPaintNode * clutter_texture_node_new (CoglTexture * typedef struct _ClutterClipNode ClutterClipNode; typedef struct _ClutterClipNodeClass ClutterClipNodeClass; +CLUTTER_AVAILABLE_IN_1_10 GType clutter_clip_node_get_type (void) G_GNUC_CONST; +CLUTTER_AVAILABLE_IN_1_10 ClutterPaintNode * clutter_clip_node_new (void); #define CLUTTER_TYPE_PIPELINE_NODE (clutter_pipeline_node_get_type ()) @@ -109,9 +115,11 @@ ClutterPaintNode * clutter_clip_node_new (void); typedef struct _ClutterPipelineNode ClutterPipelineNode; typedef struct _ClutterPipelineNodeClass ClutterPipelineNodeClass; +CLUTTER_AVAILABLE_IN_1_10 GType clutter_pipeline_node_get_type (void) G_GNUC_CONST; #if defined(COGL_ENABLE_EXPERIMENTAL_2_0_API) && defined(CLUTTER_ENABLE_EXPERIMENTAL_API) +CLUTTER_AVAILABLE_IN_1_10 ClutterPaintNode * clutter_pipeline_node_new (CoglPipeline *pipeline); #endif /* COGL_ENABLE_EXPERIMENTAL_2_0_API && CLUTTER_ENABLE_EXPERIMENTAL_API */ @@ -130,8 +138,10 @@ ClutterPaintNode * clutter_pipeline_node_new (CoglPipeline * typedef struct _ClutterTextNode ClutterTextNode; typedef struct _ClutterTextNodeClass ClutterTextNodeClass; +CLUTTER_AVAILABLE_IN_1_10 GType clutter_text_node_get_type (void) G_GNUC_CONST; +CLUTTER_AVAILABLE_IN_1_10 ClutterPaintNode * clutter_text_node_new (PangoLayout *layout, const ClutterColor *color); diff --git a/clutter/clutter-property-transition.h b/clutter/clutter-property-transition.h index fae3636..09b0a95 100644 --- a/clutter/clutter-property-transition.h +++ b/clutter/clutter-property-transition.h @@ -75,12 +75,16 @@ struct _ClutterPropertyTransitionClass gpointer _padding[8]; }; +CLUTTER_AVAILABLE_IN_1_10 GType clutter_property_transition_get_type (void) G_GNUC_CONST; +CLUTTER_AVAILABLE_IN_1_10 ClutterTransition * clutter_property_transition_new (ClutterAnimatable *animatable, const char *property_name); +CLUTTER_AVAILABLE_IN_1_10 void clutter_property_transition_set_property_name (ClutterPropertyTransition *transition, const char *property_name); +CLUTTER_AVAILABLE_IN_1_10 const char * clutter_property_transition_get_property_name (ClutterPropertyTransition *transition); G_END_DECLS diff --git a/clutter/clutter-transition.h b/clutter/clutter-transition.h index 29d78b2..3323d78 100644 --- a/clutter/clutter-transition.h +++ b/clutter/clutter-transition.h @@ -93,16 +93,23 @@ struct _ClutterTransitionClass gpointer _padding[8]; }; +CLUTTER_AVAILABLE_IN_1_10 GType clutter_transition_get_type (void) G_GNUC_CONST; +CLUTTER_AVAILABLE_IN_1_10 void clutter_transition_set_interval (ClutterTransition *transition, ClutterInterval *interval); +CLUTTER_AVAILABLE_IN_1_10 ClutterInterval * clutter_transition_get_interval (ClutterTransition *transition); +CLUTTER_AVAILABLE_IN_1_10 void clutter_transition_set_animatable (ClutterTransition *transition, ClutterAnimatable *animatable); +CLUTTER_AVAILABLE_IN_1_10 ClutterAnimatable * clutter_transition_get_animatable (ClutterTransition *transition); +CLUTTER_AVAILABLE_IN_1_10 void clutter_transition_set_remove_on_complete (ClutterTransition *transition, gboolean remove_complete); +CLUTTER_AVAILABLE_IN_1_10 gboolean clutter_transition_get_remove_on_complete (ClutterTransition *transition); G_END_DECLS -- 2.7.4