X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;ds=sidebyside;f=gtk%2Fgtkscrolledwindow.c;h=91f3258ce1c0a642e31c0afb5b96f95269b1c5f8;hb=f9c7a4bbd08b65f9c5280836ea3f343efec2c82a;hp=19198c6cafaf3be06a8e2a5d9cb59a0eb0f6673b;hpb=08cc83406142f84157a4b25aeee6cc0d31dffd9e;p=~andy%2Fgtk diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c index 19198c6ca..91f3258ce 100644 --- a/gtk/gtkscrolledwindow.c +++ b/gtk/gtkscrolledwindow.c @@ -43,9 +43,9 @@ * to be best suited to display its contents, including children. * the width and/or height reported from a widget upon size requisition * may be overidden by the user by specifying a width and/or height - * other than 0 through gtk_widget_set_usize(). + * other than 0 through gtk_widget_set_size_request(). * - * a scrolled window needs (for imlementing all three policy types) to + * a scrolled window needs (for implementing all three policy types) to * request its width and height based on two different rationales. * 1) the user wants the scrolled window to just fit into the space * that it gets allocated for a specifc dimension. @@ -88,8 +88,7 @@ enum { PROP_VSCROLLBAR_POLICY, PROP_WINDOW_PLACEMENT, PROP_WINDOW_PLACEMENT_SET, - PROP_SHADOW_TYPE, - PROP_LAST + PROP_SHADOW_TYPE }; /* Signals */ @@ -785,11 +784,7 @@ gtk_scrolled_window_get_shadow_type (GtkScrolledWindow *scrolled_window) static void gtk_scrolled_window_destroy (GtkObject *object) { - GtkScrolledWindow *scrolled_window; - - g_return_if_fail (GTK_IS_SCROLLED_WINDOW (object)); - - scrolled_window = GTK_SCROLLED_WINDOW (object); + GtkScrolledWindow *scrolled_window = GTK_SCROLLED_WINDOW (object); gtk_widget_unparent (scrolled_window->hscrollbar); gtk_widget_unparent (scrolled_window->vscrollbar); @@ -904,7 +899,7 @@ traverse_container (GtkWidget *widget, if (GTK_IS_SCROLLED_WINDOW (widget)) { gtk_scrolled_window_update_real_placement (GTK_SCROLLED_WINDOW (widget)); - gtk_widget_queue_draw (widget); + gtk_widget_queue_resize (widget); } else if (GTK_IS_CONTAINER (widget)) gtk_container_forall (GTK_CONTAINER (widget), traverse_container, NULL);