diff --git a/ChangeLog b/ChangeLog index 48acd9dc07..ef9b2fbdf6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,29 @@ +2008-08-26 Martin Nordholts + + * libgimpwidgets/gimpwidgets.c + + * plug-ins/common/file-xbm.c + * plug-ins/common/file-wmf.c + * plug-ins/common/file-svg.c + * plug-ins/common/file-gih.c + * plug-ins/common/blur-motion.c + * plug-ins/file-jpeg/jpeg-save.c + * plug-ins/lighting/lighting-ui.c + * plug-ins/map-object/map-object-ui.c + + * app/tools/gimpsheartool.c + * app/tools/gimpaligntool.c + * app/tools/gimprotatetool.c + * app/tools/gimplevelstool.c + * app/dialogs/resize-dialog.c + * app/dialogs/offset-dialog.c + * app/widgets/gimppaletteeditor.c + * app/widgets/gimpcolormapeditor.c + * app/dialogs/layer-options-dialog.c + * app/display/gimpdisplayshell-scale-dialog.c: Pass page_size = 0 + to gimp_spin_button_new() to adapt to new and correct value + clamping in GTK+. + 2008-08-26 Sven Neumann * app/core/gimpdrawable-colorize.c (gimp_drawable_colorize): diff --git a/app/dialogs/layer-options-dialog.c b/app/dialogs/layer-options-dialog.c index 8f659fd010..2afe6296a6 100644 --- a/app/dialogs/layer-options-dialog.c +++ b/app/dialogs/layer-options-dialog.c @@ -150,7 +150,7 @@ layer_options_dialog_new (GimpImage *image, /* The size sizeentry */ spinbutton = gimp_spin_button_new (&adjustment, - 1, 1, 1, 1, 10, 1, + 1, 1, 1, 1, 10, 0, 1, 2); gtk_entry_set_width_chars (GTK_ENTRY (spinbutton), 10); diff --git a/app/dialogs/offset-dialog.c b/app/dialogs/offset-dialog.c index 4d24c39437..f9f4b5c510 100644 --- a/app/dialogs/offset-dialog.c +++ b/app/dialogs/offset-dialog.c @@ -162,7 +162,7 @@ offset_dialog_new (GimpDrawable *drawable, gtk_widget_show (vbox); spinbutton = gimp_spin_button_new (&adjustment, - 1, 1, 1, 1, 10, 1, + 1, 1, 1, 1, 10, 0, 1, 2); gtk_entry_set_width_chars (GTK_ENTRY (spinbutton), 10); diff --git a/app/dialogs/resize-dialog.c b/app/dialogs/resize-dialog.c index 027e20867a..e00d8d294b 100644 --- a/app/dialogs/resize-dialog.c +++ b/app/dialogs/resize-dialog.c @@ -204,7 +204,7 @@ resize_dialog_new (GimpViewable *viewable, /* the offset sizeentry */ spinbutton = gimp_spin_button_new (&adjustment, - 1, 1, 1, 1, 10, 1, + 1, 1, 1, 1, 10, 0, 1, 2); gtk_entry_set_width_chars (GTK_ENTRY (spinbutton), SB_WIDTH); diff --git a/app/display/gimpdisplayshell-scale-dialog.c b/app/display/gimpdisplayshell-scale-dialog.c index 3f5be2d459..5cb3290681 100644 --- a/app/display/gimpdisplayshell-scale-dialog.c +++ b/app/display/gimpdisplayshell-scale-dialog.c @@ -163,7 +163,7 @@ gimp_display_shell_scale_dialog (GimpDisplayShell *shell) spin = gimp_spin_button_new (&data->num_adj, num, 1, 256, - 1, 8, 1, 1, 0); + 1, 8, 0, 1, 0); gtk_entry_set_activates_default (GTK_ENTRY (spin), TRUE); gtk_box_pack_start (GTK_BOX (hbox), spin, TRUE, TRUE, 0); gtk_widget_show (spin); @@ -174,7 +174,7 @@ gimp_display_shell_scale_dialog (GimpDisplayShell *shell) spin = gimp_spin_button_new (&data->denom_adj, denom, 1, 256, - 1, 8, 1, 1, 0); + 1, 8, 0, 1, 0); gtk_entry_set_activates_default (GTK_ENTRY (spin), TRUE); gtk_box_pack_start (GTK_BOX (hbox), spin, TRUE, TRUE, 0); gtk_widget_show (spin); diff --git a/app/tools/gimpaligntool.c b/app/tools/gimpaligntool.c index 20c5597a15..a8e19cb80d 100644 --- a/app/tools/gimpaligntool.c +++ b/app/tools/gimpaligntool.c @@ -884,9 +884,9 @@ gimp_align_tool_controls (GimpAlignTool *align_tool) spinbutton = gimp_spin_button_new (&align_tool->horz_offset_adjustment, 0, - -100000., - 100000., - 1., 20., 20., 1., 0); + -100000, + 100000, + 1, 20, 0, 1, 0); gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0); g_signal_connect (align_tool->horz_offset_adjustment, "value-changed", G_CALLBACK (gimp_double_adjustment_update), diff --git a/app/tools/gimplevelstool.c b/app/tools/gimplevelstool.c index f48f50d95f..65a3ad02c2 100644 --- a/app/tools/gimplevelstool.c +++ b/app/tools/gimplevelstool.c @@ -509,7 +509,7 @@ gimp_levels_tool_dialog (GimpImageMapTool *image_map_tool) /* input gamma spin */ spinbutton = gimp_spin_button_new (&data, config->gamma[config->channel], - 0.1, 10, 0.01, 0.1, 1, 0.5, 2); + 0.1, 10, 0.01, 0.1, 0, 0.5, 2); gtk_box_pack_start (GTK_BOX (hbox), spinbutton, TRUE, FALSE, 0); gimp_help_set_help_data (spinbutton, _("Gamma"), NULL); gtk_widget_show (spinbutton); diff --git a/app/tools/gimprotatetool.c b/app/tools/gimprotatetool.c index f2bd98c8ca..290f8b53a1 100644 --- a/app/tools/gimprotatetool.c +++ b/app/tools/gimprotatetool.c @@ -199,7 +199,7 @@ gimp_rotate_tool_dialog (GimpTransformTool *tr_tool) GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0); gtk_widget_show (scale); - button = gimp_spin_button_new (&adj, 0, -1, 1, 1, 10, 1, 1, 2); + button = gimp_spin_button_new (&adj, 0, -1, 1, 1, 10, 0, 1, 2); gtk_entry_set_width_chars (GTK_ENTRY (button), SB_WIDTH); gimp_table_attach_aligned (GTK_TABLE (table), 0, 2, _("Center _X:"), 0.0, 0.5, button, 1, TRUE); diff --git a/app/tools/gimpsheartool.c b/app/tools/gimpsheartool.c index 5690194a9d..698fba2449 100644 --- a/app/tools/gimpsheartool.c +++ b/app/tools/gimpsheartool.c @@ -129,7 +129,7 @@ gimp_shear_tool_dialog (GimpTransformTool *tr_tool) gtk_widget_show (table); button = gimp_spin_button_new (&shear->x_adj, - 0, -65536, 65536, 1, 15, 1, 1, 0); + 0, -65536, 65536, 1, 15, 0, 1, 0); gtk_entry_set_width_chars (GTK_ENTRY (button), SB_WIDTH); gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, _("Shear magnitude _X:"), 0.0, 0.5, button, 1, TRUE); @@ -139,7 +139,7 @@ gimp_shear_tool_dialog (GimpTransformTool *tr_tool) tr_tool); button = gimp_spin_button_new (&shear->y_adj, - 0, -65536, 65536, 1, 15, 1, 1, 0); + 0, -65536, 65536, 1, 15, 0, 1, 0); gtk_entry_set_width_chars (GTK_ENTRY (button), SB_WIDTH); gimp_table_attach_aligned (GTK_TABLE (table), 0, 1, _("Shear magnitude _Y:"), 0.0, 0.5, button, 1, TRUE); diff --git a/app/widgets/gimpcolormapeditor.c b/app/widgets/gimpcolormapeditor.c index 153de28de8..59769b2f8b 100644 --- a/app/widgets/gimpcolormapeditor.c +++ b/app/widgets/gimpcolormapeditor.c @@ -219,7 +219,7 @@ gimp_colormap_editor_init (GimpColormapEditor *editor) gtk_widget_show (table); editor->index_spinbutton = gimp_spin_button_new (&adj, - 0, 0, 0, 1, 10, 10, 1.0, 0); + 0, 0, 0, 1, 10, 0, 1.0, 0); editor->index_adjustment = GTK_ADJUSTMENT (adj); gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, _("Color index:"), 0.0, 0.5, diff --git a/app/widgets/gimppaletteeditor.c b/app/widgets/gimppaletteeditor.c index aebdbdc72f..5249cb6053 100644 --- a/app/widgets/gimppaletteeditor.c +++ b/app/widgets/gimppaletteeditor.c @@ -264,7 +264,7 @@ gimp_palette_editor_init (GimpPaletteEditor *editor) gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); gtk_widget_show (label); - spinbutton = gimp_spin_button_new (&adj, 0, 0, 64, 1, 4, 4, 1, 0); + spinbutton = gimp_spin_button_new (&adj, 0, 0, 64, 1, 4, 0, 1, 0); editor->columns_data = GTK_ADJUSTMENT (adj); gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0); gtk_widget_show (spinbutton); diff --git a/libgimpwidgets/gimpwidgets.c b/libgimpwidgets/gimpwidgets.c index 7a87eae980..14c9cc4a65 100644 --- a/libgimpwidgets/gimpwidgets.c +++ b/libgimpwidgets/gimpwidgets.c @@ -728,7 +728,7 @@ gimp_coordinates_new (GimpUnit unit, GtkWidget *sizeentry; GtkWidget *chainbutton; - spinbutton = gimp_spin_button_new (&adjustment, 1, 0, 1, 1, 10, 1, 1, 2); + spinbutton = gimp_spin_button_new (&adjustment, 1, 0, 1, 1, 10, 0, 1, 2); if (spinbutton_width > 0) { diff --git a/plug-ins/common/blur-motion.c b/plug-ins/common/blur-motion.c index e9bfbd5045..affd78b086 100644 --- a/plug-ins/common/blur-motion.c +++ b/plug-ins/common/blur-motion.c @@ -1082,7 +1082,7 @@ mblur_dialog (gint32 image_ID, G_CALLBACK (gimp_preview_invalidate), preview); - spinbutton = gimp_spin_button_new (&adj, 1, 0, 1, 1, 10, 1, 1, 2); + spinbutton = gimp_spin_button_new (&adj, 1, 0, 1, 1, 10, 0, 1, 2); gimp_size_entry_add_field (GIMP_SIZE_ENTRY (entry), GTK_SPIN_BUTTON (spinbutton), NULL); gtk_table_attach_defaults (GTK_TABLE (entry), spinbutton, 1, 2, 0, 1); diff --git a/plug-ins/common/file-gih.c b/plug-ins/common/file-gih.c index 8f0dd95131..c2b3b0d48c 100644 --- a/plug-ins/common/file-gih.c +++ b/plug-ins/common/file-gih.c @@ -906,7 +906,7 @@ gih_save_dialog (gint32 image_ID) * Spacing: __ */ spinbutton = gimp_spin_button_new (&adjustment, info.spacing, - 1, 1000, 1, 10, 10, 1, 0); + 1, 1000, 1, 10, 0, 1, 0); gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, _("Spacing (percent):"), 0.0, 0.5, spinbutton, 1, TRUE); @@ -936,7 +936,7 @@ gih_save_dialog (gint32 image_ID) spinbutton = gimp_spin_button_new (&adjustment, gihparams.cellwidth, - 2, gimp_image_width (image_ID), 1, 1, 1, + 2, gimp_image_width (image_ID), 1, 1, 0, 1, 0); gtk_box_pack_start (GTK_BOX (box), spinbutton, FALSE, FALSE, 0); gtk_widget_show (spinbutton); @@ -959,7 +959,7 @@ gih_save_dialog (gint32 image_ID) spinbutton = gimp_spin_button_new (&adjustment, gihparams.cellheight, - 2, gimp_image_height (image_ID), 1, 1, 1, + 2, gimp_image_height (image_ID), 1, 1, 0, 1, 0); gtk_box_pack_start (GTK_BOX (box), spinbutton, FALSE, FALSE, 0); gtk_widget_show (spinbutton); @@ -989,7 +989,7 @@ gih_save_dialog (gint32 image_ID) * Number of cells: ___ */ spinbutton = gimp_spin_button_new (&adjustment, - gihparams.ncells, 1, 1000, 1, 10, 10, + gihparams.ncells, 1, 1000, 1, 10, 0, 1, 0); gimp_table_attach_aligned (GTK_TABLE (table), 0, 3, _("Number of cells:"), 0.0, 0.5, @@ -1049,7 +1049,7 @@ gih_save_dialog (gint32 image_ID) * Dimension: ___ */ spinbutton = gimp_spin_button_new (&adjustment, gihparams.dim, - 1, GIMP_PIXPIPE_MAXDIM, 1, 1, 1, 1, 0); + 1, GIMP_PIXPIPE_MAXDIM, 1, 1, 0, 1, 0); gimp_table_attach_aligned (GTK_TABLE (table), 0, 5, _("Dimension:"), 0.0, 0.5, spinbutton, 1, TRUE); @@ -1069,7 +1069,7 @@ gih_save_dialog (gint32 image_ID) gint j; spinbutton = gimp_spin_button_new (&adjustment, - gihparams.rank[i], 1, 100, 1, 1, 1, + gihparams.rank[i], 1, 100, 1, 1, 0, 1, 0); gtk_table_attach (GTK_TABLE (dimtable), spinbutton, 0, 1, i, i + 1, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0); diff --git a/plug-ins/common/file-svg.c b/plug-ins/common/file-svg.c index 49a4b3b262..eb971fd04f 100644 --- a/plug-ins/common/file-svg.c +++ b/plug-ins/common/file-svg.c @@ -809,7 +809,7 @@ load_dialog (const gchar *filename, GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); gtk_widget_show (hbox); - spinbutton = gimp_spin_button_new (&adj, 1, 1, 1, 1, 10, 1, 1, 2); + spinbutton = gimp_spin_button_new (&adj, 1, 1, 1, 1, 10, 0, 1, 2); gtk_entry_set_width_chars (GTK_ENTRY (spinbutton), 10); gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0); gtk_widget_show (spinbutton); @@ -862,7 +862,7 @@ load_dialog (const gchar *filename, ratio_x, (gdouble) GIMP_MIN_IMAGE_SIZE / (gdouble) svg_width, (gdouble) GIMP_MAX_IMAGE_SIZE / (gdouble) svg_width, - 0.01, 0.1, 1, + 0.01, 0.1, 0, 0.01, 4); gtk_entry_set_width_chars (GTK_ENTRY (spinbutton), 10); gtk_table_attach_defaults (GTK_TABLE (table2), spinbutton, 0, 1, 0, 1); @@ -884,7 +884,7 @@ load_dialog (const gchar *filename, ratio_y, (gdouble) GIMP_MIN_IMAGE_SIZE / (gdouble) svg_height, (gdouble) GIMP_MAX_IMAGE_SIZE / (gdouble) svg_height, - 0.01, 0.1, 1, + 0.01, 0.1, 0, 0.01, 4); gtk_entry_set_width_chars (GTK_ENTRY (spinbutton), 10); gtk_table_attach_defaults (GTK_TABLE (table2), spinbutton, 0, 1, 1, 2); diff --git a/plug-ins/common/file-wmf.c b/plug-ins/common/file-wmf.c index 2b417fec20..6626e423f2 100644 --- a/plug-ins/common/file-wmf.c +++ b/plug-ins/common/file-wmf.c @@ -585,7 +585,7 @@ load_dialog (const gchar *filename) GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); gtk_widget_show (hbox); - spinbutton = gimp_spin_button_new (&adj, 1, 1, 1, 1, 10, 1, 1, 2); + spinbutton = gimp_spin_button_new (&adj, 1, 1, 1, 1, 10, 0, 1, 2); gtk_entry_set_width_chars (GTK_ENTRY (spinbutton), 10); gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0); gtk_widget_show (spinbutton); @@ -638,7 +638,7 @@ load_dialog (const gchar *filename) ratio_x, (gdouble) GIMP_MIN_IMAGE_SIZE / (gdouble) wmf_width, (gdouble) GIMP_MAX_IMAGE_SIZE / (gdouble) wmf_width, - 0.01, 0.1, 1, + 0.01, 0.1, 0, 0.01, 4); gtk_entry_set_width_chars (GTK_ENTRY (spinbutton), 10); gtk_table_attach_defaults (GTK_TABLE (table2), spinbutton, 0, 1, 0, 1); @@ -660,7 +660,7 @@ load_dialog (const gchar *filename) ratio_y, (gdouble) GIMP_MIN_IMAGE_SIZE / (gdouble) wmf_height, (gdouble) GIMP_MAX_IMAGE_SIZE / (gdouble) wmf_height, - 0.01, 0.1, 1, + 0.01, 0.1, 0, 0.01, 4); gtk_entry_set_width_chars (GTK_ENTRY (spinbutton), 10); gtk_table_attach_defaults (GTK_TABLE (table2), spinbutton, 0, 1, 1, 2); diff --git a/plug-ins/common/file-xbm.c b/plug-ins/common/file-xbm.c index 5fee91d6d9..ba7f5a3258 100644 --- a/plug-ins/common/file-xbm.c +++ b/plug-ins/common/file-xbm.c @@ -1272,7 +1272,7 @@ save_dialog (gint32 drawable_ID) spinbutton = gimp_spin_button_new (&adj, xsvals.x_hot, 0, gimp_drawable_width (drawable_ID) - 1, - 1, 1, 1, 0, 0); + 1, 1, 0, 0, 0); gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, _("Hot spot _X:"), 0.0, 0.5, spinbutton, 1, TRUE); @@ -1282,7 +1282,7 @@ save_dialog (gint32 drawable_ID) spinbutton = gimp_spin_button_new (&adj, xsvals.y_hot, 0, gimp_drawable_height (drawable_ID) - 1, - 1, 1, 1, 0, 0); + 1, 1, 0, 0, 0); gimp_table_attach_aligned (GTK_TABLE (table), 0, 1, _("Hot spot _Y:"), 0.0, 0.5, spinbutton, 1, TRUE); diff --git a/plug-ins/file-jpeg/jpeg-save.c b/plug-ins/file-jpeg/jpeg-save.c index 9056908927..3573ca3e2b 100644 --- a/plug-ins/file-jpeg/jpeg-save.c +++ b/plug-ins/file-jpeg/jpeg-save.c @@ -942,7 +942,7 @@ save_dialog (void) pg.restart = restart_markers_scale = spinbutton = gimp_spin_button_new (&pg.scale_data, (jsvals.restart == 0) ? 1 : jsvals.restart, - 1.0, 64.0, 1.0, 1.0, 64.0, 1.0, 0); + 1.0, 64.0, 1.0, 1.0, 0, 1.0, 0); gtk_table_attach (GTK_TABLE (table), spinbutton, 5, 6, 1, 2, GTK_FILL, GTK_FILL, 0, 0); gtk_widget_show (spinbutton); diff --git a/plug-ins/lighting/lighting-ui.c b/plug-ins/lighting/lighting-ui.c index 407243f8ff..71cd58f7fc 100644 --- a/plug-ins/lighting/lighting-ui.c +++ b/plug-ins/lighting/lighting-ui.c @@ -451,7 +451,7 @@ create_light_page (void) spin_intensity = gimp_spin_button_new (&adj, mapvals.lightsource[k].intensity, 0.0, 100.0, - 0.01, 0.1, 1.0, 0.0, 2); + 0.01, 0.1, 0.0, 0.0, 2); gimp_table_attach_aligned (GTK_TABLE (table), 0, 3, _("_Intensity:"), 0.0, 0.5, spin_intensity, 1, TRUE); @@ -472,7 +472,7 @@ create_light_page (void) spin_pos_x = gimp_spin_button_new (&adj, mapvals.lightsource[k].position.x, -100.0, 100.0, - 0.1, 1.0, 1.0, 0.0, 2); + 0.1, 1.0, 0.0, 0.0, 2); gimp_table_attach_aligned (GTK_TABLE (table), 2, 1, _("_X:"), 0.0, 0.5, spin_pos_x, 1, TRUE); @@ -487,7 +487,7 @@ create_light_page (void) spin_pos_y = gimp_spin_button_new (&adj, mapvals.lightsource[k].position.y, -100.0, 100.0, - 0.1, 1.0, 1.0, 0.0, 2); + 0.1, 1.0, 0.0, 0.0, 2); gimp_table_attach_aligned (GTK_TABLE (table), 2, 2, _("_Y:"), 0.0, 0.5, spin_pos_y, 1, TRUE); @@ -502,7 +502,7 @@ create_light_page (void) spin_pos_z = gimp_spin_button_new (&adj, mapvals.lightsource[k].position.z, -100.0, 100.0, - 0.1, 1.0, 1.0, 0.0, 2); + 0.1, 1.0, 0.0, 0.0, 2); gimp_table_attach_aligned (GTK_TABLE (table), 2, 3, _("_Z:"), 0.0, 0.5, spin_pos_z, 1, TRUE); @@ -522,7 +522,7 @@ create_light_page (void) spin_dir_x = gimp_spin_button_new (&adj, mapvals.lightsource[k].direction.x, - -100.0, 100.0, 0.1, 1.0, 1.0, 0.0, 2); + -100.0, 100.0, 0.1, 1.0, 0.0, 0.0, 2); gimp_table_attach_aligned (GTK_TABLE (table), 4, 1, _("X:"), 0.0, 0.5, spin_dir_x, 1, TRUE); @@ -536,7 +536,7 @@ create_light_page (void) spin_dir_y = gimp_spin_button_new (&adj, mapvals.lightsource[k].direction.y, - -100.0, 100.0, 0.1, 1.0, 1.0, 0.0, 2); + -100.0, 100.0, 0.1, 1.0, 0.0, 0.0, 2); gimp_table_attach_aligned (GTK_TABLE (table), 4, 2, _("Y:"), 0.0, 0.5, spin_dir_y, 1, TRUE); @@ -550,7 +550,7 @@ create_light_page (void) spin_dir_z = gimp_spin_button_new (&adj, mapvals.lightsource[k].direction.z, - -100.0, 100.0, 0.1, 1.0, 1.0, 0.0, 2); + -100.0, 100.0, 0.1, 1.0, 0.0, 0.0, 2); gimp_table_attach_aligned (GTK_TABLE (table), 4, 3, _("Z:"), 0.0, 0.5, spin_dir_z, 1, TRUE); @@ -641,7 +641,7 @@ create_material_page (void) gtk_size_group_add_widget (group, label); spinbutton = gimp_spin_button_new (&adj, mapvals.material.ambient_int, - 0, G_MAXFLOAT, 0.01, 0.1, 1.0, 0.0, 2); + 0, G_MAXFLOAT, 0.01, 0.1, 0.0, 0.0, 2); gtk_table_attach (GTK_TABLE (table), spinbutton, 2, 3, 0, 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); gtk_widget_show (spinbutton); @@ -674,7 +674,7 @@ create_material_page (void) gtk_size_group_add_widget (group, label); spinbutton = gimp_spin_button_new (&adj, mapvals.material.diffuse_int, - 0, G_MAXFLOAT, 0.01, 0.1, 1.0, 0.0, 2); + 0, G_MAXFLOAT, 0.01, 0.1, 0.0, 0.0, 2); gtk_table_attach (GTK_TABLE (table), spinbutton, 2, 3, 1, 2, GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); gtk_widget_show (spinbutton); @@ -707,7 +707,7 @@ create_material_page (void) gtk_size_group_add_widget (group, label); spinbutton = gimp_spin_button_new (&adj, mapvals.material.specular_ref, - 0, G_MAXFLOAT, 0.01, 0.1, 1.0, 0.0, 2); + 0, G_MAXFLOAT, 0.01, 0.1, 0.0, 0.0, 2); gtk_table_attach (GTK_TABLE (table), spinbutton, 2, 3, 2, 3, GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); gtk_widget_show (spinbutton); @@ -739,7 +739,7 @@ create_material_page (void) gtk_size_group_add_widget (group, label); spinbutton = gimp_spin_button_new (&adj, mapvals.material.highlight, - 0, G_MAXFLOAT, 0.01, 0.1, 1.0, 0.0, 2); + 0, G_MAXFLOAT, 0.01, 0.1, 0.0, 0.0, 2); gtk_table_attach (GTK_TABLE (table), spinbutton, 2, 3, 3, 4, GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); gtk_widget_show (spinbutton); @@ -855,7 +855,7 @@ create_bump_page (void) _("Cu_rve:"), 0.0, 0.5, combo, 1, FALSE); spinbutton = gimp_spin_button_new (&adj, mapvals.bumpmax, - 0, G_MAXFLOAT, 0.01, 0.1, 1.0, 0.0, 2); + 0, G_MAXFLOAT, 0.01, 0.1, 0.0, 0.0, 2); gimp_table_attach_aligned (GTK_TABLE (table), 0, 2, _("Ma_ximum height:"), 0.0, 0.5, spinbutton, 1, TRUE); diff --git a/plug-ins/map-object/map-object-ui.c b/plug-ins/map-object/map-object-ui.c index c41e081967..af74cc6f49 100644 --- a/plug-ins/map-object/map-object-ui.c +++ b/plug-ins/map-object/map-object-ui.c @@ -580,7 +580,7 @@ create_options_page (void) &mapvals.maxdepth); spinbutton = gimp_spin_button_new (&adj, mapvals.pixeltreshold, - 0.001, 1000, 0.1, 1, 1, 0, 3); + 0.001, 1000, 0.1, 1, 0, 0, 3); gimp_table_attach_aligned (GTK_TABLE (table), 0, 1, _("_Threshold:"), 0.0, 0.5, spinbutton, 1, TRUE); @@ -670,7 +670,7 @@ create_light_page (void) spinbutton = gimp_spin_button_new (&xadj, mapvals.lightsource.position.x, -G_MAXFLOAT, G_MAXFLOAT, - 0.1, 1.0, 1.0, 0.0, 2); + 0.1, 1.0, 0.0, 0.0, 2); gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, _("X:"), 0.0, 0.5, spinbutton, 1, TRUE); @@ -684,7 +684,7 @@ create_light_page (void) spinbutton = gimp_spin_button_new (&yadj, mapvals.lightsource.position.y, -G_MAXFLOAT, G_MAXFLOAT, - 0.1, 1.0, 1.0, 0.0, 2); + 0.1, 1.0, 0.0, 0.0, 2); gimp_table_attach_aligned (GTK_TABLE (table), 0, 1, _("Y:"), 0.0, 0.5, spinbutton, 1, TRUE); @@ -698,7 +698,7 @@ create_light_page (void) spinbutton = gimp_spin_button_new (&zadj, mapvals.lightsource.position.z, -G_MAXFLOAT, G_MAXFLOAT, - 0.1, 1.0, 1.0, 0.0, 2); + 0.1, 1.0, 0.0, 0.0, 2); gimp_table_attach_aligned (GTK_TABLE (table), 0, 2, _("Z:"), 0.0, 0.5, spinbutton, 1, TRUE); @@ -724,7 +724,7 @@ create_light_page (void) gtk_widget_show (table); spinbutton = gimp_spin_button_new (&adj, mapvals.lightsource.direction.x, - -1.0, 1.0, 0.01, 0.1, 1.0, 0.0, 2); + -1.0, 1.0, 0.01, 0.1, 0.0, 0.0, 2); gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, _("X:"), 0.0, 0.5, spinbutton, 1, TRUE); @@ -737,7 +737,7 @@ create_light_page (void) _("Light source X direction in XYZ space"), NULL); spinbutton = gimp_spin_button_new (&adj, mapvals.lightsource.direction.y, - -1.0, 1.0, 0.01, 0.1, 1.0, 0.0, 2); + -1.0, 1.0, 0.01, 0.1, 0.0, 0.0, 2); gimp_table_attach_aligned (GTK_TABLE (table), 0, 1, _("Y:"), 0.0, 0.5, spinbutton, 1, TRUE); @@ -750,7 +750,7 @@ create_light_page (void) _("Light source Y direction in XYZ space"), NULL); spinbutton = gimp_spin_button_new (&adj, mapvals.lightsource.direction.z, - -1.0, 1.0, 0.01, 0.1, 1.0, 0.0, 2); + -1.0, 1.0, 0.01, 0.1, 0.0, 0.0, 2); gimp_table_attach_aligned (GTK_TABLE (table), 0, 2, _("Z:"), 0.0, 0.5, spinbutton, 1, TRUE); @@ -811,7 +811,7 @@ create_material_page (void) gtk_size_group_add_widget (group, label); spinbutton = gimp_spin_button_new (&adj, mapvals.material.ambient_int, - 0, G_MAXFLOAT, 0.1, 1.0, 1.0, 0.0, 2); + 0, G_MAXFLOAT, 0.1, 1.0, 0.0, 0.0, 2); gtk_table_attach (GTK_TABLE (table), spinbutton, 2, 3, 0, 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); gtk_widget_show (spinbutton); @@ -840,7 +840,7 @@ create_material_page (void) gtk_size_group_add_widget (group, label); spinbutton = gimp_spin_button_new (&adj, mapvals.material.diffuse_int, - 0, G_MAXFLOAT, 0.1, 1.0, 1.0, 0.0, 2); + 0, G_MAXFLOAT, 0.1, 1.0, 0.0, 0.0, 2); gtk_table_attach (GTK_TABLE (table), spinbutton, 2, 3, 1, 2, GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); gtk_widget_show (spinbutton); @@ -883,7 +883,7 @@ create_material_page (void) gtk_size_group_add_widget (group, label); spinbutton = gimp_spin_button_new (&adj, mapvals.material.diffuse_ref, - 0, G_MAXFLOAT, 0.1, 1.0, 1.0, 0.0, 2); + 0, G_MAXFLOAT, 0.1, 1.0, 0.0, 0.0, 2); gtk_table_attach (GTK_TABLE (table), spinbutton, 2, 3, 0, 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); gtk_widget_show (spinbutton); @@ -912,7 +912,7 @@ create_material_page (void) gtk_size_group_add_widget (group, label); spinbutton = gimp_spin_button_new (&adj, mapvals.material.specular_ref, - 0, G_MAXFLOAT, 0.1, 1.0, 1.0, 0.0, 2); + 0, G_MAXFLOAT, 0.1, 1.0, 0.0, 0.0, 2); gtk_table_attach (GTK_TABLE (table), spinbutton, 2, 3, 1, 2, GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); gtk_widget_show (spinbutton); @@ -941,7 +941,7 @@ create_material_page (void) gtk_size_group_add_widget (group, label); spinbutton = gimp_spin_button_new (&adj, mapvals.material.highlight, - 0, G_MAXFLOAT, 0.1, 1.0, 1.0, 0.0, 2); + 0, G_MAXFLOAT, 0.1, 1.0, 0.0, 0.0, 2); gtk_table_attach (GTK_TABLE (table), spinbutton, 2, 3, 2, 3, GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); gtk_widget_show (spinbutton);