diff options
| author | Owen Taylor <otaylor@redhat.com> | 2001-11-15 21:04:51 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2001-11-15 21:04:51 +0000 |
| commit | b27345fe2cf7277bb3483d06651c8bb6820003ec (patch) | |
| tree | 5d692b7598d24fb038d1c02b9304cb9b68e4a236 /gtk/gtkwidget.c | |
| parent | 41f14d359739ba21d0725d7025885da880100f33 (diff) | |
| download | gtk+-b27345fe2cf7277bb3483d06651c8bb6820003ec.tar.gz | |
Cal gdk_window_invalidate_maybe_recurse() for recursion. (Soeren Sandmann)
Thu Nov 15 14:19:34 2001 Owen Taylor <otaylor@redhat.com>
* gdk/gdkwindow.c (gdk_window_invalidate_maybe_recurse): Cal
gdk_window_invalidate_maybe_recurse() for recursion.
(Soeren Sandmann)
* gtk/gtkviewport.c: Make !redraw_on_allocate. (Soeren Sandmann)
* gtk/gtkcontainer.c (gtk_container_expose): Call
gtk_container_forall() not _foreach() to propagate,
since we need to propagate exposes to internal children
as well.
* gtk/gtkwidget.c (gtk_widget_set_events, gtk_widget_add_events):
Remove the restriction of only being able to call these
on window widgets, since we have lots of NO_WINDOW widgets
with windows now; for add events, recurse over the children
of widget->window to find one owned by the widget.
* gtk/gtkbutton.[ch]: Make a NO_WINDOW widget, using an input-only
window to catch events.
* gtk/gtktogglebutton.[ch]: Remove the code for switching
between NO_WINDOW and WINDOW widgets based on the mode.
* gtk/gtkcheckbutton.c gtk/gtkoptionmenu.c gtk/gtkclist.c
gtk/gtktreeview.c: Adopt to NO_WINDOW change for GtkButton.
* gtk/gtkrange.[ch]: Make into a NO_WINDOW widget.
* gtk/gtkhscale.c, gtk/gtkvscale.c: Adopt to NO_WINDOW
change for range.
* gtk/gtknotebook.[ch]: Make into a NO_WINDOW widget.
* docs/Changes-2.0.txt: Add a note about the NO_WINDOW changes.
Diffstat (limited to 'gtk/gtkwidget.c')
| -rw-r--r-- | gtk/gtkwidget.c | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index 646ac49078..b8d4aab318 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -4857,7 +4857,6 @@ gtk_widget_set_events (GtkWidget *widget, gint *eventp; g_return_if_fail (GTK_IS_WIDGET (widget)); - g_return_if_fail (!GTK_WIDGET_NO_WINDOW (widget)); g_return_if_fail (!GTK_WIDGET_REALIZED (widget)); eventp = gtk_object_get_data_by_id (GTK_OBJECT (widget), quark_event_mask); @@ -4895,8 +4894,7 @@ gtk_widget_add_events (GtkWidget *widget, gint *eventp; g_return_if_fail (GTK_IS_WIDGET (widget)); - g_return_if_fail (!GTK_WIDGET_NO_WINDOW (widget)); - + eventp = gtk_object_get_data_by_id (GTK_OBJECT (widget), quark_event_mask); if (events) @@ -4918,8 +4916,25 @@ gtk_widget_add_events (GtkWidget *widget, if (GTK_WIDGET_REALIZED (widget)) { - gdk_window_set_events (widget->window, - gdk_window_get_events (widget->window) | events); + if (GTK_WIDGET_NO_WINDOW (widget)) + { + GList *children = gdk_window_get_children (widget->window); + GList *tmp_list = children; + + while (tmp_list) + { + GdkWindow *window = tmp_list->data; + gpointer user_data; + + gdk_window_get_user_data (window, &user_data); + if (user_data == widget) + gdk_window_set_events (window, gdk_window_get_events (window) | events); + } + } + else + { + gdk_window_set_events (widget->window, gdk_window_get_events (widget->window) | events); + } } g_object_notify (G_OBJECT (widget), "events"); |