AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-19 08:30:09 +00:00
Code Issues Projects Releases Wiki Activity

Move GtkWidgetPrivate to gtkwidgetprivate.h

Browse Source 
This lets us use inlined getters for members in there,
avoiding the type checks in the public getters.
This commit is contained in:
Matthias Clasen 2015-09-06 19:58:03 -04:00
parent 7da1f8a1ce
commit 0f92a43e10
10 changed files with 426 additions and 370 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
gtk/gtkbox.c
View File

@ -463,7 +463,7 @@ count_expand_children (GtkBox *box,
{ {
child = children->data; child = children->data;
if (gtk_widget_get_visible (child->widget)) if (_gtk_widget_get_visible (child->widget))
{ {
*visible_children += 1; *visible_children += 1;
if (child->expand || gtk_widget_compute_expand (child->widget, private->orientation)) if (child->expand || gtk_widget_compute_expand (child->widget, private->orientation))
@ -526,7 +526,7 @@ gtk_box_size_allocate_no_center (GtkWidget *widget,
{ {
child = children->data; child = children->data;
if (!gtk_widget_get_visible (child->widget)) if (!_gtk_widget_get_visible (child->widget))
continue; continue;
if (private->orientation == GTK_ORIENTATION_HORIZONTAL) if (private->orientation == GTK_ORIENTATION_HORIZONTAL)
@ -607,7 +607,7 @@ gtk_box_size_allocate_no_center (GtkWidget *widget,
child = children->data; child = children->data;
/* If widget is not visible, skip it. */ /* If widget is not visible, skip it. */
if (!gtk_widget_get_visible (child->widget)) if (!_gtk_widget_get_visible (child->widget))
continue; continue;
/* If widget is packed differently skip it, but still increment i, /* If widget is packed differently skip it, but still increment i,
@ -731,7 +731,7 @@ gtk_box_size_allocate_no_center (GtkWidget *widget,
child = children->data; child = children->data;
/* If widget is not visible, skip it. */ /* If widget is not visible, skip it. */
if (!gtk_widget_get_visible (child->widget)) if (!_gtk_widget_get_visible (child->widget))
continue; continue;
/* If widget is packed differently skip it, but still increment i, /* If widget is packed differently skip it, but still increment i,
@ -848,7 +848,7 @@ gtk_box_size_allocate_with_center (GtkWidget *widget,
child = children->data; child = children->data;
if (child != priv->center && if (child != priv->center &&
gtk_widget_get_visible (child->widget)) _gtk_widget_get_visible (child->widget))
{ {
nvis[child->pack] += 1; nvis[child->pack] += 1;
if (child->expand || gtk_widget_compute_expand (child->widget, priv->orientation)) if (child->expand || gtk_widget_compute_expand (child->widget, priv->orientation))
@ -880,7 +880,7 @@ gtk_box_size_allocate_with_center (GtkWidget *widget,
child = children->data; child = children->data;
if (!gtk_widget_get_visible (child->widget)) if (!_gtk_widget_get_visible (child->widget))
continue; continue;
if (child == priv->center) if (child == priv->center)
@ -954,7 +954,7 @@ gtk_box_size_allocate_with_center (GtkWidget *widget,
child = children->data; child = children->data;
/* If widget is not visible, skip it. */ /* If widget is not visible, skip it. */
if (!gtk_widget_get_visible (child->widget)) if (!_gtk_widget_get_visible (child->widget))
continue; continue;
/* Skip the center widget */ /* Skip the center widget */
@ -1075,7 +1075,7 @@ gtk_box_size_allocate_with_center (GtkWidget *widget,
child = children->data; child = children->data;
/* If widget is not visible, skip it. */ /* If widget is not visible, skip it. */
if (!gtk_widget_get_visible (child->widget)) if (!_gtk_widget_get_visible (child->widget))
continue; continue;
/* Skip the center widget */ /* Skip the center widget */
@ -1183,7 +1183,7 @@ gtk_box_size_allocate (GtkWidget *widget,
GtkBox *box = GTK_BOX (widget); GtkBox *box = GTK_BOX (widget);
if (box->priv->center && if (box->priv->center &&
gtk_widget_get_visible (box->priv->center->widget)) _gtk_widget_get_visible (box->priv->center->widget))
gtk_box_size_allocate_with_center (widget, allocation); gtk_box_size_allocate_with_center (widget, allocation);
else else
gtk_box_size_allocate_no_center (widget, allocation); gtk_box_size_allocate_no_center (widget, allocation);
@ -1327,7 +1327,7 @@ count_widget_position (GtkWidget *widget,
{ {
CountingData *count = data; CountingData *count = data;
if (!gtk_widget_get_visible (widget)) if (!_gtk_widget_get_visible (widget))
return; return;
if (count->widget == widget) if (count->widget == widget)
@ -1377,7 +1377,7 @@ gtk_box_get_path_for_child (GtkContainer *container,
path = _gtk_widget_create_path (GTK_WIDGET (container)); path = _gtk_widget_create_path (GTK_WIDGET (container));
if (gtk_widget_get_visible (child)) if (_gtk_widget_get_visible (child))
{ {
gint position; gint position;
@ -1391,7 +1391,7 @@ gtk_box_get_path_for_child (GtkContainer *container,
for (list = children; list; list = list->next) for (list = children; list; list = list->next)
{ {
if (!gtk_widget_get_visible (list->data)) if (!_gtk_widget_get_visible (list->data))
continue; continue;
gtk_widget_path_append_for_widget (sibling_path, list->data); gtk_widget_path_append_for_widget (sibling_path, list->data);
@ -1500,7 +1500,7 @@ gtk_box_pack (GtkBox *box,
g_return_val_if_fail (GTK_IS_BOX (box), NULL); g_return_val_if_fail (GTK_IS_BOX (box), NULL);
g_return_val_if_fail (GTK_IS_WIDGET (child), NULL); g_return_val_if_fail (GTK_IS_WIDGET (child), NULL);
g_return_val_if_fail (gtk_widget_get_parent (child) == NULL, NULL); g_return_val_if_fail (_gtk_widget_get_parent (child) == NULL, NULL);
child_info = g_new (GtkBoxChild, 1); child_info = g_new (GtkBoxChild, 1);
child_info->widget = child; child_info->widget = child;
@ -1565,7 +1565,7 @@ gtk_box_get_size (GtkWidget *widget,
{ {
GtkBoxChild *child = children->data; GtkBoxChild *child = children->data;
if (gtk_widget_get_visible (child->widget)) if (_gtk_widget_get_visible (child->widget))
{ {
gint child_minimum, child_natural; gint child_minimum, child_natural;
gint child_minimum_baseline = -1, child_natural_baseline = -1; gint child_minimum_baseline = -1, child_natural_baseline = -1;
@ -1734,7 +1734,7 @@ gtk_box_compute_size_for_opposing_orientation (GtkBox *box,
{ {
child = children->data; child = children->data;
if (gtk_widget_get_visible (child->widget)) if (_gtk_widget_get_visible (child->widget))
{ {
if (private->orientation == GTK_ORIENTATION_HORIZONTAL) if (private->orientation == GTK_ORIENTATION_HORIZONTAL)
gtk_widget_get_preferred_width (child->widget, gtk_widget_get_preferred_width (child->widget,
@ -1805,7 +1805,7 @@ gtk_box_compute_size_for_opposing_orientation (GtkBox *box,
child = children->data; child = children->data;
/* If widget is not visible, skip it. */ /* If widget is not visible, skip it. */
if (!gtk_widget_get_visible (child->widget)) if (!_gtk_widget_get_visible (child->widget))
continue; continue;
/* If widget is packed differently skip it, but still increment i, /* If widget is packed differently skip it, but still increment i,
@ -1933,7 +1933,7 @@ gtk_box_compute_size_for_orientation (GtkBox *box,
{ {
GtkBoxChild *child = children->data; GtkBoxChild *child = children->data;
if (gtk_widget_get_visible (child->widget)) if (_gtk_widget_get_visible (child->widget))
{ {
if (private->orientation == GTK_ORIENTATION_HORIZONTAL) if (private->orientation == GTK_ORIENTATION_HORIZONTAL)
@ -2347,8 +2347,8 @@ gtk_box_reorder_child (GtkBox *box,
priv->children = g_list_insert_before (priv->children, new_link, child_info); priv->children = g_list_insert_before (priv->children, new_link, child_info);
gtk_widget_child_notify (child, "position"); gtk_widget_child_notify (child, "position");
if (gtk_widget_get_visible (child) && if (_gtk_widget_get_visible (child) &&
gtk_widget_get_visible (GTK_WIDGET (box))) _gtk_widget_get_visible (GTK_WIDGET (box)))
{ {
gtk_box_invalidate_order (box); gtk_box_invalidate_order (box);
gtk_widget_queue_resize (child); gtk_widget_queue_resize (child);
@ -2478,8 +2478,8 @@ gtk_box_set_child_packing (GtkBox *box,
gtk_box_invalidate_order (box); gtk_box_invalidate_order (box);
} }
if (gtk_widget_get_visible (child) if (_gtk_widget_get_visible (child) &&
&& gtk_widget_get_visible (GTK_WIDGET (box))) _gtk_widget_get_visible (GTK_WIDGET (box)))
gtk_widget_queue_resize (child); gtk_widget_queue_resize (child);
} }
gtk_widget_thaw_child_notify (child); gtk_widget_thaw_child_notify (child);
@ -2534,7 +2534,7 @@ gtk_box_remove (GtkContainer *container,
box_child_visibility_notify_cb, box_child_visibility_notify_cb,
box); box);
was_visible = gtk_widget_get_visible (widget); was_visible = _gtk_widget_get_visible (widget);
gtk_widget_unparent (widget); gtk_widget_unparent (widget);
priv->children = g_list_remove_link (priv->children, children); priv->children = g_list_remove_link (priv->children, children);

58
gtk/gtkcontainer.c
View File

@ -593,7 +593,7 @@ gtk_container_buildable_add_child (GtkBuildable *buildable,
GTK_BUILDER_WARN_INVALID_CHILD_TYPE (buildable, type); GTK_BUILDER_WARN_INVALID_CHILD_TYPE (buildable, type);
} }
else if (GTK_IS_WIDGET (child) && else if (GTK_IS_WIDGET (child) &&
gtk_widget_get_parent (GTK_WIDGET (child)) == NULL) _gtk_widget_get_parent (GTK_WIDGET (child)) == NULL)
{ {
gtk_container_add (GTK_CONTAINER (buildable), GTK_WIDGET (child)); gtk_container_add (GTK_CONTAINER (buildable), GTK_WIDGET (child));
} }
@ -613,7 +613,7 @@ gtk_container_buildable_set_child_property (GtkContainer *container,
GValue gvalue = G_VALUE_INIT; GValue gvalue = G_VALUE_INIT;
GError *error = NULL; GError *error = NULL;
if (gtk_widget_get_parent (child) != (GtkWidget *)container && if (_gtk_widget_get_parent (child) != (GtkWidget *)container &&
!GTK_IS_ASSISTANT (container) && !GTK_IS_ASSISTANT (container) &&
!GTK_IS_ACTION_BAR (container) && !GTK_IS_ACTION_BAR (container) &&
!GTK_IS_POPOVER_MENU (container)) !GTK_IS_POPOVER_MENU (container))
@ -1374,14 +1374,14 @@ gtk_container_add_with_properties (GtkContainer *container,
{ {
g_return_if_fail (GTK_IS_CONTAINER (container)); g_return_if_fail (GTK_IS_CONTAINER (container));
g_return_if_fail (GTK_IS_WIDGET (widget)); g_return_if_fail (GTK_IS_WIDGET (widget));
g_return_if_fail (gtk_widget_get_parent (widget) == NULL); g_return_if_fail (_gtk_widget_get_parent (widget) == NULL);
g_object_ref (container); g_object_ref (container);
g_object_ref (widget); g_object_ref (widget);
gtk_widget_freeze_child_notify (widget); gtk_widget_freeze_child_notify (widget);
g_signal_emit (container, container_signals[ADD], 0, widget); g_signal_emit (container, container_signals[ADD], 0, widget);
if (gtk_widget_get_parent (widget)) if (_gtk_widget_get_parent (widget))
{ {
va_list var_args; va_list var_args;
@ -1693,7 +1693,7 @@ gtk_container_set_border_width (GtkContainer *container,
g_object_notify_by_pspec (G_OBJECT (container), container_props[PROP_BORDER_WIDTH]); g_object_notify_by_pspec (G_OBJECT (container), container_props[PROP_BORDER_WIDTH]);
if (gtk_widget_get_realized (GTK_WIDGET (container))) if (_gtk_widget_get_realized (GTK_WIDGET (container)))
gtk_widget_queue_resize (GTK_WIDGET (container)); gtk_widget_queue_resize (GTK_WIDGET (container));
} }
} }
@ -1742,7 +1742,7 @@ gtk_container_add (GtkContainer *container,
g_return_if_fail (GTK_IS_CONTAINER (container)); g_return_if_fail (GTK_IS_CONTAINER (container));
g_return_if_fail (GTK_IS_WIDGET (widget)); g_return_if_fail (GTK_IS_WIDGET (widget));
parent = gtk_widget_get_parent (widget); parent = _gtk_widget_get_parent (widget);
if (parent != NULL) if (parent != NULL)
{ {
@ -1781,7 +1781,7 @@ gtk_container_remove (GtkContainer *container,
{ {
g_return_if_fail (GTK_IS_CONTAINER (container)); g_return_if_fail (GTK_IS_CONTAINER (container));
g_return_if_fail (GTK_IS_WIDGET (widget)); g_return_if_fail (GTK_IS_WIDGET (widget));
g_return_if_fail (gtk_widget_get_parent (widget) == GTK_WIDGET (container) || g_return_if_fail (_gtk_widget_get_parent (widget) == GTK_WIDGET (container) ||
GTK_IS_ASSISTANT (container) || GTK_IS_ASSISTANT (container) ||
GTK_IS_ACTION_BAR (container) || GTK_IS_ACTION_BAR (container) ||
GTK_IS_POPOVER_MENU (container)); GTK_IS_POPOVER_MENU (container));
@ -1826,13 +1826,14 @@ gtk_container_set_resize_mode (GtkContainer *container,
GtkResizeMode resize_mode) GtkResizeMode resize_mode)
{ {
GtkContainerPrivate *priv; GtkContainerPrivate *priv;
GtkWidget *widget = (GtkWidget *)container;
g_return_if_fail (GTK_IS_CONTAINER (container)); g_return_if_fail (GTK_IS_CONTAINER (container));
g_return_if_fail (resize_mode <= GTK_RESIZE_IMMEDIATE); g_return_if_fail (resize_mode <= GTK_RESIZE_IMMEDIATE);
priv = container->priv; priv = container->priv;
if (gtk_widget_is_toplevel (GTK_WIDGET (container)) && if (_gtk_widget_is_toplevel (widget) &&
resize_mode == GTK_RESIZE_PARENT) resize_mode == GTK_RESIZE_PARENT)
{ {
resize_mode = GTK_RESIZE_QUEUE; resize_mode = GTK_RESIZE_QUEUE;
@ -1842,7 +1843,7 @@ gtk_container_set_resize_mode (GtkContainer *container,
{ {
priv->resize_mode = resize_mode; priv->resize_mode = resize_mode;
gtk_widget_queue_resize (GTK_WIDGET (container)); gtk_widget_queue_resize (widget);
g_object_notify_by_pspec (G_OBJECT (container), container_props[PROP_RESIZE_MODE]); g_object_notify_by_pspec (G_OBJECT (container), container_props[PROP_RESIZE_MODE]);
} }
} }
@ -1974,9 +1975,9 @@ gtk_container_queue_resize_handler (GtkContainer *container)
widget = GTK_WIDGET (container); widget = GTK_WIDGET (container);
if (gtk_widget_get_visible (widget) && if (_gtk_widget_get_visible (widget) &&
(gtk_widget_is_toplevel (widget) || (_gtk_widget_is_toplevel (widget) ||
gtk_widget_get_realized (widget))) _gtk_widget_get_realized (widget)))
{ {
switch (container->priv->resize_mode) switch (container->priv->resize_mode)
{ {
@ -2006,9 +2007,7 @@ _gtk_container_queue_resize_internal (GtkContainer *container,
{ {
GtkWidget *widget; GtkWidget *widget;
g_return_if_fail (GTK_IS_CONTAINER (container)); widget = (GtkWidget*)container;
widget = GTK_WIDGET (container);
do do
{ {
@ -2016,16 +2015,16 @@ _gtk_container_queue_resize_internal (GtkContainer *container,
_gtk_size_request_cache_clear (_gtk_widget_peek_request_cache (widget)); _gtk_size_request_cache_clear (_gtk_widget_peek_request_cache (widget));
G_GNUC_BEGIN_IGNORE_DEPRECATIONS; G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
if (GTK_IS_RESIZE_CONTAINER (widget)) if (((GtkContainer*)widget)->priv->resize_mode != GTK_RESIZE_PARENT)
break; break;
G_GNUC_END_IGNORE_DEPRECATIONS; G_GNUC_END_IGNORE_DEPRECATIONS;
widget = gtk_widget_get_parent (widget); widget = _gtk_widget_get_parent (widget);
} }
while (widget); while (widget);
if (widget && !invalidate_only) if (widget && !invalidate_only)
gtk_container_queue_resize_handler (GTK_CONTAINER (widget)); gtk_container_queue_resize_handler ((GtkContainer*)widget);
} }
void void
@ -2495,7 +2494,7 @@ _gtk_container_child_composite_name (GtkContainer *container,
g_return_val_if_fail (GTK_IS_CONTAINER (container), NULL); g_return_val_if_fail (GTK_IS_CONTAINER (container), NULL);
g_return_val_if_fail (GTK_IS_WIDGET (child), NULL); g_return_val_if_fail (GTK_IS_WIDGET (child), NULL);
g_return_val_if_fail (gtk_widget_get_parent (child) == GTK_WIDGET (container), NULL); g_return_val_if_fail (_gtk_widget_get_parent (child) == GTK_WIDGET (container), NULL);
g_object_get (child, "composite-child", &composite_child, NULL); g_object_get (child, "composite-child", &composite_child, NULL);
if (composite_child) if (composite_child)
@ -2658,9 +2657,10 @@ gtk_container_real_get_path_for_child (GtkContainer *container,
GtkStyleContext *context; GtkStyleContext *context;
GtkWidgetPath *path; GtkWidgetPath *path;
GList *classes; GList *classes;
GtkWidget *widget = (GtkWidget *)container;
context = gtk_widget_get_style_context (GTK_WIDGET (container)); context = _gtk_widget_get_style_context (widget);
path = _gtk_widget_create_path (GTK_WIDGET (container)); path = _gtk_widget_create_path (widget);
/* Copy any permanent classes to the path */ /* Copy any permanent classes to the path */
classes = gtk_style_context_list_classes (context); classes = gtk_style_context_list_classes (context);
@ -2818,7 +2818,7 @@ find_old_focus (GtkContainer *container,
{ {
GtkWidget *parent; GtkWidget *parent;
parent = gtk_widget_get_parent (widget); parent = _gtk_widget_get_parent (widget);
if (parent && (gtk_container_get_focus_child (GTK_CONTAINER (parent)) != widget)) if (parent && (gtk_container_get_focus_child (GTK_CONTAINER (parent)) != widget))
goto next; goto next;
@ -2840,7 +2840,7 @@ old_focus_coords (GtkContainer *container,
GdkRectangle *old_focus_rect) GdkRectangle *old_focus_rect)
{ {
GtkWidget *widget = GTK_WIDGET (container); GtkWidget *widget = GTK_WIDGET (container);
GtkWidget *toplevel = gtk_widget_get_toplevel (widget); GtkWidget *toplevel = _gtk_widget_get_toplevel (widget);
GtkWidget *old_focus; GtkWidget *old_focus;
if (GTK_IS_WINDOW (toplevel)) if (GTK_IS_WINDOW (toplevel))
@ -3152,7 +3152,7 @@ _gtk_container_focus_sort (GtkContainer *container,
while (children) while (children)
{ {
if (gtk_widget_get_realized (children->data)) if (_gtk_widget_get_realized (children->data))
visible_children = g_list_prepend (visible_children, children->data); visible_children = g_list_prepend (visible_children, children->data);
children = children->next; children = children->next;
} }
@ -3597,9 +3597,9 @@ static void
gtk_container_map_child (GtkWidget *child, gtk_container_map_child (GtkWidget *child,
gpointer client_data) gpointer client_data)
{ {
if (gtk_widget_get_visible (child) && if (_gtk_widget_get_visible (child) &&
gtk_widget_get_child_visible (child) && _gtk_widget_get_child_visible (child) &&
!gtk_widget_get_mapped (child)) !_gtk_widget_get_mapped (child))
gtk_widget_map (child); gtk_widget_map (child);
} }
@ -3704,7 +3704,7 @@ gtk_container_propagate_draw (GtkContainer *container,
g_return_if_fail (GTK_IS_WIDGET (child)); g_return_if_fail (GTK_IS_WIDGET (child));
g_return_if_fail (cr != NULL); g_return_if_fail (cr != NULL);
g_assert (gtk_widget_get_parent (child) == GTK_WIDGET (container)); g_assert (_gtk_widget_get_parent (child) == GTK_WIDGET (container));
if (!gtk_container_should_propagate_draw (container, child, cr)) if (!gtk_container_should_propagate_draw (container, child, cr))
return; return;
@ -3778,7 +3778,7 @@ gtk_container_get_path_for_child (GtkContainer *container,
g_return_val_if_fail (GTK_IS_CONTAINER (container), NULL); g_return_val_if_fail (GTK_IS_CONTAINER (container), NULL);
g_return_val_if_fail (GTK_IS_WIDGET (child), NULL); g_return_val_if_fail (GTK_IS_WIDGET (child), NULL);
g_return_val_if_fail (container == (GtkContainer *) gtk_widget_get_parent (child), NULL); g_return_val_if_fail (container == (GtkContainer *) _gtk_widget_get_parent (child), NULL);
path = GTK_CONTAINER_GET_CLASS (container)->get_path_for_child (container, child); path = GTK_CONTAINER_GET_CLASS (container)->get_path_for_child (container, child);
if (gtk_widget_path_get_object_type (path) != G_OBJECT_TYPE (child)) if (gtk_widget_path_get_object_type (path) != G_OBJECT_TYPE (child))

4
gtk/gtkcsswidgetnode.c
View File

@ -165,7 +165,7 @@ widget_needs_widget_path (GtkWidget *widget)
g_assert (i == G_N_ELEMENTS (funcs)); g_assert (i == G_N_ELEMENTS (funcs));
} }
parent = gtk_widget_get_parent (widget); parent = _gtk_widget_get_parent (widget);
if (parent == NULL) if (parent == NULL)
return FALSE; return FALSE;
@ -302,7 +302,7 @@ gtk_css_widget_node_new (GtkWidget *widget)
result = g_object_new (GTK_TYPE_CSS_WIDGET_NODE, NULL); result = g_object_new (GTK_TYPE_CSS_WIDGET_NODE, NULL);
result->widget = widget; result->widget = widget;
gtk_css_node_set_visible (GTK_CSS_NODE (result), gtk_css_node_set_visible (GTK_CSS_NODE (result),
gtk_widget_get_visible (widget)); _gtk_widget_get_visible (widget));
return GTK_CSS_NODE (result); return GTK_CSS_NODE (result);
} }

38
gtk/gtkgrid.c
View File

@ -373,8 +373,8 @@ gtk_grid_set_child_property (GtkContainer *container,
break; break;
} }
if (gtk_widget_get_visible (child) && if (_gtk_widget_get_visible (child) &&
gtk_widget_get_visible (GTK_WIDGET (grid))) _gtk_widget_get_visible (GTK_WIDGET (grid)))
gtk_widget_queue_resize (child); gtk_widget_queue_resize (child);
} }
@ -517,7 +517,7 @@ gtk_grid_remove (GtkContainer *container,
if (grid_child->widget == child) if (grid_child->widget == child)
{ {
gboolean was_visible = gtk_widget_get_visible (child); gboolean was_visible = _gtk_widget_get_visible (child);
gtk_widget_unparent (child); gtk_widget_unparent (child);
@ -525,7 +525,7 @@ gtk_grid_remove (GtkContainer *container,
g_slice_free (GtkGridChild, grid_child); g_slice_free (GtkGridChild, grid_child);
if (was_visible && gtk_widget_get_visible (GTK_WIDGET (grid))) if (was_visible && _gtk_widget_get_visible (GTK_WIDGET (grid)))
gtk_widget_queue_resize (GTK_WIDGET (grid)); gtk_widget_queue_resize (GTK_WIDGET (grid));
break; break;
@ -726,7 +726,7 @@ gtk_grid_request_non_spanning (GtkGridRequest *request,
{ {
child = list->data; child = list->data;
if (!gtk_widget_get_visible (child->widget)) if (!_gtk_widget_get_visible (child->widget))
continue; continue;
attach = &child->attach[orientation]; attach = &child->attach[orientation];
@ -857,7 +857,7 @@ gtk_grid_request_spanning (GtkGridRequest *request,
{ {
child = list->data; child = list->data;
if (!gtk_widget_get_visible (child->widget)) if (!_gtk_widget_get_visible (child->widget))
continue; continue;
attach = &child->attach[orientation]; attach = &child->attach[orientation];
@ -997,7 +997,7 @@ gtk_grid_request_compute_expand (GtkGridRequest *request,
{ {
child = list->data; child = list->data;
if (!gtk_widget_get_visible (child->widget)) if (!_gtk_widget_get_visible (child->widget))
continue; continue;
attach = &child->attach[orientation]; attach = &child->attach[orientation];
@ -1017,7 +1017,7 @@ gtk_grid_request_compute_expand (GtkGridRequest *request,
{ {
child = list->data; child = list->data;
if (!gtk_widget_get_visible (child->widget)) if (!_gtk_widget_get_visible (child->widget))
continue; continue;
attach = &child->attach[orientation]; attach = &child->attach[orientation];
@ -1617,7 +1617,7 @@ gtk_grid_request_allocate_children (GtkGridRequest *request)
{ {
child = list->data; child = list->data;
if (!gtk_widget_get_visible (child->widget)) if (!_gtk_widget_get_visible (child->widget))
continue; continue;
allocate_child (request, GTK_ORIENTATION_HORIZONTAL, child, &x, &width, &ignore); allocate_child (request, GTK_ORIENTATION_HORIZONTAL, child, &x, &width, &ignore);
@ -1836,7 +1836,7 @@ gtk_grid_attach (GtkGrid *grid,
{ {
g_return_if_fail (GTK_IS_GRID (grid)); g_return_if_fail (GTK_IS_GRID (grid));
g_return_if_fail (GTK_IS_WIDGET (child)); g_return_if_fail (GTK_IS_WIDGET (child));
g_return_if_fail (gtk_widget_get_parent (child) == NULL); g_return_if_fail (_gtk_widget_get_parent (child) == NULL);
g_return_if_fail (width > 0); g_return_if_fail (width > 0);
g_return_if_fail (height > 0); g_return_if_fail (height > 0);
@ -1876,8 +1876,8 @@ gtk_grid_attach_next_to (GtkGrid *grid,
g_return_if_fail (GTK_IS_GRID (grid)); g_return_if_fail (GTK_IS_GRID (grid));
g_return_if_fail (GTK_IS_WIDGET (child)); g_return_if_fail (GTK_IS_WIDGET (child));
g_return_if_fail (gtk_widget_get_parent (child) == NULL); g_return_if_fail (_gtk_widget_get_parent (child) == NULL);
g_return_if_fail (sibling == NULL || gtk_widget_get_parent (sibling) == (GtkWidget*)grid); g_return_if_fail (sibling == NULL || _gtk_widget_get_parent (sibling) == (GtkWidget*)grid);
g_return_if_fail (width > 0); g_return_if_fail (width > 0);
g_return_if_fail (height > 0); g_return_if_fail (height > 0);
@ -2204,7 +2204,7 @@ gtk_grid_insert_next_to (GtkGrid *grid,
g_return_if_fail (GTK_IS_GRID (grid)); g_return_if_fail (GTK_IS_GRID (grid));
g_return_if_fail (GTK_IS_WIDGET (sibling)); g_return_if_fail (GTK_IS_WIDGET (sibling));
g_return_if_fail (gtk_widget_get_parent (sibling) == (GtkWidget*)grid); g_return_if_fail (_gtk_widget_get_parent (sibling) == (GtkWidget*)grid);
child = find_grid_child (grid, sibling); child = find_grid_child (grid, sibling);
@ -2248,7 +2248,7 @@ gtk_grid_set_row_homogeneous (GtkGrid *grid,
{ {
COLUMNS (priv)->homogeneous = homogeneous; COLUMNS (priv)->homogeneous = homogeneous;
if (gtk_widget_get_visible (GTK_WIDGET (grid))) if (_gtk_widget_get_visible (GTK_WIDGET (grid)))
gtk_widget_queue_resize (GTK_WIDGET (grid)); gtk_widget_queue_resize (GTK_WIDGET (grid));
g_object_notify_by_pspec (G_OBJECT (grid), obj_properties [PROP_ROW_HOMOGENEOUS]); g_object_notify_by_pspec (G_OBJECT (grid), obj_properties [PROP_ROW_HOMOGENEOUS]);
@ -2295,7 +2295,7 @@ gtk_grid_set_column_homogeneous (GtkGrid *grid,
{ {
ROWS (priv)->homogeneous = homogeneous; ROWS (priv)->homogeneous = homogeneous;
if (gtk_widget_get_visible (GTK_WIDGET (grid))) if (_gtk_widget_get_visible (GTK_WIDGET (grid)))
gtk_widget_queue_resize (GTK_WIDGET (grid)); gtk_widget_queue_resize (GTK_WIDGET (grid));
g_object_notify_by_pspec (G_OBJECT (grid), obj_properties [PROP_COLUMN_HOMOGENEOUS]); g_object_notify_by_pspec (G_OBJECT (grid), obj_properties [PROP_COLUMN_HOMOGENEOUS]);
@ -2342,7 +2342,7 @@ gtk_grid_set_row_spacing (GtkGrid *grid,
{ {
COLUMNS (priv)->spacing = spacing; COLUMNS (priv)->spacing = spacing;
if (gtk_widget_get_visible (GTK_WIDGET (grid))) if (_gtk_widget_get_visible (GTK_WIDGET (grid)))
gtk_widget_queue_resize (GTK_WIDGET (grid)); gtk_widget_queue_resize (GTK_WIDGET (grid));
g_object_notify_by_pspec (G_OBJECT (grid), obj_properties [PROP_ROW_SPACING]); g_object_notify_by_pspec (G_OBJECT (grid), obj_properties [PROP_ROW_SPACING]);
@ -2389,7 +2389,7 @@ gtk_grid_set_column_spacing (GtkGrid *grid,
{ {
ROWS (priv)->spacing = spacing; ROWS (priv)->spacing = spacing;
if (gtk_widget_get_visible (GTK_WIDGET (grid))) if (_gtk_widget_get_visible (GTK_WIDGET (grid)))
gtk_widget_queue_resize (GTK_WIDGET (grid)); gtk_widget_queue_resize (GTK_WIDGET (grid));
g_object_notify_by_pspec (G_OBJECT (grid), obj_properties [PROP_COLUMN_SPACING]); g_object_notify_by_pspec (G_OBJECT (grid), obj_properties [PROP_COLUMN_SPACING]);
@ -2497,7 +2497,7 @@ gtk_grid_set_row_baseline_position (GtkGrid *grid,
{ {
props->baseline_position = pos; props->baseline_position = pos;
if (gtk_widget_get_visible (GTK_WIDGET (grid))) if (_gtk_widget_get_visible (GTK_WIDGET (grid)))
gtk_widget_queue_resize (GTK_WIDGET (grid)); gtk_widget_queue_resize (GTK_WIDGET (grid));
} }
} }
@ -2556,7 +2556,7 @@ gtk_grid_set_baseline_row (GtkGrid *grid,
{ {
priv->baseline_row = row; priv->baseline_row = row;
if (gtk_widget_get_visible (GTK_WIDGET (grid))) if (_gtk_widget_get_visible (GTK_WIDGET (grid)))
gtk_widget_queue_resize (GTK_WIDGET (grid)); gtk_widget_queue_resize (GTK_WIDGET (grid));
g_object_notify (G_OBJECT (grid), "baseline-row"); g_object_notify (G_OBJECT (grid), "baseline-row");
} }

10
gtk/gtksizegroup.c
View File

@ -212,9 +212,9 @@ real_queue_resize (GtkWidget *widget,
_gtk_widget_set_alloc_needed (widget, TRUE); _gtk_widget_set_alloc_needed (widget, TRUE);
_gtk_size_request_cache_clear (_gtk_widget_peek_request_cache (widget)); _gtk_size_request_cache_clear (_gtk_widget_peek_request_cache (widget));
container = gtk_widget_get_parent (widget); container = _gtk_widget_get_parent (widget);
if (!container && if (!container &&
gtk_widget_is_toplevel (widget) && GTK_IS_CONTAINER (widget)) _gtk_widget_is_toplevel (widget) && GTK_IS_CONTAINER (widget))
container = widget; container = widget;
if (container) if (container)
@ -243,7 +243,7 @@ queue_resize_on_widget (GtkWidget *widget,
if (widget == parent && !check_siblings) if (widget == parent && !check_siblings)
{ {
real_queue_resize (widget, flags); real_queue_resize (widget, flags);
parent = gtk_widget_get_parent (parent); parent = _gtk_widget_get_parent (parent);
continue; continue;
} }
@ -253,7 +253,7 @@ queue_resize_on_widget (GtkWidget *widget,
if (widget == parent) if (widget == parent)
real_queue_resize (widget, flags); real_queue_resize (widget, flags);
parent = gtk_widget_get_parent (parent); parent = _gtk_widget_get_parent (parent);
continue; continue;
} }
@ -297,7 +297,7 @@ queue_resize_on_widget (GtkWidget *widget,
g_hash_table_destroy (widgets); g_hash_table_destroy (widgets);
parent = gtk_widget_get_parent (parent); parent = _gtk_widget_get_parent (parent);
} }
} }

2
gtk/gtksizerequest.c
View File

@ -372,7 +372,7 @@ gtk_widget_compute_size_for_orientation (GtkWidget *widget,
gpointer key; gpointer key;
gint min_result = 0, nat_result = 0; gint min_result = 0, nat_result = 0;
if (!gtk_widget_get_visible (widget) && !gtk_widget_is_toplevel (widget)) if (!_gtk_widget_get_visible (widget) && !_gtk_widget_is_toplevel (widget))
{ {
if (minimum) if (minimum)
*minimum = 0; *minimum = 0;

7
gtk/gtkstylecascade.c
View File

@ -221,11 +221,10 @@ gtk_style_cascade_lookup (GtkStyleProviderPrivate *provider,
item; item;
item = gtk_style_cascade_iter_next (cascade, &iter)) item = gtk_style_cascade_iter_next (cascade, &iter))
{ {
if (GTK_IS_STYLE_PROVIDER_PRIVATE (item)) GtkStyleProviderPrivate *sp = (GtkStyleProviderPrivate*)item;
if (GTK_IS_STYLE_PROVIDER_PRIVATE (sp))
{ {
_gtk_style_provider_private_lookup (GTK_STYLE_PROVIDER_PRIVATE (item), _gtk_style_provider_private_lookup (sp, matcher, lookup,
matcher,
lookup,
change ? &iter_change : NULL); change ? &iter_change : NULL);
if (change) if (change)
*change |= iter_change; *change |= iter_change;

367
gtk/gtkwidget.c
View File

@ -45,7 +45,6 @@
#include "gtkselectionprivate.h" #include "gtkselectionprivate.h"
#include "gtksettingsprivate.h" #include "gtksettingsprivate.h"
#include "gtksizegroup-private.h" #include "gtksizegroup-private.h"
#include "gtksizerequestcacheprivate.h"
#include "gtkwidget.h" #include "gtkwidget.h"
#include "gtkwidgetprivate.h" #include "gtkwidgetprivate.h"
#include "gtkwindowprivate.h" #include "gtkwindowprivate.h"
@ -457,8 +456,6 @@
#define WIDGET_CLASS(w) GTK_WIDGET_GET_CLASS (w) #define WIDGET_CLASS(w) GTK_WIDGET_GET_CLASS (w)
#define GTK_STATE_FLAGS_BITS 12
typedef struct { typedef struct {
gchar *name; /* Name of the template automatic child */ gchar *name; /* Name of the template automatic child */
gboolean internal_child; /* Whether the automatic widget should be exported as an <internal-child> */ gboolean internal_child; /* Whether the automatic widget should be exported as an <internal-child> */
@ -486,124 +483,6 @@ typedef struct {
guint sequence_state_changed_id; guint sequence_state_changed_id;
} EventControllerData; } EventControllerData;
struct _GtkWidgetPrivate
{
/* The state of the widget. Needs to be able to hold all GtkStateFlags bits
* (defined in "gtkenums.h").
*/
guint state_flags : GTK_STATE_FLAGS_BITS;
guint direction : 2;
guint in_destruction : 1;
guint toplevel : 1;
guint anchored : 1;
guint composite_child : 1;
guint no_window : 1;
guint realized : 1;
guint mapped : 1;
guint visible : 1;
guint sensitive : 1;
guint can_focus : 1;
guint has_focus : 1;
guint can_default : 1;
guint has_default : 1;
guint receives_default : 1;
guint has_grab : 1;
guint shadowed : 1;
guint style_update_pending : 1;
guint app_paintable : 1;
guint double_buffered : 1;
guint redraw_on_alloc : 1;
guint no_show_all : 1;
guint child_visible : 1;
guint multidevice : 1;
guint has_shape_mask : 1;
guint in_reparent : 1;
/* Queue-resize related flags */
guint alloc_needed : 1;
/* Expand-related flags */
guint need_compute_expand : 1; /* Need to recompute computed_[hv]_expand */
guint computed_hexpand : 1; /* computed results (composite of child flags) */
guint computed_vexpand : 1;
guint hexpand : 1; /* application-forced expand */
guint vexpand : 1;
guint hexpand_set : 1; /* whether to use application-forced */
guint vexpand_set : 1; /* instead of computing from children */
/* SizeGroup related flags */
guint have_size_groups : 1;
guint8 alpha;
guint8 user_alpha;
/* The widget's name. If the widget does not have a name
* (the name is NULL), then its name (as returned by
* "gtk_widget_get_name") is its class's name.
* Among other things, the widget name is used to determine
* the style to use for a widget.
*/
gchar *name;
/* The list of attached windows to this widget.
* We keep a list in order to call reset_style to all of them,
* recursively. */
GList *attached_windows;
/* The style for the widget. The style contains the
* colors the widget should be drawn in for each state
* along with graphics contexts used to draw with and
* the font to use for text.
*/
GtkStyle *style;
GtkCssNode *cssnode;
GtkStyleContext *context;
/* Widget's path for styling */
GtkWidgetPath *path;
/* The widget's allocated size */
GtkAllocation allocation;
gint allocated_baseline;
GtkAllocation clip;
/* The widget's requested sizes */
SizeRequestCache requests;
/* actions attached to this or any parent widget */
GtkActionMuxer *muxer;
/* The widget's window or its parent window if it does
* not have a window. (Which will be indicated by the
* no_window field being set).
*/
GdkWindow *window;
GList *registered_windows;
/* The widget's parent */
GtkWidget *parent;
/* Animations and other things to update on clock ticks */
GList *tick_callbacks;
guint clock_tick_id;
/* A hash by GType key, containing hash tables by widget name
*/
GHashTable *auto_children;
#ifdef G_ENABLE_DEBUG
/* Number of gtk_widget_push_verify_invariants () */
guint verifying_invariants_count;
#endif /* G_ENABLE_DEBUG */
GList *event_controllers;
cairo_font_options_t *font_options;
PangoFontMap *font_map;
};
struct _GtkWidgetClassPrivate struct _GtkWidgetClassPrivate
{ {
GtkWidgetTemplate *template; GtkWidgetTemplate *template;
@ -3828,7 +3707,7 @@ gtk_widget_set_property (GObject *object,
G_GNUC_END_IGNORE_DEPRECATIONS; G_GNUC_END_IGNORE_DEPRECATIONS;
break; break;
case PROP_EVENTS: case PROP_EVENTS:
if (!gtk_widget_get_realized (widget) && gtk_widget_get_has_window (widget)) if (!_gtk_widget_get_realized (widget) && gtk_widget_get_has_window (widget))
gtk_widget_set_events (widget, g_value_get_flags (value)); gtk_widget_set_events (widget, g_value_get_flags (value));
break; break;
case PROP_NO_SHOW_ALL: case PROP_NO_SHOW_ALL:
@ -3856,7 +3735,7 @@ gtk_widget_set_property (GObject *object,
tmp = (tooltip_window != NULL || tooltip_markup != NULL); tmp = (tooltip_window != NULL || tooltip_markup != NULL);
gtk_widget_real_set_has_tooltip (widget, tmp, FALSE); gtk_widget_real_set_has_tooltip (widget, tmp, FALSE);
if (gtk_widget_get_visible (widget)) if (_gtk_widget_get_visible (widget))
gtk_widget_queue_tooltip_query (widget); gtk_widget_queue_tooltip_query (widget);
break; break;
case PROP_TOOLTIP_TEXT: case PROP_TOOLTIP_TEXT:
@ -3877,7 +3756,7 @@ gtk_widget_set_property (GObject *object,
tmp = (tooltip_window != NULL || tooltip_markup != NULL); tmp = (tooltip_window != NULL || tooltip_markup != NULL);
gtk_widget_real_set_has_tooltip (widget, tmp, FALSE); gtk_widget_real_set_has_tooltip (widget, tmp, FALSE);
if (gtk_widget_get_visible (widget)) if (_gtk_widget_get_visible (widget))
gtk_widget_queue_tooltip_query (widget); gtk_widget_queue_tooltip_query (widget);
break; break;
case PROP_DOUBLE_BUFFERED: case PROP_DOUBLE_BUFFERED:
@ -3985,7 +3864,7 @@ gtk_widget_get_property (GObject *object,
} }
break; break;
case PROP_VISIBLE: case PROP_VISIBLE:
g_value_set_boolean (value, gtk_widget_get_visible (widget)); g_value_set_boolean (value, _gtk_widget_get_visible (widget));
break; break;
case PROP_SENSITIVE: case PROP_SENSITIVE:
g_value_set_boolean (value, gtk_widget_get_sensitive (widget)); g_value_set_boolean (value, gtk_widget_get_sensitive (widget));
@ -4184,12 +4063,12 @@ _gtk_widget_emulate_press (GtkWidget *widget,
press->any.send_event = TRUE; press->any.send_event = TRUE;
next_child = event_widget; next_child = event_widget;
parent = gtk_widget_get_parent (next_child); parent = _gtk_widget_get_parent (next_child);
while (parent != widget) while (parent != widget)
{ {
next_child = parent; next_child = parent;
parent = gtk_widget_get_parent (parent); parent = _gtk_widget_get_parent (parent);
} }
/* Perform propagation state starting from the next child in the chain */ /* Perform propagation state starting from the next child in the chain */
@ -4663,8 +4542,8 @@ gtk_widget_unparent (GtkWidget *widget)
g_object_freeze_notify (G_OBJECT (widget)); g_object_freeze_notify (G_OBJECT (widget));
nqueue = g_object_notify_queue_freeze (G_OBJECT (widget), _gtk_widget_child_property_notify_context); nqueue = g_object_notify_queue_freeze (G_OBJECT (widget), _gtk_widget_child_property_notify_context);
toplevel = gtk_widget_get_toplevel (widget); toplevel = _gtk_widget_get_toplevel (widget);
if (gtk_widget_is_toplevel (toplevel)) if (_gtk_widget_is_toplevel (toplevel))
_gtk_window_unset_focus_and_default (GTK_WINDOW (toplevel), widget); _gtk_window_unset_focus_and_default (GTK_WINDOW (toplevel), widget);
if (gtk_container_get_focus_child (GTK_CONTAINER (priv->parent)) == widget) if (gtk_container_get_focus_child (GTK_CONTAINER (priv->parent)) == widget)
@ -4680,7 +4559,7 @@ gtk_widget_unparent (GtkWidget *widget)
priv->allocation.width = 1; priv->allocation.width = 1;
priv->allocation.height = 1; priv->allocation.height = 1;
if (gtk_widget_get_realized (widget)) if (_gtk_widget_get_realized (widget))
{ {
if (priv->in_reparent) if (priv->in_reparent)
gtk_widget_unmap (widget); gtk_widget_unmap (widget);
@ -4709,7 +4588,7 @@ gtk_widget_unparent (GtkWidget *widget)
* child was expand=TRUE and could therefore * child was expand=TRUE and could therefore
* be forcing it to. * be forcing it to.
*/ */
if (gtk_widget_get_visible (widget) && if (_gtk_widget_get_visible (widget) &&
(priv->need_compute_expand || (priv->need_compute_expand ||
priv->computed_hexpand || priv->computed_hexpand ||
priv->computed_vexpand)) priv->computed_vexpand))
@ -4824,12 +4703,12 @@ gtk_widget_show (GtkWidget *widget)
{ {
g_return_if_fail (GTK_IS_WIDGET (widget)); g_return_if_fail (GTK_IS_WIDGET (widget));
if (!gtk_widget_get_visible (widget)) if (!_gtk_widget_get_visible (widget))
{ {
g_object_ref (widget); g_object_ref (widget);
gtk_widget_push_verify_invariants (widget); gtk_widget_push_verify_invariants (widget);
if (!gtk_widget_is_toplevel (widget)) if (!_gtk_widget_is_toplevel (widget))
gtk_widget_queue_resize (widget); gtk_widget_queue_resize (widget);
/* see comment in set_parent() for why this should and can be /* see comment in set_parent() for why this should and can be
@ -4858,14 +4737,14 @@ gtk_widget_real_show (GtkWidget *widget)
{ {
GtkWidgetPrivate *priv = widget->priv; GtkWidgetPrivate *priv = widget->priv;
if (!gtk_widget_get_visible (widget)) if (!_gtk_widget_get_visible (widget))
{ {
priv->visible = TRUE; priv->visible = TRUE;
if (priv->parent && if (priv->parent &&
gtk_widget_get_mapped (priv->parent) && _gtk_widget_get_mapped (priv->parent) &&
gtk_widget_get_child_visible (widget) && _gtk_widget_get_child_visible (widget) &&
!gtk_widget_get_mapped (widget)) !_gtk_widget_get_mapped (widget))
gtk_widget_map (widget); gtk_widget_map (widget);
} }
} }
@ -4897,8 +4776,8 @@ gtk_widget_show_now (GtkWidget *widget)
g_return_if_fail (GTK_IS_WIDGET (widget)); g_return_if_fail (GTK_IS_WIDGET (widget));
/* make sure we will get event */ /* make sure we will get event */
if (!gtk_widget_get_mapped (widget) && if (!_gtk_widget_get_mapped (widget) &&
gtk_widget_is_toplevel (widget)) _gtk_widget_is_toplevel (widget))
{ {
gtk_widget_show (widget); gtk_widget_show (widget);
@ -4925,14 +4804,14 @@ gtk_widget_hide (GtkWidget *widget)
{ {
g_return_if_fail (GTK_IS_WIDGET (widget)); g_return_if_fail (GTK_IS_WIDGET (widget));
if (gtk_widget_get_visible (widget)) if (_gtk_widget_get_visible (widget))
{ {
GtkWidget *toplevel = gtk_widget_get_toplevel (widget); GtkWidget *toplevel = _gtk_widget_get_toplevel (widget);
g_object_ref (widget); g_object_ref (widget);
gtk_widget_push_verify_invariants (widget); gtk_widget_push_verify_invariants (widget);
if (toplevel != widget && gtk_widget_is_toplevel (toplevel)) if (toplevel != widget && _gtk_widget_is_toplevel (toplevel))
_gtk_window_unset_focus_and_default (GTK_WINDOW (toplevel), widget); _gtk_window_unset_focus_and_default (GTK_WINDOW (toplevel), widget);
/* a parent may now be expand=FALSE since we're hidden. */ /* a parent may now be expand=FALSE since we're hidden. */
@ -4946,7 +4825,7 @@ gtk_widget_hide (GtkWidget *widget)
gtk_css_node_set_visible (widget->priv->cssnode, FALSE); gtk_css_node_set_visible (widget->priv->cssnode, FALSE);
g_signal_emit (widget, widget_signals[HIDE], 0); g_signal_emit (widget, widget_signals[HIDE], 0);
if (!gtk_widget_is_toplevel (widget)) if (!_gtk_widget_is_toplevel (widget))
gtk_widget_queue_resize (widget); gtk_widget_queue_resize (widget);
g_object_notify_by_pspec (G_OBJECT (widget), widget_props[PROP_VISIBLE]); g_object_notify_by_pspec (G_OBJECT (widget), widget_props[PROP_VISIBLE]);
@ -4958,11 +4837,11 @@ gtk_widget_hide (GtkWidget *widget)
static void static void
gtk_widget_real_hide (GtkWidget *widget) gtk_widget_real_hide (GtkWidget *widget)
{ {
if (gtk_widget_get_visible (widget)) if (_gtk_widget_get_visible (widget))
{ {
widget->priv->visible = FALSE; widget->priv->visible = FALSE;
if (gtk_widget_get_mapped (widget)) if (_gtk_widget_get_mapped (widget))
gtk_widget_unmap (widget); gtk_widget_unmap (widget);
} }
} }
@ -5027,16 +4906,16 @@ gtk_widget_map (GtkWidget *widget)
GtkWidgetPrivate *priv; GtkWidgetPrivate *priv;
g_return_if_fail (GTK_IS_WIDGET (widget)); g_return_if_fail (GTK_IS_WIDGET (widget));
g_return_if_fail (gtk_widget_get_visible (widget)); g_return_if_fail (_gtk_widget_get_visible (widget));
g_return_if_fail (gtk_widget_get_child_visible (widget)); g_return_if_fail (_gtk_widget_get_child_visible (widget));
priv = widget->priv; priv = widget->priv;
if (!gtk_widget_get_mapped (widget)) if (!_gtk_widget_get_mapped (widget))
{ {
gtk_widget_push_verify_invariants (widget); gtk_widget_push_verify_invariants (widget);
if (!gtk_widget_get_realized (widget)) if (!_gtk_widget_get_realized (widget))
gtk_widget_realize (widget); gtk_widget_realize (widget);
g_signal_emit (widget, widget_signals[MAP], 0); g_signal_emit (widget, widget_signals[MAP], 0);
@ -5064,7 +4943,7 @@ gtk_widget_unmap (GtkWidget *widget)
priv = widget->priv; priv = widget->priv;
if (gtk_widget_get_mapped (widget)) if (_gtk_widget_get_mapped (widget))
{ {
g_object_ref (widget); g_object_ref (widget);
gtk_widget_push_verify_invariants (widget); gtk_widget_push_verify_invariants (widget);
@ -5497,7 +5376,7 @@ gtk_widget_realize (GtkWidget *widget)
priv = widget->priv; priv = widget->priv;
if (!gtk_widget_get_realized (widget)) if (!_gtk_widget_get_realized (widget))
{ {
gtk_widget_push_verify_invariants (widget); gtk_widget_push_verify_invariants (widget);
@ -5507,12 +5386,12 @@ gtk_widget_realize (GtkWidget *widget)
*/ */
if (priv->parent == NULL && if (priv->parent == NULL &&
!gtk_widget_is_toplevel (widget)) !_gtk_widget_is_toplevel (widget))
g_warning ("Calling gtk_widget_realize() on a widget that isn't " g_warning ("Calling gtk_widget_realize() on a widget that isn't "
"inside a toplevel window is not going to work very well. " "inside a toplevel window is not going to work very well. "
"Widgets must be inside a toplevel container before realizing them."); "Widgets must be inside a toplevel container before realizing them.");
if (priv->parent && !gtk_widget_get_realized (priv->parent)) if (priv->parent && !_gtk_widget_get_realized (priv->parent))
gtk_widget_realize (priv->parent); gtk_widget_realize (priv->parent);
G_GNUC_BEGIN_IGNORE_DEPRECATIONS; G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
@ -5575,7 +5454,7 @@ gtk_widget_unrealize (GtkWidget *widget)
if (g_object_get_qdata (G_OBJECT (widget), quark_input_shape_info)) if (g_object_get_qdata (G_OBJECT (widget), quark_input_shape_info))
gtk_widget_input_shape_combine_region (widget, NULL); gtk_widget_input_shape_combine_region (widget, NULL);
if (gtk_widget_get_realized (widget)) if (_gtk_widget_get_realized (widget))
{ {
if (widget->priv->mapped) if (widget->priv->mapped)
gtk_widget_unmap (widget); gtk_widget_unmap (widget);
@ -5631,12 +5510,12 @@ gtk_widget_queue_draw_region (GtkWidget *widget,
g_return_if_fail (GTK_IS_WIDGET (widget)); g_return_if_fail (GTK_IS_WIDGET (widget));
if (!gtk_widget_get_realized (widget)) if (!_gtk_widget_get_realized (widget))
return; return;
/* Just return if the widget or one of its ancestors isn't mapped */ /* Just return if the widget or one of its ancestors isn't mapped */
for (w = widget; w != NULL; w = w->priv->parent) for (w = widget; w != NULL; w = w->priv->parent)
if (!gtk_widget_get_mapped (w)) if (!_gtk_widget_get_mapped (w))
return; return;
WIDGET_CLASS (widget)->queue_draw_region (widget, region); WIDGET_CLASS (widget)->queue_draw_region (widget, region);
@ -5733,7 +5612,7 @@ gtk_widget_queue_resize (GtkWidget *widget)
{ {
g_return_if_fail (GTK_IS_WIDGET (widget)); g_return_if_fail (GTK_IS_WIDGET (widget));
if (gtk_widget_get_realized (widget)) if (_gtk_widget_get_realized (widget))
gtk_widget_queue_draw (widget); gtk_widget_queue_draw (widget);
_gtk_size_group_queue_resize (widget, 0); _gtk_size_group_queue_resize (widget, 0);
@ -5799,7 +5678,7 @@ gtk_widget_get_frame_clock (GtkWidget *widget)
* hierarchy anyways, but should squash any funny business with * hierarchy anyways, but should squash any funny business with
* reparenting windows and widgets. * reparenting windows and widgets.
*/ */
GtkWidget *toplevel = gtk_widget_get_toplevel (widget); GtkWidget *toplevel = _gtk_widget_get_toplevel (widget);
GdkWindow *window = gtk_widget_get_window (toplevel); GdkWindow *window = gtk_widget_get_window (toplevel);
g_assert (window != NULL); g_assert (window != NULL);
@ -5891,12 +5770,12 @@ invalidate_predicate (GdkWindow *window,
* modified by this call. * modified by this call.
*/ */
static void static void
gtk_widget_invalidate_widget_windows (GtkWidget *widget, gtk_widget_invalidate_widget_windows (GtkWidget *widget,
cairo_region_t *region) cairo_region_t *region)
{ {
GtkWidgetPrivate *priv = widget->priv; GtkWidgetPrivate *priv = widget->priv;
if (!gtk_widget_get_realized (widget)) if (!_gtk_widget_get_realized (widget))
return; return;
if (gtk_widget_get_has_window (widget) && priv->parent) if (gtk_widget_get_has_window (widget) && priv->parent)
@ -5954,7 +5833,7 @@ gtk_widget_size_allocate_with_baseline (GtkWidget *widget,
g_return_if_fail (GTK_IS_WIDGET (widget)); g_return_if_fail (GTK_IS_WIDGET (widget));
if (!priv->visible && !gtk_widget_is_toplevel (widget)) if (!priv->visible && !_gtk_widget_is_toplevel (widget))
return; return;
gtk_widget_push_verify_invariants (widget); gtk_widget_push_verify_invariants (widget);
@ -5971,7 +5850,7 @@ gtk_widget_size_allocate_with_baseline (GtkWidget *widget,
while (parent) while (parent)
{ {
depth++; depth++;
parent = gtk_widget_get_parent (parent); parent = _gtk_widget_get_parent (parent);
} }
name = g_type_name (G_OBJECT_TYPE (G_OBJECT (widget))); name = g_type_name (G_OBJECT_TYPE (G_OBJECT (widget)));
@ -6100,7 +5979,7 @@ gtk_widget_size_allocate_with_baseline (GtkWidget *widget,
position_changed |= (old_clip.x != priv->clip.x || position_changed |= (old_clip.x != priv->clip.x ||
old_clip.y != priv->clip.y); old_clip.y != priv->clip.y);
if (gtk_widget_get_mapped (widget) && priv->redraw_on_alloc) if (_gtk_widget_get_mapped (widget) && priv->redraw_on_alloc)
{ {
if (!gtk_widget_get_has_window (widget) && position_changed) if (!gtk_widget_get_has_window (widget) && position_changed)
{ {
@ -6126,7 +6005,7 @@ gtk_widget_size_allocate_with_baseline (GtkWidget *widget,
} }
if ((size_changed || position_changed || baseline_changed) && priv->parent && if ((size_changed || position_changed || baseline_changed) && priv->parent &&
gtk_widget_get_realized (priv->parent) && _gtk_container_get_reallocate_redraws (GTK_CONTAINER (priv->parent))) _gtk_widget_get_realized (priv->parent) && _gtk_container_get_reallocate_redraws (GTK_CONTAINER (priv->parent)))
{ {
cairo_region_t *invalidate = cairo_region_create_rectangle (&priv->parent->priv->clip); cairo_region_t *invalidate = cairo_region_create_rectangle (&priv->parent->priv->clip);
gtk_widget_invalidate_widget_windows (priv->parent, invalidate); gtk_widget_invalidate_widget_windows (priv->parent, invalidate);
@ -6257,7 +6136,7 @@ gtk_widget_translate_coordinates (GtkWidget *src_widget,
g_return_val_if_fail (GTK_IS_WIDGET (dest_widget), FALSE); g_return_val_if_fail (GTK_IS_WIDGET (dest_widget), FALSE);
ancestor = gtk_widget_common_ancestor (src_widget, dest_widget); ancestor = gtk_widget_common_ancestor (src_widget, dest_widget);
if (!ancestor || !gtk_widget_get_realized (src_widget) || !gtk_widget_get_realized (dest_widget)) if (!ancestor || !_gtk_widget_get_realized (src_widget) || !_gtk_widget_get_realized (dest_widget))
return FALSE; return FALSE;
/* Translate from allocation relative to window relative */ /* Translate from allocation relative to window relative */
@ -6350,7 +6229,7 @@ gtk_widget_real_size_allocate (GtkWidget *widget,
gtk_widget_set_allocation (widget, allocation); gtk_widget_set_allocation (widget, allocation);
if (gtk_widget_get_realized (widget) && if (_gtk_widget_get_realized (widget) &&
gtk_widget_get_has_window (widget)) gtk_widget_get_has_window (widget))
{ {
gdk_window_move_resize (priv->window, gdk_window_move_resize (priv->window,
@ -7122,7 +7001,7 @@ _gtk_widget_draw (GtkWidget *widget,
push_group = push_group =
widget->priv->alpha != 255 && widget->priv->alpha != 255 &&
(!gtk_widget_is_toplevel (widget) || (!_gtk_widget_is_toplevel (widget) ||
gtk_widget_get_visual (widget) == gdk_screen_get_rgba_visual (gtk_widget_get_screen (widget))); gtk_widget_get_visual (widget) == gdk_screen_get_rgba_visual (gtk_widget_get_screen (widget)));
if (push_group) if (push_group)
@ -7343,7 +7222,7 @@ gtk_widget_real_grab_broken_event (GtkWidget *widget,
} }
#define WIDGET_REALIZED_FOR_EVENT(widget, event) \ #define WIDGET_REALIZED_FOR_EVENT(widget, event) \
(event->type == GDK_FOCUS_CHANGE || gtk_widget_get_realized(widget)) (event->type == GDK_FOCUS_CHANGE || _gtk_widget_get_realized(widget))
/** /**
* gtk_widget_event: * gtk_widget_event:
@ -7599,7 +7478,7 @@ gtk_widget_send_expose (GtkWidget *widget,
cairo_t *cr; cairo_t *cr;
g_return_val_if_fail (GTK_IS_WIDGET (widget), TRUE); g_return_val_if_fail (GTK_IS_WIDGET (widget), TRUE);
g_return_val_if_fail (gtk_widget_get_realized (widget), TRUE); g_return_val_if_fail (_gtk_widget_get_realized (widget), TRUE);
g_return_val_if_fail (event != NULL, TRUE); g_return_val_if_fail (event != NULL, TRUE);
g_return_val_if_fail (event->type == GDK_EXPOSE, TRUE); g_return_val_if_fail (event->type == GDK_EXPOSE, TRUE);
@ -7934,7 +7813,7 @@ gtk_widget_reparent (GtkWidget *widget,
* the widget as we reparent it. if so we set a flag so * the widget as we reparent it. if so we set a flag so
* that gtk_widget_unparent doesn't unrealize widget * that gtk_widget_unparent doesn't unrealize widget
*/ */
if (gtk_widget_get_realized (widget) && gtk_widget_get_realized (new_parent)) if (_gtk_widget_get_realized (widget) && _gtk_widget_get_realized (new_parent))
priv->in_reparent = TRUE; priv->in_reparent = TRUE;
g_object_ref (widget); g_object_ref (widget);
@ -8110,8 +7989,8 @@ gtk_widget_real_grab_focus (GtkWidget *focus_widget)
* is the focus widget's parent, since containers above that will * is the focus widget's parent, since containers above that will
* be set by the next loop. * be set by the next loop.
*/ */
toplevel = gtk_widget_get_toplevel (focus_widget); toplevel = _gtk_widget_get_toplevel (focus_widget);
if (gtk_widget_is_toplevel (toplevel) && GTK_IS_WINDOW (toplevel)) if (_gtk_widget_is_toplevel (toplevel) && GTK_IS_WINDOW (toplevel))
{ {
widget = gtk_window_get_focus (GTK_WINDOW (toplevel)); widget = gtk_window_get_focus (GTK_WINDOW (toplevel));
@ -8280,7 +8159,7 @@ static void
gtk_widget_real_move_focus (GtkWidget *widget, gtk_widget_real_move_focus (GtkWidget *widget,
GtkDirectionType direction) GtkDirectionType direction)
{ {
GtkWidget *toplevel = gtk_widget_get_toplevel (widget); GtkWidget *toplevel = _gtk_widget_get_toplevel (widget);
if (widget != toplevel && GTK_IS_WINDOW (toplevel)) if (widget != toplevel && GTK_IS_WINDOW (toplevel))
{ {
@ -8405,7 +8284,7 @@ gtk_widget_has_visible_focus (GtkWidget *widget)
{ {
GtkWidget *toplevel; GtkWidget *toplevel;
toplevel = gtk_widget_get_toplevel (widget); toplevel = _gtk_widget_get_toplevel (widget);
if (GTK_IS_WINDOW (toplevel)) if (GTK_IS_WINDOW (toplevel))
draw_focus = gtk_window_get_focus_visible (GTK_WINDOW (toplevel)); draw_focus = gtk_window_get_focus_visible (GTK_WINDOW (toplevel));
@ -8436,7 +8315,7 @@ gtk_widget_is_focus (GtkWidget *widget)
g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE); g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
toplevel = gtk_widget_get_toplevel (widget); toplevel = _gtk_widget_get_toplevel (widget);
if (GTK_IS_WINDOW (toplevel)) if (GTK_IS_WINDOW (toplevel))
return widget == gtk_window_get_focus (GTK_WINDOW (toplevel)); return widget == gtk_window_get_focus (GTK_WINDOW (toplevel));
@ -8517,7 +8396,7 @@ _gtk_widget_set_has_default (GtkWidget *widget,
widget->priv->has_default = has_default; widget->priv->has_default = has_default;
context = gtk_widget_get_style_context (widget); context = _gtk_widget_get_style_context (widget);
if (has_default) if (has_default)
gtk_style_context_add_class (context, GTK_STYLE_CLASS_DEFAULT); gtk_style_context_add_class (context, GTK_STYLE_CLASS_DEFAULT);
@ -8547,9 +8426,9 @@ gtk_widget_grab_default (GtkWidget *widget)
g_return_if_fail (GTK_IS_WIDGET (widget)); g_return_if_fail (GTK_IS_WIDGET (widget));
g_return_if_fail (gtk_widget_get_can_default (widget)); g_return_if_fail (gtk_widget_get_can_default (widget));
window = gtk_widget_get_toplevel (widget); window = _gtk_widget_get_toplevel (widget);
if (window && gtk_widget_is_toplevel (window)) if (window && _gtk_widget_is_toplevel (window))
gtk_window_set_default (GTK_WINDOW (window), widget); gtk_window_set_default (GTK_WINDOW (window), widget);
else else
g_warning (G_STRLOC ": widget not within a GtkWindow"); g_warning (G_STRLOC ": widget not within a GtkWindow");
@ -8660,10 +8539,10 @@ gtk_widget_device_is_shadowed (GtkWidget *widget,
g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE); g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
g_return_val_if_fail (GDK_IS_DEVICE (device), FALSE); g_return_val_if_fail (GDK_IS_DEVICE (device), FALSE);
if (!gtk_widget_get_realized (widget)) if (!_gtk_widget_get_realized (widget))
return TRUE; return TRUE;
toplevel = gtk_widget_get_toplevel (widget); toplevel = _gtk_widget_get_toplevel (widget);
if (GTK_IS_WINDOW (toplevel)) if (GTK_IS_WINDOW (toplevel))
group = gtk_window_get_group (GTK_WINDOW (toplevel)); group = gtk_window_get_group (GTK_WINDOW (toplevel));
@ -9146,8 +9025,8 @@ gtk_widget_is_drawable (GtkWidget *widget)
{ {
g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE); g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
return (gtk_widget_get_visible (widget) && return (_gtk_widget_get_visible (widget) &&
gtk_widget_get_mapped (widget)); _gtk_widget_get_mapped (widget));
} }
/** /**
@ -9513,7 +9392,7 @@ gtk_widget_set_parent (GtkWidget *widget,
g_warning ("Can't set a parent on widget which has a parent\n"); g_warning ("Can't set a parent on widget which has a parent\n");
return; return;
} }
if (gtk_widget_is_toplevel (widget)) if (_gtk_widget_is_toplevel (widget))
{ {
g_warning ("Can't set a parent on a toplevel widget\n"); g_warning ("Can't set a parent on a toplevel widget\n");
return; return;
@ -9540,7 +9419,7 @@ gtk_widget_set_parent (GtkWidget *widget,
gtk_css_node_set_parent (widget->priv->cssnode, parent->priv->cssnode); gtk_css_node_set_parent (widget->priv->cssnode, parent->priv->cssnode);
if (priv->context) if (priv->context)
gtk_style_context_set_parent (priv->context, gtk_style_context_set_parent (priv->context,
gtk_widget_get_style_context (parent)); _gtk_widget_get_style_context (parent));
_gtk_widget_update_parent_muxer (widget); _gtk_widget_update_parent_muxer (widget);
@ -9551,14 +9430,14 @@ gtk_widget_set_parent (GtkWidget *widget,
/* Enforce realized/mapped invariants /* Enforce realized/mapped invariants
*/ */
if (gtk_widget_get_realized (priv->parent)) if (_gtk_widget_get_realized (priv->parent))
gtk_widget_realize (widget); gtk_widget_realize (widget);
if (gtk_widget_get_visible (priv->parent) && if (_gtk_widget_get_visible (priv->parent) &&
gtk_widget_get_visible (widget)) _gtk_widget_get_visible (widget))
{ {
if (gtk_widget_get_child_visible (widget) && if (_gtk_widget_get_child_visible (widget) &&
gtk_widget_get_mapped (priv->parent)) _gtk_widget_get_mapped (priv->parent))
gtk_widget_map (widget); gtk_widget_map (widget);
gtk_widget_queue_resize (widget); gtk_widget_queue_resize (widget);
@ -9574,7 +9453,7 @@ gtk_widget_set_parent (GtkWidget *widget,
* *
* We can't change a parent to need to expand unless we're visible. * We can't change a parent to need to expand unless we're visible.
*/ */
if (gtk_widget_get_visible (widget) && if (_gtk_widget_get_visible (widget) &&
(priv->need_compute_expand || (priv->need_compute_expand ||
priv->computed_hexpand || priv->computed_hexpand ||
priv->computed_vexpand)) priv->computed_vexpand))
@ -9618,7 +9497,7 @@ _gtk_widget_get_modifier_properties (GtkWidget *widget)
style, style,
(GDestroyNotify) g_object_unref); (GDestroyNotify) g_object_unref);
context = gtk_widget_get_style_context (widget); context = _gtk_widget_get_style_context (widget);
gtk_style_context_add_provider (context, gtk_style_context_add_provider (context,
GTK_STYLE_PROVIDER (style), GTK_STYLE_PROVIDER (style),
@ -9869,7 +9748,7 @@ gtk_widget_propagate_hierarchy_changed_recurse (GtkWidget *widget,
{ {
GtkWidgetPrivate *priv = widget->priv; GtkWidgetPrivate *priv = widget->priv;
HierarchyChangedInfo *info = client_data; HierarchyChangedInfo *info = client_data;
gboolean new_anchored = gtk_widget_is_toplevel (widget) || gboolean new_anchored = _gtk_widget_is_toplevel (widget) ||
(priv->parent && priv->parent->priv->anchored); (priv->parent && priv->parent->priv->anchored);
if (priv->anchored != new_anchored) if (priv->anchored != new_anchored)
@ -9920,7 +9799,7 @@ _gtk_widget_propagate_hierarchy_changed (GtkWidget *widget,
info.previous_toplevel = previous_toplevel; info.previous_toplevel = previous_toplevel;
info.previous_screen = previous_toplevel ? gtk_widget_get_screen (previous_toplevel) : NULL; info.previous_screen = previous_toplevel ? gtk_widget_get_screen (previous_toplevel) : NULL;
if (gtk_widget_is_toplevel (widget) || if (_gtk_widget_is_toplevel (widget) ||
(priv->parent && priv->parent->priv->anchored)) (priv->parent && priv->parent->priv->anchored))
info.new_screen = gtk_widget_get_screen (widget); info.new_screen = gtk_widget_get_screen (widget);
else else
@ -10306,7 +10185,7 @@ update_pango_context (GtkWidget *widget,
GtkStyleContext *style_context; GtkStyleContext *style_context;
GdkScreen *screen; GdkScreen *screen;
style_context = gtk_widget_get_style_context (widget); style_context = _gtk_widget_get_style_context (widget);
gtk_style_context_get (style_context, gtk_style_context_get (style_context,
gtk_widget_get_state_flags (widget), gtk_widget_get_state_flags (widget),
"font", &font_desc, "font", &font_desc,
@ -10567,7 +10446,7 @@ gtk_widget_render_icon_pixbuf (GtkWidget *widget,
g_return_val_if_fail (stock_id != NULL, NULL); g_return_val_if_fail (stock_id != NULL, NULL);
g_return_val_if_fail (size > GTK_ICON_SIZE_INVALID || size == -1, NULL); g_return_val_if_fail (size > GTK_ICON_SIZE_INVALID || size == -1, NULL);
context = gtk_widget_get_style_context (widget); context = _gtk_widget_get_style_context (widget);
G_GNUC_BEGIN_IGNORE_DEPRECATIONS; G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
icon_set = gtk_style_context_lookup_icon_set (context, stock_id); icon_set = gtk_style_context_lookup_icon_set (context, stock_id);
@ -10683,7 +10562,7 @@ gtk_widget_set_child_visible (GtkWidget *widget,
GtkWidgetPrivate *priv; GtkWidgetPrivate *priv;
g_return_if_fail (GTK_IS_WIDGET (widget)); g_return_if_fail (GTK_IS_WIDGET (widget));
g_return_if_fail (!gtk_widget_is_toplevel (widget)); g_return_if_fail (!_gtk_widget_is_toplevel (widget));
priv = widget->priv; priv = widget->priv;
@ -10698,16 +10577,16 @@ gtk_widget_set_child_visible (GtkWidget *widget,
priv->child_visible = FALSE; priv->child_visible = FALSE;
toplevel = gtk_widget_get_toplevel (widget); toplevel = _gtk_widget_get_toplevel (widget);
if (toplevel != widget && gtk_widget_is_toplevel (toplevel)) if (toplevel != widget && _gtk_widget_is_toplevel (toplevel))
_gtk_window_unset_focus_and_default (GTK_WINDOW (toplevel), widget); _gtk_window_unset_focus_and_default (GTK_WINDOW (toplevel), widget);
} }
if (priv->parent && gtk_widget_get_realized (priv->parent)) if (priv->parent && _gtk_widget_get_realized (priv->parent))
{ {
if (gtk_widget_get_mapped (priv->parent) && if (_gtk_widget_get_mapped (priv->parent) &&
priv->child_visible && priv->child_visible &&
gtk_widget_get_visible (widget)) _gtk_widget_get_visible (widget))
gtk_widget_map (widget); gtk_widget_map (widget);
else else
gtk_widget_unmap (widget); gtk_widget_unmap (widget);
@ -10743,9 +10622,9 @@ gtk_widget_get_screen_unchecked (GtkWidget *widget)
{ {
GtkWidget *toplevel; GtkWidget *toplevel;
toplevel = gtk_widget_get_toplevel (widget); toplevel = _gtk_widget_get_toplevel (widget);
if (gtk_widget_is_toplevel (toplevel)) if (_gtk_widget_is_toplevel (toplevel))
{ {
if (GTK_IS_WINDOW (toplevel)) if (GTK_IS_WINDOW (toplevel))
return gtk_window_get_screen (GTK_WINDOW (toplevel)); return gtk_window_get_screen (GTK_WINDOW (toplevel));
@ -10863,10 +10742,10 @@ gtk_widget_get_scale_factor (GtkWidget *widget)
g_return_val_if_fail (GTK_IS_WIDGET (widget), 1); g_return_val_if_fail (GTK_IS_WIDGET (widget), 1);
if (gtk_widget_get_realized (widget)) if (_gtk_widget_get_realized (widget))
return gdk_window_get_scale_factor (gtk_widget_get_window (widget)); return gdk_window_get_scale_factor (gtk_widget_get_window (widget));
toplevel = gtk_widget_get_toplevel (widget); toplevel = _gtk_widget_get_toplevel (widget);
if (toplevel && toplevel != widget) if (toplevel && toplevel != widget)
return gtk_widget_get_scale_factor (toplevel); return gtk_widget_get_scale_factor (toplevel);
@ -10966,7 +10845,7 @@ gtk_widget_child_focus (GtkWidget *widget,
g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE); g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
if (!gtk_widget_get_visible (widget) || if (!_gtk_widget_get_visible (widget) ||
!gtk_widget_is_sensitive (widget)) !gtk_widget_is_sensitive (widget))
return FALSE; return FALSE;
@ -11103,7 +10982,7 @@ gtk_widget_set_usize_internal (GtkWidget *widget,
changed = TRUE; changed = TRUE;
} }
if (gtk_widget_get_visible (widget) && changed) if (_gtk_widget_get_visible (widget) && changed)
{ {
if ((flags & GTK_QUEUE_RESIZE_INVALIDATE_ONLY) == 0) if ((flags & GTK_QUEUE_RESIZE_INVALIDATE_ONLY) == 0)
gtk_widget_queue_resize (widget); gtk_widget_queue_resize (widget);
@ -11288,7 +11167,7 @@ gtk_widget_set_events (GtkWidget *widget,
gint e; gint e;
g_return_if_fail (GTK_IS_WIDGET (widget)); g_return_if_fail (GTK_IS_WIDGET (widget));
g_return_if_fail (!gtk_widget_get_realized (widget)); g_return_if_fail (!_gtk_widget_get_realized (widget));
e = GPOINTER_TO_INT (g_object_get_qdata (G_OBJECT (widget), quark_event_mask)); e = GPOINTER_TO_INT (g_object_get_qdata (G_OBJECT (widget), quark_event_mask));
if (e != events) if (e != events)
@ -11328,7 +11207,7 @@ gtk_widget_set_device_events (GtkWidget *widget,
g_return_if_fail (GTK_IS_WIDGET (widget)); g_return_if_fail (GTK_IS_WIDGET (widget));
g_return_if_fail (GDK_IS_DEVICE (device)); g_return_if_fail (GDK_IS_DEVICE (device));
g_return_if_fail (!gtk_widget_get_realized (widget)); g_return_if_fail (!_gtk_widget_get_realized (widget));
device_events = g_object_get_qdata (G_OBJECT (widget), quark_device_event_mask); device_events = g_object_get_qdata (G_OBJECT (widget), quark_device_event_mask);
@ -11373,7 +11252,7 @@ gtk_widget_set_device_enabled (GtkWidget *widget,
g_object_set_qdata_full (G_OBJECT (widget), quark_enabled_devices, g_object_set_qdata_full (G_OBJECT (widget), quark_enabled_devices,
enabled_devices, (GDestroyNotify) g_list_free);; enabled_devices, (GDestroyNotify) g_list_free);;
if (gtk_widget_get_realized (widget)) if (_gtk_widget_get_realized (widget))
gtk_widget_set_device_enabled_internal (widget, device, TRUE, enabled); gtk_widget_set_device_enabled_internal (widget, device, TRUE, enabled);
} }
@ -11482,7 +11361,7 @@ gtk_widget_add_events (GtkWidget *widget,
g_object_set_qdata (G_OBJECT (widget), quark_event_mask, g_object_set_qdata (G_OBJECT (widget), quark_event_mask,
GINT_TO_POINTER (old_events | events)); GINT_TO_POINTER (old_events | events));
if (gtk_widget_get_realized (widget)) if (_gtk_widget_get_realized (widget))
{ {
gtk_widget_add_events_internal (widget, NULL, events); gtk_widget_add_events_internal (widget, NULL, events);
gtk_widget_update_devices_mask (widget, FALSE); gtk_widget_update_devices_mask (widget, FALSE);
@ -11527,7 +11406,7 @@ gtk_widget_add_device_events (GtkWidget *widget,
g_hash_table_insert (device_events, device, g_hash_table_insert (device_events, device,
GUINT_TO_POINTER (old_events | events)); GUINT_TO_POINTER (old_events | events));
if (gtk_widget_get_realized (widget)) if (_gtk_widget_get_realized (widget))
gtk_widget_add_events_internal (widget, device, events); gtk_widget_add_events_internal (widget, device, events);
g_object_notify_by_pspec (G_OBJECT (widget), widget_props[PROP_EVENTS]); g_object_notify_by_pspec (G_OBJECT (widget), widget_props[PROP_EVENTS]);
@ -11778,7 +11657,7 @@ gtk_widget_get_pointer (GtkWidget *widget,
if (y) if (y)
*y = -1; *y = -1;
if (gtk_widget_get_realized (widget)) if (_gtk_widget_get_realized (widget))
{ {
gdk_window_get_device_position (priv->window, gdk_window_get_device_position (priv->window,
gdk_device_manager_get_client_pointer ( gdk_device_manager_get_client_pointer (
@ -12101,11 +11980,11 @@ gtk_widget_dispose (GObject *object)
if (priv->parent) if (priv->parent)
gtk_container_remove (GTK_CONTAINER (priv->parent), widget); gtk_container_remove (GTK_CONTAINER (priv->parent), widget);
else if (gtk_widget_get_visible (widget)) else if (_gtk_widget_get_visible (widget))
gtk_widget_hide (widget); gtk_widget_hide (widget);
priv->visible = FALSE; priv->visible = FALSE;
if (gtk_widget_get_realized (widget)) if (_gtk_widget_get_realized (widget))
gtk_widget_unrealize (widget); gtk_widget_unrealize (widget);
if (!priv->in_destruction) if (!priv->in_destruction)
@ -12369,9 +12248,9 @@ gtk_widget_real_map (GtkWidget *widget)
{ {
GtkWidgetPrivate *priv = widget->priv; GtkWidgetPrivate *priv = widget->priv;
g_assert (gtk_widget_get_realized (widget)); g_assert (_gtk_widget_get_realized (widget));
if (!gtk_widget_get_mapped (widget)) if (!_gtk_widget_get_mapped (widget))
{ {
gtk_widget_set_mapped (widget, TRUE); gtk_widget_set_mapped (widget, TRUE);
@ -12393,7 +12272,7 @@ gtk_widget_real_unmap (GtkWidget *widget)
{ {
GtkWidgetPrivate *priv = widget->priv; GtkWidgetPrivate *priv = widget->priv;
if (gtk_widget_get_mapped (widget)) if (_gtk_widget_get_mapped (widget))
{ {
gtk_widget_set_mapped (widget, FALSE); gtk_widget_set_mapped (widget, FALSE);
@ -12625,7 +12504,7 @@ _gtk_widget_list_devices (GtkWidget *widget)
display = gtk_widget_get_display (widget); display = gtk_widget_get_display (widget);
device_manager = gdk_display_get_device_manager (display); device_manager = gdk_display_get_device_manager (display);
if (!gtk_widget_get_mapped (widget)) if (!_gtk_widget_get_mapped (widget))
return NULL; return NULL;
list_devices (widget, device_manager, GDK_DEVICE_TYPE_MASTER, &result); list_devices (widget, device_manager, GDK_DEVICE_TYPE_MASTER, &result);
@ -12888,9 +12767,9 @@ gtk_widget_propagate_state (GtkWidget *widget,
{ {
GtkWidget *window; GtkWidget *window;
window = gtk_widget_get_toplevel (widget); window = _gtk_widget_get_toplevel (widget);
if (window && gtk_widget_is_toplevel (window)) if (window && _gtk_widget_is_toplevel (window))
gtk_window_set_focus (GTK_WINDOW (window), NULL); gtk_window_set_focus (GTK_WINDOW (window), NULL);
} }
@ -12903,7 +12782,7 @@ gtk_widget_propagate_state (GtkWidget *widget,
if (!gtk_widget_is_sensitive (widget) && gtk_widget_has_grab (widget)) if (!gtk_widget_is_sensitive (widget) && gtk_widget_has_grab (widget))
gtk_grab_remove (widget); gtk_grab_remove (widget);
gtk_style_context_set_state (gtk_widget_get_style_context (widget), new_flags); gtk_style_context_set_state (_gtk_widget_get_style_context (widget), new_flags);
g_signal_emit (widget, widget_signals[STATE_CHANGED], 0, old_state); g_signal_emit (widget, widget_signals[STATE_CHANGED], 0, old_state);
g_signal_emit (widget, widget_signals[STATE_FLAGS_CHANGED], 0, old_flags); g_signal_emit (widget, widget_signals[STATE_FLAGS_CHANGED], 0, old_flags);
@ -13314,7 +13193,7 @@ gtk_widget_style_get_property (GtkWidget *widget,
GtkStyleContext *context; GtkStyleContext *context;
const GValue *peek_value; const GValue *peek_value;
context = gtk_widget_get_style_context (widget); context = _gtk_widget_get_style_context (widget);
peek_value = _gtk_style_context_peek_style_property (context, peek_value = _gtk_style_context_peek_style_property (context,
G_OBJECT_TYPE (widget), G_OBJECT_TYPE (widget),
@ -13357,7 +13236,7 @@ gtk_widget_style_get_valist (GtkWidget *widget,
g_return_if_fail (GTK_IS_WIDGET (widget)); g_return_if_fail (GTK_IS_WIDGET (widget));
g_object_ref (widget); g_object_ref (widget);
context = gtk_widget_get_style_context (widget); context = _gtk_widget_get_style_context (widget);
name = first_property_name; name = first_property_name;
while (name) while (name)
@ -13784,7 +13663,7 @@ gtk_widget_compute_expand (GtkWidget *widget,
g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE); g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
/* We never make a widget expand if not even showing. */ /* We never make a widget expand if not even showing. */
if (!gtk_widget_get_visible (widget)) if (!_gtk_widget_get_visible (widget))
return FALSE; return FALSE;
gtk_widget_update_computed_expand (widget); gtk_widget_update_computed_expand (widget);
@ -14623,7 +14502,7 @@ gtk_widget_buildable_custom_finished (GtkBuildable *buildable,
accel_data = (AccelGroupParserData*)user_data; accel_data = (AccelGroupParserData*)user_data;
g_assert (accel_data->object); g_assert (accel_data->object);
toplevel = gtk_widget_get_toplevel (GTK_WIDGET (accel_data->object)); toplevel = _gtk_widget_get_toplevel (GTK_WIDGET (accel_data->object));
_gtk_widget_buildable_finish_accelerator (GTK_WIDGET (buildable), toplevel, user_data); _gtk_widget_buildable_finish_accelerator (GTK_WIDGET (buildable), toplevel, user_data);
} }
@ -14689,7 +14568,7 @@ gtk_widget_buildable_custom_finished (GtkBuildable *buildable,
GtkStyleContext *context; GtkStyleContext *context;
GSList *l; GSList *l;
context = gtk_widget_get_style_context (GTK_WIDGET (buildable)); context = _gtk_widget_get_style_context (GTK_WIDGET (buildable));
for (l = style_data->classes; l; l = l->next) for (l = style_data->classes; l; l = l->next)
gtk_style_context_add_class (context, (const gchar *)l->data); gtk_style_context_add_class (context, (const gchar *)l->data);
@ -15391,7 +15270,7 @@ gtk_widget_real_set_has_tooltip (GtkWidget *widget,
if (priv_has_tooltip) if (priv_has_tooltip)
{ {
if (gtk_widget_get_realized (widget) && !gtk_widget_get_has_window (widget)) if (_gtk_widget_get_realized (widget) && !gtk_widget_get_has_window (widget))
gdk_window_set_events (priv->window, gdk_window_set_events (priv->window,
gdk_window_get_events (priv->window) | gdk_window_get_events (priv->window) |
GDK_LEAVE_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK |
@ -15447,7 +15326,7 @@ gtk_widget_set_tooltip_window (GtkWidget *widget,
has_tooltip = (custom_window != NULL || tooltip_markup != NULL); has_tooltip = (custom_window != NULL || tooltip_markup != NULL);
gtk_widget_real_set_has_tooltip (widget, has_tooltip, FALSE); gtk_widget_real_set_has_tooltip (widget, has_tooltip, FALSE);
if (has_tooltip && gtk_widget_get_visible (widget)) if (has_tooltip && _gtk_widget_get_visible (widget))
gtk_widget_queue_tooltip_query (widget); gtk_widget_queue_tooltip_query (widget);
} }
@ -15708,7 +15587,7 @@ gtk_widget_set_clip (GtkWidget *widget,
GtkWidgetPrivate *priv; GtkWidgetPrivate *priv;
g_return_if_fail (GTK_IS_WIDGET (widget)); g_return_if_fail (GTK_IS_WIDGET (widget));
g_return_if_fail (gtk_widget_get_visible (widget) || gtk_widget_is_toplevel (widget)); g_return_if_fail (_gtk_widget_get_visible (widget) || _gtk_widget_is_toplevel (widget));
g_return_if_fail (clip != NULL); g_return_if_fail (clip != NULL);
priv = widget->priv; priv = widget->priv;
@ -15725,7 +15604,7 @@ gtk_widget_set_clip (GtkWidget *widget,
while (parent) while (parent)
{ {
depth++; depth++;
parent = gtk_widget_get_parent (parent); parent = _gtk_widget_get_parent (parent);
} }
name = g_type_name (G_OBJECT_TYPE (G_OBJECT (widget))); name = g_type_name (G_OBJECT_TYPE (G_OBJECT (widget)));
@ -15746,7 +15625,7 @@ union_with_clip (GtkWidget *widget,
GtkAllocation widget_clip; GtkAllocation widget_clip;
if (!gtk_widget_is_visible (widget) || if (!gtk_widget_is_visible (widget) ||
!gtk_widget_get_child_visible (widget)) !_gtk_widget_get_child_visible (widget))
return; return;
gtk_widget_get_clip (widget, &widget_clip); gtk_widget_get_clip (widget, &widget_clip);
@ -15780,7 +15659,7 @@ _gtk_widget_set_simple_clip (GtkWidget *widget,
GtkAllocation clip, allocation; GtkAllocation clip, allocation;
GtkBorder extents; GtkBorder extents;
context = gtk_widget_get_style_context (widget); context = _gtk_widget_get_style_context (widget);
gtk_widget_get_allocation (widget, &allocation); gtk_widget_get_allocation (widget, &allocation);
@ -15879,7 +15758,7 @@ gtk_widget_set_allocation (GtkWidget *widget,
GtkWidgetPrivate *priv; GtkWidgetPrivate *priv;
g_return_if_fail (GTK_IS_WIDGET (widget)); g_return_if_fail (GTK_IS_WIDGET (widget));
g_return_if_fail (gtk_widget_get_visible (widget) || gtk_widget_is_toplevel (widget)); g_return_if_fail (_gtk_widget_get_visible (widget) || _gtk_widget_is_toplevel (widget));
g_return_if_fail (allocation != NULL); g_return_if_fail (allocation != NULL);
priv = widget->priv; priv = widget->priv;
@ -16135,7 +16014,7 @@ gtk_widget_set_support_multidevice (GtkWidget *widget,
priv = widget->priv; priv = widget->priv;
priv->multidevice = (support_multidevice == TRUE); priv->multidevice = (support_multidevice == TRUE);
if (gtk_widget_get_realized (widget)) if (_gtk_widget_get_realized (widget))
gdk_window_set_support_multidevice (priv->window, support_multidevice); gdk_window_set_support_multidevice (priv->window, support_multidevice);
} }
@ -16157,7 +16036,7 @@ gtk_widget_update_alpha (GtkWidget *widget)
alpha = priv->user_alpha; alpha = priv->user_alpha;
context = gtk_widget_get_style_context (widget); context = _gtk_widget_get_style_context (widget);
opacity = opacity =
_gtk_css_number_value_get (_gtk_style_context_peek_property (context, _gtk_css_number_value_get (_gtk_style_context_peek_property (context,
GTK_CSS_PROPERTY_OPACITY), GTK_CSS_PROPERTY_OPACITY),
@ -16170,9 +16049,9 @@ gtk_widget_update_alpha (GtkWidget *widget)
priv->alpha = alpha; priv->alpha = alpha;
if (gtk_widget_get_realized (widget)) if (_gtk_widget_get_realized (widget))
{ {
if (gtk_widget_is_toplevel (widget) && if (_gtk_widget_is_toplevel (widget) &&
gtk_widget_get_visual (widget) != gdk_screen_get_rgba_visual (gtk_widget_get_screen (widget))) gtk_widget_get_visual (widget) != gdk_screen_get_rgba_visual (gtk_widget_get_screen (widget)))
gdk_window_set_opacity (priv->window, priv->alpha / 255.0); gdk_window_set_opacity (priv->window, priv->alpha / 255.0);
@ -16546,7 +16425,7 @@ gtk_widget_clear_path (GtkWidget *widget)
void void
_gtk_widget_style_context_invalidated (GtkWidget *widget) _gtk_widget_style_context_invalidated (GtkWidget *widget)
{ {
if (gtk_widget_get_realized (widget)) if (_gtk_widget_get_realized (widget))
g_signal_emit (widget, widget_signals[STYLE_UPDATED], 0); g_signal_emit (widget, widget_signals[STYLE_UPDATED], 0);
else else
{ {
@ -16587,7 +16466,7 @@ gtk_widget_get_style_context (GtkWidget *widget)
g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL); g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
priv = widget->priv; priv = widget->priv;
if (G_UNLIKELY (priv->context == NULL)) if (G_UNLIKELY (priv->context == NULL))
{ {
GdkScreen *screen; GdkScreen *screen;
@ -16609,7 +16488,7 @@ gtk_widget_get_style_context (GtkWidget *widget)
if (priv->parent) if (priv->parent)
gtk_style_context_set_parent (priv->context, gtk_style_context_set_parent (priv->context,
gtk_widget_get_style_context (priv->parent)); _gtk_widget_get_style_context (priv->parent));
} }
return widget->priv->context; return widget->priv->context;
@ -16681,7 +16560,7 @@ _gtk_widget_get_parent_muxer (GtkWidget *widget,
else if (GTK_IS_POPOVER (widget)) else if (GTK_IS_POPOVER (widget))
parent = gtk_popover_get_relative_to (GTK_POPOVER (widget)); parent = gtk_popover_get_relative_to (GTK_POPOVER (widget));
else else
parent = gtk_widget_get_parent (widget); parent = _gtk_widget_get_parent (widget);
if (parent) if (parent)
return _gtk_widget_get_action_muxer (parent, create); return _gtk_widget_get_action_muxer (parent, create);
@ -17290,7 +17169,7 @@ event_controller_grab_notify (GtkWidget *widget,
static void static void
_gtk_widget_update_evmask (GtkWidget *widget) _gtk_widget_update_evmask (GtkWidget *widget)
{ {
if (gtk_widget_get_realized (widget)) if (_gtk_widget_get_realized (widget))
{ {
gint events = GPOINTER_TO_INT (g_object_get_qdata (G_OBJECT (widget), gint events = GPOINTER_TO_INT (g_object_get_qdata (G_OBJECT (widget),
quark_event_mask)); quark_event_mask));
@ -17341,7 +17220,7 @@ event_controller_sequence_state_changed (GtkGesture *gesture,
GTK_EVENT_SEQUENCE_DENIED, GTK_EVENT_SEQUENCE_DENIED,
NULL); NULL);
event_widget = gtk_widget_get_parent (event_widget); event_widget = _gtk_widget_get_parent (event_widget);
} }
} }

178
gtk/gtkwidgetprivate.h
View File

@ -27,11 +27,133 @@
#include "gtkcsstypesprivate.h" #include "gtkcsstypesprivate.h"
#include "gtkwidget.h" #include "gtkwidget.h"
#include "gtkcontainer.h"
#include "gtkeventcontroller.h" #include "gtkeventcontroller.h"
#include "gtkactionmuxer.h" #include "gtkactionmuxer.h"
#include "gtksizerequestcacheprivate.h"
G_BEGIN_DECLS G_BEGIN_DECLS
#define GTK_STATE_FLAGS_BITS 12
struct _GtkWidgetPrivate
{
/* The state of the widget. Needs to be able to hold all GtkStateFlags bits
* (defined in "gtkenums.h").
*/
guint state_flags : GTK_STATE_FLAGS_BITS;
guint direction : 2;
guint in_destruction : 1;
guint toplevel : 1;
guint anchored : 1;
guint composite_child : 1;
guint no_window : 1;
guint realized : 1;
guint mapped : 1;
guint visible : 1;
guint sensitive : 1;
guint can_focus : 1;
guint has_focus : 1;
guint can_default : 1;
guint has_default : 1;
guint receives_default : 1;
guint has_grab : 1;
guint shadowed : 1;
guint style_update_pending : 1;
guint app_paintable : 1;
guint double_buffered : 1;
guint redraw_on_alloc : 1;
guint no_show_all : 1;
guint child_visible : 1;
guint multidevice : 1;
guint has_shape_mask : 1;
guint in_reparent : 1;
/* Queue-resize related flags */
guint alloc_needed : 1;
/* Expand-related flags */
guint need_compute_expand : 1; /* Need to recompute computed_[hv]_expand */
guint computed_hexpand : 1; /* computed results (composite of child flags) */
guint computed_vexpand : 1;
guint hexpand : 1; /* application-forced expand */
guint vexpand : 1;
guint hexpand_set : 1; /* whether to use application-forced */
guint vexpand_set : 1; /* instead of computing from children */
/* SizeGroup related flags */
guint have_size_groups : 1;
guint8 alpha;
guint8 user_alpha;
/* The widget's name. If the widget does not have a name
* (the name is NULL), then its name (as returned by
* "gtk_widget_get_name") is its class's name.
* Among other things, the widget name is used to determine
* the style to use for a widget.
*/
gchar *name;
/* The list of attached windows to this widget.
* We keep a list in order to call reset_style to all of them,
* recursively. */
GList *attached_windows;
/* The style for the widget. The style contains the
* colors the widget should be drawn in for each state
* along with graphics contexts used to draw with and
* the font to use for text.
*/
GtkStyle *style;
GtkCssNode *cssnode;
GtkStyleContext *context;
/* Widget's path for styling */
GtkWidgetPath *path;
/* The widget's allocated size */
GtkAllocation allocation;
gint allocated_baseline;
GtkAllocation clip;
/* The widget's requested sizes */
SizeRequestCache requests;
/* actions attached to this or any parent widget */
GtkActionMuxer *muxer;
/* The widget's window or its parent window if it does
* not have a window. (Which will be indicated by the
* no_window field being set).
*/
GdkWindow *window;
GList *registered_windows;
/* The widget's parent */
GtkWidget *parent;
/* Animations and other things to update on clock ticks */
GList *tick_callbacks;
guint clock_tick_id;
/* A hash by GType key, containing hash tables by widget name
*/
GHashTable *auto_children;
#ifdef G_ENABLE_DEBUG
/* Number of gtk_widget_push_verify_invariants () */
guint verifying_invariants_count;
#endif /* G_ENABLE_DEBUG */
GList *event_controllers;
cairo_font_options_t *font_options;
PangoFontMap *font_map;
};
GtkCssNode * gtk_widget_get_css_node (GtkWidget *widget); GtkCssNode * gtk_widget_get_css_node (GtkWidget *widget);
void _gtk_widget_set_visible_flag (GtkWidget *widget, void _gtk_widget_set_visible_flag (GtkWidget *widget,
gboolean visible); gboolean visible);
@ -173,6 +295,62 @@ void gtk_widget_set_csd_input_shape (GtkWidget
gboolean gtk_widget_has_size_request (GtkWidget *widget); gboolean gtk_widget_has_size_request (GtkWidget *widget);
/* inline getters */
static inline GtkWidget *
_gtk_widget_get_parent (GtkWidget *widget)
{
return widget->priv->parent;
}
static inline gboolean
_gtk_widget_get_visible (GtkWidget *widget)
{
return widget->priv->visible;
}
static inline gboolean
_gtk_widget_get_child_visible (GtkWidget *widget)
{
return widget->priv->child_visible;
}
static inline gboolean
_gtk_widget_get_mapped (GtkWidget *widget)
{
return widget->priv->mapped;
}
static inline gboolean
_gtk_widget_get_realized (GtkWidget *widget)
{
return widget->priv->realized;
}
static inline gboolean
_gtk_widget_is_toplevel (GtkWidget *widget)
{
return widget->priv->toplevel;
}
static inline GtkWidget *
_gtk_widget_get_toplevel (GtkWidget *widget)
{
while (widget->priv->parent)
widget = widget->priv->parent;
return widget;
}
static inline GtkStyleContext *
_gtk_widget_get_style_context (GtkWidget *widget)
{
if (G_LIKELY (widget->priv->context))
return widget->priv->context;
return gtk_widget_get_style_context (widget);
}
G_END_DECLS G_END_DECLS
#endif /* __GTK_WIDGET_PRIVATE_H__ */ #endif /* __GTK_WIDGET_PRIVATE_H__ */

88
gtk/gtkwindow.c
View File

@ -1308,7 +1308,7 @@ send_delete_event (gpointer data)
void void
gtk_window_close (GtkWindow *window) gtk_window_close (GtkWindow *window)
{ {
if (!gtk_widget_get_realized (GTK_WIDGET (window))) if (!_gtk_widget_get_realized (GTK_WIDGET (window)))
return; return;
window->priv->delete_event_handler = gdk_threads_add_idle (send_delete_event, window); window->priv->delete_event_handler = gdk_threads_add_idle (send_delete_event, window);
@ -1324,7 +1324,7 @@ popover_destroy (GtkWindowPopover *popover)
popover->unmap_id = 0; popover->unmap_id = 0;
} }
if (popover->widget && gtk_widget_get_parent (popover->widget)) if (popover->widget && _gtk_widget_get_parent (popover->widget))
gtk_widget_unparent (popover->widget); gtk_widget_unparent (popover->widget);
if (popover->window) if (popover->window)
@ -2258,7 +2258,7 @@ gtk_window_set_title_internal (GtkWindow *window,
if (new_title == NULL) if (new_title == NULL)
new_title = ""; new_title = "";
if (gtk_widget_get_realized (widget)) if (_gtk_widget_get_realized (widget))
gdk_window_set_title (gtk_widget_get_window (widget), new_title); gdk_window_set_title (gtk_widget_get_window (widget), new_title);
if (update_titlebar && GTK_IS_HEADER_BAR (priv->title_box)) if (update_titlebar && GTK_IS_HEADER_BAR (priv->title_box))
@ -2342,7 +2342,7 @@ gtk_window_set_wmclass (GtkWindow *window,
g_free (priv->wmclass_class); g_free (priv->wmclass_class);
priv->wmclass_class = g_strdup (wmclass_class); priv->wmclass_class = g_strdup (wmclass_class);
if (gtk_widget_get_realized (GTK_WIDGET (window))) if (_gtk_widget_get_realized (GTK_WIDGET (window)))
g_warning ("gtk_window_set_wmclass: shouldn't set wmclass after window is realized!\n"); g_warning ("gtk_window_set_wmclass: shouldn't set wmclass after window is realized!\n");
} }
@ -2382,7 +2382,7 @@ gtk_window_set_role (GtkWindow *window,
g_free (priv->wm_role); g_free (priv->wm_role);
priv->wm_role = new_role; priv->wm_role = new_role;
if (gtk_widget_get_realized (widget)) if (_gtk_widget_get_realized (widget))
gdk_window_set_role (gtk_widget_get_window (widget), priv->wm_role); gdk_window_set_role (gtk_widget_get_window (widget), priv->wm_role);
g_object_notify_by_pspec (G_OBJECT (window), window_props[PROP_ROLE]); g_object_notify_by_pspec (G_OBJECT (window), window_props[PROP_ROLE]);
@ -2421,7 +2421,7 @@ gtk_window_set_startup_id (GtkWindow *window,
g_free (priv->startup_id); g_free (priv->startup_id);
priv->startup_id = g_strdup (startup_id); priv->startup_id = g_strdup (startup_id);
if (gtk_widget_get_realized (widget)) if (_gtk_widget_get_realized (widget))
{ {
GdkWindow *gdk_window; GdkWindow *gdk_window;
guint32 timestamp = extract_time_from_startup_id (priv->startup_id); guint32 timestamp = extract_time_from_startup_id (priv->startup_id);
@ -2516,7 +2516,7 @@ gtk_window_set_focus (GtkWindow *window,
GtkWidget *widget = priv->focus_widget; GtkWidget *widget = priv->focus_widget;
if (widget) if (widget)
{ {
while ((parent = gtk_widget_get_parent (widget))) while ((parent = _gtk_widget_get_parent (widget)))
{ {
widget = parent; widget = parent;
gtk_container_set_focus_child (GTK_CONTAINER (widget), NULL); gtk_container_set_focus_child (GTK_CONTAINER (widget), NULL);
@ -2983,7 +2983,7 @@ gtk_window_set_modal (GtkWindow *window,
widget = GTK_WIDGET (window); widget = GTK_WIDGET (window);
/* adjust desired modality state */ /* adjust desired modality state */
if (gtk_widget_get_realized (widget)) if (_gtk_widget_get_realized (widget))
gdk_window_set_modal_hint (gtk_widget_get_window (widget), priv->modal); gdk_window_set_modal_hint (gtk_widget_get_window (widget), priv->modal);
if (gtk_widget_get_visible (widget)) if (gtk_widget_get_visible (widget))
@ -3110,7 +3110,7 @@ static void
gtk_window_transient_parent_realized (GtkWidget *parent, gtk_window_transient_parent_realized (GtkWidget *parent,
GtkWidget *window) GtkWidget *window)
{ {
if (gtk_widget_get_realized (window)) if (_gtk_widget_get_realized (window))
gdk_window_set_transient_for (gtk_widget_get_window (window), gdk_window_set_transient_for (gtk_widget_get_window (window),
gtk_widget_get_window (parent)); gtk_widget_get_window (parent));
} }
@ -3119,7 +3119,7 @@ static void
gtk_window_transient_parent_unrealized (GtkWidget *parent, gtk_window_transient_parent_unrealized (GtkWidget *parent,
GtkWidget *window) GtkWidget *window)
{ {
if (gtk_widget_get_realized (window)) if (_gtk_widget_get_realized (window))
gdk_property_delete (gtk_widget_get_window (window), gdk_property_delete (gtk_widget_get_window (window),
gdk_atom_intern_static_string ("WM_TRANSIENT_FOR")); gdk_atom_intern_static_string ("WM_TRANSIENT_FOR"));
} }
@ -3198,9 +3198,9 @@ gtk_window_set_transient_for (GtkWindow *window,
if (priv->transient_parent) if (priv->transient_parent)
{ {
if (gtk_widget_get_realized (GTK_WIDGET (window)) && if (_gtk_widget_get_realized (GTK_WIDGET (window)) &&
gtk_widget_get_realized (GTK_WIDGET (priv->transient_parent)) && _gtk_widget_get_realized (GTK_WIDGET (priv->transient_parent)) &&
(!parent || !gtk_widget_get_realized (GTK_WIDGET (parent)))) (!parent || !_gtk_widget_get_realized (GTK_WIDGET (parent))))
gtk_window_transient_parent_unrealized (GTK_WIDGET (priv->transient_parent), gtk_window_transient_parent_unrealized (GTK_WIDGET (priv->transient_parent),
GTK_WIDGET (window)); GTK_WIDGET (window));
@ -3229,8 +3229,8 @@ gtk_window_set_transient_for (GtkWindow *window,
if (priv->destroy_with_parent) if (priv->destroy_with_parent)
connect_parent_destroyed (window); connect_parent_destroyed (window);
if (gtk_widget_get_realized (GTK_WIDGET (window)) && if (_gtk_widget_get_realized (GTK_WIDGET (window)) &&
gtk_widget_get_realized (GTK_WIDGET (parent))) _gtk_widget_get_realized (GTK_WIDGET (parent)))
gtk_window_transient_parent_realized (GTK_WIDGET (parent), gtk_window_transient_parent_realized (GTK_WIDGET (parent),
GTK_WIDGET (window)); GTK_WIDGET (window));
@ -3538,7 +3538,7 @@ gtk_window_set_skip_taskbar_hint (GtkWindow *window,
if (priv->skips_taskbar != setting) if (priv->skips_taskbar != setting)
{ {
priv->skips_taskbar = setting; priv->skips_taskbar = setting;
if (gtk_widget_get_realized (GTK_WIDGET (window))) if (_gtk_widget_get_realized (GTK_WIDGET (window)))
gdk_window_set_skip_taskbar_hint (gtk_widget_get_window (GTK_WIDGET (window)), gdk_window_set_skip_taskbar_hint (gtk_widget_get_window (GTK_WIDGET (window)),
priv->skips_taskbar); priv->skips_taskbar);
g_object_notify_by_pspec (G_OBJECT (window), window_props[PROP_SKIP_TASKBAR_HINT]); g_object_notify_by_pspec (G_OBJECT (window), window_props[PROP_SKIP_TASKBAR_HINT]);
@ -3591,7 +3591,7 @@ gtk_window_set_skip_pager_hint (GtkWindow *window,
if (priv->skips_pager != setting) if (priv->skips_pager != setting)
{ {
priv->skips_pager = setting; priv->skips_pager = setting;
if (gtk_widget_get_realized (GTK_WIDGET (window))) if (_gtk_widget_get_realized (GTK_WIDGET (window)))
gdk_window_set_skip_pager_hint (gtk_widget_get_window (GTK_WIDGET (window)), gdk_window_set_skip_pager_hint (gtk_widget_get_window (GTK_WIDGET (window)),
priv->skips_pager); priv->skips_pager);
g_object_notify_by_pspec (G_OBJECT (window), window_props[PROP_SKIP_PAGER_HINT]); g_object_notify_by_pspec (G_OBJECT (window), window_props[PROP_SKIP_PAGER_HINT]);
@ -3641,7 +3641,7 @@ gtk_window_set_urgency_hint (GtkWindow *window,
if (priv->urgent != setting) if (priv->urgent != setting)
{ {
priv->urgent = setting; priv->urgent = setting;
if (gtk_widget_get_realized (GTK_WIDGET (window))) if (_gtk_widget_get_realized (GTK_WIDGET (window)))
gdk_window_set_urgency_hint (gtk_widget_get_window (GTK_WIDGET (window)), gdk_window_set_urgency_hint (gtk_widget_get_window (GTK_WIDGET (window)),
priv->urgent); priv->urgent);
g_object_notify_by_pspec (G_OBJECT (window), window_props[PROP_URGENCY_HINT]); g_object_notify_by_pspec (G_OBJECT (window), window_props[PROP_URGENCY_HINT]);
@ -3691,7 +3691,7 @@ gtk_window_set_accept_focus (GtkWindow *window,
if (priv->accept_focus != setting) if (priv->accept_focus != setting)
{ {
priv->accept_focus = setting; priv->accept_focus = setting;
if (gtk_widget_get_realized (GTK_WIDGET (window))) if (_gtk_widget_get_realized (GTK_WIDGET (window)))
gdk_window_set_accept_focus (gtk_widget_get_window (GTK_WIDGET (window)), gdk_window_set_accept_focus (gtk_widget_get_window (GTK_WIDGET (window)),
priv->accept_focus); priv->accept_focus);
g_object_notify_by_pspec (G_OBJECT (window), window_props[PROP_ACCEPT_FOCUS]); g_object_notify_by_pspec (G_OBJECT (window), window_props[PROP_ACCEPT_FOCUS]);
@ -3742,7 +3742,7 @@ gtk_window_set_focus_on_map (GtkWindow *window,
if (priv->focus_on_map != setting) if (priv->focus_on_map != setting)
{ {
priv->focus_on_map = setting; priv->focus_on_map = setting;
if (gtk_widget_get_realized (GTK_WIDGET (window))) if (_gtk_widget_get_realized (GTK_WIDGET (window)))
gdk_window_set_focus_on_map (gtk_widget_get_window (GTK_WIDGET (window)), gdk_window_set_focus_on_map (gtk_widget_get_window (GTK_WIDGET (window)),
priv->focus_on_map); priv->focus_on_map);
g_object_notify_by_pspec (G_OBJECT (window), window_props[PROP_FOCUS_ON_MAP]); g_object_notify_by_pspec (G_OBJECT (window), window_props[PROP_FOCUS_ON_MAP]);
@ -4102,7 +4102,7 @@ gtk_window_set_titlebar (GtkWindow *window,
if ((!priv->title_box && titlebar) || (priv->title_box && !titlebar)) if ((!priv->title_box && titlebar) || (priv->title_box && !titlebar))
{ {
was_mapped = gtk_widget_get_mapped (widget); was_mapped = gtk_widget_get_mapped (widget);
if (gtk_widget_get_realized (widget)) if (_gtk_widget_get_realized (widget))
{ {
g_warning ("gtk_window_set_titlebar() called on a realized window"); g_warning ("gtk_window_set_titlebar() called on a realized window");
gtk_widget_unrealize (widget); gtk_widget_unrealize (widget);
@ -4621,7 +4621,7 @@ gtk_window_set_icon_list (GtkWindow *window,
gtk_window_unrealize_icon (window); gtk_window_unrealize_icon (window);
if (gtk_widget_get_realized (GTK_WIDGET (window))) if (_gtk_widget_get_realized (GTK_WIDGET (window)))
gtk_window_realize_icon (window); gtk_window_realize_icon (window);
/* We could try to update our transient children, but I don't think /* We could try to update our transient children, but I don't think
@ -4706,7 +4706,7 @@ update_themed_icon (GtkIconTheme *icon_theme,
gtk_window_unrealize_icon (window); gtk_window_unrealize_icon (window);
if (gtk_widget_get_realized (GTK_WIDGET (window))) if (_gtk_widget_get_realized (GTK_WIDGET (window)))
gtk_window_realize_icon (window); gtk_window_realize_icon (window);
} }
@ -4900,7 +4900,7 @@ gtk_window_set_default_icon_list (GList *list)
if (info && info->using_default_icon) if (info && info->using_default_icon)
{ {
gtk_window_unrealize_icon (w); gtk_window_unrealize_icon (w);
if (gtk_widget_get_realized (GTK_WIDGET (w))) if (_gtk_widget_get_realized (GTK_WIDGET (w)))
gtk_window_realize_icon (w); gtk_window_realize_icon (w);
} }
@ -4968,7 +4968,7 @@ gtk_window_set_default_icon_name (const gchar *name)
if (info && info->using_default_icon && info->using_themed_icon) if (info && info->using_default_icon && info->using_themed_icon)
{ {
gtk_window_unrealize_icon (w); gtk_window_unrealize_icon (w);
if (gtk_widget_get_realized (GTK_WIDGET (w))) if (_gtk_widget_get_realized (GTK_WIDGET (w)))
gtk_window_realize_icon (w); gtk_window_realize_icon (w);
} }
@ -5897,7 +5897,7 @@ gtk_window_show (GtkWidget *widget)
_gtk_widget_set_visible_flag (widget, TRUE); _gtk_widget_set_visible_flag (widget, TRUE);
need_resize = _gtk_widget_get_alloc_needed (widget) || !gtk_widget_get_realized (widget); need_resize = _gtk_widget_get_alloc_needed (widget) || !_gtk_widget_get_realized (widget);
gtk_css_node_validate (gtk_widget_get_css_node (widget)); gtk_css_node_validate (gtk_widget_get_css_node (widget));
@ -5936,7 +5936,7 @@ gtk_window_show (GtkWidget *widget)
/* Then we guarantee we have a realize */ /* Then we guarantee we have a realize */
was_realized = FALSE; was_realized = FALSE;
if (!gtk_widget_get_realized (widget)) if (!_gtk_widget_get_realized (widget))
{ {
gtk_widget_realize (widget); gtk_widget_realize (widget);
was_realized = TRUE; was_realized = TRUE;
@ -6932,7 +6932,7 @@ update_opaque_region (GtkWindow *window,
GtkStyleContext *context; GtkStyleContext *context;
gboolean is_opaque = FALSE; gboolean is_opaque = FALSE;
if (!gtk_widget_get_realized (widget)) if (!_gtk_widget_get_realized (widget))
return; return;
context = gtk_widget_get_style_context (widget); context = gtk_widget_get_style_context (widget);
@ -7060,7 +7060,7 @@ gtk_window_realize (GtkWidget *widget)
_gtk_container_queue_resize (GTK_CONTAINER (widget)); _gtk_container_queue_resize (GTK_CONTAINER (widget));
g_return_if_fail (!gtk_widget_get_realized (widget)); g_return_if_fail (!_gtk_widget_get_realized (widget));
} }
if (priv->hardcoded_window) if (priv->hardcoded_window)
@ -7169,7 +7169,7 @@ gtk_window_realize (GtkWidget *widget)
} }
if (priv->transient_parent && if (priv->transient_parent &&
gtk_widget_get_realized (GTK_WIDGET (priv->transient_parent))) _gtk_widget_get_realized (GTK_WIDGET (priv->transient_parent)))
gdk_window_set_transient_for (gdk_window, gdk_window_set_transient_for (gdk_window,
gtk_widget_get_window (GTK_WIDGET (priv->transient_parent))); gtk_widget_get_window (GTK_WIDGET (priv->transient_parent)));
@ -7426,7 +7426,7 @@ _gtk_window_set_allocation (GtkWindow *window,
get_shadow_width (widget, &window_border); get_shadow_width (widget, &window_border);
if (gtk_widget_get_realized (widget)) if (_gtk_widget_get_realized (widget))
update_realized_window_properties (window, &child_allocation, &window_border); update_realized_window_properties (window, &child_allocation, &window_border);
priv->title_height = 0; priv->title_height = 0;
@ -7465,7 +7465,7 @@ _gtk_window_set_allocation (GtkWindow *window,
priv->title_height; priv->title_height;
} }
if (!gtk_widget_is_toplevel (widget) && gtk_widget_get_realized (widget)) if (!gtk_widget_is_toplevel (widget) && _gtk_widget_get_realized (widget))
{ {
gdk_window_move_resize (gtk_widget_get_window (widget), gdk_window_move_resize (gtk_widget_get_window (widget),
allocation->x, allocation->y, allocation->x, allocation->y,
@ -7782,7 +7782,7 @@ gtk_window_propagate_key_event (GtkWindow *window,
break; break;
} }
parent = gtk_widget_get_parent (focus); parent = _gtk_widget_get_parent (focus);
if (parent) if (parent)
g_object_ref (parent); g_object_ref (parent);
@ -8180,11 +8180,11 @@ gtk_window_focus (GtkWidget *widget,
} }
/* Wrapped off the end, clear the focus setting for the toplpevel */ /* Wrapped off the end, clear the focus setting for the toplpevel */
parent = gtk_widget_get_parent (priv->focus_widget); parent = _gtk_widget_get_parent (priv->focus_widget);
while (parent) while (parent)
{ {
gtk_container_set_focus_child (GTK_CONTAINER (parent), NULL); gtk_container_set_focus_child (GTK_CONTAINER (parent), NULL);
parent = gtk_widget_get_parent (parent); parent = _gtk_widget_get_parent (parent);
} }
gtk_window_set_focus (GTK_WINDOW (container), NULL); gtk_window_set_focus (GTK_WINDOW (container), NULL);
@ -8600,13 +8600,13 @@ _gtk_window_unset_focus_and_default (GtkWindow *window,
g_object_ref (window); g_object_ref (window);
g_object_ref (widget); g_object_ref (widget);
parent = gtk_widget_get_parent (widget); parent = _gtk_widget_get_parent (widget);
if (gtk_container_get_focus_child (GTK_CONTAINER (parent)) == widget) if (gtk_container_get_focus_child (GTK_CONTAINER (parent)) == widget)
{ {
child = priv->focus_widget; child = priv->focus_widget;
while (child && child != widget) while (child && child != widget)
child = gtk_widget_get_parent (child); child = _gtk_widget_get_parent (child);
if (child == widget) if (child == widget)
gtk_window_set_focus (GTK_WINDOW (window), NULL); gtk_window_set_focus (GTK_WINDOW (window), NULL);
@ -8615,7 +8615,7 @@ _gtk_window_unset_focus_and_default (GtkWindow *window,
child = priv->default_widget; child = priv->default_widget;
while (child && child != widget) while (child && child != widget)
child = gtk_widget_get_parent (child); child = _gtk_widget_get_parent (child);
if (child == widget) if (child == widget)
gtk_window_set_default (window, NULL); gtk_window_set_default (window, NULL);
@ -10531,7 +10531,7 @@ gtk_window_set_screen (GtkWindow *window,
if (was_mapped) if (was_mapped)
gtk_widget_unmap (widget); gtk_widget_unmap (widget);
if (gtk_widget_get_realized (widget)) if (_gtk_widget_get_realized (widget))
gtk_widget_unrealize (widget); gtk_widget_unrealize (widget);
gtk_window_free_key_hash (window); gtk_window_free_key_hash (window);
@ -11816,7 +11816,7 @@ _gtk_window_add_popover (GtkWindow *window,
g_return_if_fail (GTK_IS_WINDOW (window)); g_return_if_fail (GTK_IS_WINDOW (window));
g_return_if_fail (GTK_IS_WIDGET (popover)); g_return_if_fail (GTK_IS_WIDGET (popover));
g_return_if_fail (GTK_IS_WIDGET (parent)); g_return_if_fail (GTK_IS_WIDGET (parent));
g_return_if_fail (gtk_widget_get_parent (popover) == NULL); g_return_if_fail (_gtk_widget_get_parent (popover) == NULL);
g_return_if_fail (gtk_widget_is_ancestor (parent, GTK_WIDGET (window))); g_return_if_fail (gtk_widget_is_ancestor (parent, GTK_WIDGET (window)));
priv = window->priv; priv = window->priv;
@ -11830,7 +11830,7 @@ _gtk_window_add_popover (GtkWindow *window,
data->clamp_allocation = !!clamp_allocation; data->clamp_allocation = !!clamp_allocation;
priv->popovers = g_list_prepend (priv->popovers, data); priv->popovers = g_list_prepend (priv->popovers, data);
if (gtk_widget_get_realized (GTK_WIDGET (window))) if (_gtk_widget_get_realized (GTK_WIDGET (window)))
popover_realize (popover, data, window); popover_realize (popover, data, window);
gtk_widget_set_parent (popover, GTK_WIDGET (window)); gtk_widget_set_parent (popover, GTK_WIDGET (window));
@ -11863,7 +11863,7 @@ _gtk_window_remove_popover (GtkWindow *window,
popover_unmap (popover, data); popover_unmap (popover, data);
if (gtk_widget_get_realized (GTK_WIDGET (window))) if (_gtk_widget_get_realized (GTK_WIDGET (window)))
popover_unrealize (popover, data, window); popover_unrealize (popover, data, window);
priv->popovers = g_list_remove (priv->popovers, data); priv->popovers = g_list_remove (priv->popovers, data);
@ -12189,7 +12189,7 @@ gtk_window_set_use_subsurface (GtkWindow *window,
GtkWindowPrivate *priv = window->priv; GtkWindowPrivate *priv = window->priv;
g_return_if_fail (GTK_IS_WINDOW (window)); g_return_if_fail (GTK_IS_WINDOW (window));
g_return_if_fail (!gtk_widget_get_realized (GTK_WIDGET (window))); g_return_if_fail (!_gtk_widget_get_realized (GTK_WIDGET (window)));
priv->use_subsurface = use_subsurface; priv->use_subsurface = use_subsurface;
} }
@ -12201,7 +12201,7 @@ gtk_window_set_hardcoded_window (GtkWindow *window,
GtkWindowPrivate *priv = window->priv; GtkWindowPrivate *priv = window->priv;
g_return_if_fail (GTK_IS_WINDOW (window)); g_return_if_fail (GTK_IS_WINDOW (window));
g_return_if_fail (!gtk_widget_get_realized (GTK_WIDGET (window))); g_return_if_fail (!_gtk_widget_get_realized (GTK_WIDGET (window)));
if (priv->hardcoded_window) if (priv->hardcoded_window)
g_object_unref (priv->hardcoded_window); g_object_unref (priv->hardcoded_window);