[gtk+/wip/matthiasc/kill-event-signals: 94/130] tests: Stop using ::configure-event



commit c0de1e4a40a04942f8053d8c79d35c1909c5e8c7
Author: Matthias Clasen <mclasen redhat com>
Date:   Mon Jan 1 17:47:34 2018 -0500

    tests: Stop using ::configure-event
    
    The generic ::event will do.

 tests/testwindowsize.c |   25 ++++++++++++++-----------
 1 files changed, 14 insertions(+), 11 deletions(-)
---
diff --git a/tests/testwindowsize.c b/tests/testwindowsize.c
index 495307e..6e62dd0 100644
--- a/tests/testwindowsize.c
+++ b/tests/testwindowsize.c
@@ -9,17 +9,20 @@ static GtkWidget *default_height_spin;
 static GtkWidget *resizable_check;
 
 static gboolean
-configure_event_cb (GtkWidget *window, GdkEventConfigure *event, GtkLabel *label)
+configure_event_cb (GtkWidget *window, GdkEvent *event, GtkLabel *label)
 {
-  gchar *str;
-  gint width, height;
-
-  gtk_window_get_size (GTK_WINDOW (window), &width, &height);
-  str = g_strdup_printf ("%d x %d", width, height);
-  gtk_label_set_label (label, str);
-  g_free (str);
-
-  return FALSE;
+  if (gdk_event_get_event_type (event) == GDK_CONFIGURE)
+    {
+      gchar *str;
+      gint width, height;
+
+      gtk_window_get_size (GTK_WINDOW (window), &width, &height);
+      str = g_strdup_printf ("%d x %d", width, height);
+      gtk_label_set_label (label, str);
+      g_free (str);
+    }
+
+  return GDK_EVENT_PROPAGATE;
 }
 
 static void
@@ -68,7 +71,7 @@ show_dialog (void)
   //gtk_widget_show (label);
 
   gtk_dialog_add_action_widget (GTK_DIALOG (dialog), label, GTK_RESPONSE_HELP);
-  g_signal_connect (dialog, "configure-event",
+  g_signal_connect (dialog, "event",
                     G_CALLBACK (configure_event_cb), label);
 
   gtk_dialog_run (GTK_DIALOG (dialog));


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]