diff options
| author | Tristan Van Berkom <tristan.van.berkom@gmail.com> | 2010-08-30 14:56:28 +0900 |
|---|---|---|
| committer | Tristan Van Berkom <tristan.van.berkom@gmail.com> | 2010-08-30 14:56:28 +0900 |
| commit | 54d44a9bd04cfbed8426614fc69c027a46f41a14 (patch) | |
| tree | 34bdf65a6e8d5d6d4016154345d1d803ba0da379 /demos/gtk-demo/panes.c | |
| parent | b3b22c31b997fb85b3319b392a1a69407703184c (diff) | |
| parent | 67194ed77b153eb5a7eb6c596f3c20e274b7787a (diff) | |
| download | gtk+-native-layout.tar.gz | |
Merge branch 'master' into native-layoutnative-layout
Conflicts:
gtk/gtkplug.c
gtk/gtkscrolledwindow.c
Diffstat (limited to 'demos/gtk-demo/panes.c')
| -rw-r--r-- | demos/gtk-demo/panes.c | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/demos/gtk-demo/panes.c b/demos/gtk-demo/panes.c index 60ee2dd635..3399653d10 100644 --- a/demos/gtk-demo/panes.c +++ b/demos/gtk-demo/panes.c @@ -17,17 +17,23 @@ void toggle_resize (GtkWidget *widget, GtkWidget *child) { - GtkPaned *paned = GTK_PANED (child->parent); - gboolean is_child1 = (child == gtk_paned_get_child1 (paned)); + GtkWidget *parent; + GtkPaned *paned; + gboolean is_child1; gboolean resize, shrink; + parent = gtk_widget_get_parent (child); + paned = GTK_PANED (parent); + + is_child1 = (child == gtk_paned_get_child1 (paned)); + gtk_container_child_get (GTK_CONTAINER (paned), child, "resize", &resize, "shrink", &shrink, NULL); g_object_ref (child); - gtk_container_remove (GTK_CONTAINER (child->parent), child); + gtk_container_remove (GTK_CONTAINER (parent), child); if (is_child1) gtk_paned_pack1 (paned, child, !resize, shrink); else @@ -39,17 +45,23 @@ void toggle_shrink (GtkWidget *widget, GtkWidget *child) { - GtkPaned *paned = GTK_PANED (child->parent); - gboolean is_child1 = (child == gtk_paned_get_child1 (paned)); + GtkWidget *parent; + GtkPaned *paned; + gboolean is_child1; gboolean resize, shrink; + parent = gtk_widget_get_parent (child); + paned = GTK_PANED (parent); + + is_child1 = (child == gtk_paned_get_child1 (paned)); + gtk_container_child_get (GTK_CONTAINER (paned), child, "resize", &resize, "shrink", &shrink, NULL); g_object_ref (child); - gtk_container_remove (GTK_CONTAINER (child->parent), child); + gtk_container_remove (GTK_CONTAINER (parent), child); if (is_child1) gtk_paned_pack1 (paned, child, resize, !shrink); else |