callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libgimpwidgets: deprecate gimp_spin_button_new()

Browse Source 
it should have never been added in the first place. Port all users
to using gtk_spin_button_new() directly.
This commit is contained in:
Michael Natterer
2014-06-21 22:35:39 +02:00
parent b9265ebfb9
commit eaea58f5e3
6 changed files with 77 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libgimpwidgets/gimpmemsizeentry.c
View File

@ -174,7 +174,7 @@ gimp_memsize_entry_new (guint64 value,
guint64 upper) guint64 upper)
{ {
GimpMemsizeEntry *entry; GimpMemsizeEntry *entry;
GtkObject *adj; GtkAdjustment *adj;
guint shift; guint shift;
#if _MSC_VER < 1300 #if _MSC_VER < 1300
@ -199,11 +199,13 @@ gimp_memsize_entry_new (guint64 value,
entry->upper = upper; entry->upper = upper;
entry->shift = shift; entry->shift = shift;
entry->spinbutton = gimp_spin_button_new (&adj, adj = (GtkAdjustment *) gtk_adjustment_new (CAST (value >> shift),
CAST (value >> shift), CAST (lower >> shift),
CAST (lower >> shift), CAST (upper >> shift),
CAST (upper >> shift), 1, 8, 0);
1, 8, 0, 1, 0);
entry->spinbutton = gtk_spin_button_new (adj, 1.0, 0);
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (entry->spinbutton), TRUE);
#undef CAST #undef CAST

22
libgimpwidgets/gimppropwidgets.c
View File

@ -1071,12 +1071,12 @@ gimp_prop_spin_button_new (GObject *config,
gdouble page_increment, gdouble page_increment,
gint digits) gint digits)
{ {
GParamSpec *param_spec; GParamSpec *param_spec;
GtkWidget *spinbutton; GtkWidget *spinbutton;
GtkObject *adjustment; GtkAdjustment *adjustment;
gdouble value; gdouble value;
gdouble lower; gdouble lower;
gdouble upper; gdouble upper;
param_spec = find_param_spec (config, property_name, G_STRFUNC); param_spec = find_param_spec (config, property_name, G_STRFUNC);
if (! param_spec) if (! param_spec)
@ -1089,10 +1089,12 @@ gimp_prop_spin_button_new (GObject *config,
if (! G_IS_PARAM_SPEC_DOUBLE (param_spec)) if (! G_IS_PARAM_SPEC_DOUBLE (param_spec))
digits = 0; digits = 0;
spinbutton = gimp_spin_button_new (&adjustment, adjustment = (GtkAdjustment *)
value, lower, upper, gtk_adjustment_new (value, lower, upper,
step_increment, page_increment, step_increment, page_increment, 0);
0.0, 1.0, digits);
spinbutton = gtk_spin_button_new (adjustment, step_increment, digits);
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE);
set_param_spec (G_OBJECT (adjustment), spinbutton, param_spec); set_param_spec (G_OBJECT (adjustment), spinbutton, param_spec);

26
libgimpwidgets/gimpquerybox.c
View File

@ -323,9 +323,9 @@ gimp_query_int_box (const gchar *title,
GimpQueryIntCallback callback, GimpQueryIntCallback callback,
gpointer data) gpointer data)
{ {
QueryBox *query_box; QueryBox *query_box;
GtkWidget *spinbutton; GtkWidget *spinbutton;
GtkObject *adjustment; GtkAdjustment *adjustment;
query_box = create_query_box (title, parent, help_func, help_id, query_box = create_query_box (title, parent, help_func, help_id,
G_CALLBACK (int_query_box_response), G_CALLBACK (int_query_box_response),
@ -338,9 +338,10 @@ gimp_query_int_box (const gchar *title,
if (! query_box) if (! query_box)
return NULL; return NULL;
spinbutton = gimp_spin_button_new (&adjustment, adjustment = (GtkAdjustment *)
initial, lower, upper, 1, 10, 0, gtk_adjustment_new (initial, lower, upper, 1, 10, 0);
1, 0); spinbutton = gtk_spin_button_new (adjustment, 1.0, 0);
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE);
gtk_entry_set_activates_default (GTK_ENTRY (spinbutton), TRUE); gtk_entry_set_activates_default (GTK_ENTRY (spinbutton), TRUE);
gtk_box_pack_start (GTK_BOX (query_box->vbox), spinbutton, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (query_box->vbox), spinbutton, FALSE, FALSE, 0);
gtk_widget_grab_focus (spinbutton); gtk_widget_grab_focus (spinbutton);
@ -386,9 +387,9 @@ gimp_query_double_box (const gchar *title,
GimpQueryDoubleCallback callback, GimpQueryDoubleCallback callback,
gpointer data) gpointer data)
{ {
QueryBox *query_box; QueryBox *query_box;
GtkWidget *spinbutton; GtkWidget *spinbutton;
GtkObject *adjustment; GtkAdjustment *adjustment;
query_box = create_query_box (title, parent, help_func, help_id, query_box = create_query_box (title, parent, help_func, help_id,
G_CALLBACK (double_query_box_response), G_CALLBACK (double_query_box_response),
@ -401,9 +402,10 @@ gimp_query_double_box (const gchar *title,
if (! query_box) if (! query_box)
return NULL; return NULL;
spinbutton = gimp_spin_button_new (&adjustment, adjustment = (GtkAdjustment *)
initial, lower, upper, 1, 10, 0, gtk_adjustment_new (initial, lower, upper, 1, 10, 0);
1, digits); spinbutton = gtk_spin_button_new (adjustment, 1.0, 0);
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE);
gtk_entry_set_activates_default (GTK_ENTRY (spinbutton), TRUE); gtk_entry_set_activates_default (GTK_ENTRY (spinbutton), TRUE);
gtk_box_pack_start (GTK_BOX (query_box->vbox), spinbutton, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (query_box->vbox), spinbutton, FALSE, FALSE, 0);
gtk_widget_grab_focus (spinbutton); gtk_widget_grab_focus (spinbutton);

51
libgimpwidgets/gimpscaleentry.c
View File

@ -137,11 +137,11 @@ gimp_scale_entry_new_internal (gboolean color_scale,
const gchar *tooltip, const gchar *tooltip,
const gchar *help_id) const gchar *help_id)
{ {
GtkWidget *label; GtkWidget *label;
GtkWidget *scale; GtkWidget *scale;
GtkWidget *spinbutton; GtkWidget *spinbutton;
GtkObject *adjustment; GtkAdjustment *adjustment;
GtkObject *return_adj; GtkAdjustment *return_adj;
label = gtk_label_new_with_mnemonic (text); label = gtk_label_new_with_mnemonic (text);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
@ -154,25 +154,28 @@ gimp_scale_entry_new_internal (gboolean color_scale,
unconstrained_lower <= lower && unconstrained_lower <= lower &&
unconstrained_upper >= upper) unconstrained_upper >= upper)
{ {
GtkObject *constrained_adj; GtkAdjustment *constrained_adj;
constrained_adj = gtk_adjustment_new (value, lower, upper, constrained_adj = (GtkAdjustment *)
step_increment, page_increment, gtk_adjustment_new (value, lower, upper,
0.0); step_increment, page_increment,
0.0);
spinbutton = gimp_spin_button_new (&adjustment, value, adjustment = (GtkAdjustment *)
unconstrained_lower, gtk_adjustment_new (value,
unconstrained_upper, unconstrained_lower,
step_increment, page_increment, 0.0, unconstrained_upper,
step_increment, digits); step_increment, page_increment, 0.0);
spinbutton = gtk_spin_button_new (adjustment, step_increment, digits);
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE);
g_signal_connect g_signal_connect
(G_OBJECT (constrained_adj), "value-changed", (constrained_adj, "value-changed",
G_CALLBACK (gimp_scale_entry_unconstrained_adjustment_callback), G_CALLBACK (gimp_scale_entry_unconstrained_adjustment_callback),
adjustment); adjustment);
g_signal_connect g_signal_connect
(G_OBJECT (adjustment), "value-changed", (adjustment, "value-changed",
G_CALLBACK (gimp_scale_entry_unconstrained_adjustment_callback), G_CALLBACK (gimp_scale_entry_unconstrained_adjustment_callback),
constrained_adj); constrained_adj);
@ -182,9 +185,11 @@ gimp_scale_entry_new_internal (gboolean color_scale,
} }
else else
{ {
spinbutton = gimp_spin_button_new (&adjustment, value, lower, upper, adjustment = (GtkAdjustment *)
step_increment, page_increment, 0.0, gtk_adjustment_new (value, lower, upper,
step_increment, digits); step_increment, page_increment, 0.0);
spinbutton = gtk_spin_button_new (adjustment, step_increment, digits);
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE);
return_adj = adjustment; return_adj = adjustment;
} }
@ -204,13 +209,11 @@ gimp_scale_entry_new_internal (gboolean color_scale,
scale = gimp_color_scale_new (GTK_ORIENTATION_HORIZONTAL, scale = gimp_color_scale_new (GTK_ORIENTATION_HORIZONTAL,
GIMP_COLOR_SELECTOR_VALUE); GIMP_COLOR_SELECTOR_VALUE);
gtk_range_set_adjustment (GTK_RANGE (scale), gtk_range_set_adjustment (GTK_RANGE (scale), adjustment);
GTK_ADJUSTMENT (adjustment));
} }
else else
{ {
scale = gtk_scale_new (GTK_ORIENTATION_HORIZONTAL, scale = gtk_scale_new (GTK_ORIENTATION_HORIZONTAL, adjustment);
GTK_ADJUSTMENT (adjustment));
} }
if (scale_width > 0) if (scale_width > 0)
@ -238,7 +241,7 @@ gimp_scale_entry_new_internal (gboolean color_scale,
g_object_set_data (G_OBJECT (return_adj), "scale", scale); g_object_set_data (G_OBJECT (return_adj), "scale", scale);
g_object_set_data (G_OBJECT (return_adj), "spinbutton", spinbutton); g_object_set_data (G_OBJECT (return_adj), "spinbutton", spinbutton);
return return_adj; return GTK_OBJECT (return_adj);
} }
/** /**

24
libgimpwidgets/gimpwidgets.c
View File

@ -430,6 +430,8 @@ gimp_int_radio_group_set_active (GtkRadioButton *radio_button,
* gtk_spin_button_set_numeric() so that non-numeric text cannot be * gtk_spin_button_set_numeric() so that non-numeric text cannot be
* entered. * entered.
* *
* Deprecated: 2.10: Use gtk_spin_button_new() instead.
*
* Returns: A #GtkSpinButton and its #GtkAdjustment. * Returns: A #GtkSpinButton and its #GtkAdjustment.
**/ **/
GtkWidget * GtkWidget *
@ -489,11 +491,11 @@ GtkWidget *
gimp_random_seed_new (guint *seed, gimp_random_seed_new (guint *seed,
gboolean *random_seed) gboolean *random_seed)
{ {
GtkWidget *hbox; GtkWidget *hbox;
GtkWidget *toggle; GtkWidget *toggle;
GtkWidget *spinbutton; GtkWidget *spinbutton;
GtkObject *adj; GtkAdjustment *adj;
GtkWidget *button; GtkWidget *button;
g_return_val_if_fail (seed != NULL, NULL); g_return_val_if_fail (seed != NULL, NULL);
g_return_val_if_fail (random_seed != NULL, NULL); g_return_val_if_fail (random_seed != NULL, NULL);
@ -504,8 +506,10 @@ gimp_random_seed_new (guint *seed,
if (*random_seed) if (*random_seed)
*seed = g_random_int (); *seed = g_random_int ();
spinbutton = gimp_spin_button_new (&adj, *seed, adj = (GtkAdjustment *)
0, (guint32) -1 , 1, 10, 0, 1, 0); gtk_adjustment_new (*seed, 0, (guint32) -1, 1, 10, 0);
spinbutton = gtk_spin_button_new (adj, 1.0, 0);
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE);
gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0);
gtk_widget_show (spinbutton); gtk_widget_show (spinbutton);
@ -731,12 +735,14 @@ gimp_coordinates_new (GimpUnit unit,
gdouble ysize_100 /* % */) gdouble ysize_100 /* % */)
{ {
GimpCoordinatesData *data; GimpCoordinatesData *data;
GtkObject *adjustment; GtkAdjustment *adjustment;
GtkWidget *spinbutton; GtkWidget *spinbutton;
GtkWidget *sizeentry; GtkWidget *sizeentry;
GtkWidget *chainbutton; GtkWidget *chainbutton;
spinbutton = gimp_spin_button_new (&adjustment, 1, 0, 1, 1, 10, 0, 1, 2); adjustment = (GtkAdjustment *) gtk_adjustment_new (1, 0, 1, 1, 10, 0);
spinbutton = gtk_spin_button_new (adjustment, 1.0, 2);
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE);
if (spinbutton_width > 0) if (spinbutton_width > 0)
{ {

1
libgimpwidgets/gimpwidgets.h
View File

@ -144,6 +144,7 @@ void gimp_radio_group_set_active (GtkRadioButton *radio_button,
gpointer item_data); gpointer item_data);
GIMP_DEPRECATED_FOR(gtk_spin_button_new)
GtkWidget * gimp_spin_button_new (/* return value: */ GtkWidget * gimp_spin_button_new (/* return value: */
GtkObject **adjustment, GtkObject **adjustment,