diff options
| author | Javier Jardón <jjardon@gnome.org> | 2010-06-02 06:28:22 +0200 |
|---|---|---|
| committer | Javier Jardón <jjardon@gnome.org> | 2010-07-13 19:40:46 +0200 |
| commit | 3a10216dd01c8d10df235b88c8942b2fda15689b (patch) | |
| tree | 80df10196e365741a9dcb6a8c773c1e992e3e9fe /gtk/gtkexpander.c | |
| parent | 009acc263e883923fd7c528c401f9d39756788aa (diff) | |
| download | gtk+-3a10216dd01c8d10df235b88c8942b2fda15689b.tar.gz | |
Use accessor functions to acces GtkContainer
Diffstat (limited to 'gtk/gtkexpander.c')
| -rw-r--r-- | gtk/gtkexpander.c | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/gtk/gtkexpander.c b/gtk/gtkexpander.c index 270769640c..8610f0b4d2 100644 --- a/gtk/gtkexpander.c +++ b/gtk/gtkexpander.c @@ -404,7 +404,7 @@ gtk_expander_realize (GtkWidget *widget) priv = GTK_EXPANDER (widget)->priv; gtk_widget_set_realized (widget, TRUE); - border_width = GTK_CONTAINER (widget)->border_width; + border_width = gtk_container_get_border_width (GTK_CONTAINER (widget)); get_expander_bounds (GTK_EXPANDER (widget), &expander_rect); @@ -475,7 +475,7 @@ gtk_expander_size_request (GtkWidget *widget, expander = GTK_EXPANDER (widget); priv = expander->priv; - border_width = GTK_CONTAINER (widget)->border_width; + border_width = gtk_container_get_border_width (GTK_CONTAINER (widget)); gtk_widget_style_get (widget, "interior-focus", &interior_focus, @@ -535,7 +535,7 @@ get_expander_bounds (GtkExpander *expander, widget = GTK_WIDGET (expander); priv = expander->priv; - border_width = GTK_CONTAINER (expander)->border_width; + border_width = gtk_container_get_border_width (GTK_CONTAINER (widget)); gtk_widget_style_get (widget, "interior-focus", &interior_focus, @@ -593,7 +593,7 @@ gtk_expander_size_allocate (GtkWidget *widget, GtkExpanderPrivate *priv; GtkRequisition child_requisition; gboolean child_visible = FALSE; - gint border_width; + guint border_width; gint expander_size; gint expander_spacing; gboolean interior_focus; @@ -605,7 +605,7 @@ gtk_expander_size_allocate (GtkWidget *widget, bin = GTK_BIN (widget); priv = expander->priv; - border_width = GTK_CONTAINER (widget)->border_width; + border_width = gtk_container_get_border_width (GTK_CONTAINER (widget)); gtk_widget_style_get (widget, "interior-focus", &interior_focus, @@ -747,6 +747,7 @@ gtk_expander_paint_prelight (GtkExpander *expander) int focus_pad; int expander_size; int expander_spacing; + guint border_width; priv = expander->priv; widget = GTK_WIDGET (expander); @@ -760,9 +761,10 @@ gtk_expander_paint_prelight (GtkExpander *expander) "expander-spacing", &expander_spacing, NULL); - area.x = widget->allocation.x + container->border_width; - area.y = widget->allocation.y + container->border_width; - area.width = widget->allocation.width - (2 * container->border_width); + border_width = gtk_container_get_border_width (container); + area.x = widget->allocation.x + border_width; + area.y = widget->allocation.y + border_width; + area.width = widget->allocation.width - (2 * border_width); if (priv->label_widget && gtk_widget_get_visible (priv->label_widget)) area.height = priv->label_widget->allocation.height; @@ -830,7 +832,7 @@ gtk_expander_paint_focus (GtkExpander *expander, widget = GTK_WIDGET (expander); priv = expander->priv; - border_width = GTK_CONTAINER (widget)->border_width; + border_width = gtk_container_get_border_width (GTK_CONTAINER (widget)); gtk_widget_style_get (widget, "interior-focus", &interior_focus, @@ -1080,7 +1082,7 @@ focus_current_site (GtkExpander *expander, { GtkWidget *current_focus; - current_focus = GTK_CONTAINER (expander)->focus_child; + current_focus = gtk_container_get_focus_child (GTK_CONTAINER (expander)); if (!current_focus) return FALSE; @@ -1204,7 +1206,7 @@ gtk_expander_focus (GtkWidget *widget, FocusSite site = FOCUS_NONE; widget_is_focus = gtk_widget_is_focus (widget); - old_focus_child = GTK_CONTAINER (widget)->focus_child; + old_focus_child = gtk_container_get_focus_child (GTK_CONTAINER (widget)); if (old_focus_child && old_focus_child == expander->priv->label_widget) site = FOCUS_LABEL; |