Commit 564e2235 authored by Tim Janik's avatar Tim Janik Committed by Tim Janik

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.
parent 836e5f4a
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
......
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
......
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
......
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
......
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
......
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
......
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
......
......@@ -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;
......
......@@ -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)
{
......
......@@ -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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment