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

app/tools/gimpairbrushtool.c app/tools/gimpblendtool.c 

2001-08-01  Sven Neumann  <sven@gimp.org>

	* app/tools/gimpairbrushtool.c
	* app/tools/gimpblendtool.c
	* app/tools/gimpbrightnesscontrasttool.c
	* app/tools/gimpbucketfilltool.c
	* app/tools/gimpcolorpickertool.c
	* app/tools/gimpconvolvetool.c
	* app/tools/gimpcroptool.c
	* app/tools/gimperasertool.c
	* app/tools/gimphistogramtool.c
	* app/tools/gimphuesaturationtool.c
	* app/tools/gimplevelstool.c
	* app/tools/gimpmagnifytool.c
	* app/tools/gimpposterizetool.c
	* app/tools/gimprotatetool.c
	* app/tools/gimpscaletool.c
	* app/tools/gimpsmudgetool.c
	* app/tools/gimptexttool.c
	* app/tools/gimpthresholdtool.c
	* app/tools/gimptransformtool.c
	* app/tools/paint_options.c
	* app/tools/selection_options.c
	* app/tools/transform_options.c: got rid of all remaining gtk_signal
	wrappers.
This commit is contained in:
Sven Neumann 2001-08-01 02:57:58 +00:00 committed by Sven Neumann
parent fc12bd9a52
commit 8590e01fb9
36 changed files with 559 additions and 477 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ChangeLog
View File

@ -1,3 +1,29 @@
2001-08-01 Sven Neumann <sven@gimp.org>
* app/tools/gimpairbrushtool.c
* app/tools/gimpblendtool.c
* app/tools/gimpbrightnesscontrasttool.c
* app/tools/gimpbucketfilltool.c
* app/tools/gimpcolorpickertool.c
* app/tools/gimpconvolvetool.c
* app/tools/gimpcroptool.c
* app/tools/gimperasertool.c
* app/tools/gimphistogramtool.c
* app/tools/gimphuesaturationtool.c
* app/tools/gimplevelstool.c
* app/tools/gimpmagnifytool.c
* app/tools/gimpposterizetool.c
* app/tools/gimprotatetool.c
* app/tools/gimpscaletool.c
* app/tools/gimpsmudgetool.c
* app/tools/gimptexttool.c
* app/tools/gimpthresholdtool.c
* app/tools/gimptransformtool.c
* app/tools/paint_options.c
* app/tools/selection_options.c
* app/tools/transform_options.c: got rid of all remaining gtk_signal
wrappers.
2001-08-01 Sven Neumann <sven@gimp.org> 2001-08-01 Sven Neumann <sven@gimp.org>
* app/core/core-types.h: defined GimpTransferMode enum. * app/core/core-types.h: defined GimpTransferMode enum.

36
app/base/hue-saturation.c
View File

@ -512,18 +512,18 @@ hue_saturation_dialog_new (void)
DA_WIDTH, DA_HEIGHT); DA_WIDTH, DA_HEIGHT);
gtk_widget_set_events (hsd->hue_partition_da[i - 1], gtk_widget_set_events (hsd->hue_partition_da[i - 1],
HUE_PARTITION_MASK); HUE_PARTITION_MASK);
gtk_signal_connect (GTK_OBJECT (hsd->hue_partition_da[i - 1]), "event", g_signal_connect (G_OBJECT (hsd->hue_partition_da[i - 1]), "event",
GTK_SIGNAL_FUNC (hue_saturation_hue_partition_events), G_CALLBACK (hue_saturation_hue_partition_events),
hsd); hsd);
gtk_container_add (GTK_CONTAINER (frame), hsd->hue_partition_da[i - 1]); gtk_container_add (GTK_CONTAINER (frame), hsd->hue_partition_da[i - 1]);
gtk_widget_show (hsd->hue_partition_da[i - 1]); gtk_widget_show (hsd->hue_partition_da[i - 1]);
gtk_widget_show (frame); gtk_widget_show (frame);
} }
gtk_signal_connect (GTK_OBJECT (radio_button), "toggled", g_signal_connect (G_OBJECT (radio_button), "toggled",
GTK_SIGNAL_FUNC (hue_saturation_partition_callback), G_CALLBACK (hue_saturation_partition_callback),
hsd); hsd);
gtk_widget_show (radio_button); gtk_widget_show (radio_button);
} }
@ -570,9 +570,9 @@ hue_saturation_dialog_new (void)
gtk_table_attach (GTK_TABLE (table), abox, 2, 3, 0, 1, gtk_table_attach (GTK_TABLE (table), abox, 2, 3, 0, 1,
GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
gtk_signal_connect (GTK_OBJECT (hsd->hue_data), "value_changed", g_signal_connect (G_OBJECT (hsd->hue_data), "value_changed",
GTK_SIGNAL_FUNC (hue_saturation_hue_adjustment_update), G_CALLBACK (hue_saturation_hue_adjustment_update),
hsd); hsd);
gtk_widget_show (label); gtk_widget_show (label);
gtk_widget_show (slider); gtk_widget_show (slider);
@ -604,9 +604,9 @@ hue_saturation_dialog_new (void)
gtk_table_attach (GTK_TABLE (table), abox, 2, 3, 1, 2, gtk_table_attach (GTK_TABLE (table), abox, 2, 3, 1, 2,
GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
gtk_signal_connect (GTK_OBJECT (hsd->lightness_data), "value_changed", g_signal_connect (G_OBJECT (hsd->lightness_data), "value_changed",
GTK_SIGNAL_FUNC (hue_saturation_lightness_adjustment_update), G_CALLBACK (hue_saturation_lightness_adjustment_update),
hsd); hsd);
gtk_widget_show (label); gtk_widget_show (label);
gtk_widget_show (slider); gtk_widget_show (slider);
@ -638,9 +638,9 @@ hue_saturation_dialog_new (void)
gtk_table_attach (GTK_TABLE (table), abox, 2, 3, 2, 3, gtk_table_attach (GTK_TABLE (table), abox, 2, 3, 2, 3,
GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
gtk_signal_connect (GTK_OBJECT (hsd->saturation_data), "value_changed", g_signal_connect (G_OBJECT (hsd->saturation_data), "value_changed",
GTK_SIGNAL_FUNC (hue_saturation_saturation_adjustment_update), G_CALLBACK (hue_saturation_saturation_adjustment_update),
hsd); hsd);
gtk_widget_show (label); gtk_widget_show (label);
gtk_widget_show (slider); gtk_widget_show (slider);
@ -658,9 +658,9 @@ hue_saturation_dialog_new (void)
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), hsd->preview); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), hsd->preview);
gtk_box_pack_end (GTK_BOX (hbox), toggle, FALSE, FALSE, 0); gtk_box_pack_end (GTK_BOX (hbox), toggle, FALSE, FALSE, 0);
gtk_signal_connect (GTK_OBJECT (toggle), "toggled", g_signal_connect (G_OBJECT (toggle), "toggled",
GTK_SIGNAL_FUNC (hue_saturation_preview_update), G_CALLBACK (hue_saturation_preview_update),
hsd); hsd);
gtk_widget_show (toggle); gtk_widget_show (toggle);
gtk_widget_show (hbox); gtk_widget_show (hbox);

36
app/base/threshold.c
View File

@ -225,13 +225,15 @@ gimp_threshold_tool_initialize (GimpTool *tool,
gimp_drawable_calculate_histogram (threshold_dialog->drawable, gimp_drawable_calculate_histogram (threshold_dialog->drawable,
threshold_dialog->hist); threshold_dialog->hist);
gtk_signal_handler_block_by_data (GTK_OBJECT (threshold_dialog->histogram), g_signal_handlers_block_by_func (G_OBJECT (threshold_dialog->histogram),
threshold_dialog); threshold_histogram_range,
threshold_dialog);
histogram_widget_update (threshold_dialog->histogram, histogram_widget_update (threshold_dialog->histogram,
threshold_dialog->hist); threshold_dialog->hist);
gtk_signal_handler_unblock_by_data (GTK_OBJECT (threshold_dialog->histogram), g_signal_handlers_unblock_by_func (G_OBJECT (threshold_dialog->histogram),
threshold_dialog); threshold_histogram_range,
threshold_dialog);
threshold_update (threshold_dialog, ALL); threshold_update (threshold_dialog, ALL);
if (threshold_dialog->preview) if (threshold_dialog->preview)
@ -394,9 +396,9 @@ threshold_dialog_new (void)
gtk_widget_set_usize (spinbutton, 75, -1); gtk_widget_set_usize (spinbutton, 75, -1);
gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0);
gtk_signal_connect (GTK_OBJECT (td->low_threshold_data), "value_changed", g_signal_connect (G_OBJECT (td->low_threshold_data), "value_changed",
GTK_SIGNAL_FUNC (threshold_low_threshold_adjustment_update), GTK_SIGNAL_FUNC (threshold_low_threshold_adjustment_update),
td); td);
gtk_widget_show (spinbutton); gtk_widget_show (spinbutton);
@ -408,9 +410,9 @@ threshold_dialog_new (void)
gtk_widget_set_usize (spinbutton, 75, -1); gtk_widget_set_usize (spinbutton, 75, -1);
gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0);
gtk_signal_connect (GTK_OBJECT (td->high_threshold_data), "value_changed", g_signal_connect (G_OBJECT (td->high_threshold_data), "value_changed",
GTK_SIGNAL_FUNC (threshold_high_threshold_adjustment_update), GTK_SIGNAL_FUNC (threshold_high_threshold_adjustment_update),
td); td);
gtk_widget_show (spinbutton); gtk_widget_show (spinbutton);
@ -428,9 +430,9 @@ threshold_dialog_new (void)
gtk_container_add (GTK_CONTAINER (frame), GTK_WIDGET (td->histogram)); gtk_container_add (GTK_CONTAINER (frame), GTK_WIDGET (td->histogram));
gtk_signal_connect (GTK_OBJECT (td->histogram), "range_changed", g_signal_connect (G_OBJECT (td->histogram), "range_changed",
GTK_SIGNAL_FUNC (threshold_histogram_range), GTK_SIGNAL_FUNC (threshold_histogram_range),
td); td);
gtk_widget_show (GTK_WIDGET(td->histogram)); gtk_widget_show (GTK_WIDGET(td->histogram));
@ -446,9 +448,9 @@ threshold_dialog_new (void)
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), td->preview); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), td->preview);
gtk_box_pack_end (GTK_BOX (hbox), toggle, FALSE, FALSE, 0); gtk_box_pack_end (GTK_BOX (hbox), toggle, FALSE, FALSE, 0);
gtk_signal_connect (GTK_OBJECT (toggle), "toggled", g_signal_connect (G_OBJECT (toggle), "toggled",
GTK_SIGNAL_FUNC (threshold_preview_update), GTK_SIGNAL_FUNC (threshold_preview_update),
td); td);
gtk_widget_show (toggle); gtk_widget_show (toggle);
gtk_widget_show (hbox); gtk_widget_show (hbox);

4
app/core/gimp-transform-region.c
View File

@ -236,8 +236,8 @@ gimp_transform_tool_transform (GimpTransformTool *tool,
g_return_val_if_fail (tool, NULL); g_return_val_if_fail (tool, NULL);
g_return_val_if_fail (GIMP_IS_TRANSFORM_TOOL (tool), NULL); g_return_val_if_fail (GIMP_IS_TRANSFORM_TOOL (tool), NULL);
gtk_signal_emit (GTK_OBJECT (tool), gimp_transform_tool_signals[TRANSFORM], g_signal_emit (G_OBJECT (tool), gimp_transform_tool_signals[TRANSFORM], 0,
gdisp, state, &retval); gdisp, state, &retval);
return retval; return retval;
} }

27
app/core/gimpdrawable-blend.c
View File

@ -703,9 +703,9 @@ blend_options_new (void)
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Offset:"), 1.0, 1.0, _("Offset:"), 1.0, 1.0,
scale, 1, FALSE); scale, 1, FALSE);
gtk_signal_connect (GTK_OBJECT (options->offset_w), "value_changed", g_signal_connect (G_OBJECT (options->offset_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update), G_CALLBACK (gimp_double_adjustment_update),
&options->offset); &options->offset);
/* the blend mode menu */ /* the blend mode menu */
options->blend_mode_w = gimp_option_menu_new2 options->blend_mode_w = gimp_option_menu_new2
@ -786,12 +786,13 @@ blend_options_new (void)
gtk_check_button_new_with_label (_("Adaptive Supersampling")); gtk_check_button_new_with_label (_("Adaptive Supersampling"));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (options->supersample_w), gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (options->supersample_w),
options->supersample_d); options->supersample_d);
gtk_signal_connect (GTK_OBJECT (options->supersample_w), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update),
&options->supersample);
gtk_box_pack_start (GTK_BOX (vbox), options->supersample_w, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (vbox), options->supersample_w, FALSE, FALSE, 0);
gtk_widget_show (options->supersample_w); gtk_widget_show (options->supersample_w);
g_signal_connect (G_OBJECT (options->supersample_w), "toggled",
G_CALLBACK (gimp_toggle_button_update),
&options->supersample);
/* table for supersampling options */ /* table for supersampling options */
table = gtk_table_new (2, 2, FALSE); table = gtk_table_new (2, 2, FALSE);
gtk_container_set_border_width (GTK_CONTAINER (table), 2); gtk_container_set_border_width (GTK_CONTAINER (table), 2);
@ -813,9 +814,10 @@ blend_options_new (void)
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Max Depth:"), 1.0, 1.0, _("Max Depth:"), 1.0, 1.0,
scale, 1, FALSE); scale, 1, FALSE);
gtk_signal_connect (GTK_OBJECT(options->max_depth_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_int_adjustment_update), g_signal_connect (G_OBJECT(options->max_depth_w), "value_changed",
&options->max_depth); G_CALLBACK (gimp_int_adjustment_update),
&options->max_depth);
/* threshold scale */ /* threshold scale */
options->threshold_w = options->threshold_w =
@ -826,9 +828,10 @@ blend_options_new (void)
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1, gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("Threshold:"), 1.0, 1.0, _("Threshold:"), 1.0, 1.0,
scale, 1, FALSE); scale, 1, FALSE);
gtk_signal_connect (GTK_OBJECT(options->threshold_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update), g_signal_connect (G_OBJECT(options->threshold_w), "value_changed",
&options->threshold); G_CALLBACK (gimp_double_adjustment_update),
&options->threshold);
/* show the table */ /* show the table */
gtk_widget_show (table); gtk_widget_show (table);

4
app/core/gimpdrawable-transform.c
View File

@ -236,8 +236,8 @@ gimp_transform_tool_transform (GimpTransformTool *tool,
g_return_val_if_fail (tool, NULL); g_return_val_if_fail (tool, NULL);
g_return_val_if_fail (GIMP_IS_TRANSFORM_TOOL (tool), NULL); g_return_val_if_fail (GIMP_IS_TRANSFORM_TOOL (tool), NULL);
gtk_signal_emit (GTK_OBJECT (tool), gimp_transform_tool_signals[TRANSFORM], g_signal_emit (G_OBJECT (tool), gimp_transform_tool_signals[TRANSFORM], 0,
gdisp, state, &retval); gdisp, state, &retval);
return retval; return retval;
} }

24
app/core/gimpimage-pick-color.c
View File

@ -301,9 +301,9 @@ gimp_color_picker_tool_options_new (void)
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (options->sample_merged_w), gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (options->sample_merged_w),
options->sample_merged_d); options->sample_merged_d);
gtk_box_pack_start (GTK_BOX (vbox), options->sample_merged_w, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (vbox), options->sample_merged_w, FALSE, FALSE, 0);
gtk_signal_connect (GTK_OBJECT (options->sample_merged_w), "toggled", g_signal_connect (G_OBJECT (options->sample_merged_w), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update), G_CALLBACK (gimp_toggle_button_update),
&options->sample_merged); &options->sample_merged);
gtk_widget_show (options->sample_merged_w); gtk_widget_show (options->sample_merged_w);
/* the sample average options */ /* the sample average options */
@ -317,9 +317,9 @@ gimp_color_picker_tool_options_new (void)
GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0); GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (options->sample_average_w), gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (options->sample_average_w),
options->sample_average_d); options->sample_average_d);
gtk_signal_connect (GTK_OBJECT (options->sample_average_w), "toggled", g_signal_connect (G_OBJECT (options->sample_average_w), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update), G_CALLBACK (gimp_toggle_button_update),
&options->sample_average); &options->sample_average);
gtk_widget_show (options->sample_average_w); gtk_widget_show (options->sample_average_w);
label = gtk_label_new (_("Radius:")); label = gtk_label_new (_("Radius:"));
@ -347,9 +347,9 @@ gimp_color_picker_tool_options_new (void)
label); label);
gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP); gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP);
gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED); gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED);
gtk_signal_connect (GTK_OBJECT (options->average_radius_w), "value_changed", g_signal_connect (G_OBJECT (options->average_radius_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update), G_CALLBACK (gimp_double_adjustment_update),
&options->average_radius); &options->average_radius);
gtk_widget_show (scale); gtk_widget_show (scale);
gtk_widget_show (table); gtk_widget_show (table);
@ -359,9 +359,9 @@ gimp_color_picker_tool_options_new (void)
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (options->update_active_w), gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (options->update_active_w),
options->update_active_d); options->update_active_d);
gtk_box_pack_start (GTK_BOX (vbox), options->update_active_w, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (vbox), options->update_active_w, FALSE, FALSE, 0);
gtk_signal_connect (GTK_OBJECT (options->update_active_w), "toggled", g_signal_connect (G_OBJECT (options->update_active_w), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update), G_CALLBACK (gimp_toggle_button_update),
&options->update_active); &options->update_active);
gtk_widget_show (options->update_active_w); gtk_widget_show (options->update_active_w);
return options; return options;

12
app/paint/gimpairbrush.c
View File

@ -517,9 +517,9 @@ airbrush_options_new (void)
scale = gtk_hscale_new (GTK_ADJUSTMENT (options->rate_w)); scale = gtk_hscale_new (GTK_ADJUSTMENT (options->rate_w));
gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP); gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP);
gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED); gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED);
gtk_signal_connect (GTK_OBJECT (options->rate_w), "value_changed", g_signal_connect (G_OBJECT (options->rate_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update), G_CALLBACK (gimp_double_adjustment_update),
&options->rate); &options->rate);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Rate:"), 1.0, 1.0, _("Rate:"), 1.0, 1.0,
scale, 1, FALSE); scale, 1, FALSE);
@ -530,9 +530,9 @@ airbrush_options_new (void)
scale = gtk_hscale_new (GTK_ADJUSTMENT (options->pressure_w)); scale = gtk_hscale_new (GTK_ADJUSTMENT (options->pressure_w));
gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP); gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP);
gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED); gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED);
gtk_signal_connect (GTK_OBJECT (options->pressure_w), "value_changed", g_signal_connect (G_OBJECT (options->pressure_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update), G_CALLBACK (gimp_double_adjustment_update),
&options->pressure); &options->pressure);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1, gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("Pressure:"), 1.0, 1.0, _("Pressure:"), 1.0, 1.0,
scale, 1, FALSE); scale, 1, FALSE);

6
app/paint/gimpconvolve.c
View File

@ -741,9 +741,9 @@ convolve_options_new (void)
gtk_box_pack_start (GTK_BOX (hbox), scale, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (hbox), scale, TRUE, TRUE, 0);
gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP); gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP);
gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED); gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED);
gtk_signal_connect (GTK_OBJECT (options->rate_w), "value_changed", g_signal_connect (G_OBJECT (options->rate_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update), G_CALLBACK (gimp_double_adjustment_update),
&options->rate); &options->rate);
gtk_widget_show (scale); gtk_widget_show (scale);
gtk_widget_show (hbox); gtk_widget_show (hbox);

12
app/paint/gimperaser.c
View File

@ -407,9 +407,9 @@ gimp_eraser_tool_options_new (void)
/* the hard toggle */ /* the hard toggle */
options->hard_w = gtk_check_button_new_with_label (_("Hard Edge")); options->hard_w = gtk_check_button_new_with_label (_("Hard Edge"));
gtk_box_pack_start (GTK_BOX (vbox), options->hard_w, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (vbox), options->hard_w, FALSE, FALSE, 0);
gtk_signal_connect (GTK_OBJECT (options->hard_w), "toggled", g_signal_connect (G_OBJECT (options->hard_w), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update), G_CALLBACK (gimp_toggle_button_update),
&options->hard); &options->hard);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (options->hard_w), gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (options->hard_w),
options->hard_d); options->hard_d);
gtk_widget_show (options->hard_w); gtk_widget_show (options->hard_w);
@ -417,9 +417,9 @@ gimp_eraser_tool_options_new (void)
/* the anti_erase toggle */ /* the anti_erase toggle */
options->anti_erase_w = gtk_check_button_new_with_label (_("Anti Erase")); options->anti_erase_w = gtk_check_button_new_with_label (_("Anti Erase"));
gtk_box_pack_start (GTK_BOX (vbox), options->anti_erase_w, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (vbox), options->anti_erase_w, FALSE, FALSE, 0);
gtk_signal_connect (GTK_OBJECT (options->anti_erase_w), "toggled", g_signal_connect (G_OBJECT (options->anti_erase_w), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update), G_CALLBACK (gimp_toggle_button_update),
&options->anti_erase); &options->anti_erase);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (options->anti_erase_w), gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (options->anti_erase_w),
options->anti_erase_d); options->anti_erase_d);
gtk_widget_show (options->anti_erase_w); gtk_widget_show (options->anti_erase_w);

6
app/paint/gimpsmudge.c
View File

@ -550,9 +550,9 @@ smudge_options_new (void)
gtk_box_pack_start (GTK_BOX (hbox), scale, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (hbox), scale, TRUE, TRUE, 0);
gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP); gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP);
gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED); gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED);
gtk_signal_connect (GTK_OBJECT (options->rate_w), "value_changed", g_signal_connect (G_OBJECT (options->rate_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update), G_CALLBACK (gimp_double_adjustment_update),
&options->rate); &options->rate);
gtk_widget_show (scale); gtk_widget_show (scale);
gtk_widget_show (hbox); gtk_widget_show (hbox);

12
app/tools/gimpairbrushtool.c
View File

@ -517,9 +517,9 @@ airbrush_options_new (void)
scale = gtk_hscale_new (GTK_ADJUSTMENT (options->rate_w)); scale = gtk_hscale_new (GTK_ADJUSTMENT (options->rate_w));
gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP); gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP);
gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED); gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED);
gtk_signal_connect (GTK_OBJECT (options->rate_w), "value_changed", g_signal_connect (G_OBJECT (options->rate_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update), G_CALLBACK (gimp_double_adjustment_update),
&options->rate); &options->rate);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Rate:"), 1.0, 1.0, _("Rate:"), 1.0, 1.0,
scale, 1, FALSE); scale, 1, FALSE);
@ -530,9 +530,9 @@ airbrush_options_new (void)
scale = gtk_hscale_new (GTK_ADJUSTMENT (options->pressure_w)); scale = gtk_hscale_new (GTK_ADJUSTMENT (options->pressure_w));
gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP); gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP);
gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED); gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED);
gtk_signal_connect (GTK_OBJECT (options->pressure_w), "value_changed", g_signal_connect (G_OBJECT (options->pressure_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update), G_CALLBACK (gimp_double_adjustment_update),
&options->pressure); &options->pressure);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1, gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("Pressure:"), 1.0, 1.0, _("Pressure:"), 1.0, 1.0,
scale, 1, FALSE); scale, 1, FALSE);

27
app/tools/gimpblendtool.c
View File

@ -703,9 +703,9 @@ blend_options_new (void)
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Offset:"), 1.0, 1.0, _("Offset:"), 1.0, 1.0,
scale, 1, FALSE); scale, 1, FALSE);
gtk_signal_connect (GTK_OBJECT (options->offset_w), "value_changed", g_signal_connect (G_OBJECT (options->offset_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update), G_CALLBACK (gimp_double_adjustment_update),
&options->offset); &options->offset);
/* the blend mode menu */ /* the blend mode menu */
options->blend_mode_w = gimp_option_menu_new2 options->blend_mode_w = gimp_option_menu_new2
@ -786,12 +786,13 @@ blend_options_new (void)
gtk_check_button_new_with_label (_("Adaptive Supersampling")); gtk_check_button_new_with_label (_("Adaptive Supersampling"));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (options->supersample_w), gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (options->supersample_w),
options->supersample_d); options->supersample_d);
gtk_signal_connect (GTK_OBJECT (options->supersample_w), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update),
&options->supersample);
gtk_box_pack_start (GTK_BOX (vbox), options->supersample_w, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (vbox), options->supersample_w, FALSE, FALSE, 0);
gtk_widget_show (options->supersample_w); gtk_widget_show (options->supersample_w);
g_signal_connect (G_OBJECT (options->supersample_w), "toggled",
G_CALLBACK (gimp_toggle_button_update),
&options->supersample);
/* table for supersampling options */ /* table for supersampling options */
table = gtk_table_new (2, 2, FALSE); table = gtk_table_new (2, 2, FALSE);
gtk_container_set_border_width (GTK_CONTAINER (table), 2); gtk_container_set_border_width (GTK_CONTAINER (table), 2);
@ -813,9 +814,10 @@ blend_options_new (void)
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Max Depth:"), 1.0, 1.0, _("Max Depth:"), 1.0, 1.0,
scale, 1, FALSE); scale, 1, FALSE);
gtk_signal_connect (GTK_OBJECT(options->max_depth_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_int_adjustment_update), g_signal_connect (G_OBJECT(options->max_depth_w), "value_changed",
&options->max_depth); G_CALLBACK (gimp_int_adjustment_update),
&options->max_depth);
/* threshold scale */ /* threshold scale */
options->threshold_w = options->threshold_w =
@ -826,9 +828,10 @@ blend_options_new (void)
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1, gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("Threshold:"), 1.0, 1.0, _("Threshold:"), 1.0, 1.0,
scale, 1, FALSE); scale, 1, FALSE);
gtk_signal_connect (GTK_OBJECT(options->threshold_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update), g_signal_connect (G_OBJECT(options->threshold_w), "value_changed",
&options->threshold); G_CALLBACK (gimp_double_adjustment_update),
&options->threshold);
/* show the table */ /* show the table */
gtk_widget_show (table); gtk_widget_show (table);

18
app/tools/gimpbrightnesscontrasttool.c
View File

@ -340,9 +340,9 @@ brightness_contrast_dialog_new (void)
gtk_table_attach (GTK_TABLE (table), abox, 2, 3, 0, 1, gtk_table_attach (GTK_TABLE (table), abox, 2, 3, 0, 1,
GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
gtk_signal_connect (GTK_OBJECT (data), "value_changed", g_signal_connect (G_OBJECT (data), "value_changed",
GTK_SIGNAL_FUNC (brightness_contrast_brightness_adjustment_update), G_CALLBACK (brightness_contrast_brightness_adjustment_update),
bcd); bcd);
gtk_widget_show (label); gtk_widget_show (label);
gtk_widget_show (slider); gtk_widget_show (slider);
@ -371,9 +371,9 @@ brightness_contrast_dialog_new (void)
gtk_table_attach (GTK_TABLE (table), abox, 2, 3, 1, 2, gtk_table_attach (GTK_TABLE (table), abox, 2, 3, 1, 2,
GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
gtk_signal_connect (GTK_OBJECT (data), "value_changed", g_signal_connect (G_OBJECT (data), "value_changed",
GTK_SIGNAL_FUNC (brightness_contrast_contrast_adjustment_update), G_CALLBACK (brightness_contrast_contrast_adjustment_update),
bcd); bcd);
gtk_widget_show (label); gtk_widget_show (label);
gtk_widget_show (slider); gtk_widget_show (slider);
@ -388,9 +388,9 @@ brightness_contrast_dialog_new (void)
toggle = gtk_check_button_new_with_label (_("Preview")); toggle = gtk_check_button_new_with_label (_("Preview"));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), bcd->preview); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), bcd->preview);
gtk_box_pack_end (GTK_BOX (hbox), toggle, FALSE, FALSE, 0); gtk_box_pack_end (GTK_BOX (hbox), toggle, FALSE, FALSE, 0);
gtk_signal_connect (GTK_OBJECT (toggle), "toggled", g_signal_connect (G_OBJECT (toggle), "toggled",
GTK_SIGNAL_FUNC (brightness_contrast_preview_update), G_CALLBACK (brightness_contrast_preview_update),
bcd); bcd);
gtk_widget_show (toggle); gtk_widget_show (toggle);
gtk_widget_show (hbox); gtk_widget_show (hbox);

12
app/tools/gimpbucketfilltool.c
View File

@ -254,9 +254,9 @@ bucket_options_new (void)
/* the sample merged toggle */ /* the sample merged toggle */
options->sample_merged_w = options->sample_merged_w =
gtk_check_button_new_with_label (_("Sample Merged")); gtk_check_button_new_with_label (_("Sample Merged"));
gtk_signal_connect (GTK_OBJECT (options->sample_merged_w), "toggled", g_signal_connect (G_OBJECT (options->sample_merged_w), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update), G_CALLBACK (gimp_toggle_button_update),
&options->sample_merged); &options->sample_merged);
gtk_box_pack_start (GTK_BOX (vbox), options->sample_merged_w, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (vbox), options->sample_merged_w, FALSE, FALSE, 0);
gtk_widget_show (options->sample_merged_w); gtk_widget_show (options->sample_merged_w);
@ -275,9 +275,9 @@ bucket_options_new (void)
gtk_box_pack_start (GTK_BOX (hbox), scale, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (hbox), scale, TRUE, TRUE, 0);
gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP); gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP);
gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED); gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED);
gtk_signal_connect (GTK_OBJECT (options->threshold_w), "value_changed", g_signal_connect (G_OBJECT (options->threshold_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update), G_CALLBACK (gimp_double_adjustment_update),
&options->threshold); &options->threshold);
gtk_widget_show (scale); gtk_widget_show (scale);
gtk_widget_show (hbox); gtk_widget_show (hbox);

24
app/tools/gimpcolorpickertool.c
View File

@ -301,9 +301,9 @@ gimp_color_picker_tool_options_new (void)
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (options->sample_merged_w), gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (options->sample_merged_w),
options->sample_merged_d); options->sample_merged_d);
gtk_box_pack_start (GTK_BOX (vbox), options->sample_merged_w, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (vbox), options->sample_merged_w, FALSE, FALSE, 0);
gtk_signal_connect (GTK_OBJECT (options->sample_merged_w), "toggled", g_signal_connect (G_OBJECT (options->sample_merged_w), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update), G_CALLBACK (gimp_toggle_button_update),
&options->sample_merged); &options->sample_merged);
gtk_widget_show (options->sample_merged_w); gtk_widget_show (options->sample_merged_w);
/* the sample average options */ /* the sample average options */
@ -317,9 +317,9 @@ gimp_color_picker_tool_options_new (void)
GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0); GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (options->sample_average_w), gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (options->sample_average_w),
options->sample_average_d); options->sample_average_d);
gtk_signal_connect (GTK_OBJECT (options->sample_average_w), "toggled", g_signal_connect (G_OBJECT (options->sample_average_w), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update), G_CALLBACK (gimp_toggle_button_update),
&options->sample_average); &options->sample_average);
gtk_widget_show (options->sample_average_w); gtk_widget_show (options->sample_average_w);
label = gtk_label_new (_("Radius:")); label = gtk_label_new (_("Radius:"));
@ -347,9 +347,9 @@ gimp_color_picker_tool_options_new (void)
label); label);
gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP); gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP);
gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED); gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED);
gtk_signal_connect (GTK_OBJECT (options->average_radius_w), "value_changed", g_signal_connect (G_OBJECT (options->average_radius_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update), G_CALLBACK (gimp_double_adjustment_update),
&options->average_radius); &options->average_radius);
gtk_widget_show (scale); gtk_widget_show (scale);
gtk_widget_show (table); gtk_widget_show (table);
@ -359,9 +359,9 @@ gimp_color_picker_tool_options_new (void)
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (options->update_active_w), gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (options->update_active_w),
options->update_active_d); options->update_active_d);
gtk_box_pack_start (GTK_BOX (vbox), options->update_active_w, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (vbox), options->update_active_w, FALSE, FALSE, 0);
gtk_signal_connect (GTK_OBJECT (options->update_active_w), "toggled", g_signal_connect (G_OBJECT (options->update_active_w), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update), G_CALLBACK (gimp_toggle_button_update),
&options->update_active); &options->update_active);
gtk_widget_show (options->update_active_w); gtk_widget_show (options->update_active_w);
return options; return options;

6
app/tools/gimpconvolvetool.c
View File

@ -741,9 +741,9 @@ convolve_options_new (void)
gtk_box_pack_start (GTK_BOX (hbox), scale, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (hbox), scale, TRUE, TRUE, 0);
gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP); gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP);
gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED); gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED);
gtk_signal_connect (GTK_OBJECT (options->rate_w), "value_changed", g_signal_connect (G_OBJECT (options->rate_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update), G_CALLBACK (gimp_double_adjustment_update),
&options->rate); &options->rate);
gtk_widget_show (scale); gtk_widget_show (scale);
gtk_widget_show (hbox); gtk_widget_show (hbox);

49
app/tools/gimpcroptool.c
View File

@ -154,7 +154,7 @@ static void crop_selection_callback (GtkWidget *widget,
static void crop_automatic_callback (GtkWidget *widget, static void crop_automatic_callback (GtkWidget *widget,
gpointer data); gpointer data);
static void crop_orig_changed (GtkWidget *widget, static void crop_origin_changed (GtkWidget *widget,
gpointer data); gpointer data);
static void crop_size_changed (GtkWidget *widget, static void crop_size_changed (GtkWidget *widget,
gpointer data); gpointer data);
@ -809,8 +809,12 @@ crop_start (GimpTool *tool,
if (! crop_info) if (! crop_info)
crop_info_create (tool); crop_info_create (tool);
gtk_signal_handler_block_by_data (GTK_OBJECT (origin_sizeentry), crop_info); g_signal_handlers_block_by_func (G_OBJECT (origin_sizeentry),
gtk_signal_handler_block_by_data (GTK_OBJECT (size_sizeentry), crop_info); crop_origin_changed,
crop_info);
g_signal_handlers_block_by_func (G_OBJECT (size_sizeentry),
crop_size_changed,
crop_info);
gimp_size_entry_set_resolution (GIMP_SIZE_ENTRY (origin_sizeentry), 0, gimp_size_entry_set_resolution (GIMP_SIZE_ENTRY (origin_sizeentry), 0,
tool->gdisp->gimage->xresolution, FALSE); tool->gdisp->gimage->xresolution, FALSE);
@ -848,8 +852,12 @@ crop_start (GimpTool *tool,
} }
} }
gtk_signal_handler_unblock_by_data (GTK_OBJECT (size_sizeentry), crop_info); g_signal_handlers_unblock_by_func (G_OBJECT (origin_sizeentry),
gtk_signal_handler_unblock_by_data (GTK_OBJECT (origin_sizeentry), crop_info); crop_origin_changed,
crop_info);
g_signal_handlers_unblock_by_func (G_OBJECT (size_sizeentry),
crop_size_changed,
crop_info);
old_gdisp = tool->gdisp; old_gdisp = tool->gdisp;
@ -902,7 +910,7 @@ crop_info_create (GimpTool *tool)
gdisp->dot_for_dot ? gdisp->dot_for_dot ?
GIMP_UNIT_PIXEL : gdisp->gimage->unit, "%a", GIMP_UNIT_PIXEL : gdisp->gimage->unit, "%a",
TRUE, TRUE, FALSE, GIMP_SIZE_ENTRY_UPDATE_SIZE, TRUE, TRUE, FALSE, GIMP_SIZE_ENTRY_UPDATE_SIZE,
G_CALLBACK (crop_orig_changed), G_CALLBACK (crop_origin_changed),
crop_info); crop_info);
gimp_size_entry_add_field (GIMP_SIZE_ENTRY (origin_sizeentry), gimp_size_entry_add_field (GIMP_SIZE_ENTRY (origin_sizeentry),
GTK_SPIN_BUTTON (spinbutton), NULL); GTK_SPIN_BUTTON (spinbutton), NULL);
@ -939,16 +947,17 @@ crop_info_create (GimpTool *tool)
gtk_button_box_set_spacing (GTK_BUTTON_BOX (bbox), 4); gtk_button_box_set_spacing (GTK_BUTTON_BOX (bbox), 4);
button = gtk_button_new_with_label (_("From Selection")); button = gtk_button_new_with_label (_("From Selection"));
gtk_container_add( GTK_CONTAINER(bbox), button); gtk_container_add (GTK_CONTAINER(bbox), button);
gtk_signal_connect(GTK_OBJECT (button) , "clicked", g_signal_connect (G_OBJECT (button) , "clicked",
(GtkSignalFunc) crop_selection_callback, NULL); G_CALLBACK (crop_selection_callback),
NULL);
gtk_widget_show (button); gtk_widget_show (button);
button = gtk_button_new_with_label (_("Auto Shrink")); button = gtk_button_new_with_label (_("Auto Shrink"));
gtk_container_add (GTK_CONTAINER (bbox), button); gtk_container_add (GTK_CONTAINER (bbox), button);
gtk_signal_connect (GTK_OBJECT (button) , "clicked", g_signal_connect (G_OBJECT (button) , "clicked",
GTK_SIGNAL_FUNC (crop_automatic_callback), G_CALLBACK (crop_automatic_callback),
NULL); NULL);
gtk_widget_show (button); gtk_widget_show (button);
gtk_box_pack_start (GTK_BOX (crop_info->vbox), bbox, FALSE, FALSE, 2); gtk_box_pack_start (GTK_BOX (crop_info->vbox), bbox, FALSE, FALSE, 2);
@ -1150,8 +1159,8 @@ crop_automatic_callback (GtkWidget *widget,
} }
static void static void
crop_orig_changed (GtkWidget *widget, crop_origin_changed (GtkWidget *widget,
gpointer data) gpointer data)
{ {
GimpTool *tool; GimpTool *tool;
GimpCropTool *crop; GimpCropTool *crop;
@ -1244,9 +1253,9 @@ crop_options_new (void)
gtk_check_button_new_with_label(_("Current Layer only")); gtk_check_button_new_with_label(_("Current Layer only"));
gtk_box_pack_start (GTK_BOX (vbox), options->layer_only_w, gtk_box_pack_start (GTK_BOX (vbox), options->layer_only_w,
FALSE, FALSE, 0); FALSE, FALSE, 0);
gtk_signal_connect (GTK_OBJECT (options->layer_only_w), "toggled", g_signal_connect (G_OBJECT (options->layer_only_w), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update), G_CALLBACK (gimp_toggle_button_update),
&options->layer_only); &options->layer_only);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (options->layer_only_w), gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (options->layer_only_w),
options->layer_only_d); options->layer_only_d);
gtk_widget_show (options->layer_only_w); gtk_widget_show (options->layer_only_w);
@ -1255,9 +1264,9 @@ crop_options_new (void)
options->allow_enlarge_w = gtk_check_button_new_with_label (_("Allow Enlarging")); options->allow_enlarge_w = gtk_check_button_new_with_label (_("Allow Enlarging"));
gtk_box_pack_start (GTK_BOX (vbox), options->allow_enlarge_w, gtk_box_pack_start (GTK_BOX (vbox), options->allow_enlarge_w,
FALSE, FALSE, 0); FALSE, FALSE, 0);
gtk_signal_connect (GTK_OBJECT (options->allow_enlarge_w), "toggled", g_signal_connect (G_OBJECT (options->allow_enlarge_w), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update), G_CALLBACK (gimp_toggle_button_update),
&options->allow_enlarge); &options->allow_enlarge);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (options->allow_enlarge_w), gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (options->allow_enlarge_w),
options->allow_enlarge_d); options->allow_enlarge_d);
gtk_widget_show (options->allow_enlarge_w); gtk_widget_show (options->allow_enlarge_w);

12
app/tools/gimperasertool.c
View File

@ -407,9 +407,9 @@ gimp_eraser_tool_options_new (void)
/* the hard toggle */ /* the hard toggle */
options->hard_w = gtk_check_button_new_with_label (_("Hard Edge")); options->hard_w = gtk_check_button_new_with_label (_("Hard Edge"));
gtk_box_pack_start (GTK_BOX (vbox), options->hard_w, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (vbox), options->hard_w, FALSE, FALSE, 0);
gtk_signal_connect (GTK_OBJECT (options->hard_w), "toggled", g_signal_connect (G_OBJECT (options->hard_w), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update), G_CALLBACK (gimp_toggle_button_update),
&options->hard); &options->hard);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (options->hard_w), gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (options->hard_w),
options->hard_d); options->hard_d);
gtk_widget_show (options->hard_w); gtk_widget_show (options->hard_w);
@ -417,9 +417,9 @@ gimp_eraser_tool_options_new (void)
/* the anti_erase toggle */ /* the anti_erase toggle */
options->anti_erase_w = gtk_check_button_new_with_label (_("Anti Erase")); options->anti_erase_w = gtk_check_button_new_with_label (_("Anti Erase"));
gtk_box_pack_start (GTK_BOX (vbox), options->anti_erase_w, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (vbox), options->anti_erase_w, FALSE, FALSE, 0);
gtk_signal_connect (GTK_OBJECT (options->anti_erase_w), "toggled", g_signal_connect (G_OBJECT (options->anti_erase_w), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update), G_CALLBACK (gimp_toggle_button_update),
&options->anti_erase); &options->anti_erase);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (options->anti_erase_w), gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (options->anti_erase_w),
options->anti_erase_d); options->anti_erase_d);
gtk_widget_show (options->anti_erase_w); gtk_widget_show (options->anti_erase_w);

6
app/tools/gimphistogramtool.c
View File

@ -409,9 +409,9 @@ histogram_tool_dialog_new (void)
htd->histogram = histogram_widget_new (HISTOGRAM_WIDTH, HISTOGRAM_HEIGHT); htd->histogram = histogram_widget_new (HISTOGRAM_WIDTH, HISTOGRAM_HEIGHT);
gtk_container_add (GTK_CONTAINER (frame), GTK_WIDGET(htd->histogram)); gtk_container_add (GTK_CONTAINER (frame), GTK_WIDGET(htd->histogram));
gtk_signal_connect (GTK_OBJECT (htd->histogram), "range_changed", g_signal_connect (G_OBJECT (htd->histogram), "range_changed",
GTK_SIGNAL_FUNC (histogram_tool_histogram_range), G_CALLBACK (histogram_tool_histogram_range),
htd); htd);
gtk_widget_show (GTK_WIDGET (htd->histogram)); gtk_widget_show (GTK_WIDGET (htd->histogram));
gtk_widget_show (frame); gtk_widget_show (frame);

36
app/tools/gimphuesaturationtool.c
View File

@ -512,18 +512,18 @@ hue_saturation_dialog_new (void)
DA_WIDTH, DA_HEIGHT); DA_WIDTH, DA_HEIGHT);
gtk_widget_set_events (hsd->hue_partition_da[i - 1], gtk_widget_set_events (hsd->hue_partition_da[i - 1],
HUE_PARTITION_MASK); HUE_PARTITION_MASK);
gtk_signal_connect (GTK_OBJECT (hsd->hue_partition_da[i - 1]), "event", g_signal_connect (G_OBJECT (hsd->hue_partition_da[i - 1]), "event",
GTK_SIGNAL_FUNC (hue_saturation_hue_partition_events), G_CALLBACK (hue_saturation_hue_partition_events),
hsd); hsd);
gtk_container_add (GTK_CONTAINER (frame), hsd->hue_partition_da[i - 1]); gtk_container_add (GTK_CONTAINER (frame), hsd->hue_partition_da[i - 1]);
gtk_widget_show (hsd->hue_partition_da[i - 1]); gtk_widget_show (hsd->hue_partition_da[i - 1]);
gtk_widget_show (frame); gtk_widget_show (frame);
} }
gtk_signal_connect (GTK_OBJECT (radio_button), "toggled", g_signal_connect (G_OBJECT (radio_button), "toggled",
GTK_SIGNAL_FUNC (hue_saturation_partition_callback), G_CALLBACK (hue_saturation_partition_callback),
hsd); hsd);
gtk_widget_show (radio_button); gtk_widget_show (radio_button);
} }
@ -570,9 +570,9 @@ hue_saturation_dialog_new (void)
gtk_table_attach (GTK_TABLE (table), abox, 2, 3, 0, 1, gtk_table_attach (GTK_TABLE (table), abox, 2, 3, 0, 1,
GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
gtk_signal_connect (GTK_OBJECT (hsd->hue_data), "value_changed", g_signal_connect (G_OBJECT (hsd->hue_data), "value_changed",
GTK_SIGNAL_FUNC (hue_saturation_hue_adjustment_update), G_CALLBACK (hue_saturation_hue_adjustment_update),
hsd); hsd);
gtk_widget_show (label); gtk_widget_show (label);
gtk_widget_show (slider); gtk_widget_show (slider);
@ -604,9 +604,9 @@ hue_saturation_dialog_new (void)
gtk_table_attach (GTK_TABLE (table), abox, 2, 3, 1, 2, gtk_table_attach (GTK_TABLE (table), abox, 2, 3, 1, 2,
GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
gtk_signal_connect (GTK_OBJECT (hsd->lightness_data), "value_changed", g_signal_connect (G_OBJECT (hsd->lightness_data), "value_changed",
GTK_SIGNAL_FUNC (hue_saturation_lightness_adjustment_update), G_CALLBACK (hue_saturation_lightness_adjustment_update),
hsd); hsd);
gtk_widget_show (label); gtk_widget_show (label);
gtk_widget_show (slider); gtk_widget_show (slider);
@ -638,9 +638,9 @@ hue_saturation_dialog_new (void)
gtk_table_attach (GTK_TABLE (table), abox, 2, 3, 2, 3, gtk_table_attach (GTK_TABLE (table), abox, 2, 3, 2, 3,
GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
gtk_signal_connect (GTK_OBJECT (hsd->saturation_data), "value_changed", g_signal_connect (G_OBJECT (hsd->saturation_data), "value_changed",
GTK_SIGNAL_FUNC (hue_saturation_saturation_adjustment_update), G_CALLBACK (hue_saturation_saturation_adjustment_update),
hsd); hsd);
gtk_widget_show (label); gtk_widget_show (label);
gtk_widget_show (slider); gtk_widget_show (slider);
@ -658,9 +658,9 @@ hue_saturation_dialog_new (void)
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), hsd->preview); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), hsd->preview);
gtk_box_pack_end (GTK_BOX (hbox), toggle, FALSE, FALSE, 0); gtk_box_pack_end (GTK_BOX (hbox), toggle, FALSE, FALSE, 0);
gtk_signal_connect (GTK_OBJECT (toggle), "toggled", g_signal_connect (G_OBJECT (toggle), "toggled",
GTK_SIGNAL_FUNC (hue_saturation_preview_update), G_CALLBACK (hue_saturation_preview_update),
hsd); hsd);
gtk_widget_show (toggle); gtk_widget_show (toggle);
gtk_widget_show (hbox); gtk_widget_show (hbox);

102
app/tools/gimplevelstool.c
View File

@ -505,9 +505,9 @@ levels_dialog_new (void)
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE); 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_signal_connect (GTK_OBJECT (ld->low_input_data), "value_changed", g_signal_connect (G_OBJECT (ld->low_input_data), "value_changed",
GTK_SIGNAL_FUNC (levels_low_input_adjustment_update), G_CALLBACK (levels_low_input_adjustment_update),
ld); ld);
gtk_widget_show (spinbutton); gtk_widget_show (spinbutton);
@ -520,9 +520,9 @@ levels_dialog_new (void)
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE); 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_signal_connect (GTK_OBJECT (ld->gamma_data), "value_changed", g_signal_connect (G_OBJECT (ld->gamma_data), "value_changed",
GTK_SIGNAL_FUNC (levels_gamma_adjustment_update), G_CALLBACK (levels_gamma_adjustment_update),
ld); ld);
gtk_widget_show (spinbutton); gtk_widget_show (spinbutton);
@ -535,9 +535,9 @@ levels_dialog_new (void)
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE); 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_signal_connect (GTK_OBJECT (ld->high_input_data), "value_changed", g_signal_connect (G_OBJECT (ld->high_input_data), "value_changed",
GTK_SIGNAL_FUNC (levels_high_input_adjustment_update), G_CALLBACK (levels_high_input_adjustment_update),
ld); ld);
gtk_widget_show (spinbutton); gtk_widget_show (spinbutton);
gtk_widget_show (hbox); gtk_widget_show (hbox);
@ -577,9 +577,9 @@ levels_dialog_new (void)
gtk_widget_set_events (ld->input_levels_da[0], LEVELS_DA_MASK); gtk_widget_set_events (ld->input_levels_da[0], LEVELS_DA_MASK);
gtk_box_pack_start (GTK_BOX (vbox2), ld->input_levels_da[0], FALSE, TRUE, 0); gtk_box_pack_start (GTK_BOX (vbox2), ld->input_levels_da[0], FALSE, TRUE, 0);
gtk_signal_connect (GTK_OBJECT (ld->input_levels_da[0]), "event", g_signal_connect (G_OBJECT (ld->input_levels_da[0]), "event",
GTK_SIGNAL_FUNC (levels_input_da_events), G_CALLBACK (levels_input_da_events),
ld); ld);
ld->input_levels_da[1] = gtk_drawing_area_new (); ld->input_levels_da[1] = gtk_drawing_area_new ();
gtk_drawing_area_size (GTK_DRAWING_AREA (ld->input_levels_da[1]), gtk_drawing_area_size (GTK_DRAWING_AREA (ld->input_levels_da[1]),
@ -587,9 +587,9 @@ levels_dialog_new (void)
gtk_widget_set_events (ld->input_levels_da[1], LEVELS_DA_MASK); gtk_widget_set_events (ld->input_levels_da[1], LEVELS_DA_MASK);
gtk_box_pack_start (GTK_BOX (vbox2), ld->input_levels_da[1], FALSE, TRUE, 0); gtk_box_pack_start (GTK_BOX (vbox2), ld->input_levels_da[1], FALSE, TRUE, 0);
gtk_signal_connect (GTK_OBJECT (ld->input_levels_da[1]), "event", g_signal_connect (G_OBJECT (ld->input_levels_da[1]), "event",
GTK_SIGNAL_FUNC (levels_input_da_events), G_CALLBACK (levels_input_da_events),
ld); ld);
gtk_widget_show (ld->input_levels_da[0]); gtk_widget_show (ld->input_levels_da[0]);
gtk_widget_show (ld->input_levels_da[1]); gtk_widget_show (ld->input_levels_da[1]);
@ -614,9 +614,9 @@ levels_dialog_new (void)
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE); 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_signal_connect (GTK_OBJECT (ld->low_output_data), "value_changed", g_signal_connect (G_OBJECT (ld->low_output_data), "value_changed",
GTK_SIGNAL_FUNC (levels_low_output_adjustment_update), G_CALLBACK (levels_low_output_adjustment_update),
ld); ld);
gtk_widget_show (spinbutton); gtk_widget_show (spinbutton);
@ -629,9 +629,9 @@ levels_dialog_new (void)
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE); 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_signal_connect (GTK_OBJECT (ld->high_output_data), "value_changed", g_signal_connect (G_OBJECT (ld->high_output_data), "value_changed",
GTK_SIGNAL_FUNC (levels_high_output_adjustment_update), G_CALLBACK (levels_high_output_adjustment_update),
ld); ld);
gtk_widget_show (spinbutton); gtk_widget_show (spinbutton);
gtk_widget_show (hbox); gtk_widget_show (hbox);
@ -652,18 +652,18 @@ levels_dialog_new (void)
gtk_widget_set_events (ld->output_levels_da[0], LEVELS_DA_MASK); gtk_widget_set_events (ld->output_levels_da[0], LEVELS_DA_MASK);
gtk_box_pack_start (GTK_BOX (vbox2), ld->output_levels_da[0], FALSE, TRUE, 0); gtk_box_pack_start (GTK_BOX (vbox2), ld->output_levels_da[0], FALSE, TRUE, 0);
gtk_signal_connect (GTK_OBJECT (ld->output_levels_da[0]), "event", g_signal_connect (G_OBJECT (ld->output_levels_da[0]), "event",
GTK_SIGNAL_FUNC (levels_output_da_events), G_CALLBACK (levels_output_da_events),
ld); ld);
ld->output_levels_da[1] = gtk_preview_new (GTK_PREVIEW_GRAYSCALE); ld->output_levels_da[1] = gtk_preview_new (GTK_PREVIEW_GRAYSCALE);
gtk_preview_size (GTK_PREVIEW (ld->output_levels_da[1]), DA_WIDTH, CONTROL_HEIGHT); gtk_preview_size (GTK_PREVIEW (ld->output_levels_da[1]), DA_WIDTH, CONTROL_HEIGHT);
gtk_widget_set_events (ld->output_levels_da[1], LEVELS_DA_MASK); gtk_widget_set_events (ld->output_levels_da[1], LEVELS_DA_MASK);
gtk_box_pack_start (GTK_BOX (vbox2), ld->output_levels_da[1], FALSE, TRUE, 0); gtk_box_pack_start (GTK_BOX (vbox2), ld->output_levels_da[1], FALSE, TRUE, 0);
gtk_signal_connect (GTK_OBJECT (ld->output_levels_da[1]), "event", g_signal_connect (G_OBJECT (ld->output_levels_da[1]), "event",
GTK_SIGNAL_FUNC (levels_output_da_events), G_CALLBACK (levels_output_da_events),
ld); ld);
gtk_widget_show (ld->output_levels_da[0]); gtk_widget_show (ld->output_levels_da[0]);
gtk_widget_show (ld->output_levels_da[1]); gtk_widget_show (ld->output_levels_da[1]);
@ -681,9 +681,9 @@ levels_dialog_new (void)
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), ld->preview); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), ld->preview);
gtk_box_pack_end (GTK_BOX (hbox), toggle, FALSE, FALSE, 0); gtk_box_pack_end (GTK_BOX (hbox), toggle, FALSE, FALSE, 0);
gtk_signal_connect (GTK_OBJECT (toggle), "toggled", g_signal_connect (G_OBJECT (toggle), "toggled",
GTK_SIGNAL_FUNC (levels_preview_update), G_CALLBACK (levels_preview_update),
ld); ld);
gtk_widget_show (toggle); gtk_widget_show (toggle);
@ -699,8 +699,8 @@ levels_dialog_new (void)
GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT); GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
gtk_box_pack_start (GTK_BOX (hbbox), button, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (hbbox), button, FALSE, FALSE, 0);
gtk_signal_connect (GTK_OBJECT (button), "clicked", g_signal_connect (G_OBJECT (button), "clicked",
GTK_SIGNAL_FUNC (levels_auto_callback), G_CALLBACK (levels_auto_callback),
ld); ld);
gtk_widget_show (button); gtk_widget_show (button);
@ -709,9 +709,9 @@ levels_dialog_new (void)
GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT); GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
gtk_box_pack_start (GTK_BOX (hbbox), button, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (hbbox), button, FALSE, FALSE, 0);
gtk_signal_connect (GTK_OBJECT (button), "clicked", g_signal_connect (G_OBJECT (button), "clicked",
GTK_SIGNAL_FUNC (levels_load_callback), G_CALLBACK (levels_load_callback),
ld->shell); ld->shell);
gtk_widget_show (button); gtk_widget_show (button);
@ -719,9 +719,9 @@ levels_dialog_new (void)
GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT); GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
gtk_box_pack_start (GTK_BOX (hbbox), button, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (hbbox), button, FALSE, FALSE, 0);
gtk_signal_connect (GTK_OBJECT (button), "clicked", g_signal_connect (G_OBJECT (button), "clicked",
GTK_SIGNAL_FUNC (levels_save_callback), G_CALLBACK (levels_save_callback),
ld->shell); ld->shell);
gtk_widget_show (button); gtk_widget_show (button);
@ -1550,19 +1550,21 @@ file_dialog_create (GtkWidget *parent)
gtk_container_set_border_width (GTK_CONTAINER (file_dlg), 2); gtk_container_set_border_width (GTK_CONTAINER (file_dlg), 2);
gtk_container_set_border_width (GTK_CONTAINER (GTK_FILE_SELECTION (file_dlg)->button_area), 2); gtk_container_set_border_width (GTK_CONTAINER (GTK_FILE_SELECTION (file_dlg)->button_area), 2);
gtk_signal_connect (GTK_OBJECT (GTK_FILE_SELECTION (file_dlg)->cancel_button), g_signal_connect (G_OBJECT (GTK_FILE_SELECTION (file_dlg)->cancel_button),
"clicked", GTK_SIGNAL_FUNC (file_dialog_cancel_callback), "clicked",
NULL); G_CALLBACK (file_dialog_cancel_callback),
gtk_signal_connect (GTK_OBJECT (file_dlg), "delete_event", NULL);
GTK_SIGNAL_FUNC (file_dialog_cancel_callback), g_signal_connect (G_OBJECT (GTK_FILE_SELECTION (file_dlg)->ok_button),
NULL); "clicked",
gtk_signal_connect (GTK_OBJECT (GTK_FILE_SELECTION (file_dlg)->ok_button), G_CALLBACK (file_dialog_ok_callback),
"clicked", GTK_SIGNAL_FUNC (file_dialog_ok_callback), NULL);
NULL);
gtk_signal_connect (GTK_OBJECT (parent), "unmap", g_signal_connect (G_OBJECT (file_dlg), "delete_event",
GTK_SIGNAL_FUNC (file_dialog_cancel_callback), G_CALLBACK (file_dialog_cancel_callback),
NULL); NULL);
g_signal_connect (G_OBJECT (parent), "unmap",
G_CALLBACK (file_dialog_cancel_callback),
NULL);
temp = g_strdup_printf ("%s" G_DIR_SEPARATOR_S "levels" G_DIR_SEPARATOR_S, temp = g_strdup_printf ("%s" G_DIR_SEPARATOR_S "levels" G_DIR_SEPARATOR_S,
gimp_directory ()); gimp_directory ());

9
app/tools/gimpmagnifytool.c
View File

@ -234,12 +234,13 @@ magnify_options_new (void)
/* the allow_resize toggle button */ /* the allow_resize toggle button */
options->allow_resize_w = options->allow_resize_w =
gtk_check_button_new_with_label (_("Allow Window Resizing")); gtk_check_button_new_with_label (_("Allow Window Resizing"));
gtk_signal_connect (GTK_OBJECT (options->allow_resize_w), "toggled", g_signal_connect (G_OBJECT (options->allow_resize_w), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update), G_CALLBACK (gimp_toggle_button_update),
&(gimprc.allow_resize_windows)); &(gimprc.allow_resize_windows));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (options->allow_resize_w), gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (options->allow_resize_w),
gimprc.allow_resize_windows); gimprc.allow_resize_windows);
gtk_box_pack_start (GTK_BOX (vbox), options->allow_resize_w, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (vbox),
options->allow_resize_w, FALSE, FALSE, 0);
gtk_widget_show (options->allow_resize_w); gtk_widget_show (options->allow_resize_w);
/* tool toggle */ /* tool toggle */

112
app/tools/gimppaintoptions-gui.c
View File

@ -169,16 +169,16 @@ paint_options_init (PaintOptions *options,
scale = gtk_hscale_new (GTK_ADJUSTMENT (options->opacity_w)); scale = gtk_hscale_new (GTK_ADJUSTMENT (options->opacity_w));
gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP); gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP);
gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED); gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED);
gtk_signal_connect (GTK_OBJECT (options->opacity_w), "value_changed", g_signal_connect (G_OBJECT (options->opacity_w), "value_changed",
GTK_SIGNAL_FUNC (paint_options_opacity_adjustment_update), G_CALLBACK (paint_options_opacity_adjustment_update),
tool_info->context); tool_info->context);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Opacity:"), 1.0, 1.0, _("Opacity:"), 1.0, 1.0,
scale, 1, FALSE); scale, 1, FALSE);
gtk_signal_connect (GTK_OBJECT (tool_info->context), "opacity_changed", g_signal_connect (G_OBJECT (tool_info->context), "opacity_changed",
GTK_SIGNAL_FUNC (paint_options_opacity_changed), G_CALLBACK (paint_options_opacity_changed),
options->opacity_w); options->opacity_w);
/* the paint mode menu */ /* the paint mode menu */
if (tool_type == GIMP_TYPE_BUCKET_FILL_TOOL || if (tool_type == GIMP_TYPE_BUCKET_FILL_TOOL ||
@ -200,9 +200,9 @@ paint_options_init (PaintOptions *options,
_("Mode:"), 1.0, 0.5, _("Mode:"), 1.0, 0.5,
options->paint_mode_w, 1, TRUE); options->paint_mode_w, 1, TRUE);
gtk_signal_connect (GTK_OBJECT (tool_info->context), "paint_mode_changed", g_signal_connect (G_OBJECT (tool_info->context), "paint_mode_changed",
GTK_SIGNAL_FUNC (paint_options_paint_mode_changed), G_CALLBACK (paint_options_paint_mode_changed),
options->paint_mode_w); options->paint_mode_w);
} }
/* show the main table */ /* show the main table */
@ -231,9 +231,9 @@ paint_options_init (PaintOptions *options,
gtk_check_button_new_with_label (_("Incremental")); gtk_check_button_new_with_label (_("Incremental"));
gtk_box_pack_start (GTK_BOX (options->tool_options.main_vbox), gtk_box_pack_start (GTK_BOX (options->tool_options.main_vbox),
options->incremental_w, FALSE, FALSE, 0); options->incremental_w, FALSE, FALSE, 0);
gtk_signal_connect (GTK_OBJECT (options->incremental_w), "toggled", g_signal_connect (G_OBJECT (options->incremental_w), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update), G_CALLBACK (gimp_toggle_button_update),
&options->incremental); &options->incremental);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (options->incremental_w), gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (options->incremental_w),
options->incremental_d); options->incremental_d);
gtk_widget_show (options->incremental_w); gtk_widget_show (options->incremental_w);
@ -392,9 +392,9 @@ paint_pressure_options_new (GtkType tool_type,
pressure->opacity_w = pressure->opacity_w =
gtk_check_button_new_with_label (_("Opacity")); gtk_check_button_new_with_label (_("Opacity"));
gtk_container_add (GTK_CONTAINER (wbox), pressure->opacity_w); gtk_container_add (GTK_CONTAINER (wbox), pressure->opacity_w);
gtk_signal_connect (GTK_OBJECT (pressure->opacity_w), "toggled", g_signal_connect (G_OBJECT (pressure->opacity_w), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update), G_CALLBACK (gimp_toggle_button_update),
&pressure->opacity); &pressure->opacity);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pressure->opacity_w), gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pressure->opacity_w),
pressure->opacity_d); pressure->opacity_d);
gtk_widget_show (pressure->opacity_w); gtk_widget_show (pressure->opacity_w);
@ -410,9 +410,9 @@ paint_pressure_options_new (GtkType tool_type,
{ {
pressure->pressure_w = gtk_check_button_new_with_label (_("Hardness")); pressure->pressure_w = gtk_check_button_new_with_label (_("Hardness"));
gtk_container_add (GTK_CONTAINER (wbox), pressure->pressure_w); gtk_container_add (GTK_CONTAINER (wbox), pressure->pressure_w);
gtk_signal_connect (GTK_OBJECT (pressure->pressure_w), "toggled", g_signal_connect (G_OBJECT (pressure->pressure_w), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update), G_CALLBACK (gimp_toggle_button_update),
&pressure->pressure); &pressure->pressure);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pressure->pressure_w), gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pressure->pressure_w),
pressure->pressure_d); pressure->pressure_d);
gtk_widget_show (pressure->pressure_w); gtk_widget_show (pressure->pressure_w);
@ -426,9 +426,9 @@ paint_pressure_options_new (GtkType tool_type,
pressure->rate_w = pressure->rate_w =
gtk_check_button_new_with_label (_("Rate")); gtk_check_button_new_with_label (_("Rate"));
gtk_container_add (GTK_CONTAINER (wbox), pressure->rate_w); gtk_container_add (GTK_CONTAINER (wbox), pressure->rate_w);
gtk_signal_connect (GTK_OBJECT (pressure->rate_w), "toggled", g_signal_connect (G_OBJECT (pressure->rate_w), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update), G_CALLBACK (gimp_toggle_button_update),
&pressure->rate); &pressure->rate);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pressure->rate_w), gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pressure->rate_w),
pressure->rate_d); pressure->rate_d);
gtk_widget_show (pressure->rate_w); gtk_widget_show (pressure->rate_w);
@ -446,9 +446,9 @@ paint_pressure_options_new (GtkType tool_type,
pressure->size_w = pressure->size_w =
gtk_check_button_new_with_label (_("Size")); gtk_check_button_new_with_label (_("Size"));
gtk_container_add (GTK_CONTAINER (wbox), pressure->size_w); gtk_container_add (GTK_CONTAINER (wbox), pressure->size_w);
gtk_signal_connect (GTK_OBJECT (pressure->size_w), "toggled", g_signal_connect (G_OBJECT (pressure->size_w), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update), G_CALLBACK (gimp_toggle_button_update),
&pressure->size); &pressure->size);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pressure->size_w), gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pressure->size_w),
pressure->size_d); pressure->size_d);
gtk_widget_show (pressure->size_w); gtk_widget_show (pressure->size_w);
@ -462,9 +462,9 @@ paint_pressure_options_new (GtkType tool_type,
pressure->color_w = pressure->color_w =
gtk_check_button_new_with_label (_("Color")); gtk_check_button_new_with_label (_("Color"));
gtk_container_add (GTK_CONTAINER (wbox), pressure->color_w); gtk_container_add (GTK_CONTAINER (wbox), pressure->color_w);
gtk_signal_connect (GTK_OBJECT (pressure->color_w), "toggled", g_signal_connect (G_OBJECT (pressure->color_w), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update), G_CALLBACK (gimp_toggle_button_update),
&pressure->color); &pressure->color);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pressure->color_w), gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pressure->color_w),
pressure->color_d); pressure->color_d);
gtk_widget_show (pressure->color_w); gtk_widget_show (pressure->color_w);
@ -557,9 +557,9 @@ paint_gradient_options_new (GtkType tool_type,
gradient->use_fade_w = gradient->use_fade_w =
gtk_check_button_new_with_label (_("Fade Out")); gtk_check_button_new_with_label (_("Fade Out"));
gtk_container_add (GTK_CONTAINER (abox), gradient->use_fade_w); gtk_container_add (GTK_CONTAINER (abox), gradient->use_fade_w);
gtk_signal_connect (GTK_OBJECT (gradient->use_fade_w), "toggled", g_signal_connect (G_OBJECT (gradient->use_fade_w), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update), G_CALLBACK (gimp_toggle_button_update),
&gradient->use_fade); &gradient->use_fade);
gtk_widget_show (gradient->use_fade_w); gtk_widget_show (gradient->use_fade_w);
/* the fade-out sizeentry */ /* the fade-out sizeentry */
@ -570,18 +570,18 @@ paint_gradient_options_new (GtkType tool_type,
1.0, 0.0); 1.0, 0.0);
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE);
gtk_widget_set_usize (spinbutton, 75, 0); gtk_widget_set_usize (spinbutton, 75, 0);
gtk_signal_connect (GTK_OBJECT (gradient->fade_out_w), "value_changed", g_signal_connect (G_OBJECT (gradient->fade_out_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update), G_CALLBACK (gimp_double_adjustment_update),
&gradient->fade_out); &gradient->fade_out);
gtk_table_attach_defaults (GTK_TABLE (table), spinbutton, 1, 2, 0, 1); gtk_table_attach_defaults (GTK_TABLE (table), spinbutton, 1, 2, 0, 1);
gtk_widget_show (spinbutton); gtk_widget_show (spinbutton);
/* the fade-out unitmenu */ /* the fade-out unitmenu */
gradient->fade_unit_w = gradient->fade_unit_w =
gimp_unit_menu_new ("%a", gradient->fade_unit_d, TRUE, TRUE, TRUE); gimp_unit_menu_new ("%a", gradient->fade_unit_d, TRUE, TRUE, TRUE);
gtk_signal_connect (GTK_OBJECT (gradient->fade_unit_w), "unit_changed", g_signal_connect (G_OBJECT (gradient->fade_unit_w), "unit_changed",
GTK_SIGNAL_FUNC (gimp_unit_menu_update), G_CALLBACK (gimp_unit_menu_update),
&gradient->fade_unit); &gradient->fade_unit);
g_object_set_data (G_OBJECT (gradient->fade_unit_w), "set_digits", g_object_set_data (G_OBJECT (gradient->fade_unit_w), "set_digits",
spinbutton); spinbutton);
gtk_table_attach (GTK_TABLE (table), gradient->fade_unit_w, 2, 3, 0, 1, gtk_table_attach (GTK_TABLE (table), gradient->fade_unit_w, 2, 3, 0, 1,
@ -609,9 +609,9 @@ paint_gradient_options_new (GtkType tool_type,
gradient->use_gradient_w = gradient->use_gradient_w =
gtk_check_button_new_with_label (_("Gradient")); gtk_check_button_new_with_label (_("Gradient"));
gtk_container_add (GTK_CONTAINER (abox), gradient->use_gradient_w); gtk_container_add (GTK_CONTAINER (abox), gradient->use_gradient_w);
gtk_signal_connect (GTK_OBJECT (gradient->use_gradient_w), "toggled", g_signal_connect (G_OBJECT (gradient->use_gradient_w), "toggled",
GTK_SIGNAL_FUNC (paint_gradient_options_gradient_toggle_callback), G_CALLBACK (paint_gradient_options_gradient_toggle_callback),
paint_options); paint_options);
gtk_widget_show (gradient->use_gradient_w); gtk_widget_show (gradient->use_gradient_w);
/* the gradient length scale */ /* the gradient length scale */
@ -623,18 +623,18 @@ paint_gradient_options_new (GtkType tool_type,
1.0, 0.0); 1.0, 0.0);
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE);
gtk_widget_set_usize (spinbutton, 75, 0); gtk_widget_set_usize (spinbutton, 75, 0);
gtk_signal_connect (GTK_OBJECT (gradient->gradient_length_w), "value_changed", g_signal_connect (G_OBJECT (gradient->gradient_length_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update), G_CALLBACK (gimp_double_adjustment_update),
&gradient->gradient_length); &gradient->gradient_length);
gtk_table_attach_defaults (GTK_TABLE (table), spinbutton, 1, 2, 1, 2); gtk_table_attach_defaults (GTK_TABLE (table), spinbutton, 1, 2, 1, 2);
gtk_widget_show (spinbutton); gtk_widget_show (spinbutton);
/* the gradient unitmenu */ /* the gradient unitmenu */
gradient->gradient_unit_w = gradient->gradient_unit_w =
gimp_unit_menu_new ("%a", gradient->gradient_unit_d, TRUE, TRUE, TRUE); gimp_unit_menu_new ("%a", gradient->gradient_unit_d, TRUE, TRUE, TRUE);
gtk_signal_connect (GTK_OBJECT (gradient->gradient_unit_w), "unit_changed", g_signal_connect (G_OBJECT (gradient->gradient_unit_w), "unit_changed",
GTK_SIGNAL_FUNC (gimp_unit_menu_update), G_CALLBACK (gimp_unit_menu_update),
&gradient->gradient_unit); &gradient->gradient_unit);
g_object_set_data (G_OBJECT (gradient->gradient_unit_w), "set_digits", g_object_set_data (G_OBJECT (gradient->gradient_unit_w), "set_digits",
spinbutton); spinbutton);
gtk_table_attach (GTK_TABLE (table), gradient->gradient_unit_w, 2, 3, 1, 2, gtk_table_attach (GTK_TABLE (table), gradient->gradient_unit_w, 2, 3, 1, 2,
@ -752,10 +752,14 @@ static void
paint_options_opacity_adjustment_update (GtkAdjustment *adjustment, paint_options_opacity_adjustment_update (GtkAdjustment *adjustment,
gpointer data) gpointer data)
{ {
gtk_signal_handler_block_by_data (GTK_OBJECT (data), adjustment); g_signal_handlers_block_by_func (G_OBJECT (data),
paint_options_opacity_changed,
adjustment);
gimp_context_set_opacity (GIMP_CONTEXT (data), gimp_context_set_opacity (GIMP_CONTEXT (data),
adjustment->value / 100); adjustment->value / 100);
gtk_signal_handler_unblock_by_data (GTK_OBJECT (data), adjustment); g_signal_handlers_unblock_by_func (G_OBJECT (data),
paint_options_opacity_changed,
adjustment);
} }
static void static void
@ -763,9 +767,13 @@ paint_options_opacity_changed (GimpContext *context,
gdouble opacity, gdouble opacity,
gpointer data) gpointer data)
{ {
gtk_signal_handler_block_by_data (GTK_OBJECT (data), context); g_signal_handlers_block_by_func (G_OBJECT (data),
paint_options_opacity_adjustment_update,
context);
gtk_adjustment_set_value (GTK_ADJUSTMENT (data), opacity * 100); gtk_adjustment_set_value (GTK_ADJUSTMENT (data), opacity * 100);
gtk_signal_handler_unblock_by_data (GTK_OBJECT (data), context); g_signal_handlers_unblock_by_func (G_OBJECT (data),
paint_options_opacity_adjustment_update,
context);
} }
static void static void
@ -775,8 +783,10 @@ paint_options_paint_mode_update (GtkWidget *widget,
LayerModeEffects paint_mode; LayerModeEffects paint_mode;
PaintOptions *options; PaintOptions *options;
paint_mode = (LayerModeEffects) gtk_object_get_user_data (GTK_OBJECT (widget)); paint_mode =
options = (PaintOptions *) data; (LayerModeEffects) gtk_object_get_user_data (GTK_OBJECT (widget));
options = (PaintOptions *) data;
gtk_signal_handler_block_by_data (GTK_OBJECT (options->context), gtk_signal_handler_block_by_data (GTK_OBJECT (options->context),
options->paint_mode_w); options->paint_mode_w);

12
app/tools/gimpposterizetool.c
View File

@ -308,9 +308,9 @@ posterize_dialog_new (void)
gtk_widget_set_usize (spinbutton, 75, -1); gtk_widget_set_usize (spinbutton, 75, -1);
gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0);
gtk_signal_connect (GTK_OBJECT (pd->levels_data), "value_changed", g_signal_connect (G_OBJECT (pd->levels_data), "value_changed",
GTK_SIGNAL_FUNC (posterize_levels_adjustment_update), G_CALLBACK (posterize_levels_adjustment_update),
pd); pd);
gtk_widget_show (spinbutton); gtk_widget_show (spinbutton);
gtk_widget_show (hbox); gtk_widget_show (hbox);
@ -324,9 +324,9 @@ posterize_dialog_new (void)
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), pd->preview); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), pd->preview);
gtk_box_pack_end (GTK_BOX (hbox), toggle, FALSE, FALSE, 0); gtk_box_pack_end (GTK_BOX (hbox), toggle, FALSE, FALSE, 0);
gtk_signal_connect (GTK_OBJECT (toggle), "toggled", g_signal_connect (G_OBJECT (toggle), "toggled",
GTK_SIGNAL_FUNC (posterize_preview_update), G_CALLBACK (posterize_preview_update),
pd); pd);
gtk_widget_show (label); gtk_widget_show (label);
gtk_widget_show (toggle); gtk_widget_show (toggle);

12
app/tools/gimprotatetool.c
View File

@ -241,14 +241,14 @@ gimp_rotate_tool_transform (GimpTransformTool *transform_tool,
info_dialog_add_spinbutton (transform_info, _("Angle:"), info_dialog_add_spinbutton (transform_info, _("Angle:"),
&angle_val, &angle_val,
-180, 180, 1, 15, 1, 1, 2, -180, 180, 1, 15, 1, 1, 2,
(GtkSignalFunc) rotate_angle_changed, G_CALLBACK (rotate_angle_changed),
tool); tool);
gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (widget), TRUE); gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (widget), TRUE);
/* this looks strange (-180, 181), but it works */ /* this looks strange (-180, 181), but it works */
widget = info_dialog_add_scale (transform_info, "", &angle_val, widget = info_dialog_add_scale (transform_info, "", &angle_val,
-180, 181, 0.01, 0.1, 1, -1, -180, 181, 0.01, 0.1, 1, -1,
(GtkSignalFunc) rotate_angle_changed, G_CALLBACK (rotate_angle_changed),
tool); tool);
gtk_widget_set_usize (widget, 180, 0); gtk_widget_set_usize (widget, 180, 0);
@ -273,7 +273,9 @@ gimp_rotate_tool_transform (GimpTransformTool *transform_tool,
2, 0); 2, 0);
} }
gtk_signal_handler_block_by_data (GTK_OBJECT (sizeentry), tool); g_signal_handlers_block_by_func (G_OBJECT (sizeentry),
rotate_center_changed,
tool);
gimp_size_entry_set_unit (GIMP_SIZE_ENTRY (sizeentry), gimp_size_entry_set_unit (GIMP_SIZE_ENTRY (sizeentry),
gdisp->gimage->unit); gdisp->gimage->unit);
@ -304,7 +306,9 @@ gimp_rotate_tool_transform (GimpTransformTool *transform_tool,
gtk_widget_set_sensitive (transform_info->shell, TRUE); gtk_widget_set_sensitive (transform_info->shell, TRUE);
gtk_signal_handler_unblock_by_data (GTK_OBJECT (sizeentry), tool); g_signal_handlers_unblock_by_func (G_OBJECT (sizeentry),
rotate_center_changed,
tool);
transform_tool->trans_info[ANGLE] = angle_val; transform_tool->trans_info[ANGLE] = angle_val;
transform_tool->trans_info[REAL_ANGLE] = angle_val; transform_tool->trans_info[REAL_ANGLE] = angle_val;

16
app/tools/gimpscaletool.c
View File

@ -207,7 +207,7 @@ gimp_scale_tool_transform (GimpTransformTool *tr_tool,
tool); tool);
g_signal_connect (G_OBJECT (sizeentry), "unit_changed", g_signal_connect (G_OBJECT (sizeentry), "unit_changed",
G_CALLBACK (gimp_scale_tool_unit_changed), G_CALLBACK (gimp_scale_tool_unit_changed),
sc_tool); tool);
gimp_size_entry_add_field (GIMP_SIZE_ENTRY (sizeentry), gimp_size_entry_add_field (GIMP_SIZE_ENTRY (sizeentry),
GTK_SPIN_BUTTON (spinbutton), NULL); GTK_SPIN_BUTTON (spinbutton), NULL);
@ -223,7 +223,12 @@ gimp_scale_tool_transform (GimpTransformTool *tr_tool,
2, 0); 2, 0);
} }
gtk_signal_handler_block_by_data (GTK_OBJECT (sizeentry), tool); g_signal_handlers_block_by_func (G_OBJECT (sizeentry),
gimp_scale_tool_size_changed,
tool);
g_signal_handlers_block_by_func (G_OBJECT (sizeentry),
gimp_scale_tool_unit_changed,
tool);
gimp_size_entry_set_unit (GIMP_SIZE_ENTRY (sizeentry), gimp_size_entry_set_unit (GIMP_SIZE_ENTRY (sizeentry),
gdisp->gimage->unit); gdisp->gimage->unit);
@ -254,7 +259,12 @@ gimp_scale_tool_transform (GimpTransformTool *tr_tool,
gtk_widget_set_sensitive (GTK_WIDGET (transform_info->shell), TRUE); gtk_widget_set_sensitive (GTK_WIDGET (transform_info->shell), TRUE);
gtk_signal_handler_unblock_by_data (GTK_OBJECT (sizeentry), tool); g_signal_handlers_unblock_by_func (G_OBJECT (sizeentry),
gimp_scale_tool_size_changed,
tool);
g_signal_handlers_unblock_by_func (G_OBJECT (sizeentry),
gimp_scale_tool_unit_changed,
tool);
tr_tool->trans_info [X0] = (double) tr_tool->x1; tr_tool->trans_info [X0] = (double) tr_tool->x1;
tr_tool->trans_info [Y0] = (double) tr_tool->y1; tr_tool->trans_info [Y0] = (double) tr_tool->y1;

60
app/tools/gimpselectionoptions.c
View File

@ -93,9 +93,9 @@ selection_options_init (SelectionOptions *options,
GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0); GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (options->feather_w), gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (options->feather_w),
options->feather_d); options->feather_d);
gtk_signal_connect (GTK_OBJECT (options->feather_w), "toggled", g_signal_connect (G_OBJECT (options->feather_w), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update), G_CALLBACK (gimp_toggle_button_update),
&options->feather); &options->feather);
gtk_widget_show (options->feather_w); gtk_widget_show (options->feather_w);
/* the feather radius scale */ /* the feather radius scale */
@ -116,9 +116,9 @@ selection_options_init (SelectionOptions *options,
gtk_container_add (GTK_CONTAINER (abox), scale); gtk_container_add (GTK_CONTAINER (abox), scale);
gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP); gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP);
gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED); gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED);
gtk_signal_connect (GTK_OBJECT (options->feather_radius_w), "value_changed", g_signal_connect (G_OBJECT (options->feather_radius_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update), G_CALLBACK (gimp_double_adjustment_update),
&options->feather_radius); &options->feather_radius);
gtk_widget_show (scale); gtk_widget_show (scale);
/* grey out label & scale if feather is off */ /* grey out label & scale if feather is off */
@ -136,9 +136,9 @@ selection_options_init (SelectionOptions *options,
gtk_box_pack_start (GTK_BOX (vbox), options->antialias_w, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (vbox), options->antialias_w, FALSE, FALSE, 0);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (options->antialias_w), gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (options->antialias_w),
options->antialias_d); options->antialias_d);
gtk_signal_connect (GTK_OBJECT (options->antialias_w), "toggled", g_signal_connect (G_OBJECT (options->antialias_w), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update), G_CALLBACK (gimp_toggle_button_update),
&options->antialias); &options->antialias);
gtk_widget_show (options->antialias_w); gtk_widget_show (options->antialias_w);
} }
@ -164,9 +164,9 @@ selection_options_init (SelectionOptions *options,
FALSE, FALSE, 0); FALSE, FALSE, 0);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (options->interactive_w), gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (options->interactive_w),
options->interactive_d); options->interactive_d);
gtk_signal_connect (GTK_OBJECT (options->interactive_w), "toggled", g_signal_connect (G_OBJECT (options->interactive_w), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update), G_CALLBACK (gimp_toggle_button_update),
&options->interactive); &options->interactive);
gtk_widget_show (options->interactive_w); gtk_widget_show (options->interactive_w);
} }
@ -180,9 +180,9 @@ selection_options_init (SelectionOptions *options,
gtk_check_button_new_with_label (_("Sample Merged")); gtk_check_button_new_with_label (_("Sample Merged"));
gtk_box_pack_start (GTK_BOX (vbox), options->sample_merged_w, gtk_box_pack_start (GTK_BOX (vbox), options->sample_merged_w,
FALSE, FALSE, 0); FALSE, FALSE, 0);
gtk_signal_connect (GTK_OBJECT (options->sample_merged_w), "toggled", g_signal_connect (G_OBJECT (options->sample_merged_w), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update), G_CALLBACK (gimp_toggle_button_update),
&options->sample_merged); &options->sample_merged);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (options->sample_merged_w), gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (options->sample_merged_w),
options->sample_merged_d); options->sample_merged_d);
gtk_widget_show (options->sample_merged_w); gtk_widget_show (options->sample_merged_w);
@ -203,9 +203,9 @@ selection_options_init (SelectionOptions *options,
gtk_box_pack_start (GTK_BOX (hbox), scale, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (hbox), scale, TRUE, TRUE, 0);
gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP); gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP);
gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED); gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED);
gtk_signal_connect (GTK_OBJECT (options->threshold_w), "value_changed", g_signal_connect (G_OBJECT (options->threshold_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update), G_CALLBACK (gimp_double_adjustment_update),
&options->threshold); &options->threshold);
gtk_widget_show (scale); gtk_widget_show (scale);
} }
@ -222,9 +222,9 @@ selection_options_init (SelectionOptions *options,
gtk_check_button_new_with_label (_("Fixed Size / Aspect Ratio")); gtk_check_button_new_with_label (_("Fixed Size / Aspect Ratio"));
gtk_box_pack_start (GTK_BOX (vbox), options->fixed_size_w, gtk_box_pack_start (GTK_BOX (vbox), options->fixed_size_w,
FALSE, FALSE, 0); FALSE, FALSE, 0);
gtk_signal_connect (GTK_OBJECT (options->fixed_size_w), "toggled", g_signal_connect (G_OBJECT (options->fixed_size_w), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update), G_CALLBACK (gimp_toggle_button_update),
&options->fixed_size); &options->fixed_size);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (options->fixed_size_w), gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (options->fixed_size_w),
options->fixed_size_d); options->fixed_size_d);
gtk_widget_show (options->fixed_size_w); gtk_widget_show (options->fixed_size_w);
@ -250,9 +250,9 @@ selection_options_init (SelectionOptions *options,
gtk_spin_button_new (GTK_ADJUSTMENT (options->fixed_width_w), 1.0, 0.0); gtk_spin_button_new (GTK_ADJUSTMENT (options->fixed_width_w), 1.0, 0.0);
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (width_spinbutton), TRUE); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (width_spinbutton), TRUE);
gtk_widget_set_usize (width_spinbutton, 75, 0); gtk_widget_set_usize (width_spinbutton, 75, 0);
gtk_signal_connect (GTK_OBJECT (options->fixed_width_w), "value_changed", g_signal_connect (G_OBJECT (options->fixed_width_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update), G_CALLBACK (gimp_double_adjustment_update),
&options->fixed_width); &options->fixed_width);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Width:"), 1.0, 0.5, _("Width:"), 1.0, 0.5,
width_spinbutton, 1, FALSE); width_spinbutton, 1, FALSE);
@ -264,18 +264,18 @@ selection_options_init (SelectionOptions *options,
gtk_spin_button_new (GTK_ADJUSTMENT (options->fixed_height_w), 1.0, 0.0); gtk_spin_button_new (GTK_ADJUSTMENT (options->fixed_height_w), 1.0, 0.0);
gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(height_spinbutton), TRUE); gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(height_spinbutton), TRUE);
gtk_widget_set_usize (height_spinbutton, 75, 0); gtk_widget_set_usize (height_spinbutton, 75, 0);
gtk_signal_connect (GTK_OBJECT (options->fixed_height_w), "value_changed", g_signal_connect (G_OBJECT (options->fixed_height_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update), G_CALLBACK (gimp_double_adjustment_update),
&options->fixed_height); &options->fixed_height);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1, gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("Height:"), 1.0, 0.5, _("Height:"), 1.0, 0.5,
height_spinbutton, 1, FALSE); height_spinbutton, 1, FALSE);
options->fixed_unit_w = options->fixed_unit_w =
gimp_unit_menu_new ("%a", options->fixed_unit_d, TRUE, TRUE, TRUE); gimp_unit_menu_new ("%a", options->fixed_unit_d, TRUE, TRUE, TRUE);
gtk_signal_connect (GTK_OBJECT (options->fixed_unit_w), "unit_changed", g_signal_connect (G_OBJECT (options->fixed_unit_w), "unit_changed",
GTK_SIGNAL_FUNC (gimp_unit_menu_update), G_CALLBACK (gimp_unit_menu_update),
&options->fixed_unit); &options->fixed_unit);
g_object_set_data (G_OBJECT (options->fixed_unit_w), "set_digits", g_object_set_data (G_OBJECT (options->fixed_unit_w), "set_digits",
width_spinbutton); width_spinbutton);
g_object_set_data (G_OBJECT (width_spinbutton), "set_digits", g_object_set_data (G_OBJECT (width_spinbutton), "set_digits",

6
app/tools/gimpsmudgetool.c
View File

@ -550,9 +550,9 @@ smudge_options_new (void)
gtk_box_pack_start (GTK_BOX (hbox), scale, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (hbox), scale, TRUE, TRUE, 0);
gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP); gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP);
gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED); gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED);
gtk_signal_connect (GTK_OBJECT (options->rate_w), "value_changed", g_signal_connect (G_OBJECT (options->rate_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update), G_CALLBACK (gimp_double_adjustment_update),
&options->rate); &options->rate);
gtk_widget_show (scale); gtk_widget_show (scale);
gtk_widget_show (hbox); gtk_widget_show (hbox);

40
app/tools/gimptexttool.c
View File

@ -284,9 +284,9 @@ text_tool_options_new (void)
/* antialias toggle */ /* antialias toggle */
options->antialias_w = options->antialias_w =
gtk_check_button_new_with_label (_("Antialiasing")); gtk_check_button_new_with_label (_("Antialiasing"));
gtk_signal_connect (GTK_OBJECT (options->antialias_w), "toggled", g_signal_connect (G_OBJECT (options->antialias_w), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update), G_CALLBACK (gimp_toggle_button_update),
&options->antialias); &options->antialias);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (options->antialias_w), gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (options->antialias_w),
options->antialias_d); options->antialias_d);
gtk_box_pack_start (GTK_BOX (vbox), options->antialias_w, gtk_box_pack_start (GTK_BOX (vbox), options->antialias_w,
@ -303,9 +303,9 @@ text_tool_options_new (void)
options->border_w = options->border_w =
gtk_adjustment_new (options->border_d, 0.0, 32767.0, 1.0, 50.0, 0.0); gtk_adjustment_new (options->border_d, 0.0, 32767.0, 1.0, 50.0, 0.0);
gtk_signal_connect (GTK_OBJECT (options->border_w), "value_changed", g_signal_connect (G_OBJECT (options->border_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_int_adjustment_update), G_CALLBACK (gimp_int_adjustment_update),
&options->border); &options->border);
spinbutton = spinbutton =
gtk_spin_button_new (GTK_ADJUSTMENT (options->border_w), 1.0, 0.0); gtk_spin_button_new (GTK_ADJUSTMENT (options->border_w), 1.0, 0.0);
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE);
@ -322,9 +322,9 @@ text_tool_options_new (void)
/* the dynamic text toggle */ /* the dynamic text toggle */
options->use_dyntext_w = options->use_dyntext_w =
gtk_check_button_new_with_label (_("Use Dynamic Text")); gtk_check_button_new_with_label (_("Use Dynamic Text"));
gtk_signal_connect (GTK_OBJECT (options->use_dyntext_w), "toggled", g_signal_connect (G_OBJECT (options->use_dyntext_w), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update), G_CALLBACK (gimp_toggle_button_update),
&options->use_dyntext); &options->use_dyntext);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (options->use_dyntext_w), gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (options->use_dyntext_w),
options->use_dyntext_d); options->use_dyntext_d);
gtk_box_pack_start (GTK_BOX (vbox), options->use_dyntext_w, gtk_box_pack_start (GTK_BOX (vbox), options->use_dyntext_w,
@ -484,20 +484,20 @@ text_dialog_create (void)
gtk_window_set_position (GTK_WINDOW (text_tool_shell), GTK_WIN_POS_MOUSE); gtk_window_set_position (GTK_WINDOW (text_tool_shell), GTK_WIN_POS_MOUSE);
/* handle the wm close signal */ /* handle the wm close signal */
gtk_signal_connect (GTK_OBJECT (text_tool_shell), "delete_event", g_signal_connect (G_OBJECT (text_tool_shell), "delete_event",
GTK_SIGNAL_FUNC (text_dialog_delete_callback), G_CALLBACK (text_dialog_delete_callback),
text_tool_shell); text_tool_shell);
/* ok and cancel buttons */ /* ok and cancel buttons */
gtk_signal_connect (GTK_OBJECT (GTK_FONT_SELECTION_DIALOG g_signal_connect (G_OBJECT (GTK_FONT_SELECTION_DIALOG
(text_tool_shell)->ok_button), "clicked", (text_tool_shell)->ok_button), "clicked",
GTK_SIGNAL_FUNC (text_dialog_ok_callback), G_CALLBACK (text_dialog_ok_callback),
text_tool_shell); text_tool_shell);
gtk_signal_connect (GTK_OBJECT (GTK_FONT_SELECTION_DIALOG g_signal_connect (G_OBJECT (GTK_FONT_SELECTION_DIALOG
(text_tool_shell)->cancel_button), "clicked", (text_tool_shell)->cancel_button), "clicked",
GTK_SIGNAL_FUNC (text_dialog_cancel_callback), G_CALLBACK (text_dialog_cancel_callback),
text_tool_shell); text_tool_shell);
/* Show the shell */ /* Show the shell */
gtk_widget_show (text_tool_shell); gtk_widget_show (text_tool_shell);

36
app/tools/gimpthresholdtool.c
View File

@ -225,13 +225,15 @@ gimp_threshold_tool_initialize (GimpTool *tool,
gimp_drawable_calculate_histogram (threshold_dialog->drawable, gimp_drawable_calculate_histogram (threshold_dialog->drawable,
threshold_dialog->hist); threshold_dialog->hist);
gtk_signal_handler_block_by_data (GTK_OBJECT (threshold_dialog->histogram), g_signal_handlers_block_by_func (G_OBJECT (threshold_dialog->histogram),
threshold_dialog); threshold_histogram_range,
threshold_dialog);
histogram_widget_update (threshold_dialog->histogram, histogram_widget_update (threshold_dialog->histogram,
threshold_dialog->hist); threshold_dialog->hist);
gtk_signal_handler_unblock_by_data (GTK_OBJECT (threshold_dialog->histogram), g_signal_handlers_unblock_by_func (G_OBJECT (threshold_dialog->histogram),
threshold_dialog); threshold_histogram_range,
threshold_dialog);
threshold_update (threshold_dialog, ALL); threshold_update (threshold_dialog, ALL);
if (threshold_dialog->preview) if (threshold_dialog->preview)
@ -394,9 +396,9 @@ threshold_dialog_new (void)
gtk_widget_set_usize (spinbutton, 75, -1); gtk_widget_set_usize (spinbutton, 75, -1);
gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0);
gtk_signal_connect (GTK_OBJECT (td->low_threshold_data), "value_changed", g_signal_connect (G_OBJECT (td->low_threshold_data), "value_changed",
GTK_SIGNAL_FUNC (threshold_low_threshold_adjustment_update), GTK_SIGNAL_FUNC (threshold_low_threshold_adjustment_update),
td); td);
gtk_widget_show (spinbutton); gtk_widget_show (spinbutton);
@ -408,9 +410,9 @@ threshold_dialog_new (void)
gtk_widget_set_usize (spinbutton, 75, -1); gtk_widget_set_usize (spinbutton, 75, -1);
gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0);
gtk_signal_connect (GTK_OBJECT (td->high_threshold_data), "value_changed", g_signal_connect (G_OBJECT (td->high_threshold_data), "value_changed",
GTK_SIGNAL_FUNC (threshold_high_threshold_adjustment_update), GTK_SIGNAL_FUNC (threshold_high_threshold_adjustment_update),
td); td);
gtk_widget_show (spinbutton); gtk_widget_show (spinbutton);
@ -428,9 +430,9 @@ threshold_dialog_new (void)
gtk_container_add (GTK_CONTAINER (frame), GTK_WIDGET (td->histogram)); gtk_container_add (GTK_CONTAINER (frame), GTK_WIDGET (td->histogram));
gtk_signal_connect (GTK_OBJECT (td->histogram), "range_changed", g_signal_connect (G_OBJECT (td->histogram), "range_changed",
GTK_SIGNAL_FUNC (threshold_histogram_range), GTK_SIGNAL_FUNC (threshold_histogram_range),
td); td);
gtk_widget_show (GTK_WIDGET(td->histogram)); gtk_widget_show (GTK_WIDGET(td->histogram));
@ -446,9 +448,9 @@ threshold_dialog_new (void)
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), td->preview); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), td->preview);
gtk_box_pack_end (GTK_BOX (hbox), toggle, FALSE, FALSE, 0); gtk_box_pack_end (GTK_BOX (hbox), toggle, FALSE, FALSE, 0);
gtk_signal_connect (GTK_OBJECT (toggle), "toggled", g_signal_connect (G_OBJECT (toggle), "toggled",
GTK_SIGNAL_FUNC (threshold_preview_update), GTK_SIGNAL_FUNC (threshold_preview_update),
td); td);
gtk_widget_show (toggle); gtk_widget_show (toggle);
gtk_widget_show (hbox); gtk_widget_show (hbox);

30
app/tools/gimptransformoptions.c
View File

@ -239,9 +239,9 @@ transform_options_init (TransformOptions *options,
/* the show grid toggle button */ /* the show grid toggle button */
options->show_grid_w = gtk_check_button_new_with_label (_("Show Grid")); options->show_grid_w = gtk_check_button_new_with_label (_("Show Grid"));
gtk_signal_connect (GTK_OBJECT (options->show_grid_w), "toggled", g_signal_connect (G_OBJECT (options->show_grid_w), "toggled",
GTK_SIGNAL_FUNC (gimp_transform_tool_show_grid_update), G_CALLBACK (gimp_transform_tool_show_grid_update),
&options->show_grid); &options->show_grid);
gtk_box_pack_start (GTK_BOX (fbox), options->show_grid_w, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (fbox), options->show_grid_w, FALSE, FALSE, 0);
gtk_widget_show (options->show_grid_w); gtk_widget_show (options->show_grid_w);
@ -259,9 +259,9 @@ transform_options_init (TransformOptions *options,
grid_density = grid_density =
gtk_spin_button_new (GTK_ADJUSTMENT (options->grid_size_w), 0, 0); gtk_spin_button_new (GTK_ADJUSTMENT (options->grid_size_w), 0, 0);
gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (grid_density), TRUE); gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (grid_density), TRUE);
gtk_signal_connect (GTK_OBJECT (options->grid_size_w), "value_changed", g_signal_connect (G_OBJECT (options->grid_size_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_transform_tool_grid_density_callback), G_CALLBACK (gimp_transform_tool_grid_density_callback),
&options->grid_size); &options->grid_size);
gtk_box_pack_start (GTK_BOX (hbox), grid_density, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (hbox), grid_density, FALSE, FALSE, 0);
gtk_widget_show (grid_density); gtk_widget_show (grid_density);
gtk_widget_set_sensitive (label, options->show_grid_d); gtk_widget_set_sensitive (label, options->show_grid_d);
@ -283,18 +283,18 @@ transform_options_init (TransformOptions *options,
/* the smoothing toggle button */ /* the smoothing toggle button */
options->smoothing_w = gtk_check_button_new_with_label (_("Smoothing")); options->smoothing_w = gtk_check_button_new_with_label (_("Smoothing"));
gtk_signal_connect (GTK_OBJECT (options->smoothing_w), "toggled", g_signal_connect (G_OBJECT (options->smoothing_w), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update), G_CALLBACK (gimp_toggle_button_update),
&options->smoothing); &options->smoothing);
gtk_table_attach_defaults (GTK_TABLE (table), gtk_table_attach_defaults (GTK_TABLE (table),
options->smoothing_w, 0, 1, 0, 1); options->smoothing_w, 0, 1, 0, 1);
gtk_widget_show (options->smoothing_w); gtk_widget_show (options->smoothing_w);
/* the showpath toggle button */ /* the showpath toggle button */
options->showpath_w = gtk_check_button_new_with_label (_("Show Path")); options->showpath_w = gtk_check_button_new_with_label (_("Show Path"));
gtk_signal_connect (GTK_OBJECT (options->showpath_w), "toggled", g_signal_connect (G_OBJECT (options->showpath_w), "toggled",
GTK_SIGNAL_FUNC (gimp_transform_tool_show_path_update), G_CALLBACK (gimp_transform_tool_show_path_update),
&options->showpath); &options->showpath);
gtk_table_attach_defaults (GTK_TABLE (table), gtk_table_attach_defaults (GTK_TABLE (table),
options->showpath_w, 1, 2, 0, 1); options->showpath_w, 1, 2, 0, 1);
gtk_widget_show (options->showpath_w); gtk_widget_show (options->showpath_w);
@ -303,9 +303,9 @@ transform_options_init (TransformOptions *options,
/* the clip resulting image toggle button */ /* the clip resulting image toggle button */
options->clip_w = gtk_check_button_new_with_label (_("Clip Result")); options->clip_w = gtk_check_button_new_with_label (_("Clip Result"));
gtk_signal_connect (GTK_OBJECT (options->clip_w), "toggled", g_signal_connect (G_OBJECT (options->clip_w), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update), G_CALLBACK (gimp_toggle_button_update),
&options->clip); &options->clip);
gtk_box_pack_start (GTK_BOX (options->tool_options.main_vbox), gtk_box_pack_start (GTK_BOX (options->tool_options.main_vbox),
options->clip_w, FALSE, FALSE, 0); options->clip_w, FALSE, FALSE, 0);
gtk_widget_show (options->clip_w); gtk_widget_show (options->clip_w);

4
app/tools/gimptransformtool.c
View File

@ -236,8 +236,8 @@ gimp_transform_tool_transform (GimpTransformTool *tool,
g_return_val_if_fail (tool, NULL); g_return_val_if_fail (tool, NULL);
g_return_val_if_fail (GIMP_IS_TRANSFORM_TOOL (tool), NULL); g_return_val_if_fail (GIMP_IS_TRANSFORM_TOOL (tool), NULL);
gtk_signal_emit (GTK_OBJECT (tool), gimp_transform_tool_signals[TRANSFORM], g_signal_emit (G_OBJECT (tool), gimp_transform_tool_signals[TRANSFORM], 0,
gdisp, state, &retval); gdisp, state, &retval);
return retval; return retval;
} }

112
app/tools/paint_options.c
View File

@ -169,16 +169,16 @@ paint_options_init (PaintOptions *options,
scale = gtk_hscale_new (GTK_ADJUSTMENT (options->opacity_w)); scale = gtk_hscale_new (GTK_ADJUSTMENT (options->opacity_w));
gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP); gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP);
gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED); gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED);
gtk_signal_connect (GTK_OBJECT (options->opacity_w), "value_changed", g_signal_connect (G_OBJECT (options->opacity_w), "value_changed",
GTK_SIGNAL_FUNC (paint_options_opacity_adjustment_update), G_CALLBACK (paint_options_opacity_adjustment_update),
tool_info->context); tool_info->context);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Opacity:"), 1.0, 1.0, _("Opacity:"), 1.0, 1.0,
scale, 1, FALSE); scale, 1, FALSE);
gtk_signal_connect (GTK_OBJECT (tool_info->context), "opacity_changed", g_signal_connect (G_OBJECT (tool_info->context), "opacity_changed",
GTK_SIGNAL_FUNC (paint_options_opacity_changed), G_CALLBACK (paint_options_opacity_changed),
options->opacity_w); options->opacity_w);
/* the paint mode menu */ /* the paint mode menu */
if (tool_type == GIMP_TYPE_BUCKET_FILL_TOOL || if (tool_type == GIMP_TYPE_BUCKET_FILL_TOOL ||
@ -200,9 +200,9 @@ paint_options_init (PaintOptions *options,
_("Mode:"), 1.0, 0.5, _("Mode:"), 1.0, 0.5,
options->paint_mode_w, 1, TRUE); options->paint_mode_w, 1, TRUE);
gtk_signal_connect (GTK_OBJECT (tool_info->context), "paint_mode_changed", g_signal_connect (G_OBJECT (tool_info->context), "paint_mode_changed",
GTK_SIGNAL_FUNC (paint_options_paint_mode_changed), G_CALLBACK (paint_options_paint_mode_changed),
options->paint_mode_w); options->paint_mode_w);
} }
/* show the main table */ /* show the main table */
@ -231,9 +231,9 @@ paint_options_init (PaintOptions *options,
gtk_check_button_new_with_label (_("Incremental")); gtk_check_button_new_with_label (_("Incremental"));
gtk_box_pack_start (GTK_BOX (options->tool_options.main_vbox), gtk_box_pack_start (GTK_BOX (options->tool_options.main_vbox),
options->incremental_w, FALSE, FALSE, 0); options->incremental_w, FALSE, FALSE, 0);
gtk_signal_connect (GTK_OBJECT (options->incremental_w), "toggled", g_signal_connect (G_OBJECT (options->incremental_w), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update), G_CALLBACK (gimp_toggle_button_update),
&options->incremental); &options->incremental);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (options->incremental_w), gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (options->incremental_w),
options->incremental_d); options->incremental_d);
gtk_widget_show (options->incremental_w); gtk_widget_show (options->incremental_w);
@ -392,9 +392,9 @@ paint_pressure_options_new (GtkType tool_type,
pressure->opacity_w = pressure->opacity_w =
gtk_check_button_new_with_label (_("Opacity")); gtk_check_button_new_with_label (_("Opacity"));
gtk_container_add (GTK_CONTAINER (wbox), pressure->opacity_w); gtk_container_add (GTK_CONTAINER (wbox), pressure->opacity_w);
gtk_signal_connect (GTK_OBJECT (pressure->opacity_w), "toggled", g_signal_connect (G_OBJECT (pressure->opacity_w), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update), G_CALLBACK (gimp_toggle_button_update),
&pressure->opacity); &pressure->opacity);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pressure->opacity_w), gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pressure->opacity_w),
pressure->opacity_d); pressure->opacity_d);
gtk_widget_show (pressure->opacity_w); gtk_widget_show (pressure->opacity_w);
@ -410,9 +410,9 @@ paint_pressure_options_new (GtkType tool_type,
{ {
pressure->pressure_w = gtk_check_button_new_with_label (_("Hardness")); pressure->pressure_w = gtk_check_button_new_with_label (_("Hardness"));
gtk_container_add (GTK_CONTAINER (wbox), pressure->pressure_w); gtk_container_add (GTK_CONTAINER (wbox), pressure->pressure_w);
gtk_signal_connect (GTK_OBJECT (pressure->pressure_w), "toggled", g_signal_connect (G_OBJECT (pressure->pressure_w), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update), G_CALLBACK (gimp_toggle_button_update),
&pressure->pressure); &pressure->pressure);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pressure->pressure_w), gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pressure->pressure_w),
pressure->pressure_d); pressure->pressure_d);
gtk_widget_show (pressure->pressure_w); gtk_widget_show (pressure->pressure_w);
@ -426,9 +426,9 @@ paint_pressure_options_new (GtkType tool_type,
pressure->rate_w = pressure->rate_w =
gtk_check_button_new_with_label (_("Rate")); gtk_check_button_new_with_label (_("Rate"));
gtk_container_add (GTK_CONTAINER (wbox), pressure->rate_w); gtk_container_add (GTK_CONTAINER (wbox), pressure->rate_w);
gtk_signal_connect (GTK_OBJECT (pressure->rate_w), "toggled", g_signal_connect (G_OBJECT (pressure->rate_w), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update), G_CALLBACK (gimp_toggle_button_update),
&pressure->rate); &pressure->rate);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pressure->rate_w), gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pressure->rate_w),
pressure->rate_d); pressure->rate_d);
gtk_widget_show (pressure->rate_w); gtk_widget_show (pressure->rate_w);
@ -446,9 +446,9 @@ paint_pressure_options_new (GtkType tool_type,
pressure->size_w = pressure->size_w =
gtk_check_button_new_with_label (_("Size")); gtk_check_button_new_with_label (_("Size"));
gtk_container_add (GTK_CONTAINER (wbox), pressure->size_w); gtk_container_add (GTK_CONTAINER (wbox), pressure->size_w);
gtk_signal_connect (GTK_OBJECT (pressure->size_w), "toggled", g_signal_connect (G_OBJECT (pressure->size_w), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update), G_CALLBACK (gimp_toggle_button_update),
&pressure->size); &pressure->size);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pressure->size_w), gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pressure->size_w),
pressure->size_d); pressure->size_d);
gtk_widget_show (pressure->size_w); gtk_widget_show (pressure->size_w);
@ -462,9 +462,9 @@ paint_pressure_options_new (GtkType tool_type,
pressure->color_w = pressure->color_w =
gtk_check_button_new_with_label (_("Color")); gtk_check_button_new_with_label (_("Color"));
gtk_container_add (GTK_CONTAINER (wbox), pressure->color_w); gtk_container_add (GTK_CONTAINER (wbox), pressure->color_w);
gtk_signal_connect (GTK_OBJECT (pressure->color_w), "toggled", g_signal_connect (G_OBJECT (pressure->color_w), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update), G_CALLBACK (gimp_toggle_button_update),
&pressure->color); &pressure->color);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pressure->color_w), gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pressure->color_w),
pressure->color_d); pressure->color_d);
gtk_widget_show (pressure->color_w); gtk_widget_show (pressure->color_w);
@ -557,9 +557,9 @@ paint_gradient_options_new (GtkType tool_type,
gradient->use_fade_w = gradient->use_fade_w =
gtk_check_button_new_with_label (_("Fade Out")); gtk_check_button_new_with_label (_("Fade Out"));
gtk_container_add (GTK_CONTAINER (abox), gradient->use_fade_w); gtk_container_add (GTK_CONTAINER (abox), gradient->use_fade_w);
gtk_signal_connect (GTK_OBJECT (gradient->use_fade_w), "toggled", g_signal_connect (G_OBJECT (gradient->use_fade_w), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update), G_CALLBACK (gimp_toggle_button_update),
&gradient->use_fade); &gradient->use_fade);
gtk_widget_show (gradient->use_fade_w); gtk_widget_show (gradient->use_fade_w);
/* the fade-out sizeentry */ /* the fade-out sizeentry */
@ -570,18 +570,18 @@ paint_gradient_options_new (GtkType tool_type,
1.0, 0.0); 1.0, 0.0);
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE);
gtk_widget_set_usize (spinbutton, 75, 0); gtk_widget_set_usize (spinbutton, 75, 0);
gtk_signal_connect (GTK_OBJECT (gradient->fade_out_w), "value_changed", g_signal_connect (G_OBJECT (gradient->fade_out_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update), G_CALLBACK (gimp_double_adjustment_update),
&gradient->fade_out); &gradient->fade_out);
gtk_table_attach_defaults (GTK_TABLE (table), spinbutton, 1, 2, 0, 1); gtk_table_attach_defaults (GTK_TABLE (table), spinbutton, 1, 2, 0, 1);
gtk_widget_show (spinbutton); gtk_widget_show (spinbutton);
/* the fade-out unitmenu */ /* the fade-out unitmenu */
gradient->fade_unit_w = gradient->fade_unit_w =
gimp_unit_menu_new ("%a", gradient->fade_unit_d, TRUE, TRUE, TRUE); gimp_unit_menu_new ("%a", gradient->fade_unit_d, TRUE, TRUE, TRUE);
gtk_signal_connect (GTK_OBJECT (gradient->fade_unit_w), "unit_changed", g_signal_connect (G_OBJECT (gradient->fade_unit_w), "unit_changed",
GTK_SIGNAL_FUNC (gimp_unit_menu_update), G_CALLBACK (gimp_unit_menu_update),
&gradient->fade_unit); &gradient->fade_unit);
g_object_set_data (G_OBJECT (gradient->fade_unit_w), "set_digits", g_object_set_data (G_OBJECT (gradient->fade_unit_w), "set_digits",
spinbutton); spinbutton);
gtk_table_attach (GTK_TABLE (table), gradient->fade_unit_w, 2, 3, 0, 1, gtk_table_attach (GTK_TABLE (table), gradient->fade_unit_w, 2, 3, 0, 1,
@ -609,9 +609,9 @@ paint_gradient_options_new (GtkType tool_type,
gradient->use_gradient_w = gradient->use_gradient_w =
gtk_check_button_new_with_label (_("Gradient")); gtk_check_button_new_with_label (_("Gradient"));
gtk_container_add (GTK_CONTAINER (abox), gradient->use_gradient_w); gtk_container_add (GTK_CONTAINER (abox), gradient->use_gradient_w);
gtk_signal_connect (GTK_OBJECT (gradient->use_gradient_w), "toggled", g_signal_connect (G_OBJECT (gradient->use_gradient_w), "toggled",
GTK_SIGNAL_FUNC (paint_gradient_options_gradient_toggle_callback), G_CALLBACK (paint_gradient_options_gradient_toggle_callback),
paint_options); paint_options);
gtk_widget_show (gradient->use_gradient_w); gtk_widget_show (gradient->use_gradient_w);
/* the gradient length scale */ /* the gradient length scale */
@ -623,18 +623,18 @@ paint_gradient_options_new (GtkType tool_type,
1.0, 0.0); 1.0, 0.0);
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE);
gtk_widget_set_usize (spinbutton, 75, 0); gtk_widget_set_usize (spinbutton, 75, 0);
gtk_signal_connect (GTK_OBJECT (gradient->gradient_length_w), "value_changed", g_signal_connect (G_OBJECT (gradient->gradient_length_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update), G_CALLBACK (gimp_double_adjustment_update),
&gradient->gradient_length); &gradient->gradient_length);
gtk_table_attach_defaults (GTK_TABLE (table), spinbutton, 1, 2, 1, 2); gtk_table_attach_defaults (GTK_TABLE (table), spinbutton, 1, 2, 1, 2);
gtk_widget_show (spinbutton); gtk_widget_show (spinbutton);
/* the gradient unitmenu */ /* the gradient unitmenu */
gradient->gradient_unit_w = gradient->gradient_unit_w =
gimp_unit_menu_new ("%a", gradient->gradient_unit_d, TRUE, TRUE, TRUE); gimp_unit_menu_new ("%a", gradient->gradient_unit_d, TRUE, TRUE, TRUE);
gtk_signal_connect (GTK_OBJECT (gradient->gradient_unit_w), "unit_changed", g_signal_connect (G_OBJECT (gradient->gradient_unit_w), "unit_changed",
GTK_SIGNAL_FUNC (gimp_unit_menu_update), G_CALLBACK (gimp_unit_menu_update),
&gradient->gradient_unit); &gradient->gradient_unit);
g_object_set_data (G_OBJECT (gradient->gradient_unit_w), "set_digits", g_object_set_data (G_OBJECT (gradient->gradient_unit_w), "set_digits",
spinbutton); spinbutton);
gtk_table_attach (GTK_TABLE (table), gradient->gradient_unit_w, 2, 3, 1, 2, gtk_table_attach (GTK_TABLE (table), gradient->gradient_unit_w, 2, 3, 1, 2,
@ -752,10 +752,14 @@ static void
paint_options_opacity_adjustment_update (GtkAdjustment *adjustment, paint_options_opacity_adjustment_update (GtkAdjustment *adjustment,
gpointer data) gpointer data)
{ {
gtk_signal_handler_block_by_data (GTK_OBJECT (data), adjustment); g_signal_handlers_block_by_func (G_OBJECT (data),
paint_options_opacity_changed,
adjustment);
gimp_context_set_opacity (GIMP_CONTEXT (data), gimp_context_set_opacity (GIMP_CONTEXT (data),
adjustment->value / 100); adjustment->value / 100);
gtk_signal_handler_unblock_by_data (GTK_OBJECT (data), adjustment); g_signal_handlers_unblock_by_func (G_OBJECT (data),
paint_options_opacity_changed,
adjustment);
} }
static void static void
@ -763,9 +767,13 @@ paint_options_opacity_changed (GimpContext *context,
gdouble opacity, gdouble opacity,
gpointer data) gpointer data)
{ {
gtk_signal_handler_block_by_data (GTK_OBJECT (data), context); g_signal_handlers_block_by_func (G_OBJECT (data),
paint_options_opacity_adjustment_update,
context);
gtk_adjustment_set_value (GTK_ADJUSTMENT (data), opacity * 100); gtk_adjustment_set_value (GTK_ADJUSTMENT (data), opacity * 100);
gtk_signal_handler_unblock_by_data (GTK_OBJECT (data), context); g_signal_handlers_unblock_by_func (G_OBJECT (data),
paint_options_opacity_adjustment_update,
context);
} }
static void static void
@ -775,8 +783,10 @@ paint_options_paint_mode_update (GtkWidget *widget,
LayerModeEffects paint_mode; LayerModeEffects paint_mode;
PaintOptions *options; PaintOptions *options;
paint_mode = (LayerModeEffects) gtk_object_get_user_data (GTK_OBJECT (widget)); paint_mode =
options = (PaintOptions *) data; (LayerModeEffects) gtk_object_get_user_data (GTK_OBJECT (widget));
options = (PaintOptions *) data;
gtk_signal_handler_block_by_data (GTK_OBJECT (options->context), gtk_signal_handler_block_by_data (GTK_OBJECT (options->context),
options->paint_mode_w); options->paint_mode_w);

60
app/tools/selection_options.c
View File

@ -93,9 +93,9 @@ selection_options_init (SelectionOptions *options,
GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0); GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (options->feather_w), gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (options->feather_w),
options->feather_d); options->feather_d);
gtk_signal_connect (GTK_OBJECT (options->feather_w), "toggled", g_signal_connect (G_OBJECT (options->feather_w), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update), G_CALLBACK (gimp_toggle_button_update),
&options->feather); &options->feather);
gtk_widget_show (options->feather_w); gtk_widget_show (options->feather_w);
/* the feather radius scale */ /* the feather radius scale */
@ -116,9 +116,9 @@ selection_options_init (SelectionOptions *options,
gtk_container_add (GTK_CONTAINER (abox), scale); gtk_container_add (GTK_CONTAINER (abox), scale);
gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP); gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP);
gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED); gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED);
gtk_signal_connect (GTK_OBJECT (options->feather_radius_w), "value_changed", g_signal_connect (G_OBJECT (options->feather_radius_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update), G_CALLBACK (gimp_double_adjustment_update),
&options->feather_radius); &options->feather_radius);
gtk_widget_show (scale); gtk_widget_show (scale);
/* grey out label & scale if feather is off */ /* grey out label & scale if feather is off */
@ -136,9 +136,9 @@ selection_options_init (SelectionOptions *options,
gtk_box_pack_start (GTK_BOX (vbox), options->antialias_w, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (vbox), options->antialias_w, FALSE, FALSE, 0);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (options->antialias_w), gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (options->antialias_w),
options->antialias_d); options->antialias_d);
gtk_signal_connect (GTK_OBJECT (options->antialias_w), "toggled", g_signal_connect (G_OBJECT (options->antialias_w), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update), G_CALLBACK (gimp_toggle_button_update),
&options->antialias); &options->antialias);
gtk_widget_show (options->antialias_w); gtk_widget_show (options->antialias_w);
} }
@ -164,9 +164,9 @@ selection_options_init (SelectionOptions *options,
FALSE, FALSE, 0); FALSE, FALSE, 0);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (options->interactive_w), gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (options->interactive_w),
options->interactive_d); options->interactive_d);
gtk_signal_connect (GTK_OBJECT (options->interactive_w), "toggled", g_signal_connect (G_OBJECT (options->interactive_w), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update), G_CALLBACK (gimp_toggle_button_update),
&options->interactive); &options->interactive);
gtk_widget_show (options->interactive_w); gtk_widget_show (options->interactive_w);
} }
@ -180,9 +180,9 @@ selection_options_init (SelectionOptions *options,
gtk_check_button_new_with_label (_("Sample Merged")); gtk_check_button_new_with_label (_("Sample Merged"));
gtk_box_pack_start (GTK_BOX (vbox), options->sample_merged_w, gtk_box_pack_start (GTK_BOX (vbox), options->sample_merged_w,
FALSE, FALSE, 0); FALSE, FALSE, 0);
gtk_signal_connect (GTK_OBJECT (options->sample_merged_w), "toggled", g_signal_connect (G_OBJECT (options->sample_merged_w), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update), G_CALLBACK (gimp_toggle_button_update),
&options->sample_merged); &options->sample_merged);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (options->sample_merged_w), gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (options->sample_merged_w),
options->sample_merged_d); options->sample_merged_d);
gtk_widget_show (options->sample_merged_w); gtk_widget_show (options->sample_merged_w);
@ -203,9 +203,9 @@ selection_options_init (SelectionOptions *options,
gtk_box_pack_start (GTK_BOX (hbox), scale, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (hbox), scale, TRUE, TRUE, 0);
gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP); gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP);
gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED); gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED);
gtk_signal_connect (GTK_OBJECT (options->threshold_w), "value_changed", g_signal_connect (G_OBJECT (options->threshold_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update), G_CALLBACK (gimp_double_adjustment_update),
&options->threshold); &options->threshold);
gtk_widget_show (scale); gtk_widget_show (scale);
} }
@ -222,9 +222,9 @@ selection_options_init (SelectionOptions *options,
gtk_check_button_new_with_label (_("Fixed Size / Aspect Ratio")); gtk_check_button_new_with_label (_("Fixed Size / Aspect Ratio"));
gtk_box_pack_start (GTK_BOX (vbox), options->fixed_size_w, gtk_box_pack_start (GTK_BOX (vbox), options->fixed_size_w,
FALSE, FALSE, 0); FALSE, FALSE, 0);
gtk_signal_connect (GTK_OBJECT (options->fixed_size_w), "toggled", g_signal_connect (G_OBJECT (options->fixed_size_w), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update), G_CALLBACK (gimp_toggle_button_update),
&options->fixed_size); &options->fixed_size);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (options->fixed_size_w), gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (options->fixed_size_w),
options->fixed_size_d); options->fixed_size_d);
gtk_widget_show (options->fixed_size_w); gtk_widget_show (options->fixed_size_w);
@ -250,9 +250,9 @@ selection_options_init (SelectionOptions *options,
gtk_spin_button_new (GTK_ADJUSTMENT (options->fixed_width_w), 1.0, 0.0); gtk_spin_button_new (GTK_ADJUSTMENT (options->fixed_width_w), 1.0, 0.0);
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (width_spinbutton), TRUE); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (width_spinbutton), TRUE);
gtk_widget_set_usize (width_spinbutton, 75, 0); gtk_widget_set_usize (width_spinbutton, 75, 0);
gtk_signal_connect (GTK_OBJECT (options->fixed_width_w), "value_changed", g_signal_connect (G_OBJECT (options->fixed_width_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update), G_CALLBACK (gimp_double_adjustment_update),
&options->fixed_width); &options->fixed_width);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Width:"), 1.0, 0.5, _("Width:"), 1.0, 0.5,
width_spinbutton, 1, FALSE); width_spinbutton, 1, FALSE);
@ -264,18 +264,18 @@ selection_options_init (SelectionOptions *options,
gtk_spin_button_new (GTK_ADJUSTMENT (options->fixed_height_w), 1.0, 0.0); gtk_spin_button_new (GTK_ADJUSTMENT (options->fixed_height_w), 1.0, 0.0);
gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(height_spinbutton), TRUE); gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(height_spinbutton), TRUE);
gtk_widget_set_usize (height_spinbutton, 75, 0); gtk_widget_set_usize (height_spinbutton, 75, 0);
gtk_signal_connect (GTK_OBJECT (options->fixed_height_w), "value_changed", g_signal_connect (G_OBJECT (options->fixed_height_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update), G_CALLBACK (gimp_double_adjustment_update),
&options->fixed_height); &options->fixed_height);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1, gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("Height:"), 1.0, 0.5, _("Height:"), 1.0, 0.5,
height_spinbutton, 1, FALSE); height_spinbutton, 1, FALSE);
options->fixed_unit_w = options->fixed_unit_w =
gimp_unit_menu_new ("%a", options->fixed_unit_d, TRUE, TRUE, TRUE); gimp_unit_menu_new ("%a", options->fixed_unit_d, TRUE, TRUE, TRUE);
gtk_signal_connect (GTK_OBJECT (options->fixed_unit_w), "unit_changed", g_signal_connect (G_OBJECT (options->fixed_unit_w), "unit_changed",
GTK_SIGNAL_FUNC (gimp_unit_menu_update), G_CALLBACK (gimp_unit_menu_update),
&options->fixed_unit); &options->fixed_unit);
g_object_set_data (G_OBJECT (options->fixed_unit_w), "set_digits", g_object_set_data (G_OBJECT (options->fixed_unit_w), "set_digits",
width_spinbutton); width_spinbutton);
g_object_set_data (G_OBJECT (width_spinbutton), "set_digits", g_object_set_data (G_OBJECT (width_spinbutton), "set_digits",

30
app/tools/transform_options.c
View File

@ -239,9 +239,9 @@ transform_options_init (TransformOptions *options,
/* the show grid toggle button */ /* the show grid toggle button */
options->show_grid_w = gtk_check_button_new_with_label (_("Show Grid")); options->show_grid_w = gtk_check_button_new_with_label (_("Show Grid"));
gtk_signal_connect (GTK_OBJECT (options->show_grid_w), "toggled", g_signal_connect (G_OBJECT (options->show_grid_w), "toggled",
GTK_SIGNAL_FUNC (gimp_transform_tool_show_grid_update), G_CALLBACK (gimp_transform_tool_show_grid_update),
&options->show_grid); &options->show_grid);
gtk_box_pack_start (GTK_BOX (fbox), options->show_grid_w, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (fbox), options->show_grid_w, FALSE, FALSE, 0);
gtk_widget_show (options->show_grid_w); gtk_widget_show (options->show_grid_w);
@ -259,9 +259,9 @@ transform_options_init (TransformOptions *options,
grid_density = grid_density =
gtk_spin_button_new (GTK_ADJUSTMENT (options->grid_size_w), 0, 0); gtk_spin_button_new (GTK_ADJUSTMENT (options->grid_size_w), 0, 0);
gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (grid_density), TRUE); gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (grid_density), TRUE);
gtk_signal_connect (GTK_OBJECT (options->grid_size_w), "value_changed", g_signal_connect (G_OBJECT (options->grid_size_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_transform_tool_grid_density_callback), G_CALLBACK (gimp_transform_tool_grid_density_callback),
&options->grid_size); &options->grid_size);
gtk_box_pack_start (GTK_BOX (hbox), grid_density, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (hbox), grid_density, FALSE, FALSE, 0);
gtk_widget_show (grid_density); gtk_widget_show (grid_density);
gtk_widget_set_sensitive (label, options->show_grid_d); gtk_widget_set_sensitive (label, options->show_grid_d);
@ -283,18 +283,18 @@ transform_options_init (TransformOptions *options,
/* the smoothing toggle button */ /* the smoothing toggle button */
options->smoothing_w = gtk_check_button_new_with_label (_("Smoothing")); options->smoothing_w = gtk_check_button_new_with_label (_("Smoothing"));
gtk_signal_connect (GTK_OBJECT (options->smoothing_w), "toggled", g_signal_connect (G_OBJECT (options->smoothing_w), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update), G_CALLBACK (gimp_toggle_button_update),
&options->smoothing); &options->smoothing);
gtk_table_attach_defaults (GTK_TABLE (table), gtk_table_attach_defaults (GTK_TABLE (table),
options->smoothing_w, 0, 1, 0, 1); options->smoothing_w, 0, 1, 0, 1);
gtk_widget_show (options->smoothing_w); gtk_widget_show (options->smoothing_w);
/* the showpath toggle button */ /* the showpath toggle button */
options->showpath_w = gtk_check_button_new_with_label (_("Show Path")); options->showpath_w = gtk_check_button_new_with_label (_("Show Path"));
gtk_signal_connect (GTK_OBJECT (options->showpath_w), "toggled", g_signal_connect (G_OBJECT (options->showpath_w), "toggled",
GTK_SIGNAL_FUNC (gimp_transform_tool_show_path_update), G_CALLBACK (gimp_transform_tool_show_path_update),
&options->showpath); &options->showpath);
gtk_table_attach_defaults (GTK_TABLE (table), gtk_table_attach_defaults (GTK_TABLE (table),
options->showpath_w, 1, 2, 0, 1); options->showpath_w, 1, 2, 0, 1);
gtk_widget_show (options->showpath_w); gtk_widget_show (options->showpath_w);
@ -303,9 +303,9 @@ transform_options_init (TransformOptions *options,
/* the clip resulting image toggle button */ /* the clip resulting image toggle button */
options->clip_w = gtk_check_button_new_with_label (_("Clip Result")); options->clip_w = gtk_check_button_new_with_label (_("Clip Result"));
gtk_signal_connect (GTK_OBJECT (options->clip_w), "toggled", g_signal_connect (G_OBJECT (options->clip_w), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update), G_CALLBACK (gimp_toggle_button_update),
&options->clip); &options->clip);
gtk_box_pack_start (GTK_BOX (options->tool_options.main_vbox), gtk_box_pack_start (GTK_BOX (options->tool_options.main_vbox),
options->clip_w, FALSE, FALSE, 0); options->clip_w, FALSE, FALSE, 0);
gtk_widget_show (options->clip_w); gtk_widget_show (options->clip_w);