diff --git a/plug-ins/gimpressionist/brush.c b/plug-ins/gimpressionist/brush.c index d12a452f86..5f9c7420c8 100644 --- a/plug-ins/gimpressionist/brush.c +++ b/plug-ins/gimpressionist/brush.c @@ -65,7 +65,7 @@ brush_restore (void) void brush_store (void) { - pcvals.brushgamma = GTK_ADJUSTMENT (brush_gamma_adjust)->value; + pcvals.brushgamma = gtk_adjustment_get_value (GTK_ADJUSTMENT (brush_gamma_adjust)); } void @@ -363,7 +363,7 @@ update_brush_preview (const gchar *fn) set_colorbrushes (fn); - sc = GTK_ADJUSTMENT (brush_gamma_adjust)->value; + sc = gtk_adjustment_get_value (GTK_ADJUSTMENT (brush_gamma_adjust)); if (sc != 1.0) for (i = 0; i < 256; i++) gammatable[i] = pow (i / 255.0, sc) * 255; @@ -372,7 +372,7 @@ update_brush_preview (const gchar *fn) gammatable[i] = i; newheight = p.height * - pow (10, GTK_ADJUSTMENT (brush_aspect_adjust)->value); + pow (10, gtk_adjustment_get_value (GTK_ADJUSTMENT (brush_aspect_adjust))); sc = p.width > newheight ? p.width : newheight; sc = 100.0 / sc; diff --git a/plug-ins/gimpressionist/general.c b/plug-ins/gimpressionist/general.c index 8fefd4321c..4efd30db8f 100644 --- a/plug-ins/gimpressionist/general.c +++ b/plug-ins/gimpressionist/general.c @@ -62,13 +62,13 @@ void general_store (void) { pcvals.general_paint_edges = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (general_paint_edges)); - pcvals.general_dark_edge = GTK_ADJUSTMENT (general_dark_edge_adjust)->value; + pcvals.general_dark_edge = gtk_adjustment_get_value (GTK_ADJUSTMENT (general_dark_edge_adjust)); pcvals.general_tileable = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (general_tileable)); pcvals.general_drop_shadow = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (general_drop_shadow)); - pcvals.general_shadow_darkness = GTK_ADJUSTMENT (general_shadow_adjust)->value; - pcvals.general_shadow_depth = GTK_ADJUSTMENT (general_shadow_depth)->value; - pcvals.general_shadow_blur = GTK_ADJUSTMENT (general_shadow_blur)->value; - pcvals.devthresh = GTK_ADJUSTMENT (dev_thresh_adjust)->value; + pcvals.general_shadow_darkness = gtk_adjustment_get_value (GTK_ADJUSTMENT (general_shadow_adjust)); + pcvals.general_shadow_depth = gtk_adjustment_get_value (GTK_ADJUSTMENT (general_shadow_depth)); + pcvals.general_shadow_blur = gtk_adjustment_get_value (GTK_ADJUSTMENT (general_shadow_blur)); + pcvals.devthresh = gtk_adjustment_get_value (GTK_ADJUSTMENT (dev_thresh_adjust)); } int diff --git a/plug-ins/gimpressionist/orientmap.c b/plug-ins/gimpressionist/orientmap.c index f9491d702a..7fdeb1864a 100644 --- a/plug-ins/gimpressionist/orientmap.c +++ b/plug-ins/gimpressionist/orientmap.c @@ -80,8 +80,8 @@ double get_direction (double x, double y, int from) { n = num_vectors; vec = vector; - angoff = GTK_ADJUSTMENT (angle_offset_adjust)->value; - strexp = GTK_ADJUSTMENT (orient_map_str_exp_adjust)->value; + angoff = gtk_adjustment_get_value (GTK_ADJUSTMENT (angle_offset_adjust)); + strexp = gtk_adjustment_get_value (GTK_ADJUSTMENT (orient_map_str_exp_adjust)); voronoi = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (orient_voronoi)); } else @@ -225,7 +225,7 @@ update_vector_prev (void) guchar white[3] = {255, 255, 255}; if (vector_preview_brightness_adjust) - val = 1.0 - GTK_ADJUSTMENT (vector_preview_brightness_adjust)->value / 100.0; + val = 1.0 - gtk_adjustment_get_value (GTK_ADJUSTMENT (vector_preview_brightness_adjust)) / 100.0; else val = 0.5; @@ -390,7 +390,7 @@ angle_adjust_move_callback (GtkWidget *w, gpointer data) { if (adjignore) return; - vector[selectedvector].dir = GTK_ADJUSTMENT (angle_adjust)->value; + vector[selectedvector].dir = gtk_adjustment_get_value (GTK_ADJUSTMENT (angle_adjust)); vector[selectedvector].dx = sin (gimp_deg_to_rad (vector[selectedvector].dir)); vector[selectedvector].dy = @@ -404,7 +404,7 @@ strength_adjust_move_callback (GtkWidget *w, gpointer data) { if (adjignore) return; - vector[selectedvector].str = GTK_ADJUSTMENT (strength_adjust)->value; + vector[selectedvector].str = gtk_adjustment_get_value (GTK_ADJUSTMENT (strength_adjust)); update_vector_prev (); update_orient_map_preview_prev (); } @@ -455,8 +455,8 @@ orient_map_response (GtkWidget *widget, pcvals.orient_vectors[i] = vector[i]; pcvals.num_orient_vectors = num_vectors; - pcvals.orient_strength_exponent = GTK_ADJUSTMENT (orient_map_str_exp_adjust)->value; - pcvals.orient_angle_offset = GTK_ADJUSTMENT (angle_offset_adjust)->value; + pcvals.orient_strength_exponent = gtk_adjustment_get_value (GTK_ADJUSTMENT (orient_map_str_exp_adjust)); + pcvals.orient_angle_offset = gtk_adjustment_get_value (GTK_ADJUSTMENT (angle_offset_adjust)); pcvals.orient_voronoi = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (orient_voronoi)); } }; diff --git a/plug-ins/gimpressionist/sizemap.c b/plug-ins/gimpressionist/sizemap.c index 8fbec985a8..59da1fb3db 100644 --- a/plug-ins/gimpressionist/sizemap.c +++ b/plug-ins/gimpressionist/sizemap.c @@ -61,7 +61,7 @@ static double getsiz_from_gui (double x, double y) { return getsiz_proto (x,y, numsmvect, smvector, - GTK_ADJUSTMENT (smstrexpadjust)->value, + gtk_adjustment_get_value (GTK_ADJUSTMENT (smstrexpadjust)), gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (size_voronoi))); } @@ -116,7 +116,7 @@ updatesmvectorprev (void) guchar white[3] = {255, 255, 255}; if (smvectprevbrightadjust) - val = 1.0 - GTK_ADJUSTMENT (smvectprevbrightadjust)->value / 100.0; + val = 1.0 - gtk_adjustment_get_value (GTK_ADJUSTMENT (smvectprevbrightadjust)) / 100.0; else val = 0.5; @@ -280,7 +280,7 @@ angsmadjmove (GtkWidget *w, gpointer data) { if (!smadjignore) { - smvector[selectedsmvector].siz = GTK_ADJUSTMENT (sizadjust)->value; + smvector[selectedsmvector].siz = gtk_adjustment_get_value (GTK_ADJUSTMENT (sizadjust)); updatesmvectorprev (); updatesmpreviewprev (); } @@ -291,7 +291,7 @@ strsmadjmove (GtkWidget *w, gpointer data) { if (!smadjignore) { - smvector[selectedsmvector].str = GTK_ADJUSTMENT (smstradjust)->value; + smvector[selectedsmvector].str = gtk_adjustment_get_value (GTK_ADJUSTMENT (smstradjust)); updatesmvectorprev (); updatesmpreviewprev (); }