From 20f28c180d171a2f0e707c274b249d90f8d903e0 Mon Sep 17 00:00:00 2001 From: John Darrington Date: Sun, 26 May 2013 15:11:39 +0200 Subject: [PATCH] Avoid yet more sealed access --- src/ui/gui/pspp-sheet-view-column.c | 4 ++-- src/ui/gui/psppire-hbuttonbox.c | 32 ++++++++++++++--------------- src/ui/gui/psppire-vbuttonbox.c | 32 ++++++++++++++--------------- 3 files changed, 34 insertions(+), 34 deletions(-) diff --git a/src/ui/gui/pspp-sheet-view-column.c b/src/ui/gui/pspp-sheet-view-column.c index ad214ee522..a11acf7e35 100644 --- a/src/ui/gui/pspp-sheet-view-column.c +++ b/src/ui/gui/pspp-sheet-view-column.c @@ -1085,10 +1085,10 @@ pspp_sheet_view_column_update_button (PsppSheetViewColumn *tree_column) if (! tree_column->button) return; - hbox = GTK_BIN (tree_column->button)->child; + hbox = gtk_bin_get_child (GTK_BIN (tree_column->button)); alignment = tree_column->alignment; arrow = tree_column->arrow; - current_child = GTK_BIN (alignment)->child; + current_child = gtk_bin_get_child (GTK_BIN (alignment)); /* Set up the actual button */ gtk_alignment_set (GTK_ALIGNMENT (alignment), tree_column->xalign, diff --git a/src/ui/gui/psppire-hbuttonbox.c b/src/ui/gui/psppire-hbuttonbox.c index 9ce34bb491..d200b9d087 100644 --- a/src/ui/gui/psppire-hbuttonbox.c +++ b/src/ui/gui/psppire-hbuttonbox.c @@ -114,9 +114,9 @@ gtk_hbutton_box_size_request (GtkWidget *widget, box = GTK_BOX (widget); bbox = GTK_BUTTON_BOX (widget); - spacing = box->spacing; - layout = bbox->layout_style != GTK_BUTTONBOX_DEFAULT_STYLE - ? bbox->layout_style : default_layout_style; + spacing = gtk_box_get_spacing (box); + layout = gtk_button_box_get_layout (bbox) != GTK_BUTTONBOX_DEFAULT_STYLE + ? gtk_button_box_get_layout (bbox) : default_layout_style; _psppire_button_box_child_requisition (widget, &nvis_children, @@ -150,8 +150,8 @@ gtk_hbutton_box_size_request (GtkWidget *widget, requisition->height = child_height; } - requisition->width += GTK_CONTAINER (box)->border_width * 2; - requisition->height += GTK_CONTAINER (box)->border_width * 2; + requisition->width += gtk_container_get_border_width (GTK_CONTAINER (box)) * 2; + requisition->height += gtk_container_get_border_width (GTK_CONTAINER (box)) * 2; } @@ -179,28 +179,28 @@ gtk_hbutton_box_size_allocate (GtkWidget *widget, base_box = GTK_BOX (widget); box = GTK_BUTTON_BOX (widget); - spacing = base_box->spacing; - layout = box->layout_style != GTK_BUTTONBOX_DEFAULT_STYLE - ? box->layout_style : default_layout_style; + spacing = gtk_box_get_spacing (base_box); + layout = gtk_button_box_get_layout (box) != GTK_BUTTONBOX_DEFAULT_STYLE + ? gtk_button_box_get_layout (box) : default_layout_style; _psppire_button_box_child_requisition (widget, &nvis_children, &n_secondaries, &child_width, &child_height); - widget->allocation = *allocation; - width = allocation->width - GTK_CONTAINER (box)->border_width*2; + gtk_widget_set_allocation (widget, allocation); + width = allocation->width - gtk_container_get_border_width (GTK_CONTAINER (box))*2; switch (layout) { case GTK_BUTTONBOX_SPREAD: childspacing = (width - (nvis_children * child_width)) / (nvis_children + 1); - x = allocation->x + GTK_CONTAINER (box)->border_width + childspacing; + x = allocation->x + gtk_container_get_border_width (GTK_CONTAINER (box)) + childspacing; secondary_x = x + ((nvis_children - n_secondaries) * (child_width + childspacing)); break; case GTK_BUTTONBOX_EDGE: if (nvis_children >= 2) { childspacing = (width - (nvis_children * child_width)) / (nvis_children - 1); - x = allocation->x + GTK_CONTAINER (box)->border_width; + x = allocation->x + gtk_container_get_border_width (GTK_CONTAINER (box)); secondary_x = x + ((nvis_children - n_secondaries) * (child_width + childspacing)); } else @@ -212,19 +212,19 @@ gtk_hbutton_box_size_allocate (GtkWidget *widget, break; case GTK_BUTTONBOX_START: childspacing = spacing; - x = allocation->x + GTK_CONTAINER (box)->border_width; + x = allocation->x + gtk_container_get_border_width (GTK_CONTAINER (box)); secondary_x = allocation->x + allocation->width - child_width * n_secondaries - spacing * (n_secondaries - 1) - - GTK_CONTAINER (box)->border_width; + - gtk_container_get_border_width (GTK_CONTAINER (box)); break; case GTK_BUTTONBOX_END: childspacing = spacing; x = allocation->x + allocation->width - child_width * (nvis_children - n_secondaries) - spacing * (nvis_children - n_secondaries - 1) - - GTK_CONTAINER (box)->border_width; - secondary_x = allocation->x + GTK_CONTAINER (box)->border_width; + - gtk_container_get_border_width (GTK_CONTAINER (box)); + secondary_x = allocation->x + gtk_container_get_border_width (GTK_CONTAINER (box)); break; default: g_assert_not_reached(); diff --git a/src/ui/gui/psppire-vbuttonbox.c b/src/ui/gui/psppire-vbuttonbox.c index eb9a662ecb..2af878f38e 100644 --- a/src/ui/gui/psppire-vbuttonbox.c +++ b/src/ui/gui/psppire-vbuttonbox.c @@ -114,9 +114,9 @@ gtk_vbutton_box_size_request (GtkWidget *widget, box = GTK_BOX (widget); bbox = GTK_BUTTON_BOX (widget); - spacing = box->spacing; - layout = bbox->layout_style != GTK_BUTTONBOX_DEFAULT_STYLE - ? bbox->layout_style : default_layout_style; + spacing = gtk_box_get_spacing (box); + layout = gtk_button_box_get_layout (bbox) != GTK_BUTTONBOX_DEFAULT_STYLE + ? gtk_button_box_get_layout (bbox) : default_layout_style; _psppire_button_box_child_requisition (widget, &nvis_children, @@ -150,8 +150,8 @@ gtk_vbutton_box_size_request (GtkWidget *widget, requisition->width = child_width; } - requisition->width += GTK_CONTAINER (box)->border_width * 2; - requisition->height += GTK_CONTAINER (box)->border_width * 2; + requisition->width += gtk_container_get_border_width (GTK_CONTAINER (box)) * 2; + requisition->height += gtk_container_get_border_width (GTK_CONTAINER (box)) * 2; } @@ -179,28 +179,28 @@ gtk_vbutton_box_size_allocate (GtkWidget *widget, base_box = GTK_BOX (widget); box = GTK_BUTTON_BOX (widget); - spacing = base_box->spacing; - layout = box->layout_style != GTK_BUTTONBOX_DEFAULT_STYLE - ? box->layout_style : default_layout_style; + spacing = gtk_box_get_spacing (base_box); + layout = gtk_button_box_get_layout (box) != GTK_BUTTONBOX_DEFAULT_STYLE + ? gtk_button_box_get_layout (box) : default_layout_style; _psppire_button_box_child_requisition (widget, &nvis_children, &n_secondaries, &child_width, &child_height); - widget->allocation = *allocation; - height = allocation->height - GTK_CONTAINER (box)->border_width*2; + gtk_widget_set_allocation (widget, allocation); + height = allocation->height - gtk_container_get_border_width (GTK_CONTAINER (box))*2; switch (layout) { case GTK_BUTTONBOX_SPREAD: childspacing = (height - (nvis_children * child_height)) / (nvis_children + 1); - y = allocation->y + GTK_CONTAINER (box)->border_width + childspacing; + y = allocation->y + gtk_container_get_border_width (GTK_CONTAINER (box)) + childspacing; secondary_y = y + ((nvis_children - n_secondaries) * (child_height + childspacing)); break; case GTK_BUTTONBOX_EDGE: if (nvis_children >= 2) { childspacing = (height - (nvis_children*child_height)) / (nvis_children-1); - y = allocation->y + GTK_CONTAINER (box)->border_width; + y = allocation->y + gtk_container_get_border_width (GTK_CONTAINER (box)); secondary_y = y + ((nvis_children - n_secondaries) * (child_height + childspacing)); } else @@ -212,19 +212,19 @@ gtk_vbutton_box_size_allocate (GtkWidget *widget, break; case GTK_BUTTONBOX_START: childspacing = spacing; - y = allocation->y + GTK_CONTAINER (box)->border_width; + y = allocation->y + gtk_container_get_border_width (GTK_CONTAINER (box)); secondary_y = allocation->y + allocation->height - child_height * n_secondaries - spacing * (n_secondaries - 1) - - GTK_CONTAINER (box)->border_width; + - gtk_container_get_border_width (GTK_CONTAINER (box)); break; case GTK_BUTTONBOX_END: childspacing = spacing; y = allocation->y + allocation->height - child_height * (nvis_children - n_secondaries) - spacing * (nvis_children - n_secondaries - 1) - - GTK_CONTAINER (box)->border_width; - secondary_y = allocation->y + GTK_CONTAINER (box)->border_width; + - gtk_container_get_border_width (GTK_CONTAINER (box)); + secondary_y = allocation->y + gtk_container_get_border_width (GTK_CONTAINER (box)); break; default: g_assert_not_reached(); -- 2.30.2