summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmmanuele Bassi <ebassi@linux.intel.com>2012-02-27 16:31:53 +0000
committerEmmanuele Bassi <ebassi@linux.intel.com>2012-02-27 16:35:09 +0000
commitfb9df4bef27a45de5471ee2937156ec5191bc201 (patch)
tree0c319d8c420a3ad6eecfdc25672b733f2dc599e1
parent7d4fa54a4b7a8c19d493da187a14081202c41271 (diff)
downloadclutter-fb9df4bef27a45de5471ee2937156ec5191bc201.tar.gz
Annotate all functions available since 1.10
Diffstat
-rw-r--r--clutter/clutter-actor.h43
-rw-r--r--clutter/clutter-event.h1
-rw-r--r--clutter/clutter-input-device.h3
-rw-r--r--clutter/clutter-offscreen-effect.h1
-rw-r--r--clutter/clutter-script.h1
-rw-r--r--clutter/clutter-text-buffer.h24
-rw-r--r--clutter/clutter-text.c6
-rw-r--r--clutter/clutter-text.h4
-rw-r--r--clutter/clutter-timeline.h6
-rw-r--r--clutter/clutter-types.h1
10 files changed, 76 insertions, 14 deletions
diff --git a/clutter/clutter-actor.h b/clutter/clutter-actor.h
index 2e6c0793c..de932d557 100644
--- a/clutter/clutter-actor.h
+++ b/clutter/clutter-actor.h
@@ -302,6 +302,7 @@ void clutter_actor_unmap
void clutter_actor_paint (ClutterActor *self);
void clutter_actor_continue_paint (ClutterActor *self);
void clutter_actor_queue_redraw (ClutterActor *self);
+CLUTTER_AVAILABLE_IN_1_10
void clutter_actor_queue_redraw_with_clip (ClutterActor *self,
const cairo_rectangle_int_t *clip);
void clutter_actor_queue_relayout (ClutterActor *self);
@@ -392,29 +393,45 @@ void clutter_actor_set_y
void clutter_actor_set_depth (ClutterActor *self,
gfloat depth);
gfloat clutter_actor_get_depth (ClutterActor *self);
+CLUTTER_AVAILABLE_IN_1_10
void clutter_actor_set_layout_manager (ClutterActor *self,
ClutterLayoutManager *manager);
+CLUTTER_AVAILABLE_IN_1_10
ClutterLayoutManager * clutter_actor_get_layout_manager (ClutterActor *self);
+CLUTTER_AVAILABLE_IN_1_10
void clutter_actor_set_x_align (ClutterActor *self,
ClutterActorAlign x_align);
+CLUTTER_AVAILABLE_IN_1_10
ClutterActorAlign clutter_actor_get_x_align (ClutterActor *self);
+CLUTTER_AVAILABLE_IN_1_10
void clutter_actor_set_y_align (ClutterActor *self,
ClutterActorAlign y_align);
+CLUTTER_AVAILABLE_IN_1_10
ClutterActorAlign clutter_actor_get_y_align (ClutterActor *self);
+CLUTTER_AVAILABLE_IN_1_10
void clutter_actor_set_margin_top (ClutterActor *self,
gfloat margin);
+CLUTTER_AVAILABLE_IN_1_10
gfloat clutter_actor_get_margin_top (ClutterActor *self);
+CLUTTER_AVAILABLE_IN_1_10
void clutter_actor_set_margin_bottom (ClutterActor *self,
gfloat margin);
+CLUTTER_AVAILABLE_IN_1_10
gfloat clutter_actor_get_margin_bottom (ClutterActor *self);
+CLUTTER_AVAILABLE_IN_1_10
void clutter_actor_set_margin_left (ClutterActor *self,
gfloat margin);
+CLUTTER_AVAILABLE_IN_1_10
gfloat clutter_actor_get_margin_left (ClutterActor *self);
+CLUTTER_AVAILABLE_IN_1_10
void clutter_actor_set_margin_right (ClutterActor *self,
gfloat margin);
+CLUTTER_AVAILABLE_IN_1_10
gfloat clutter_actor_get_margin_right (ClutterActor *self);
+CLUTTER_AVAILABLE_IN_1_10
void clutter_actor_set_margin (ClutterActor *self,
const ClutterMargin *margin);
+CLUTTER_AVAILABLE_IN_1_10
void clutter_actor_get_margin (ClutterActor *self,
ClutterMargin *margin);
@@ -447,13 +464,16 @@ gboolean clutter_actor_is_in_clone_paint
gboolean clutter_actor_get_paint_box (ClutterActor *self,
ClutterActorBox *box);
gboolean clutter_actor_has_overlaps (ClutterActor *self);
+CLUTTER_AVAILABLE_IN_1_10
void clutter_actor_set_background_color (ClutterActor *self,
const ClutterColor *color);
+CLUTTER_AVAILABLE_IN_1_10
void clutter_actor_get_background_color (ClutterActor *self,
ClutterColor *color);
const ClutterPaintVolume * clutter_actor_get_paint_volume (ClutterActor *self);
const ClutterPaintVolume * clutter_actor_get_transformed_paint_volume (ClutterActor *self,
ClutterActor *relative_to_ancestor);
+CLUTTER_AVAILABLE_IN_1_10
const ClutterPaintVolume * clutter_actor_get_default_paint_volume (ClutterActor *self);
/* Events */
@@ -477,52 +497,75 @@ void clutter_actor_set_text_direction
ClutterTextDirection clutter_actor_get_text_direction (ClutterActor *self);
/* Actor hierarchy */
+CLUTTER_AVAILABLE_IN_1_10
void clutter_actor_add_child (ClutterActor *self,
ClutterActor *child);
+CLUTTER_AVAILABLE_IN_1_10
void clutter_actor_insert_child_at_index (ClutterActor *self,
ClutterActor *child,
gint index_);
+CLUTTER_AVAILABLE_IN_1_10
void clutter_actor_insert_child_above (ClutterActor *self,
ClutterActor *child,
ClutterActor *sibling);
+CLUTTER_AVAILABLE_IN_1_10
void clutter_actor_insert_child_below (ClutterActor *self,
ClutterActor *child,
ClutterActor *sibling);
+CLUTTER_AVAILABLE_IN_1_10
void clutter_actor_replace_child (ClutterActor *self,
ClutterActor *old_child,
ClutterActor *new_child);
+CLUTTER_AVAILABLE_IN_1_10
void clutter_actor_remove_child (ClutterActor *self,
ClutterActor *child);
+CLUTTER_AVAILABLE_IN_1_10
void clutter_actor_remove_all_children (ClutterActor *self);
+CLUTTER_AVAILABLE_IN_1_10
void clutter_actor_destroy_all_children (ClutterActor *self);
+CLUTTER_AVAILABLE_IN_1_10
GList * clutter_actor_get_children (ClutterActor *self);
+CLUTTER_AVAILABLE_IN_1_10
gint clutter_actor_get_n_children (ClutterActor *self);
+CLUTTER_AVAILABLE_IN_1_10
ClutterActor * clutter_actor_get_child_at_index (ClutterActor *self,
gint index_);
+CLUTTER_AVAILABLE_IN_1_10
ClutterActor * clutter_actor_get_previous_sibling (ClutterActor *self);
+CLUTTER_AVAILABLE_IN_1_10
ClutterActor * clutter_actor_get_next_sibling (ClutterActor *self);
+CLUTTER_AVAILABLE_IN_1_10
ClutterActor * clutter_actor_get_first_child (ClutterActor *self);
+CLUTTER_AVAILABLE_IN_1_10
ClutterActor * clutter_actor_get_last_child (ClutterActor *self);
ClutterActor * clutter_actor_get_parent (ClutterActor *self);
gboolean clutter_actor_contains (ClutterActor *self,
ClutterActor *descendant);
ClutterActor* clutter_actor_get_stage (ClutterActor *actor);
+CLUTTER_AVAILABLE_IN_1_10
void clutter_actor_set_child_below_sibling (ClutterActor *self,
ClutterActor *child,
ClutterActor *sibling);
+CLUTTER_AVAILABLE_IN_1_10
void clutter_actor_set_child_above_sibling (ClutterActor *self,
ClutterActor *child,
ClutterActor *sibling);
+CLUTTER_AVAILABLE_IN_1_10
void clutter_actor_set_child_at_index (ClutterActor *self,
ClutterActor *child,
gint index_);
+CLUTTER_AVAILABLE_IN_1_10
void clutter_actor_iter_init (ClutterActorIter *iter,
ClutterActor *root);
+CLUTTER_AVAILABLE_IN_1_10
gboolean clutter_actor_iter_next (ClutterActorIter *iter,
ClutterActor **child);
+CLUTTER_AVAILABLE_IN_1_10
gboolean clutter_actor_iter_prev (ClutterActorIter *iter,
ClutterActor **child);
+CLUTTER_AVAILABLE_IN_1_10
void clutter_actor_iter_remove (ClutterActorIter *iter);
+CLUTTER_AVAILABLE_IN_1_10
void clutter_actor_iter_destroy (ClutterActorIter *iter);
/* Transformations */
diff --git a/clutter/clutter-event.h b/clutter/clutter-event.h
index 11df47131..487f131c1 100644
--- a/clutter/clutter-event.h
+++ b/clutter/clutter-event.h
@@ -422,6 +422,7 @@ void clutter_event_set_scroll_direction (ClutterEvent
ClutterScrollDirection clutter_event_get_scroll_direction (const ClutterEvent *event);
guint32 clutter_keysym_to_unicode (guint keyval);
+CLUTTER_AVAILABLE_IN_1_10
guint clutter_unicode_to_keysym (guint32 wc);
guint32 clutter_get_current_event_time (void);
diff --git a/clutter/clutter-input-device.h b/clutter/clutter-input-device.h
index 437a2ccab..a2950f885 100644
--- a/clutter/clutter-input-device.h
+++ b/clutter/clutter-input-device.h
@@ -89,9 +89,12 @@ void clutter_input_device_update_from_event (ClutterInputDev
ClutterEvent *event,
gboolean update_stage);
+CLUTTER_AVAILABLE_IN_1_10
void clutter_input_device_grab (ClutterInputDevice *device,
ClutterActor *actor);
+CLUTTER_AVAILABLE_IN_1_10
void clutter_input_device_ungrab (ClutterInputDevice *device);
+CLUTTER_AVAILABLE_IN_1_10
ClutterActor * clutter_input_device_get_grabbed_actor (ClutterInputDevice *device);
G_END_DECLS
diff --git a/clutter/clutter-offscreen-effect.h b/clutter/clutter-offscreen-effect.h
index 6b5b17164..a5987d754 100644
--- a/clutter/clutter-offscreen-effect.h
+++ b/clutter/clutter-offscreen-effect.h
@@ -96,6 +96,7 @@ GType clutter_offscreen_effect_get_type (void) G_GNUC_CONST;
CoglMaterial * clutter_offscreen_effect_get_target (ClutterOffscreenEffect *effect);
+CLUTTER_AVAILABLE_IN_1_10
CoglHandle clutter_offscreen_effect_get_texture (ClutterOffscreenEffect *effect);
void clutter_offscreen_effect_paint_target (ClutterOffscreenEffect *effect);
diff --git a/clutter/clutter-script.h b/clutter/clutter-script.h
index db33c51fc..d690dbc63 100644
--- a/clutter/clutter-script.h
+++ b/clutter/clutter-script.h
@@ -153,6 +153,7 @@ guint clutter_script_load_from_data (ClutterScript
const gchar *data,
gssize length,
GError **error);
+CLUTTER_AVAILABLE_IN_1_10
guint clutter_script_load_from_resource (ClutterScript *script,
const gchar *resource_path,
GError **error);
diff --git a/clutter/clutter-text-buffer.h b/clutter/clutter-text-buffer.h
index 06a6f94db..9b6f8ceee 100644
--- a/clutter/clutter-text-buffer.h
+++ b/clutter/clutter-text-buffer.h
@@ -26,7 +26,7 @@
#ifndef __CLUTTER_TEXT_BUFFER_H__
#define __CLUTTER_TEXT_BUFFER_H__
-#include <glib-object.h>
+#include <clutter/clutter-types.h>
G_BEGIN_DECLS
@@ -123,42 +123,46 @@ struct _ClutterTextBufferClass
void (*_clutter_reserved8) (void);
};
+CLUTTER_AVAILABLE_IN_1_10
GType clutter_text_buffer_get_type (void) G_GNUC_CONST;
+CLUTTER_AVAILABLE_IN_1_10
ClutterTextBuffer* clutter_text_buffer_new (void);
-
+CLUTTER_AVAILABLE_IN_1_10
ClutterTextBuffer* clutter_text_buffer_new_with_text (const gchar *text,
gssize text_len);
+CLUTTER_AVAILABLE_IN_1_10
gsize clutter_text_buffer_get_bytes (ClutterTextBuffer *buffer);
-
+CLUTTER_AVAILABLE_IN_1_10
guint clutter_text_buffer_get_length (ClutterTextBuffer *buffer);
-
+CLUTTER_AVAILABLE_IN_1_10
const gchar* clutter_text_buffer_get_text (ClutterTextBuffer *buffer);
-
+CLUTTER_AVAILABLE_IN_1_10
void clutter_text_buffer_set_text (ClutterTextBuffer *buffer,
const gchar *chars,
gint n_chars);
-
+CLUTTER_AVAILABLE_IN_1_10
void clutter_text_buffer_set_max_length (ClutterTextBuffer *buffer,
gint max_length);
-
+CLUTTER_AVAILABLE_IN_1_10
gint clutter_text_buffer_get_max_length (ClutterTextBuffer *buffer);
+CLUTTER_AVAILABLE_IN_1_10
guint clutter_text_buffer_insert_text (ClutterTextBuffer *buffer,
guint position,
const gchar *chars,
gint n_chars);
-
+CLUTTER_AVAILABLE_IN_1_10
guint clutter_text_buffer_delete_text (ClutterTextBuffer *buffer,
guint position,
gint n_chars);
-
+CLUTTER_AVAILABLE_IN_1_10
void clutter_text_buffer_emit_inserted_text (ClutterTextBuffer *buffer,
guint position,
const gchar *chars,
guint n_chars);
-
+CLUTTER_AVAILABLE_IN_1_10
void clutter_text_buffer_emit_deleted_text (ClutterTextBuffer *buffer,
guint position,
guint n_chars);
diff --git a/clutter/clutter-text.c b/clutter/clutter-text.c
index a74f014c1..464b3b898 100644
--- a/clutter/clutter-text.c
+++ b/clutter/clutter-text.c
@@ -3881,7 +3881,7 @@ buffer_disconnect_signals (ClutterText *self)
*
* Return value: a new #ClutterText
*
- * Since: 1.8
+ * Since: 1.10
*/
ClutterActor *
clutter_text_new_with_buffer (ClutterTextBuffer *buffer)
@@ -3899,7 +3899,7 @@ clutter_text_new_with_buffer (ClutterTextBuffer *buffer)
*
* Returns: (transfer none): A #GtkEntryBuffer object.
*
- * Since: 1.8
+ * Since: 1.10
*/
ClutterTextBuffer*
clutter_text_get_buffer (ClutterText *self)
@@ -3917,7 +3917,7 @@ clutter_text_get_buffer (ClutterText *self)
* Set the #ClutterTextBuffer object which holds the text for
* this widget.
*
- * Since: 1.8
+ * Since: 1.10
*/
void
clutter_text_set_buffer (ClutterText *self,
diff --git a/clutter/clutter-text.h b/clutter/clutter-text.h
index 761136920..22c90a2f6 100644
--- a/clutter/clutter-text.h
+++ b/clutter/clutter-text.h
@@ -103,8 +103,11 @@ ClutterActor * clutter_text_new_full (const gchar *f
const ClutterColor *color);
ClutterActor * clutter_text_new_with_text (const gchar *font_name,
const gchar *text);
+CLUTTER_AVAILABLE_IN_1_10
ClutterActor * clutter_text_new_with_buffer (ClutterTextBuffer *buffer);
+CLUTTER_AVAILABLE_IN_1_10
ClutterTextBuffer * clutter_text_get_buffer (ClutterText *self);
+CLUTTER_AVAILABLE_IN_1_10
void clutter_text_set_buffer (ClutterText *self,
ClutterTextBuffer *buffer);
const gchar * clutter_text_get_text (ClutterText *self);
@@ -210,6 +213,7 @@ void clutter_text_get_selected_text_color (ClutterText
ClutterColor *color);
gboolean clutter_text_activate (ClutterText *self);
+CLUTTER_AVAILABLE_IN_1_10
gint clutter_text_coords_to_position (ClutterText *self,
gfloat x,
gfloat y);
diff --git a/clutter/clutter-timeline.h b/clutter/clutter-timeline.h
index b910dc709..3833a0cc0 100644
--- a/clutter/clutter-timeline.h
+++ b/clutter/clutter-timeline.h
@@ -129,8 +129,10 @@ void clutter_timeline_stop (Clutter
void clutter_timeline_set_auto_reverse (ClutterTimeline *timeline,
gboolean reverse);
gboolean clutter_timeline_get_auto_reverse (ClutterTimeline *timeline);
+CLUTTER_AVAILABLE_IN_1_10
void clutter_timeline_set_repeat_count (ClutterTimeline *timeline,
gint count);
+CLUTTER_AVAILABLE_IN_1_10
gint clutter_timeline_get_repeat_count (ClutterTimeline *timeline);
void clutter_timeline_rewind (ClutterTimeline *timeline);
void clutter_timeline_skip (ClutterTimeline *timeline,
@@ -156,13 +158,15 @@ gboolean clutter_timeline_has_marker (Clutter
const gchar *marker_name);
void clutter_timeline_advance_to_marker (ClutterTimeline *timeline,
const gchar *marker_name);
-
+CLUTTER_AVAILABLE_IN_1_10
void clutter_timeline_set_progress_func (ClutterTimeline *timeline,
ClutterTimelineProgressFunc func,
gpointer data,
GDestroyNotify notify);
+CLUTTER_AVAILABLE_IN_1_10
void clutter_timeline_set_progress_mode (ClutterTimeline *timeline,
ClutterAnimationMode mode);
+CLUTTER_AVAILABLE_IN_1_10
ClutterAnimationMode clutter_timeline_get_progress_mode (ClutterTimeline *timeline);
G_END_DECLS
diff --git a/clutter/clutter-types.h b/clutter/clutter-types.h
index cb3f2846e..d2b5fe267 100644
--- a/clutter/clutter-types.h
+++ b/clutter/clutter-types.h
@@ -255,6 +255,7 @@ void clutter_paint_volume_set_depth (ClutterPaintVolume
gfloat clutter_paint_volume_get_depth (const ClutterPaintVolume *pv);
void clutter_paint_volume_union (ClutterPaintVolume *pv,
const ClutterPaintVolume *another_pv);
+CLUTTER_AVAILABLE_IN_1_10
void clutter_paint_volume_union_box (ClutterPaintVolume *pv,
const ClutterActorBox *box);
View Lorry Controller Status