diff options
| author | Tim Janik <timj@gtk.org> | 2000-02-07 05:27:08 +0000 |
|---|---|---|
| committer | Tim Janik <timj@src.gnome.org> | 2000-02-07 05:27:08 +0000 |
| commit | 49bc9e0606566e41167de9cc38845f904d83bc7d (patch) | |
| tree | 92eb37e93cb30b174a6fda0e006a03dfcd1c6655 | |
| parent | 81cb919181615d9bbfb5709b2dc4c513862704c9 (diff) | |
| download | gdk-pixbuf-49bc9e0606566e41167de9cc38845f904d83bc7d.tar.gz | |
ignore delete events when grabs are active, unless a delete event is send
Mon Feb 7 04:01:55 2000 Tim Janik <timj@gtk.org>
* gtk/gtkmain.c (gtk_main_do_event): ignore delete events when
grabs are active, unless a delete event is send to the toplevel
of the currently grab holding widget.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-0 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-2 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-4 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 6 | ||||
| -rw-r--r-- | gtk/gtkmain.c | 4 |
8 files changed, 44 insertions, 2 deletions
@@ -1,3 +1,9 @@ +Mon Feb 7 04:01:55 2000 Tim Janik <timj@gtk.org> + + * gtk/gtkmain.c (gtk_main_do_event): ignore delete events when + grabs are active, unless a delete event is send to the toplevel + of the currently grab holding widget. + Sun Feb 6 10:13:15 2000 Owen Taylor <otaylor@redhat.com> * gtk/gtkctree.c (gtk_ctree_drag_data_received): Remove diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index dc73cebd0..cef810dfa 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +Mon Feb 7 04:01:55 2000 Tim Janik <timj@gtk.org> + + * gtk/gtkmain.c (gtk_main_do_event): ignore delete events when + grabs are active, unless a delete event is send to the toplevel + of the currently grab holding widget. + Sun Feb 6 10:13:15 2000 Owen Taylor <otaylor@redhat.com> * gtk/gtkctree.c (gtk_ctree_drag_data_received): Remove diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index dc73cebd0..cef810dfa 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Mon Feb 7 04:01:55 2000 Tim Janik <timj@gtk.org> + + * gtk/gtkmain.c (gtk_main_do_event): ignore delete events when + grabs are active, unless a delete event is send to the toplevel + of the currently grab holding widget. + Sun Feb 6 10:13:15 2000 Owen Taylor <otaylor@redhat.com> * gtk/gtkctree.c (gtk_ctree_drag_data_received): Remove diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index dc73cebd0..cef810dfa 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Mon Feb 7 04:01:55 2000 Tim Janik <timj@gtk.org> + + * gtk/gtkmain.c (gtk_main_do_event): ignore delete events when + grabs are active, unless a delete event is send to the toplevel + of the currently grab holding widget. + Sun Feb 6 10:13:15 2000 Owen Taylor <otaylor@redhat.com> * gtk/gtkctree.c (gtk_ctree_drag_data_received): Remove diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index dc73cebd0..cef810dfa 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Mon Feb 7 04:01:55 2000 Tim Janik <timj@gtk.org> + + * gtk/gtkmain.c (gtk_main_do_event): ignore delete events when + grabs are active, unless a delete event is send to the toplevel + of the currently grab holding widget. + Sun Feb 6 10:13:15 2000 Owen Taylor <otaylor@redhat.com> * gtk/gtkctree.c (gtk_ctree_drag_data_received): Remove diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index dc73cebd0..cef810dfa 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Mon Feb 7 04:01:55 2000 Tim Janik <timj@gtk.org> + + * gtk/gtkmain.c (gtk_main_do_event): ignore delete events when + grabs are active, unless a delete event is send to the toplevel + of the currently grab holding widget. + Sun Feb 6 10:13:15 2000 Owen Taylor <otaylor@redhat.com> * gtk/gtkctree.c (gtk_ctree_drag_data_received): Remove diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index dc73cebd0..cef810dfa 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Mon Feb 7 04:01:55 2000 Tim Janik <timj@gtk.org> + + * gtk/gtkmain.c (gtk_main_do_event): ignore delete events when + grabs are active, unless a delete event is send to the toplevel + of the currently grab holding widget. + Sun Feb 6 10:13:15 2000 Owen Taylor <otaylor@redhat.com> * gtk/gtkctree.c (gtk_ctree_drag_data_received): Remove diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c index 2df9e5f2f..775f9164c 100644 --- a/gtk/gtkmain.c +++ b/gtk/gtkmain.c @@ -678,8 +678,8 @@ gtk_main_do_event (GdkEvent *event) case GDK_DELETE: gtk_widget_ref (event_widget); - if (!gtk_widget_event (event_widget, event) && - !GTK_OBJECT_DESTROYED (event_widget)) + if ((!grabs || gtk_widget_get_toplevel (grabs->data) == event_widget) && + !gtk_widget_event (event_widget, event)) gtk_widget_destroy (event_widget); gtk_widget_unref (event_widget); break; |