AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "gtkbin: replace internal api"

Browse Source 
This reverts commit 0f4751c08e.

This causes warnings from the notebook and combobox code.
This commit is contained in:
Matthias Clasen 2014-06-16 17:31:56 -04:00
parent b57c04de5c
commit f0f9c2aa37
6 changed files with 36 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gtk/gtkassistant.c
View File

@ -1434,7 +1434,8 @@ gtk_assistant_add (GtkContainer *container,
*/
if (!gtk_bin_get_child (GTK_BIN (container)))
{
GTK_CONTAINER_CLASS (gtk_assistant_parent_class)->add (container, page);
gtk_widget_set_parent (page, GTK_WIDGET (container));
_gtk_bin_set_child (GTK_BIN (container), page);
return;
}

6
gtk/gtkbin.c
View File

@ -331,3 +331,9 @@ gtk_bin_get_child (GtkBin *bin)
return bin->priv->child;
}
void
_gtk_bin_set_child (GtkBin *bin,
GtkWidget *widget)
{
bin->priv->child = widget;
}

3
gtk/gtkbin.h
View File

@ -79,6 +79,9 @@ GType gtk_bin_get_type (void) G_GNUC_CONST;
GDK_AVAILABLE_IN_ALL
GtkWidget *gtk_bin_get_child (GtkBin *bin);
void _gtk_bin_set_child (GtkBin *bin,
GtkWidget *widget);
G_END_DECLS
#endif /* __GTK_BIN_H__ */

18
gtk/gtkcombobox.c
View File

@ -1587,10 +1587,13 @@ gtk_combo_box_add (GtkContainer *container,
if (priv->cell_view &&
gtk_widget_get_parent (priv->cell_view))
{
GTK_CONTAINER_CLASS (gtk_combo_box_parent_class)->remove (container, priv->cell_view);
gtk_widget_unparent (priv->cell_view);
_gtk_bin_set_child (GTK_BIN (container), NULL);
gtk_widget_queue_resize (GTK_WIDGET (container));
}
GTK_CONTAINER_CLASS (gtk_combo_box_parent_class)->add (container, widget);
gtk_widget_set_parent (widget, GTK_WIDGET (container));
_gtk_bin_set_child (GTK_BIN (container), widget);
if (priv->cell_view &&
widget != priv->cell_view)
@ -1654,11 +1657,14 @@ gtk_combo_box_remove (GtkContainer *container,
if (widget == priv->cell_view)
priv->cell_view = NULL;
GTK_CONTAINER_CLASS (gtk_combo_box_parent_class)->remove (container, widget);
gtk_widget_unparent (widget);
_gtk_bin_set_child (GTK_BIN (container), NULL);
if (gtk_widget_in_destruction (GTK_WIDGET (combo_box)))
return;
gtk_widget_queue_resize (GTK_WIDGET (container));
if (!priv->tree_view)
appears_as_list = FALSE;
else
@ -1676,7 +1682,8 @@ gtk_combo_box_remove (GtkContainer *container,
if (!priv->cell_view)
{
priv->cell_view = gtk_cell_view_new ();
GTK_CONTAINER_CLASS (gtk_combo_box_parent_class)->add (container, priv->cell_view);
gtk_widget_set_parent (priv->cell_view, GTK_WIDGET (container));
_gtk_bin_set_child (GTK_BIN (container), priv->cell_view);
gtk_widget_show (priv->cell_view);
gtk_cell_view_set_model (GTK_CELL_VIEW (priv->cell_view),
@ -4810,7 +4817,8 @@ gtk_combo_box_constructor (GType type,
priv->cell_view = gtk_cell_view_new_with_context (priv->area, NULL);
gtk_cell_view_set_fit_model (GTK_CELL_VIEW (priv->cell_view), TRUE);
gtk_cell_view_set_model (GTK_CELL_VIEW (priv->cell_view), priv->model);
GTK_CONTAINER_CLASS (gtk_combo_box_parent_class)->add (GTK_CONTAINER (combo_box),priv->cell_view);
gtk_widget_set_parent (priv->cell_view, GTK_WIDGET (combo_box));
_gtk_bin_set_child (GTK_BIN (combo_box), priv->cell_view);
gtk_widget_show (priv->cell_view);
gtk_combo_box_check_appearance (combo_box);

7
gtk/gtknotebook.c
View File

@ -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

12
gtk/gtkscrolledwindow.c
View File

@ -2727,9 +2727,14 @@ gtk_scrolled_window_add (GtkContainer *container,
{
GtkScrolledWindowPrivate *priv;
GtkScrolledWindow *scrolled_window;
GtkWidget *scrollable_child;
GtkBin *bin;
GtkWidget *child_widget, *scrollable_child;
GtkAdjustment *hadj, *vadj;
bin = GTK_BIN (container);
child_widget = gtk_bin_get_child (bin);
g_return_if_fail (child_widget == NULL);
scrolled_window = GTK_SCROLLED_WINDOW (container);
priv = scrolled_window->priv;
@ -2760,10 +2765,11 @@ gtk_scrolled_window_add (GtkContainer *container,
gtk_container_add (GTK_CONTAINER (scrollable_child), child);
}
if (gtk_widget_get_realized (GTK_WIDGET (container)))
if (gtk_widget_get_realized (GTK_WIDGET (bin)))
gtk_widget_set_parent_window (scrollable_child, priv->overshoot_window);
GTK_CONTAINER_CLASS (gtk_scrolled_window_parent_class)->add (container, scrollable_child);
_gtk_bin_set_child (bin, scrollable_child);
gtk_widget_set_parent (scrollable_child, GTK_WIDGET (bin));
g_object_set (scrollable_child, "hadjustment", hadj, "vadjustment", vadj, NULL);
}