diff options
| author | Alex Valavanis <valavanisalex@gmail.com> | 2011-12-28 19:08:12 +0000 |
|---|---|---|
| committer | Alex Valavanis <valavanisalex@gmail.com> | 2011-12-28 19:08:12 +0000 |
| commit | a31a2f6af851a7a19f4dfb95c2c23873f5a14889 (patch) | |
| tree | c4e8456a46fa1b1832e1981ff24bc20db8971b91 /src | |
| parent | GDL: Cherry-pick upstream patch 73852 (2011-03-23) - Add missing return value. (diff) | |
| download | inkscape-a31a2f6af851a7a19f4dfb95c2c23873f5a14889.tar.gz inkscape-a31a2f6af851a7a19f4dfb95c2c23873f5a14889.zip | |
GDL: Fix GSEAL issues
(bzr r10797)
Diffstat (limited to 'src')
| -rw-r--r-- | src/libgdl/gdl-dock-item.c | 6 | ||||
| -rw-r--r-- | src/libgdl/gdl-dock-paned.c | 15 |
2 files changed, 11 insertions, 10 deletions
diff --git a/src/libgdl/gdl-dock-item.c b/src/libgdl/gdl-dock-item.c index 50be88583..11727cf5e 100644 --- a/src/libgdl/gdl-dock-item.c +++ b/src/libgdl/gdl-dock-item.c @@ -2367,9 +2367,9 @@ gdl_dock_item_or_child_has_focus (GdlDockItem *item) g_return_val_if_fail (GDL_IS_DOCK_ITEM (item), FALSE); - for (item_child = GTK_CONTAINER (item)->focus_child; - item_child && GTK_IS_CONTAINER (item_child) && GTK_CONTAINER (item_child)->focus_child; - item_child = GTK_CONTAINER (item_child)->focus_child) ; + for (item_child = gtk_container_get_focus_child (GTK_CONTAINER (item)); + item_child && GTK_IS_CONTAINER (item_child) && gtk_container_get_focus_child (GTK_CONTAINER (item_child)); + item_child = gtk_container_get_focus_child (GTK_CONTAINER (item_child))) ; item_or_child_has_focus = (gtk_widget_has_focus (GTK_WIDGET (item)) || diff --git a/src/libgdl/gdl-dock-paned.c b/src/libgdl/gdl-dock-paned.c index 299384de4..f5fc88e47 100644 --- a/src/libgdl/gdl-dock-paned.c +++ b/src/libgdl/gdl-dock-paned.c @@ -165,26 +165,27 @@ gdl_dock_paned_resize_paned_ancestors (GdlDockPaned *paned, return; } - for (widget = GTK_WIDGET (paned)->parent; widget != NULL; - widget = widget->parent) { + for (widget = gtk_widget_get_parent (GTK_WIDGET (paned)); widget != NULL; + widget = gtk_widget_get_parent (widget)) { if (GTK_IS_PANED (widget)) { GtkPaned *paned = GTK_PANED (widget); - if (last_widget == paned->child1) { + if (last_widget == gtk_paned_get_child1 (paned)) { - if (!GDL_IS_DOCK_OBJECT(widget->parent)) { + if (!GDL_IS_DOCK_OBJECT(gtk_widget_get_parent (widget))) { GtkRequisition requisition; - GtkAllocation allocation = paned->child1->allocation; + GtkAllocation allocation; + gtk_widget_get_allocation (gtk_paned_get_child1 (paned), &allocation); - gtk_widget_size_request (paned->child1, &requisition); + gtk_widget_size_request (gtk_paned_get_child1 (paned), &requisition); gint new_height = (allocation.height > requisition.height && diff > 0 ? allocation.height : requisition.height) + diff; - gtk_widget_set_size_request (paned->child1, -1, new_height); + gtk_widget_set_size_request (gtk_paned_get_child1 (paned), -1, new_height); } gtk_paned_set_position (paned, gtk_paned_get_position (paned) + diff); |