88 lines
3.1 KiB
Diff
88 lines
3.1 KiB
Diff
From 92d8c2a24dbf5a1a902efef0da86dd23e43208db Mon Sep 17 00:00:00 2001
|
|
From: Bastien Nocera <hadess@hadess.net>
|
|
Date: Fri, 11 Jun 2010 13:15:36 +0200
|
|
Subject: [PATCH 036/249] [ln-p] GSEAL nautilus-horizontal-splitter.
|
|
|
|
---
|
|
libnautilus-private/nautilus-horizontal-splitter.c | 26 ++++++++++----------
|
|
1 files changed, 13 insertions(+), 13 deletions(-)
|
|
|
|
diff --git a/libnautilus-private/nautilus-horizontal-splitter.c b/libnautilus-private/nautilus-horizontal-splitter.c
|
|
index 717d763..fa09d87 100644
|
|
--- a/libnautilus-private/nautilus-horizontal-splitter.c
|
|
+++ b/libnautilus-private/nautilus-horizontal-splitter.c
|
|
@@ -109,7 +109,7 @@ splitter_hide (NautilusHorizontalSplitter *splitter)
|
|
|
|
parent = GTK_PANED (splitter);
|
|
|
|
- gtk_widget_hide (parent->child1);
|
|
+ gtk_widget_hide (gtk_paned_get_child1 (parent));
|
|
}
|
|
|
|
static void
|
|
@@ -119,7 +119,7 @@ splitter_show (NautilusHorizontalSplitter *splitter)
|
|
|
|
parent = GTK_PANED (splitter);
|
|
|
|
- gtk_widget_show (parent->child1);
|
|
+ gtk_widget_show (gtk_paned_get_child1 (parent));
|
|
}
|
|
|
|
static gboolean
|
|
@@ -129,7 +129,7 @@ splitter_is_hidden (NautilusHorizontalSplitter *splitter)
|
|
|
|
parent = GTK_PANED (splitter);
|
|
|
|
- return gtk_widget_get_visible (parent->child1);
|
|
+ return gtk_widget_get_visible (gtk_paned_get_child1 (parent));
|
|
}
|
|
|
|
void
|
|
@@ -234,33 +234,33 @@ nautilus_horizontal_splitter_size_allocate (GtkWidget *widget,
|
|
GtkRequisition child_requisition;
|
|
|
|
paned = GTK_PANED (widget);
|
|
- border_width = GTK_CONTAINER (paned)->border_width;
|
|
+ border_width = gtk_container_get_border_width (GTK_CONTAINER (paned));
|
|
|
|
- widget->allocation = *allocation;
|
|
+ gtk_widget_set_allocation (widget, allocation);
|
|
|
|
- if (paned->child2 != NULL && gtk_widget_get_visible (paned->child2)) {
|
|
+ if (gtk_paned_get_child2 (paned) != NULL && gtk_widget_get_visible (gtk_paned_get_child2 (paned))) {
|
|
EEL_CALL_PARENT (GTK_WIDGET_CLASS, size_allocate,
|
|
(widget, allocation));
|
|
- } else if (paned->child1 && gtk_widget_get_visible (paned->child1)) {
|
|
+ } else if (gtk_paned_get_child1 (paned) && gtk_widget_get_visible (gtk_paned_get_child1 (paned))) {
|
|
|
|
if (gtk_widget_get_realized (widget)) {
|
|
- gdk_window_hide (paned->handle);
|
|
+ gdk_window_hide (gtk_paned_get_handle_window (paned));
|
|
}
|
|
|
|
- gtk_widget_get_child_requisition (paned->child1,
|
|
+ gtk_widget_get_child_requisition (gtk_paned_get_child1 (paned),
|
|
&child_requisition);
|
|
|
|
- child_allocation.x = widget->allocation.x + border_width;
|
|
- child_allocation.y = widget->allocation.y + border_width;
|
|
+ child_allocation.x = allocation->x + border_width;
|
|
+ child_allocation.y = allocation->y + border_width;
|
|
child_allocation.width = MIN (child_requisition.width,
|
|
allocation->width - 2 * border_width);
|
|
child_allocation.height = MIN (child_requisition.height,
|
|
allocation->height - 2 * border_width);
|
|
|
|
- gtk_widget_size_allocate (paned->child1, &child_allocation);
|
|
+ gtk_widget_size_allocate (gtk_paned_get_child1 (paned), &child_allocation);
|
|
} else
|
|
if (gtk_widget_get_realized (widget)) {
|
|
- gdk_window_hide (paned->handle);
|
|
+ gdk_window_hide (gtk_paned_get_handle_window (paned));
|
|
}
|
|
|
|
}
|
|
--
|
|
1.7.2
|
|
|