diff options
| author | Emmanuele Bassi <ebassi@gnome.org> | 2015-01-03 20:34:20 +0000 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gnome.org> | 2015-01-03 20:34:20 +0000 |
| commit | 77ec8774a08c884d8acdf6c5f36a3e5003596626 (patch) | |
| tree | a1ebb161dd9d46d9df5545db0dbbcd2727747e68 /clutter/clutter-grid-layout.h | |
| parent | c3c89332f6541848b5c3853858249e39b116b4fd (diff) | |
| download | clutter-77ec8774a08c884d8acdf6c5f36a3e5003596626.tar.gz | |
WARNING: Massive revert commit
Revert all the work that happened on the master branch.
Sadly, this is the only way to merge the current development branch back
into master.
It is now abundantly clear that I merged the 1.99 branch far too soon,
and that Clutter 2.0 won't happen any time soon, if at all.
Since having the development happen on a separate branch throws a lot of
people into confusion, let's undo the clutter-1.99 → master merge, and
move back the development of Clutter to the master branch.
In order to do so, we need to do some surgery to the Git repository.
First, we do a massive revert in a single commit of all that happened
since the switch to 1.99 and the API version bump done with the
89a2862b057423c3c1fc666e6fa776ccacf377dd commit. The history is too long
to be reverted commit by commit without being extremely messy.
Diffstat (limited to 'clutter/clutter-grid-layout.h')
| -rw-r--r-- | clutter/clutter-grid-layout.h | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/clutter/clutter-grid-layout.h b/clutter/clutter-grid-layout.h index b3b2ebcf1..1c7644a2b 100644 --- a/clutter/clutter-grid-layout.h +++ b/clutter/clutter-grid-layout.h @@ -54,7 +54,7 @@ typedef struct _ClutterGridLayoutClass ClutterGridLayoutClass; * The #ClutterGridLayout structure contains only private data * and should be accessed using the provided API * - * + * Since: 1.12 */ struct _ClutterGridLayout { @@ -70,7 +70,7 @@ struct _ClutterGridLayout * The #ClutterGridLayoutClass structure contains only private * data and should be accessed using the provided API * - * + * Since: 1.12 */ struct _ClutterGridLayoutClass { @@ -80,13 +80,13 @@ struct _ClutterGridLayoutClass gpointer _padding[8]; }; - +CLUTTER_AVAILABLE_IN_1_12 GType clutter_grid_layout_get_type (void) G_GNUC_CONST; - +CLUTTER_AVAILABLE_IN_1_12 ClutterLayoutManager * clutter_grid_layout_new (void); - +CLUTTER_AVAILABLE_IN_1_12 void clutter_grid_layout_attach (ClutterGridLayout *layout, ClutterActor *child, gint left, @@ -94,7 +94,7 @@ void clutter_grid_layout_attach (ClutterGrid gint width, gint height); - +CLUTTER_AVAILABLE_IN_1_12 void clutter_grid_layout_attach_next_to (ClutterGridLayout *layout, ClutterActor *child, ClutterActor *sibling, @@ -102,58 +102,58 @@ void clutter_grid_layout_attach_next_to (ClutterGrid gint width, gint height); - +CLUTTER_AVAILABLE_IN_1_12 ClutterActor * clutter_grid_layout_get_child_at (ClutterGridLayout *layout, gint left, gint top); - +CLUTTER_AVAILABLE_IN_1_12 void clutter_grid_layout_insert_row (ClutterGridLayout *layout, gint position); - +CLUTTER_AVAILABLE_IN_1_12 void clutter_grid_layout_insert_column (ClutterGridLayout *layout, gint position); - +CLUTTER_AVAILABLE_IN_1_12 void clutter_grid_layout_insert_next_to (ClutterGridLayout *layout, ClutterActor *sibling, ClutterGridPosition side); - +CLUTTER_AVAILABLE_IN_1_12 void clutter_grid_layout_set_orientation (ClutterGridLayout *layout, ClutterOrientation orientation); - +CLUTTER_AVAILABLE_IN_1_12 ClutterOrientation clutter_grid_layout_get_orientation (ClutterGridLayout *layout); - +CLUTTER_AVAILABLE_IN_1_12 void clutter_grid_layout_set_column_spacing (ClutterGridLayout *layout, guint spacing); - +CLUTTER_AVAILABLE_IN_1_12 guint clutter_grid_layout_get_column_spacing (ClutterGridLayout *layout); - +CLUTTER_AVAILABLE_IN_1_12 void clutter_grid_layout_set_row_spacing (ClutterGridLayout *layout, guint spacing); - +CLUTTER_AVAILABLE_IN_1_12 guint clutter_grid_layout_get_row_spacing (ClutterGridLayout *layout); - +CLUTTER_AVAILABLE_IN_1_12 void clutter_grid_layout_set_column_homogeneous (ClutterGridLayout *layout, gboolean homogeneous); - +CLUTTER_AVAILABLE_IN_1_12 gboolean clutter_grid_layout_get_column_homogeneous (ClutterGridLayout *layout); - +CLUTTER_AVAILABLE_IN_1_12 void clutter_grid_layout_set_row_homogeneous (ClutterGridLayout *layout, gboolean homogeneous); - +CLUTTER_AVAILABLE_IN_1_12 gboolean clutter_grid_layout_get_row_homogeneous (ClutterGridLayout *layout); G_END_DECLS |