diff options
author | Matthias Clasen <mclasen@redhat.com> | 2014-06-16 17:31:56 -0400 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2014-06-16 17:31:56 -0400 |
commit | f0f9c2aa37893cf5d3f09ce9c8ac36a88d661e37 (patch) | |
tree | 0062ca04becddb65cdfd81252e069cee0c21254e /gtk/gtknotebook.c | |
parent | b57c04de5c8d2cd2305f6561309af335428685a4 (diff) | |
download | gtk+-f0f9c2aa37893cf5d3f09ce9c8ac36a88d661e37.tar.gz |
Revert "gtkbin: replace internal api"
This reverts commit 0f4751c08e22a4f45d58e2368e4ae82df407d330.
This causes warnings from the notebook and combobox code.
Diffstat (limited to 'gtk/gtknotebook.c')
-rw-r--r-- | gtk/gtknotebook.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c index 1e48671e9a..4cc472c317 100644 --- a/gtk/gtknotebook.c +++ b/gtk/gtknotebook.c @@ -3723,8 +3723,7 @@ gtk_notebook_drag_end (GtkWidget *widget, if (priv->detached_tab) gtk_notebook_switch_page (notebook, priv->detached_tab); - GTK_CONTAINER_CLASS (gtk_notebook_parent_class)->remove (GTK_CONTAINER (priv->dnd_window), - gtk_bin_get_child (GTK_BIN (priv->dnd_window))); + _gtk_bin_set_child (GTK_BIN (priv->dnd_window), NULL); gtk_widget_destroy (priv->dnd_window); priv->dnd_window = NULL; @@ -6911,8 +6910,8 @@ static void gtk_notebook_menu_label_unparent (GtkWidget *widget, gpointer data) { - GTK_CONTAINER_CLASS (gtk_notebook_parent_class)->remove (GTK_CONTAINER (widget), - gtk_bin_get_child (GTK_BIN (widget))); + gtk_widget_unparent (gtk_bin_get_child (GTK_BIN (widget))); + _gtk_bin_set_child (GTK_BIN (widget), NULL); } static void |