diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2014-10-23 17:21:00 +0200 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2014-10-28 11:25:14 +0100 |
| commit | 316cb068bdaf456040934f7368e09be7be4d942e (patch) | |
| tree | 5b2241c73e2de05b9b3b6ceb3412c65f7bfae553 /ui/gtk.c | |
| parent | 987fec54e1a59f50b3edd68b07964d7e1b62ae9a (diff) | |
| download | focaccia-qemu-316cb068bdaf456040934f7368e09be7be4d942e.tar.gz focaccia-qemu-316cb068bdaf456040934f7368e09be7be4d942e.zip | |
gtk: avoid gd_widget_reparent with gtk 3.14+
gtk_widget_reparent is depricated in gtk 3.14, stop using it. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'ui/gtk.c')
| -rw-r--r-- | ui/gtk.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/ui/gtk.c b/ui/gtk.c index 9727dec1ef..a5f6869e9a 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -435,6 +435,15 @@ static void gtk_release_modifiers(GtkDisplayState *s) } } +static void gd_widget_reparent(GtkWidget *from, GtkWidget *to, + GtkWidget *widget) +{ + g_object_ref(G_OBJECT(widget)); + gtk_container_remove(GTK_CONTAINER(from), widget); + gtk_container_add(GTK_CONTAINER(to), widget); + g_object_unref(G_OBJECT(widget)); +} + /** DisplayState Callbacks **/ static void gd_update(DisplayChangeListener *dcl, @@ -1031,7 +1040,7 @@ static gboolean gd_tab_window_close(GtkWidget *widget, GdkEvent *event, GtkDisplayState *s = vc->s; gtk_widget_set_sensitive(vc->menu_item, true); - gtk_widget_reparent(vc->tab_item, s->notebook); + gd_widget_reparent(vc->window, s->notebook, vc->tab_item); gtk_notebook_set_tab_label_text(GTK_NOTEBOOK(s->notebook), vc->tab_item, vc->label); gtk_widget_destroy(vc->window); @@ -1065,7 +1074,7 @@ static void gd_menu_untabify(GtkMenuItem *item, void *opaque) if (!vc->window) { gtk_widget_set_sensitive(vc->menu_item, false); vc->window = gtk_window_new(GTK_WINDOW_TOPLEVEL); - gtk_widget_reparent(vc->tab_item, vc->window); + gd_widget_reparent(s->notebook, vc->window, vc->tab_item); g_signal_connect(vc->window, "delete-event", G_CALLBACK(gd_tab_window_close), vc); |