From 02b1566249c9d16db5cc082f05483d64e172e057 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Sat, 10 Oct 2009 14:46:05 +0200 Subject: [PATCH] Use accessors instead of widget->window and adjustment->value --- plug-ins/common/file-ps.c | 4 ++-- plug-ins/common/filter-pack.c | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/plug-ins/common/file-ps.c b/plug-ins/common/file-ps.c index 82e3c7fb7f..0cacf7bb3c 100644 --- a/plug-ins/common/file-ps.c +++ b/plug-ins/common/file-ps.c @@ -3532,7 +3532,7 @@ save_unit_toggle_update (GtkWidget *widget, for (i = 0; i < 4; i++) { - value = GTK_ADJUSTMENT (vals->adjustment[i])->value * factor; + value = gtk_adjustment_get_value (GTK_ADJUSTMENT (vals->adjustment[i])) * factor; gtk_adjustment_set_value (GTK_ADJUSTMENT (vals->adjustment[i]), value); @@ -3548,7 +3548,7 @@ resolution_change_callback (GtkAdjustment *adjustment, gdouble ratio; if (*old_resolution) - ratio = (gdouble) adjustment->value / *old_resolution; + ratio = (gdouble) gtk_adjustment_get_value (adjustment) / *old_resolution; else ratio = 1.0; diff --git a/plug-ins/common/filter-pack.c b/plug-ins/common/filter-pack.c index 2d7930489c..3e3c014d16 100644 --- a/plug-ins/common/filter-pack.c +++ b/plug-ins/common/filter-pack.c @@ -1163,9 +1163,9 @@ fp_scale_update (GtkAdjustment *adjustment, { static gdouble prevValue = 0.25; - *scale_val = adjustment->value; + *scale_val = gtk_adjustment_get_value (adjustment); - if (prevValue != adjustment->value) + if (prevValue != gtk_adjustment_get_value (adjustment)) { fp_create_nudge (nudgeArray); fp_refresh_previews (fpvals.visible_frames); @@ -1173,7 +1173,7 @@ fp_scale_update (GtkAdjustment *adjustment, if (AW.window != NULL && GTK_WIDGET_VISIBLE (AW.window)) fp_create_smoothness_graph (AW.aliasing_preview); - prevValue = adjustment->value; + prevValue = gtk_adjustment_get_value (adjustment); } } @@ -1280,7 +1280,7 @@ static void fp_preview_scale_update (GtkAdjustment *adjustment, gdouble *scale_val) { - fpvals.preview_size = adjustment->value; + fpvals.preview_size = gtk_adjustment_get_value (adjustment); fp_redraw_all_windows(); } @@ -1477,17 +1477,17 @@ draw_it (GtkWidget *widget) { GtkStyle *style = gtk_widget_get_style (AW.aliasing_graph); - draw_slider (AW.aliasing_graph->window, + draw_slider (gtk_widget_get_window (AW.aliasing_graph), style->black_gc, style->dark_gc[GTK_STATE_NORMAL], fpvals.cutoff[SHADOWS]); - draw_slider (AW.aliasing_graph->window, + draw_slider (gtk_widget_get_window (AW.aliasing_graph), style->black_gc, style->dark_gc[GTK_STATE_NORMAL], fpvals.cutoff[MIDTONES]); - draw_slider (AW.aliasing_graph->window, + draw_slider (gtk_widget_get_window (AW.aliasing_graph), style->black_gc, style->dark_gc[GTK_STATE_SELECTED], fpvals.offset); @@ -1528,7 +1528,7 @@ fp_range_change_events (GtkWidget *widget, else new = &fpvals.offset; - slider_erase (AW.aliasing_graph->window, *new); + slider_erase (gtk_widget_get_window (AW.aliasing_graph), *new); *new = bevent->x; } @@ -1549,7 +1549,7 @@ fp_range_change_events (GtkWidget *widget, if (x >= 0 && x < 256) { - slider_erase (AW.aliasing_graph->window, *new); + slider_erase (gtk_widget_get_window (AW.aliasing_graph), *new); *new = x; draw_it (NULL); fp_range_preview_spill (AW.range_preview, fpvals.value_by);