mirror of
https://github.com/brl/mutter.git
synced 2024-12-23 03:22:04 +00:00
Rename ClutterContainer raise() and lower() methods to avoid clashes
Language bindings will have problems with raise() and lower() bein in both ClutterContainer and ClutterActor; hence, this patch renames clutter_container_raise() and clutter_container_lower() to clutter_container_raise_child() and clutter_container_lower_child(), respectively.
This commit is contained in:
parent
8ad4dde16b
commit
ab948d577f
@ -2739,7 +2739,7 @@ clutter_actor_raise (ClutterActor *self,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
clutter_container_raise (CLUTTER_CONTAINER (parent), self, below);
|
clutter_container_raise_child (CLUTTER_CONTAINER (parent), self, below);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -2778,7 +2778,7 @@ clutter_actor_lower (ClutterActor *self,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
clutter_container_lower (CLUTTER_CONTAINER (parent), self, above);
|
clutter_container_lower_child (CLUTTER_CONTAINER (parent), self, above);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -401,7 +401,7 @@ clutter_container_find_child_by_id (ClutterContainer *container,
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* clutter_container_raise:
|
* clutter_container_raise_child:
|
||||||
* @container: a #ClutterContainer
|
* @container: a #ClutterContainer
|
||||||
* @actor: the actor to raise
|
* @actor: the actor to raise
|
||||||
* @sibling: the sibling to raise to, or %NULL to raise at the top
|
* @sibling: the sibling to raise to, or %NULL to raise at the top
|
||||||
@ -411,8 +411,8 @@ clutter_container_find_child_by_id (ClutterContainer *container,
|
|||||||
* Since: 0.6
|
* Since: 0.6
|
||||||
*/
|
*/
|
||||||
void
|
void
|
||||||
clutter_container_raise (ClutterContainer *container,
|
clutter_container_raise_child (ClutterContainer *container,
|
||||||
ClutterActor *actor,
|
ClutterActor *actor,
|
||||||
ClutterActor *sibling)
|
ClutterActor *sibling)
|
||||||
{
|
{
|
||||||
g_return_if_fail (CLUTTER_IS_CONTAINER (container));
|
g_return_if_fail (CLUTTER_IS_CONTAINER (container));
|
||||||
@ -445,7 +445,7 @@ clutter_container_raise (ClutterContainer *container,
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* clutter_container_lower:
|
* clutter_container_lower_child:
|
||||||
* @container: a #ClutterContainer
|
* @container: a #ClutterContainer
|
||||||
* @actor: the actor to raise
|
* @actor: the actor to raise
|
||||||
* @sibling: the sibling to lower to, or %NULL to lower at the bottom
|
* @sibling: the sibling to lower to, or %NULL to lower at the bottom
|
||||||
@ -455,8 +455,8 @@ clutter_container_raise (ClutterContainer *container,
|
|||||||
* Since: 0.6
|
* Since: 0.6
|
||||||
*/
|
*/
|
||||||
void
|
void
|
||||||
clutter_container_lower (ClutterContainer *container,
|
clutter_container_lower_child (ClutterContainer *container,
|
||||||
ClutterActor *actor,
|
ClutterActor *actor,
|
||||||
ClutterActor *sibling)
|
ClutterActor *sibling)
|
||||||
{
|
{
|
||||||
g_return_if_fail (CLUTTER_IS_CONTAINER (container));
|
g_return_if_fail (CLUTTER_IS_CONTAINER (container));
|
||||||
|
@ -114,10 +114,10 @@ void clutter_container_foreach (ClutterContainer *container,
|
|||||||
gpointer user_data);
|
gpointer user_data);
|
||||||
ClutterActor *clutter_container_find_child_by_id (ClutterContainer *container,
|
ClutterActor *clutter_container_find_child_by_id (ClutterContainer *container,
|
||||||
guint child_id);
|
guint child_id);
|
||||||
void clutter_container_raise (ClutterContainer *container,
|
void clutter_container_raise_child (ClutterContainer *container,
|
||||||
ClutterActor *actor,
|
ClutterActor *actor,
|
||||||
ClutterActor *sibling);
|
ClutterActor *sibling);
|
||||||
void clutter_container_lower (ClutterContainer *container,
|
void clutter_container_lower_child (ClutterContainer *container,
|
||||||
ClutterActor *actor,
|
ClutterActor *actor,
|
||||||
ClutterActor *sibling);
|
ClutterActor *sibling);
|
||||||
void clutter_container_sort_depth_order (ClutterContainer *container);
|
void clutter_container_sort_depth_order (ClutterContainer *container);
|
||||||
|
@ -705,7 +705,7 @@ clutter_group_find_child_by_id (ClutterGroup *self,
|
|||||||
*
|
*
|
||||||
* FIXME
|
* FIXME
|
||||||
*
|
*
|
||||||
* Deprecated: 0.6: Use clutter_container_raise() instead.
|
* Deprecated: 0.6: Use clutter_container_raise_child() instead.
|
||||||
*/
|
*/
|
||||||
void
|
void
|
||||||
clutter_group_raise (ClutterGroup *self,
|
clutter_group_raise (ClutterGroup *self,
|
||||||
@ -719,7 +719,7 @@ clutter_group_raise (ClutterGroup *self,
|
|||||||
if (actor == sibling)
|
if (actor == sibling)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
clutter_container_raise (CLUTTER_CONTAINER (self), actor, sibling);
|
clutter_container_raise_child (CLUTTER_CONTAINER (self), actor, sibling);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -730,7 +730,7 @@ clutter_group_raise (ClutterGroup *self,
|
|||||||
*
|
*
|
||||||
* FIXME
|
* FIXME
|
||||||
*
|
*
|
||||||
* Deprecated: 0.6: Use clutter_container_lower() instead
|
* Deprecated: 0.6: Use clutter_container_lower_child() instead
|
||||||
*/
|
*/
|
||||||
void
|
void
|
||||||
clutter_group_lower (ClutterGroup *self,
|
clutter_group_lower (ClutterGroup *self,
|
||||||
@ -744,7 +744,7 @@ clutter_group_lower (ClutterGroup *self,
|
|||||||
if (actor == sibling)
|
if (actor == sibling)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
clutter_container_lower (CLUTTER_CONTAINER (self), actor, sibling);
|
clutter_container_lower_child (CLUTTER_CONTAINER (self), actor, sibling);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -219,8 +219,8 @@ clutter_container_remove_valist
|
|||||||
clutter_container_get_children
|
clutter_container_get_children
|
||||||
clutter_container_foreach
|
clutter_container_foreach
|
||||||
clutter_container_find_child_by_id
|
clutter_container_find_child_by_id
|
||||||
clutter_container_raise
|
clutter_container_raise_child
|
||||||
clutter_container_lower
|
clutter_container_lower_child
|
||||||
clutter_container_sort_depth_order
|
clutter_container_sort_depth_order
|
||||||
<SUBSECTION Standard>
|
<SUBSECTION Standard>
|
||||||
ClutterContainer
|
ClutterContainer
|
||||||
|
Loading…
Reference in New Issue
Block a user