summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2018-07-15 08:01:53 -0400
committerMatthias Clasen <mclasen@redhat.com>2018-07-15 08:12:57 -0400
commitedccd76fbb4144cb6983d56e0745aa7450b34d1e (patch)
tree1dea7ebee86809af5d3d9375f8062e6dfd286675
parentd0e28abbd4b9406636e4ab82ea1c6949beb4b724 (diff)
downloadgtk+-edccd76fbb4144cb6983d56e0745aa7450b34d1e.tar.gz
tests: Stop using configure events
-rw-r--r--tests/testwindowsize.c27
1 files changed, 13 insertions, 14 deletions
diff --git a/tests/testwindowsize.c b/tests/testwindowsize.c
index 6e62dd0a60..1caf80cf2e 100644
--- a/tests/testwindowsize.c
+++ b/tests/testwindowsize.c
@@ -9,20 +9,16 @@ static GtkWidget *default_height_spin;
static GtkWidget *resizable_check;
static gboolean
-configure_event_cb (GtkWidget *window, GdkEvent *event, GtkLabel *label)
+configure_event_cb (GdkSurface *surface, GParamSpec *pspec, GtkLabel *label)
{
- 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;
+ int width, height;
+ char *str;
+
+ width = gdk_surface_get_width (surface);
+ height = gdk_surface_get_height (surface);
+ str = g_strdup_printf ("%d x %d", width, height);
+ gtk_label_set_label (label, str);
+ g_free (str);
}
static void
@@ -71,7 +67,10 @@ show_dialog (void)
//gtk_widget_show (label);
gtk_dialog_add_action_widget (GTK_DIALOG (dialog), label, GTK_RESPONSE_HELP);
- g_signal_connect (dialog, "event",
+ gtk_widget_realize (dialog);
+ g_signal_connect (gtk_widget_get_surface (dialog), "notify::width",
+ G_CALLBACK (configure_event_cb), label);
+ g_signal_connect (gtk_widget_get_surface (dialog), "notify::height",
G_CALLBACK (configure_event_cb), label);
gtk_dialog_run (GTK_DIALOG (dialog));