diff options
Diffstat (limited to 'gtk/gtkwidget.c')
| -rw-r--r-- | gtk/gtkwidget.c | 27 |
1 files changed, 10 insertions, 17 deletions
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index 348a9de4e0..e3d76d01d2 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -925,8 +925,7 @@ static gboolean setup_template_child (GtkWidgetTemplat static void gtk_widget_set_usize_internal (GtkWidget *widget, gint width, - gint height, - GtkQueueResizeFlags flags); + gint height); static void gtk_widget_add_events_internal (GtkWidget *widget, GdkDevice *device, @@ -3813,10 +3812,10 @@ gtk_widget_set_property (GObject *object, gtk_container_add (GTK_CONTAINER (g_value_get_object (value)), widget); break; case PROP_WIDTH_REQUEST: - gtk_widget_set_usize_internal (widget, g_value_get_int (value), -2, 0); + gtk_widget_set_usize_internal (widget, g_value_get_int (value), -2); break; case PROP_HEIGHT_REQUEST: - gtk_widget_set_usize_internal (widget, -2, g_value_get_int (value), 0); + gtk_widget_set_usize_internal (widget, -2, g_value_get_int (value)); break; case PROP_VISIBLE: gtk_widget_set_visible (widget, g_value_get_boolean (value)); @@ -5748,7 +5747,7 @@ gtk_widget_queue_resize (GtkWidget *widget) if (gtk_widget_get_realized (widget)) gtk_widget_queue_draw (widget); - _gtk_size_group_queue_resize (widget, 0); + _gtk_size_group_queue_resize (widget); } /** @@ -5765,7 +5764,7 @@ gtk_widget_queue_resize_no_redraw (GtkWidget *widget) { g_return_if_fail (GTK_IS_WIDGET (widget)); - _gtk_size_group_queue_resize (widget, 0); + _gtk_size_group_queue_resize (widget); } /** @@ -10957,8 +10956,7 @@ gtk_widget_error_bell (GtkWidget *widget) static void gtk_widget_set_usize_internal (GtkWidget *widget, gint width, - gint height, - GtkQueueResizeFlags flags) + gint height) { GtkWidgetAuxInfo *aux_info; gboolean changed = FALSE; @@ -10969,25 +10967,20 @@ gtk_widget_set_usize_internal (GtkWidget *widget, if (width > -2 && aux_info->width != width) { - if ((flags & GTK_QUEUE_RESIZE_INVALIDATE_ONLY) == 0) - g_object_notify (G_OBJECT (widget), "width-request"); + g_object_notify (G_OBJECT (widget), "width-request"); aux_info->width = width; changed = TRUE; } if (height > -2 && aux_info->height != height) { - if ((flags & GTK_QUEUE_RESIZE_INVALIDATE_ONLY) == 0) - g_object_notify (G_OBJECT (widget), "height-request"); + g_object_notify (G_OBJECT (widget), "height-request"); aux_info->height = height; changed = TRUE; } if (gtk_widget_get_visible (widget) && changed) { - if ((flags & GTK_QUEUE_RESIZE_INVALIDATE_ONLY) == 0) - gtk_widget_queue_resize (widget); - else - _gtk_size_group_queue_resize (widget, GTK_QUEUE_RESIZE_INVALIDATE_ONLY); + gtk_widget_queue_resize (widget); } g_object_thaw_notify (G_OBJECT (widget)); @@ -11044,7 +11037,7 @@ gtk_widget_set_size_request (GtkWidget *widget, if (height == 0) height = 1; - gtk_widget_set_usize_internal (widget, width, height, 0); + gtk_widget_set_usize_internal (widget, width, height); } |