From 091c9ee9dca247fdbba068562160c8fe2e524857 Mon Sep 17 00:00:00 2001 From: Jose Antonio Ortega Ruiz Date: Sun, 18 Oct 2020 18:13:17 +0100 Subject: gtk_widget_reparent deprecation --- mixgtk/mixgtk_wm.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) (limited to 'mixgtk') diff --git a/mixgtk/mixgtk_wm.c b/mixgtk/mixgtk_wm.c index 725776f..2f96bba 100644 --- a/mixgtk/mixgtk_wm.c +++ b/mixgtk/mixgtk_wm.c @@ -1,7 +1,7 @@ /* -*-c-*- -------------- mixgtk_wm.c : * Implementation of the functions declared in mixgtk_wm.h * ------------------------------------------------------------------ - * Copyright (C) 2001, 2002, 2004, 2006, 2007, 2008, 2019 Free Software Foundation, Inc. + * Copyright (C) 2001, 2002, 2004, 2006, 2007, 2008, 2019, 2020 Free Software Foundation, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -84,6 +84,7 @@ static void mixal_attach_ (void); static void mixal_detach_ (void); static void dev_attach_ (void); static void dev_detach_ (void); +static void reparent_ (GtkWidget *widget, GtkWidget *parent); static void update_attach_buttons_ (void); static void on_tb_style_ (GtkMenuItem *w, gpointer style); static void on_nb_switch_ (GtkNotebook *notebook, GtkWidget *page, @@ -573,11 +574,18 @@ mixvm_attach_ (void) add_page_ (infos_[MIXGTK_MIXVM_WINDOW].widget, MIXGTK_MIXVM_WINDOW); } +static void +reparent_ (GtkWidget *widget, GtkWidget *parent) +{ + gtk_container_remove (GTK_CONTAINER (gtk_widget_get_parent (widget)), + widget); + gtk_container_add (GTK_CONTAINER (parent), widget); +} + static void mixvm_detach_ (void) { - gtk_widget_reparent (infos_[MIXGTK_MIXVM_WINDOW].widget, - GTK_WIDGET (mixvm_container_)); + reparent_ (infos_[MIXGTK_MIXVM_WINDOW].widget, GTK_WIDGET (mixvm_container_)); } static void @@ -616,8 +624,7 @@ mixal_detach_ (void) } mixgtk_mixal_reparent (stat); - gtk_widget_reparent (infos_[MIXGTK_MIXAL_WINDOW].widget, - GTK_WIDGET (mixal_container_)); + reparent_ (infos_[MIXGTK_MIXAL_WINDOW].widget, GTK_WIDGET (mixal_container_)); } static void @@ -630,8 +637,7 @@ dev_attach_ (void) static void dev_detach_ (void) { - gtk_widget_reparent (infos_[MIXGTK_DEVICES_WINDOW].widget, - GTK_WIDGET (dev_container_)); + reparent_ (infos_[MIXGTK_DEVICES_WINDOW].widget, GTK_WIDGET (dev_container_)); } static void -- cgit v1.2.3