[gtk/readonly-events-1: 20/27] gtk: Stop handling GDK_DESTROY differently from GDK_DELETE
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/readonly-events-1: 20/27] gtk: Stop handling GDK_DESTROY differently from GDK_DELETE
- Date: Sat, 15 Feb 2020 18:38:56 +0000 (UTC)
commit 60be15edabae912ddd1a14a2ef632e0a09c8fc06
Author: Matthias Clasen <mclasen redhat com>
Date: Sat Feb 15 11:11:13 2020 -0500
gtk: Stop handling GDK_DESTROY differently from GDK_DELETE
We don't have child windows anymore, so there is no difference.
gtk/gtkmain.c | 15 +--------------
1 file changed, 1 insertion(+), 14 deletions(-)
---
diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index f4c2ca946e..5e95ae3e1e 100644
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -1781,6 +1781,7 @@ gtk_main_do_event (GdkEvent *event)
break;
case GDK_DELETE:
+ case GDK_DESTROY:
g_object_ref (target_widget);
if (!gtk_window_group_get_current_grab (window_group) ||
GTK_WIDGET (gtk_widget_get_root (gtk_window_group_get_current_grab (window_group))) ==
target_widget)
@@ -1792,20 +1793,6 @@ gtk_main_do_event (GdkEvent *event)
g_object_unref (target_widget);
break;
- case GDK_DESTROY:
- /* Unexpected GDK_DESTROY from the outside, ignore for
- * child windows, handle like a GDK_DELETE for toplevels
- */
- if (!gtk_widget_get_parent (target_widget))
- {
- g_object_ref (target_widget);
- if (!gtk_widget_event (target_widget, event) &&
- gtk_widget_get_realized (target_widget))
- gtk_widget_destroy (target_widget);
- g_object_unref (target_widget);
- }
- break;
-
case GDK_FOCUS_CHANGE:
case GDK_GRAB_BROKEN:
if (!_gtk_widget_captured_event (target_widget, event))
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]