brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

st: Replace deprecated macros

Browse Source
This commit is contained in:
Florian Müllner 2015-07-22 15:43:12 +02:00
parent 9b69a45eee
commit d21edcfed5
8 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/shell-embedded-window.c
View File

@ -59,7 +59,7 @@ shell_embedded_window_show (GtkWidget *widget)
/* Size is 0x0 if the GtkWindow is not shown */
clutter_actor_queue_relayout (CLUTTER_ACTOR (window->priv->actor));
if (CLUTTER_ACTOR_IS_REALIZED (window->priv->actor))
if (clutter_actor_is_realized (CLUTTER_ACTOR (window->priv->actor)))
gtk_widget_map (widget);
}
}
@ -166,7 +166,7 @@ _shell_embedded_window_set_actor (ShellEmbeddedWindow *window,
window->priv->actor = actor;
if (actor &&
CLUTTER_ACTOR_IS_MAPPED (actor) &&
clutter_actor_is_mapped (CLUTTER_ACTOR (actor)) &&
gtk_widget_get_visible (GTK_WIDGET (window)))
gtk_widget_map (GTK_WIDGET (window));
}

4
src/shell-generic-container.c
View File

@ -172,7 +172,7 @@ shell_generic_container_get_focus_chain (StWidget *widget)
child != NULL;
child = clutter_actor_get_next_sibling (child))
{
if (CLUTTER_ACTOR_IS_VISIBLE (child) &&
if (clutter_actor_is_visible (child) &&
!shell_generic_container_get_skip_paint (self, child))
focus_chain = g_list_prepend (focus_chain, child);
}
@ -273,7 +273,7 @@ shell_generic_container_get_paint_volume (ClutterActor *self,
{
const ClutterPaintVolume *child_volume;
if (!CLUTTER_ACTOR_IS_VISIBLE (child))
if (!clutter_actor_is_visible (child))
continue;
if (shell_generic_container_get_skip_paint (SHELL_GENERIC_CONTAINER (self), child))

2
src/shell-stack.c
View File

@ -155,7 +155,7 @@ shell_stack_navigate_focus (StWidget *widget,
if (from && clutter_actor_contains (CLUTTER_ACTOR (widget), from))
return FALSE;
if (CLUTTER_ACTOR_IS_MAPPED (CLUTTER_ACTOR (widget)))
if (clutter_actor_is_mapped (CLUTTER_ACTOR (widget)))
{
clutter_actor_grab_key_focus (CLUTTER_ACTOR (widget));
return TRUE;

8
src/st/st-bin.c
View File

@ -101,7 +101,7 @@ st_bin_allocate (ClutterActor *self,
clutter_actor_set_allocation (self, box, flags);
if (priv->child && CLUTTER_ACTOR_IS_VISIBLE (priv->child))
if (priv->child && clutter_actor_is_visible (priv->child))
{
StThemeNode *theme_node = st_widget_get_theme_node (ST_WIDGET (self));
ClutterActorBox childbox;
@ -128,7 +128,7 @@ st_bin_get_preferred_width (ClutterActor *self,
st_theme_node_adjust_for_height (theme_node, &for_height);
if (priv->child == NULL || !CLUTTER_ACTOR_IS_VISIBLE (priv->child))
if (priv->child == NULL || !clutter_actor_is_visible (priv->child))
{
if (min_width_p)
*min_width_p = 0;
@ -157,7 +157,7 @@ st_bin_get_preferred_height (ClutterActor *self,
st_theme_node_adjust_for_width (theme_node, &for_width);
if (priv->child == NULL || !CLUTTER_ACTOR_IS_VISIBLE (priv->child))
if (priv->child == NULL || !clutter_actor_is_visible (priv->child))
{
if (min_height_p)
*min_height_p = 0;
@ -209,7 +209,7 @@ st_bin_navigate_focus (StWidget *widget,
if (from && clutter_actor_contains (bin_actor, from))
return FALSE;
if (CLUTTER_ACTOR_IS_MAPPED (bin_actor))
if (clutter_actor_is_mapped (bin_actor))
{
clutter_actor_grab_key_focus (bin_actor);
return TRUE;

2
src/st/st-entry.c
View File

@ -304,7 +304,7 @@ st_entry_navigate_focus (StWidget *widget,
if (from == priv->entry)
return FALSE;
else if (st_widget_get_can_focus (widget) &&
CLUTTER_ACTOR_IS_MAPPED (priv->entry))
clutter_actor_is_mapped (priv->entry))
{
clutter_actor_grab_key_focus (priv->entry);
return TRUE;

2
src/st/st-scroll-bar.c
View File

@ -845,7 +845,7 @@ st_scroll_bar_notify_reactive (StScrollBar *self)
{
StScrollBarPrivate *priv = self->priv;
gboolean reactive = CLUTTER_ACTOR_IS_REACTIVE (self);
gboolean reactive = clutter_actor_get_reactive (CLUTTER_ACTOR (self));
clutter_actor_set_reactive (CLUTTER_ACTOR (priv->trough), reactive);
clutter_actor_set_reactive (CLUTTER_ACTOR (priv->handle), reactive);

4
src/st/st-scroll-view.c
View File

@ -313,7 +313,7 @@ get_scrollbar_width (StScrollView *scroll,
{
StScrollViewPrivate *priv = scroll->priv;
if (CLUTTER_ACTOR_IS_VISIBLE (priv->vscroll))
if (clutter_actor_is_visible (priv->vscroll))
{
gfloat min_size;
@ -331,7 +331,7 @@ get_scrollbar_height (StScrollView *scroll,
{
StScrollViewPrivate *priv = scroll->priv;
if (CLUTTER_ACTOR_IS_VISIBLE (priv->hscroll))
if (clutter_actor_is_visible (priv->hscroll))
{
gfloat min_size;

10
src/st/st-widget.c
View File

@ -315,7 +315,7 @@ st_widget_texture_cache_changed (StTextureCache *cache,
*/
st_theme_node_paint_state_invalidate (current_paint_state (actor));
if (CLUTTER_ACTOR_IS_MAPPED (CLUTTER_ACTOR (actor)))
if (clutter_actor_is_mapped (CLUTTER_ACTOR (actor)))
clutter_actor_queue_redraw (CLUTTER_ACTOR (actor));
}
}
@ -537,7 +537,7 @@ st_widget_style_changed (StWidget *widget)
}
/* update the style only if we are mapped */
if (CLUTTER_ACTOR_IS_MAPPED (CLUTTER_ACTOR (widget)))
if (clutter_actor_is_mapped (CLUTTER_ACTOR (widget)))
st_widget_recompute_style (widget, old_theme_node);
if (old_theme_node)
@ -794,7 +794,7 @@ st_widget_get_paint_volume (ClutterActor *self,
{
const ClutterPaintVolume *child_volume;
if (!CLUTTER_ACTOR_IS_VISIBLE (child))
if (!clutter_actor_is_visible (child))
continue;
child_volume = clutter_actor_get_transformed_paint_volume (child, self);
@ -1926,7 +1926,7 @@ st_widget_real_navigate_focus (StWidget *widget,
{
if (!focus_child)
{
if (CLUTTER_ACTOR_IS_MAPPED (widget_actor))
if (clutter_actor_is_mapped (widget_actor))
{
/* Accept focus from outside */
clutter_actor_grab_key_focus (widget_actor);
@ -2847,7 +2847,7 @@ check_labels (StWidgetAccessible *widget_accessible,
*
* Gets a list of the focusable children of @widget, in "Tab"
* order. By default, this returns all visible
* (as in CLUTTER_ACTOR_IS_VISIBLE()) children of @widget.
* (as in clutter_actor_is_visible()) children of @widget.
*
* Returns: (element-type Clutter.Actor) (transfer container):
* @widget's focusable children