diff options
author | Tim Janik <timj@gtk.org> | 2001-05-11 04:09:47 +0000 |
---|---|---|
committer | Tim Janik <timj@src.gnome.org> | 2001-05-11 04:09:47 +0000 |
commit | 564e2235e9384b6984f43fa35cb141439b5bb27f (patch) | |
tree | f2b7cd2aefb889284fdb4465c356488ebffabc3b | |
parent | 836e5f4a79821bc5385eb7974801160f046f1cb2 (diff) | |
download | gdk-pixbuf-564e2235e9384b6984f43fa35cb141439b5bb27f.tar.gz |
don't propagate exposes to NULL child.
Fri May 11 02:53:57 2001 Tim Janik <timj@gtk.org>
* gtk/gtktogglebutton.c (gtk_toggle_button_expose): don't
propagate exposes to NULL child.
* gtk/gtkscrolledwindow.c (gtk_scrolled_window_adjustment_changed): guard
against not having one of the scrollbars.
* gtk/gtklabel.c (gtk_label_setup_mnemonic): clean up after us,
we don't keep a mnemonic window if we have no mnemonic installed.
-rw-r--r-- | ChangeLog | 11 | ||||
-rw-r--r-- | ChangeLog.pre-2-0 | 11 | ||||
-rw-r--r-- | ChangeLog.pre-2-10 | 11 | ||||
-rw-r--r-- | ChangeLog.pre-2-2 | 11 | ||||
-rw-r--r-- | ChangeLog.pre-2-4 | 11 | ||||
-rw-r--r-- | ChangeLog.pre-2-6 | 11 | ||||
-rw-r--r-- | ChangeLog.pre-2-8 | 11 | ||||
-rw-r--r-- | gtk/gtklabel.c | 9 | ||||
-rw-r--r-- | gtk/gtkscrolledwindow.c | 7 | ||||
-rw-r--r-- | gtk/gtktogglebutton.c | 9 |
10 files changed, 93 insertions, 9 deletions
@@ -1,3 +1,14 @@ +Fri May 11 02:53:57 2001 Tim Janik <timj@gtk.org> + + * gtk/gtktogglebutton.c (gtk_toggle_button_expose): don't + propagate exposes to NULL child. + + * gtk/gtkscrolledwindow.c (gtk_scrolled_window_adjustment_changed): guard + against not having one of the scrollbars. + + * gtk/gtklabel.c (gtk_label_setup_mnemonic): clean up after us, + we don't keep a mnemonic window if we have no mnemonic installed. + Fri May 11 01:05:00 2001 Tim Janik <timj@gtk.org> * gtk/gtktypeutils.h: grum, gtk_type_class() is not GNUC_CONST diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index ef8230858..c705940b1 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,14 @@ +Fri May 11 02:53:57 2001 Tim Janik <timj@gtk.org> + + * gtk/gtktogglebutton.c (gtk_toggle_button_expose): don't + propagate exposes to NULL child. + + * gtk/gtkscrolledwindow.c (gtk_scrolled_window_adjustment_changed): guard + against not having one of the scrollbars. + + * gtk/gtklabel.c (gtk_label_setup_mnemonic): clean up after us, + we don't keep a mnemonic window if we have no mnemonic installed. + Fri May 11 01:05:00 2001 Tim Janik <timj@gtk.org> * gtk/gtktypeutils.h: grum, gtk_type_class() is not GNUC_CONST diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index ef8230858..c705940b1 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,14 @@ +Fri May 11 02:53:57 2001 Tim Janik <timj@gtk.org> + + * gtk/gtktogglebutton.c (gtk_toggle_button_expose): don't + propagate exposes to NULL child. + + * gtk/gtkscrolledwindow.c (gtk_scrolled_window_adjustment_changed): guard + against not having one of the scrollbars. + + * gtk/gtklabel.c (gtk_label_setup_mnemonic): clean up after us, + we don't keep a mnemonic window if we have no mnemonic installed. + Fri May 11 01:05:00 2001 Tim Janik <timj@gtk.org> * gtk/gtktypeutils.h: grum, gtk_type_class() is not GNUC_CONST diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index ef8230858..c705940b1 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,14 @@ +Fri May 11 02:53:57 2001 Tim Janik <timj@gtk.org> + + * gtk/gtktogglebutton.c (gtk_toggle_button_expose): don't + propagate exposes to NULL child. + + * gtk/gtkscrolledwindow.c (gtk_scrolled_window_adjustment_changed): guard + against not having one of the scrollbars. + + * gtk/gtklabel.c (gtk_label_setup_mnemonic): clean up after us, + we don't keep a mnemonic window if we have no mnemonic installed. + Fri May 11 01:05:00 2001 Tim Janik <timj@gtk.org> * gtk/gtktypeutils.h: grum, gtk_type_class() is not GNUC_CONST diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index ef8230858..c705940b1 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,14 @@ +Fri May 11 02:53:57 2001 Tim Janik <timj@gtk.org> + + * gtk/gtktogglebutton.c (gtk_toggle_button_expose): don't + propagate exposes to NULL child. + + * gtk/gtkscrolledwindow.c (gtk_scrolled_window_adjustment_changed): guard + against not having one of the scrollbars. + + * gtk/gtklabel.c (gtk_label_setup_mnemonic): clean up after us, + we don't keep a mnemonic window if we have no mnemonic installed. + Fri May 11 01:05:00 2001 Tim Janik <timj@gtk.org> * gtk/gtktypeutils.h: grum, gtk_type_class() is not GNUC_CONST diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index ef8230858..c705940b1 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,14 @@ +Fri May 11 02:53:57 2001 Tim Janik <timj@gtk.org> + + * gtk/gtktogglebutton.c (gtk_toggle_button_expose): don't + propagate exposes to NULL child. + + * gtk/gtkscrolledwindow.c (gtk_scrolled_window_adjustment_changed): guard + against not having one of the scrollbars. + + * gtk/gtklabel.c (gtk_label_setup_mnemonic): clean up after us, + we don't keep a mnemonic window if we have no mnemonic installed. + Fri May 11 01:05:00 2001 Tim Janik <timj@gtk.org> * gtk/gtktypeutils.h: grum, gtk_type_class() is not GNUC_CONST diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index ef8230858..c705940b1 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,14 @@ +Fri May 11 02:53:57 2001 Tim Janik <timj@gtk.org> + + * gtk/gtktogglebutton.c (gtk_toggle_button_expose): don't + propagate exposes to NULL child. + + * gtk/gtkscrolledwindow.c (gtk_scrolled_window_adjustment_changed): guard + against not having one of the scrollbars. + + * gtk/gtklabel.c (gtk_label_setup_mnemonic): clean up after us, + we don't keep a mnemonic window if we have no mnemonic installed. + Fri May 11 01:05:00 2001 Tim Janik <timj@gtk.org> * gtk/gtktypeutils.h: grum, gtk_type_class() is not GNUC_CONST diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c index ddcfd428f..bc3a99c71 100644 --- a/gtk/gtklabel.c +++ b/gtk/gtklabel.c @@ -467,9 +467,12 @@ gtk_label_setup_mnemonic (GtkLabel *label, GtkWidget *toplevel; if (last_key != GDK_VoidSymbol && label->mnemonic_window) - gtk_window_remove_mnemonic (label->mnemonic_window, - last_key, - GTK_WIDGET (label)); + { + gtk_window_remove_mnemonic (label->mnemonic_window, + last_key, + GTK_WIDGET (label)); + label->mnemonic_window = NULL; + } if (label->mnemonic_keyval == GDK_VoidSymbol) return; diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c index d220614c8..a9cb3e33c 100644 --- a/gtk/gtkscrolledwindow.c +++ b/gtk/gtkscrolledwindow.c @@ -688,6 +688,7 @@ gtk_scrolled_window_size_request (GtkWidget *widget, else { GtkWidgetAuxInfo *aux_info = _gtk_widget_get_aux_info (bin->child, FALSE); + if (aux_info && aux_info->height > 0) { requisition->height += aux_info->height; @@ -968,7 +969,8 @@ gtk_scrolled_window_adjustment_changed (GtkAdjustment *adjustment, scrolled_win = GTK_SCROLLED_WINDOW (data); - if (adjustment == gtk_range_get_adjustment (GTK_RANGE (scrolled_win->hscrollbar))) + if (scrolled_win->hscrollbar && + adjustment == gtk_range_get_adjustment (GTK_RANGE (scrolled_win->hscrollbar))) { if (scrolled_win->hscrollbar_policy == GTK_POLICY_AUTOMATIC) { @@ -981,7 +983,8 @@ gtk_scrolled_window_adjustment_changed (GtkAdjustment *adjustment, gtk_widget_queue_resize (GTK_WIDGET (scrolled_win)); } } - else if (adjustment == gtk_range_get_adjustment (GTK_RANGE (scrolled_win->vscrollbar))) + else if (scrolled_win->vscrollbar && + adjustment == gtk_range_get_adjustment (GTK_RANGE (scrolled_win->vscrollbar))) { if (scrolled_win->vscrollbar_policy == GTK_POLICY_AUTOMATIC) { diff --git a/gtk/gtktogglebutton.c b/gtk/gtktogglebutton.c index b4af1af24..46cc40d93 100644 --- a/gtk/gtktogglebutton.c +++ b/gtk/gtktogglebutton.c @@ -466,11 +466,12 @@ gtk_toggle_button_expose (GtkWidget *widget, { if (GTK_WIDGET_DRAWABLE (widget)) { + GtkWidget *child = GTK_BIN (widget)->child; + gtk_toggle_button_paint (widget, &event->area); - - gtk_container_propagate_expose (GTK_CONTAINER (widget), - GTK_BIN (widget)->child, - event); + + if (child) + gtk_container_propagate_expose (GTK_CONTAINER (widget), child, event); } return TRUE; |