dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

libgimpwidgets: a bit of s/GtkObject/GtkAdjustment/ 

only the GtkObjects in the public API left now, can't change these until 3.x
This commit is contained in:
Michael Natterer 2017-05-22 22:39:28 +02:00
parent c4701c484a
commit c61500066c
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libgimpwidgets/gimpcolorscales.c
View File

@ -74,7 +74,7 @@ struct _GimpColorScales
GtkWidget *toggles[10]; GtkWidget *toggles[10];
GtkWidget *sliders[10]; GtkWidget *sliders[10];
GtkObject *slider_data[10]; GtkAdjustment *slider_data[10];
}; };
struct _GimpColorScalesClass struct _GimpColorScalesClass
@ -204,7 +204,7 @@ gimp_color_scales_init (GimpColorScales *scales)
scales); scales);
} }
scales->slider_data[i] = scales->slider_data[i] = (GtkAdjustment *)
gimp_color_scale_entry_new (GTK_TABLE (table), 1, i, gimp_color_scale_entry_new (GTK_TABLE (table), 1, i,
gettext (enum_desc->value_desc), gettext (enum_desc->value_desc),
-1, -1, -1, -1,
@ -216,7 +216,7 @@ gimp_color_scales_init (GimpColorScales *scales)
gettext (enum_desc->value_help), gettext (enum_desc->value_help),
NULL); NULL);
gtk_adjustment_configure (GTK_ADJUSTMENT (scales->slider_data[i]), gtk_adjustment_configure (scales->slider_data[i],
slider_initial_vals[i], slider_initial_vals[i],
spin_min_vals[i], spin_min_vals[i],
spin_max_vals[i], spin_max_vals[i],
@ -366,8 +366,7 @@ gimp_color_scales_update_scales (GimpColorScales *scales,
gimp_color_scales_scale_changed, gimp_color_scales_scale_changed,
scales); scales);
gtk_adjustment_set_value (GTK_ADJUSTMENT (scales->slider_data[i]), gtk_adjustment_set_value (scales->slider_data[i], values[i]);
values[i]);
g_signal_handlers_unblock_by_func (scales->slider_data[i], g_signal_handlers_unblock_by_func (scales->slider_data[i],
gimp_color_scales_scale_changed, gimp_color_scales_scale_changed,
@ -410,7 +409,7 @@ gimp_color_scales_scale_changed (GtkAdjustment *adjustment,
gint i; gint i;
for (i = 0; i < 10; i++) for (i = 0; i < 10; i++)
if (scales->slider_data[i] == GTK_OBJECT (adjustment)) if (scales->slider_data[i] == adjustment)
break; break;
switch (i) switch (i)

5
libgimpwidgets/gimppropwidgets.c
View File

@ -1298,7 +1298,7 @@ gimp_prop_hscale_new (GObject *config,
{ {
GParamSpec *param_spec; GParamSpec *param_spec;
GtkWidget *scale; GtkWidget *scale;
GtkObject *adjustment; GtkAdjustment *adjustment;
gdouble value; gdouble value;
gdouble lower; gdouble lower;
gdouble upper; gdouble upper;
@ -1314,7 +1314,8 @@ gimp_prop_hscale_new (GObject *config,
if (! G_IS_PARAM_SPEC_DOUBLE (param_spec)) if (! G_IS_PARAM_SPEC_DOUBLE (param_spec))
digits = 0; digits = 0;
adjustment = gtk_adjustment_new (value, lower, upper, adjustment = (GtkAdjustment *)
gtk_adjustment_new (value, lower, upper,
step_increment, page_increment, 0.0); step_increment, page_increment, 0.0);
scale = g_object_new (GTK_TYPE_SCALE, scale = g_object_new (GTK_TYPE_SCALE,