diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2014-05-22 08:50:18 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2014-05-22 08:50:18 -0400 |
| commit | 69cef3c9b46023aac32bd08efebd39951fbbbffd (patch) | |
| tree | 63928314ad8fa5d21113804219743046a368fb0a | |
| parent | cbb5e27b3e77bcba5eff39f02f8417d5c14f92f3 (diff) | |
| download | gtk+-69cef3c9b46023aac32bd08efebd39951fbbbffd.tar.gz | |
tests: Adapt to gtk_widget_reparent deprecations
| -rw-r--r-- | tests/testgtk.c | 8 | ||||
| -rw-r--r-- | tests/testlist2.c | 2 |
2 files changed, 10 insertions, 0 deletions
diff --git a/tests/testgtk.c b/tests/testgtk.c index 94648a071b..6126c750a3 100644 --- a/tests/testgtk.c +++ b/tests/testgtk.c @@ -2092,7 +2092,9 @@ reparent_label (GtkWidget *widget, label = g_object_get_data (G_OBJECT (widget), "user_data"); +G_GNUC_BEGIN_IGNORE_DEPRECATIONS gtk_widget_reparent (label, new_parent); +G_GNUC_END_IGNORE_DEPRECATIONS } static void @@ -3734,7 +3736,9 @@ static gulong sw_destroyed_handler = 0; static gboolean scrolled_windows_delete_cb (GtkWidget *widget, GdkEventAny *event, GtkWidget *scrollwin) { +G_GNUC_BEGIN_IGNORE_DEPRECATIONS gtk_widget_reparent (scrollwin, sw_parent); +G_GNUC_END_IGNORE_DEPRECATIONS g_signal_handler_disconnect (sw_parent, sw_destroyed_handler); sw_float_parent = NULL; @@ -3765,7 +3769,9 @@ scrolled_windows_remove (GtkWidget *dialog, gint response, GtkWidget *scrollwin) if (sw_parent) { +G_GNUC_BEGIN_IGNORE_DEPRECATIONS gtk_widget_reparent (scrollwin, sw_parent); +G_GNUC_END_IGNORE_DEPRECATIONS gtk_widget_destroy (sw_float_parent); g_signal_handler_disconnect (sw_parent, sw_destroyed_handler); @@ -3782,7 +3788,9 @@ scrolled_windows_remove (GtkWidget *dialog, gint response, GtkWidget *scrollwin) gtk_window_set_default_size (GTK_WINDOW (sw_float_parent), 200, 200); +G_GNUC_BEGIN_IGNORE_DEPRECATIONS gtk_widget_reparent (scrollwin, sw_float_parent); +G_GNUC_END_IGNORE_DEPRECATIONS gtk_widget_show (sw_float_parent); sw_destroyed_handler = diff --git a/tests/testlist2.c b/tests/testlist2.c index d565b52e14..1f0b2aa97d 100644 --- a/tests/testlist2.c +++ b/tests/testlist2.c @@ -20,7 +20,9 @@ remove_this_row (GtkButton *button, GtkWidget *child) revealer = gtk_revealer_new (); gtk_revealer_set_reveal_child (GTK_REVEALER (revealer), TRUE); gtk_widget_show (revealer); +G_GNUC_BEGIN_IGNORE_DEPRECATIONS gtk_widget_reparent (child, revealer); +G_GNUC_END_IGNORE_DEPRECATIONS gtk_container_add (GTK_CONTAINER (row), revealer); g_signal_connect (revealer, "notify::child-revealed", G_CALLBACK (row_unrevealed), NULL); |