Commit c1d4e892 authored by Sven Neumann's avatar Sven Neumann Committed by Sven Neumann

plug-ins/common/AlienMap.c plug-ins/common/AlienMap2.c

2001-07-29  Sven Neumann  <sven@gimp.org>

	* plug-ins/common/AlienMap.c
	* plug-ins/common/AlienMap2.c
	* plug-ins/common/CML_explorer.c
	* plug-ins/common/align_layers.c
	* plug-ins/common/blinds.c
	* plug-ins/common/borderaverage.c
	* plug-ins/common/bumpmap.c
	* plug-ins/common/curve_bend.c
	* plug-ins/common/deinterlace.c
	* plug-ins/common/emboss.c
	* plug-ins/common/film.c
	* plug-ins/common/fractaltrace.c
	* plug-ins/common/gif.c
	* plug-ins/common/gih.c
	* plug-ins/common/hot.c
	* plug-ins/common/iwarp.c
	* plug-ins/common/jigsaw.c
	* plug-ins/common/jpeg.c
	* plug-ins/common/lic.c
	* plug-ins/common/mail.c
	* plug-ins/common/max_rgb.c
	* plug-ins/common/mblur.c
	* plug-ins/common/newsprint.c
	* plug-ins/common/nlfilt.c
	* plug-ins/common/papertile.c
	* plug-ins/common/pnm.c
	* plug-ins/common/ps.c
	* plug-ins/common/psp.c
	* plug-ins/common/ripple.c
	* plug-ins/common/sample_colorize.c
	* plug-ins/common/screenshot.c
	* plug-ins/common/shift.c
	* plug-ins/common/sinus.c
	* plug-ins/common/sparkle.c
	* plug-ins/common/struc.c
	* plug-ins/common/sunras.c
	* plug-ins/common/tiff.c
	* plug-ins/common/waves.c
	* plug-ins/common/wind.c
	* plug-ins/common/xbm.c: got rid of lots of compiler warnings by
	adding G_CALLBACK() casts and some const declarations.
parent 20a735c5
2001-07-29 Sven Neumann <sven@gimp.org>
* plug-ins/common/AlienMap.c
* plug-ins/common/AlienMap2.c
* plug-ins/common/CML_explorer.c
* plug-ins/common/align_layers.c
* plug-ins/common/blinds.c
* plug-ins/common/borderaverage.c
* plug-ins/common/bumpmap.c
* plug-ins/common/curve_bend.c
* plug-ins/common/deinterlace.c
* plug-ins/common/emboss.c
* plug-ins/common/film.c
* plug-ins/common/fractaltrace.c
* plug-ins/common/gif.c
* plug-ins/common/gih.c
* plug-ins/common/hot.c
* plug-ins/common/iwarp.c
* plug-ins/common/jigsaw.c
* plug-ins/common/jpeg.c
* plug-ins/common/lic.c
* plug-ins/common/mail.c
* plug-ins/common/max_rgb.c
* plug-ins/common/mblur.c
* plug-ins/common/newsprint.c
* plug-ins/common/nlfilt.c
* plug-ins/common/papertile.c
* plug-ins/common/pnm.c
* plug-ins/common/ps.c
* plug-ins/common/psp.c
* plug-ins/common/ripple.c
* plug-ins/common/sample_colorize.c
* plug-ins/common/screenshot.c
* plug-ins/common/shift.c
* plug-ins/common/sinus.c
* plug-ins/common/sparkle.c
* plug-ins/common/struc.c
* plug-ins/common/sunras.c
* plug-ins/common/tiff.c
* plug-ins/common/waves.c
* plug-ins/common/wind.c
* plug-ins/common/xbm.c: got rid of lots of compiler warnings by
adding G_CALLBACK() casts and some const declarations.
2001-07-29 Sven Neumann <sven@gimp.org>
* app/docindex.c
......@@ -24,7 +68,7 @@
and include <gtk/gtktext.h> to make them compile/work again
* plug-ins/common/spheredesigner.c : gtk_color_selction_set_opacity
renamed to gtk_color_selction_set_current_alpha
renamed to gtk_color_selection_set_current_alpha
* plug-ins/gflare/gtkmultioptionmenu.c : ported ny removing the
virtual draw function and style->xthickness and ythickness via
......@@ -32,8 +76,8 @@
* plug-ins/common/nlfilt.c :
* plug-ims/gap/gap_movdialog.c :
* plug-ims/gimpressionist/gimpressionist.c : gtk_widget_set_default_visible is
neither available nor needed anymore
* plug-ims/gimpressionist/gimpressionist.c :
gtk_widget_set_default_visible is neither available nor needed anymore
* plug-ins/common/plugindetails.c : ported to GtkTextBuffer
and reflect gtk_paned api changes
......
......@@ -1465,7 +1465,7 @@ alienmap_dialog (void)
/* Redmode toggle box */
frame = gimp_radio_group_new2 (TRUE, _("Red"),
alienmap_toggle_update,
G_CALLBACK (alienmap_toggle_update),
&wvals.redmode, (gpointer) wvals.redmode,
_("Sine"), (gpointer) SINUS, &toggle1,
......@@ -1488,7 +1488,7 @@ alienmap_dialog (void)
/* Greenmode toggle box */
frame = gimp_radio_group_new2 (TRUE, _("Green"),
alienmap_toggle_update,
G_CALLBACK (alienmap_toggle_update),
&wvals.greenmode, (gpointer) wvals.greenmode,
_("Sine"), (gpointer) SINUS, &toggle1,
......@@ -1511,7 +1511,7 @@ alienmap_dialog (void)
/* Bluemode toggle box */
frame = gimp_radio_group_new2 (TRUE, _("Blue"),
alienmap_toggle_update,
G_CALLBACK (alienmap_toggle_update),
&wvals.bluemode, (gpointer) wvals.bluemode,
_("Sine"), (gpointer) SINUS, &toggle1,
......
......@@ -1492,7 +1492,7 @@ alienmap2_dialog (void)
/* Mode toggle box */
frame =
gimp_radio_group_new2 (TRUE, _("Mode"),
alienmap2_radio_update,
G_CALLBACK (alienmap2_radio_update),
&wvals.colormodel, (gpointer) wvals.colormodel,
_("RGB Color Model"), (gpointer) RGB_MODEL, NULL,
......
......@@ -369,26 +369,26 @@ static void CML_explorer_ok_callback (GtkWidget *widget,
gpointer data);
static void CML_save_to_file_callback (GtkWidget *widget,
gpointer data);
static void CML_execute_save_to_file (GtkWidget *widget,
gpointer data);
static gint force_overwrite (gchar *filename);
static void CML_overwrite_ok_callback (GtkWidget *widget,
gpointer data);
static void CML_preview_update_callback (GtkWidget *widget,
gpointer data);
static void CML_load_from_file_callback (GtkWidget *widget,
gpointer data);
static gint CML_load_parameter_file (gchar *filename,
gint interactive_mode);
static void CML_execute_load_from_file (GtkWidget *widget,
gpointer data);
static gint parse_line_to_gint (FILE *file,
gint *flag);
static gdouble parse_line_to_gdouble (FILE *file,
gint *flag);
static void CML_save_to_file_callback (GtkWidget *widget,
gpointer data);
static void CML_execute_save_to_file (GtkWidget *widget,
gpointer data);
static gint force_overwrite (const gchar *filename);
static void CML_overwrite_ok_callback (GtkWidget *widget,
gpointer data);
static void CML_preview_update_callback (GtkWidget *widget,
gpointer data);
static void CML_load_from_file_callback (GtkWidget *widget,
gpointer data);
static gint CML_load_parameter_file (const gchar *filename,
gint interactive_mode);
static void CML_execute_load_from_file (GtkWidget *widget,
gpointer data);
static gint parse_line_to_gint (FILE *file,
gint *flag);
static gdouble parse_line_to_gdouble (FILE *file,
gint *flag);
GimpPlugInInfo PLUG_IN_INFO =
......@@ -1325,7 +1325,7 @@ CML_explorer_dialog (void)
optionmenu =
gimp_option_menu_new2
(FALSE, CML_initial_value_menu_update,
(FALSE, G_CALLBACK (CML_initial_value_menu_update),
&VALS.initial_value,
(gpointer) VALS.initial_value,
......@@ -1455,7 +1455,8 @@ CML_explorer_dialog (void)
gtk_container_add (GTK_CONTAINER (subframe), table);
gtk_widget_show (table);
optionmenu = gimp_option_menu_new2 (FALSE, gimp_menu_item_update,
optionmenu = gimp_option_menu_new2 (FALSE,
G_CALLBACK (gimp_menu_item_update),
&copy_source, (gpointer) copy_source,
gettext (channel_names[0]),
......@@ -1470,7 +1471,8 @@ CML_explorer_dialog (void)
_("Source Channel:"), 1.0, 0.5,
optionmenu, 1, TRUE);
optionmenu = gimp_option_menu_new2 (FALSE, gimp_menu_item_update,
optionmenu = gimp_option_menu_new2 (FALSE,
G_CALLBACK (gimp_menu_item_update),
&copy_destination,
(gpointer) copy_destination,
......@@ -1505,7 +1507,8 @@ CML_explorer_dialog (void)
gtk_container_add (GTK_CONTAINER (subframe), table);
gtk_widget_show (table);
optionmenu = gimp_option_menu_new2 (FALSE, gimp_menu_item_update,
optionmenu = gimp_option_menu_new2 (FALSE,
G_CALLBACK (gimp_menu_item_update),
&selective_load_source,
(gpointer) selective_load_source,
......@@ -1523,7 +1526,8 @@ CML_explorer_dialog (void)
_("Source Channel in File:"), 1.0, 0.5,
optionmenu, 1, TRUE);
optionmenu = gimp_option_menu_new2 (FALSE, gimp_menu_item_update,
optionmenu = gimp_option_menu_new2 (FALSE,
G_CALLBACK (gimp_menu_item_update),
&selective_load_destination,
(gpointer) selective_load_destination,
......@@ -1590,7 +1594,7 @@ CML_dialog_channel_panel_new (gchar *name,
gtk_widget_show (table);
optionmenu =
gimp_option_menu_new2 (FALSE, CML_explorer_menu_update,
gimp_option_menu_new2 (FALSE, G_CALLBACK (CML_explorer_menu_update),
&param->function, (gpointer) param->function,
gettext (function_names[CML_KEEP_VALUES]),
......@@ -1641,7 +1645,7 @@ CML_dialog_channel_panel_new (gchar *name,
index++;
optionmenu =
gimp_option_menu_new2 (FALSE, CML_explorer_menu_update,
gimp_option_menu_new2 (FALSE, G_CALLBACK (CML_explorer_menu_update),
&param->composition, (gpointer) param->composition,
gettext (composition_names[COMP_NONE]),
......@@ -1698,7 +1702,7 @@ CML_dialog_channel_panel_new (gchar *name,
index++;
optionmenu =
gimp_option_menu_new2 (FALSE, CML_explorer_menu_update,
gimp_option_menu_new2 (FALSE, G_CALLBACK (CML_explorer_menu_update),
&param->arrange, (gpointer) param->arrange,
gettext (arrange_names[STANDARD]),
......@@ -2141,7 +2145,7 @@ static void
CML_execute_save_to_file (GtkWidget *widget,
gpointer data)
{
gchar *filename;
const gchar *filename;
struct stat buf;
FILE *file = NULL;
gint channel_id;
......@@ -2229,16 +2233,15 @@ CML_execute_save_to_file (GtkWidget *widget,
g_message (_("Parameters were Saved to\n\"%s\""), filename);
if (sizeof (VALS.last_file_name) <= strlen (filename))
filename[sizeof (VALS.last_file_name) - 1] = '\0';
strcpy (VALS.last_file_name, filename);
strncpy (VALS.last_file_name, filename,
sizeof (VALS.last_file_name) - 1);
}
gtk_widget_destroy (GTK_WIDGET (data));
}
static gint
force_overwrite (gchar *filename)
force_overwrite (const gchar *filename)
{
GtkWidget *dlg;
GtkWidget *label;
......@@ -2332,9 +2335,9 @@ static void
CML_execute_load_from_file (GtkWidget *widget,
gpointer data)
{
gchar *filename;
gint channel_id;
gint flag = TRUE;
const gchar *filename;
gint channel_id;
gint flag = TRUE;
filename = gtk_file_selection_get_filename (GTK_FILE_SELECTION (data));
......@@ -2371,8 +2374,8 @@ CML_execute_load_from_file (GtkWidget *widget,
}
static gint
CML_load_parameter_file (gchar *filename,
gint interactive_mode)
CML_load_parameter_file (const gchar *filename,
gint interactive_mode)
{
FILE *file;
gint channel_id;
......@@ -2500,9 +2503,8 @@ CML_load_parameter_file (gchar *filename,
sizeof (CML_PARAM));
}
if ( sizeof (VALS.last_file_name) <= strlen (filename))
filename[sizeof (VALS.last_file_name) - 1] = '\0';
strcpy (VALS.last_file_name, filename);
strncpy (VALS.last_file_name, filename,
sizeof (VALS.last_file_name) - 1);
}
return flag;
}
......
......@@ -446,7 +446,7 @@ align_layers_dialog (void)
gtk_widget_show (table);
optionmenu =
gimp_option_menu_new2 (FALSE, gimp_menu_item_update,
gimp_option_menu_new2 (FALSE, G_CALLBACK (gimp_menu_item_update),
&VALS.h_style, (gpointer) VALS.h_style,
_("None"),
......@@ -466,7 +466,7 @@ align_layers_dialog (void)
optionmenu, 1, FALSE);
optionmenu =
gimp_option_menu_new2 (FALSE, gimp_menu_item_update,
gimp_option_menu_new2 (FALSE, G_CALLBACK (gimp_menu_item_update),
&VALS.h_base, (gpointer) VALS.h_base,
_("Left Edge"), (gpointer) H_BASE_LEFT, NULL,
......@@ -479,7 +479,7 @@ align_layers_dialog (void)
optionmenu, 1, FALSE);
optionmenu =
gimp_option_menu_new2 (FALSE, gimp_menu_item_update,
gimp_option_menu_new2 (FALSE, G_CALLBACK (gimp_menu_item_update),
&VALS.v_style, (gpointer) VALS.v_style,
_("None"),
......@@ -499,7 +499,7 @@ align_layers_dialog (void)
optionmenu, 1, FALSE);
optionmenu =
gimp_option_menu_new2 (FALSE, gimp_menu_item_update,
gimp_option_menu_new2 (FALSE, G_CALLBACK (gimp_menu_item_update),
&VALS.v_base, (gpointer) VALS.v_base,
_("Top Edge"), (gpointer) V_BASE_TOP, NULL,
......
......@@ -367,7 +367,7 @@ blinds_dialog (void)
frame =
gimp_radio_group_new2 (TRUE, _("Orientation"),
blinds_radio_update,
G_CALLBACK (blinds_radio_update),
&bvals.orientation, (gpointer) bvals.orientation,
_("Horizontal"), (gpointer) HORIZONTAL, NULL,
......
......@@ -423,7 +423,7 @@ borderaverage_dialog (void)
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
gtk_widget_show (label);
menu = gimp_option_menu_new2 (FALSE, gimp_menu_item_update,
menu = gimp_option_menu_new2 (FALSE, G_CALLBACK (gimp_menu_item_update),
&borderaverage_bucket_exponent,
(gpointer) borderaverage_bucket_exponent,
......
......@@ -941,7 +941,7 @@ bumpmap_dialog (void)
/* Type of map */
frame =
gimp_radio_group_new2 (TRUE, _("Map Type"),
dialog_map_type_callback,
G_CALLBACK (dialog_map_type_callback),
&bmvals.type, (gpointer) bmvals.type,
_("Linear Map"), (gpointer) LINEAR, NULL,
......
......@@ -326,7 +326,7 @@ static void p_copy_points (BenderDialog *cd, int out
int argc, gdouble *floatarray);
static void p_copy_yval (BenderDialog *cd, int outline,
int argc, gint8 *int8array);
static int p_save_pointfile (BenderDialog *cd, char *filename);
static int p_save_pointfile (BenderDialog *cd, const gchar *filename);
/* Global Variables */
......@@ -705,7 +705,7 @@ run (char *name, /* name of plugin */
int *nreturn_vals, /* number of out-parameters */
GimpParam **return_vals) /* out-parameters */
{
char *l_env;
const gchar *l_env;
BenderDialog *cd;
GimpDrawable *l_active_drawable = NULL;
......@@ -938,7 +938,7 @@ run (char *name, /* name of plugin */
/* XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX */
int
p_save_pointfile (BenderDialog *cd,
char *filename)
const gchar *filename)
{
int j;
FILE *l_fp;
......@@ -988,7 +988,7 @@ p_save_pointfile (BenderDialog *cd,
int
p_load_pointfile (BenderDialog *cd,
char *filename)
const gchar *filename)
{
int l_pi, l_ci, l_n, l_len;
FILE *l_fp;
......@@ -2118,14 +2118,14 @@ p_points_save_to_file (GtkWidget *widget,
gpointer data)
{
BenderDialog *cd;
char *filename;
const char *filename;
if(gb_debug) printf("p_points_save_to_file\n");
cd = (BenderDialog *) data;
if(cd->filesel == NULL) return;
filename = gtk_file_selection_get_filename (GTK_FILE_SELECTION (cd->filesel));
filename = gtk_file_selection_get_filename(GTK_FILE_SELECTION (cd->filesel));
p_save_pointfile(cd, filename);
gtk_widget_destroy(GTK_WIDGET(cd->filesel));
cd->filesel = NULL;
......@@ -2136,14 +2136,14 @@ p_points_load_from_file (GtkWidget *widget,
gpointer data)
{
BenderDialog *cd;
char *filename;
const char *filename;
if(gb_debug) printf("p_points_load_from_file\n");
cd = (BenderDialog *) data;
if(cd->filesel == NULL) return;
filename = gtk_file_selection_get_filename (GTK_FILE_SELECTION (cd->filesel));
filename = gtk_file_selection_get_filename(GTK_FILE_SELECTION (cd->filesel));
p_load_pointfile(cd, filename);
gtk_widget_destroy(GTK_WIDGET(cd->filesel));
cd->filesel = NULL;
......
......@@ -286,7 +286,7 @@ deinterlace_dialog (void)
frame =
gimp_radio_group_new2 (TRUE, _("Mode"),
gimp_radio_button_update,
G_CALLBACK (gimp_radio_button_update),
&DeinterlaceValue, (gpointer) DeinterlaceValue,
_("Keep Odd Fields"), (gpointer) ODD_FIELDS, NULL,
......
......@@ -545,7 +545,7 @@ pluginCoreIA (struct piArgs *argp)
emboss_do_preview (preview);
frame = gimp_radio_group_new2 (TRUE, _("Function"),
emboss_radio_button_callback,
G_CALLBACK (emboss_radio_button_callback),
&argp->embossp, (gpointer) argp->embossp,
_("Bumpmap"), (gpointer) FUNCTION_BUMPMAP, NULL,
......
......@@ -1492,11 +1492,11 @@ static void
film_ok_callback (GtkWidget *widget,
gpointer data)
{
gint num_images;
gchar *s;
GtkWidget *label;
GList *tmp_list;
gint32 image_ID;
gint num_images;
const gchar *s;
GtkWidget *label;
GList *tmp_list;
gint32 image_ID;
/* Read font family */
s = gtk_entry_get_text (GTK_ENTRY (filmint.font_entry));
......
......@@ -763,7 +763,7 @@ dialog_show (void)
/* Settings */
frame = gimp_radio_group_new2 (TRUE, _("Outside Type"),
dialog_outside_type_callback,
G_CALLBACK (dialog_outside_type_callback),
&parameters.outside_type,
(gpointer) parameters.outside_type,
......
......@@ -1367,7 +1367,7 @@ save_dialog (gint32 image_ID)
gtk_widget_show (label);
disposal_option_menu =
gimp_option_menu_new2 (FALSE, gimp_menu_item_update,
gimp_option_menu_new2 (FALSE, G_CALLBACK (gimp_menu_item_update),
&gsvals.default_dispose,
(gpointer) gsvals.default_dispose,
......
......@@ -810,7 +810,7 @@ static void
cb_callback (GtkWidget *widget,
gpointer data)
{
*((gchar **) data) = gtk_entry_get_text (GTK_ENTRY (widget));
*((const gchar **) data) = gtk_entry_get_text (GTK_ENTRY (widget));
}
static void
......
......@@ -615,7 +615,7 @@ pluginCoreIA (struct piArgs *argp)
gtk_widget_show (toggle);
frame = gimp_radio_group_new2 (TRUE, _("Mode"),
gimp_radio_button_update,
G_CALLBACK (gimp_radio_button_update),
&argp->mode, (gpointer) argp->mode,
"NTSC", (gpointer) mode_ntsc, NULL,
......@@ -628,7 +628,7 @@ pluginCoreIA (struct piArgs *argp)
frame =
gimp_radio_group_new2 (TRUE, _("Action"),
gimp_radio_button_update,
G_CALLBACK (gimp_radio_button_update),
&argp->action, (gpointer) argp->action,
_("Reduce Luminance"), (gpointer) act_lredux, NULL,
......
......@@ -1034,7 +1034,7 @@ iwarp_settings_dialog (GtkWidget *dlg,
gtk_widget_show (hbox);
vbox2 = gimp_radio_group_new2 (FALSE, NULL,
gimp_radio_button_update,
G_CALLBACK (gimp_radio_button_update),
&iwarp_vals.deform_mode,
(gpointer) iwarp_vals.deform_mode,
......
......@@ -2617,7 +2617,7 @@ dialog_box (void)
gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, FALSE, 0);
frame = gimp_radio_group_new2 (TRUE, _("Jigsaw Style"),
jigsaw_radio_button_update,
G_CALLBACK (jigsaw_radio_button_update),
&config.style, (gpointer) config.style,
_("Square"), (gpointer) BEZIER_1, &rbutton1,
......
......@@ -1765,7 +1765,7 @@ save_dialog (void)
/* Subsampling */
menu =
gimp_option_menu_new2 (FALSE,
menu_callback,
G_CALLBACK (menu_callback),
&jsvals.subsmp, GINT_TO_POINTER (jsvals.subsmp),
"2x2,1x1,1x1", GINT_TO_POINTER (0), NULL,
"2x1,1x1,1x1 (4:2:2)", GINT_TO_POINTER (1), NULL,
......@@ -1780,7 +1780,7 @@ save_dialog (void)
/* DCT method */
menu =
gimp_option_menu_new2 (FALSE,
menu_callback,
G_CALLBACK (menu_callback),
&jsvals.dct, GINT_TO_POINTER (jsvals.dct),
_("Fast Integer"), GINT_TO_POINTER (1), NULL,
_("Integer"), GINT_TO_POINTER (0), NULL,
......
......@@ -1051,7 +1051,7 @@ create_main_dialog (void)
gtk_widget_show (button);
frame = gimp_radio_group_new2 (TRUE, _("Effect Channel"),
gimp_radio_button_update,
G_CALLBACK (gimp_radio_button_update),
&licvals.effect_channel,
(gpointer) licvals.effect_channel,
......@@ -1064,7 +1064,7 @@ create_main_dialog (void)
gtk_widget_show (frame);
frame = gimp_radio_group_new2 (TRUE, _("Effect Operator"),
gimp_radio_button_update,
G_CALLBACK (gimp_radio_button_update),
&licvals.effect_operator,
(gpointer) licvals.effect_operator,
......@@ -1076,7 +1076,7 @@ create_main_dialog (void)
gtk_widget_show (frame);
frame = gimp_radio_group_new2 (TRUE, _("Convolve"),
gimp_radio_button_update,
G_CALLBACK (gimp_radio_button_update),
&licvals.effect_convolve,
(gpointer) licvals.effect_convolve,
......
......@@ -583,7 +583,7 @@ save_dialog (void)
/* Encapsulation radiobuttons */
vbox = gimp_radio_group_new2 (FALSE, NULL,
gimp_radio_button_update,
G_CALLBACK (gimp_radio_button_update),
&mail_info.encapsulation,
(gpointer) mail_info.encapsulation,
......
......@@ -379,7 +379,7 @@ dialog (GimpDrawable *drawable)
gtk_widget_show (preview);
frame = gimp_radio_group_new2 (TRUE, _("Parameter Settings"),
radio_callback,
G_CALLBACK (radio_callback),
&pvals.max_p, (gpointer) pvals.max_p,
_("Hold the Maximal Channels"),
......
......@@ -777,7 +777,7 @@ mblur_dialog (void)
frame =
gimp_radio_group_new2 (TRUE, _("Blur Type"),
gimp_radio_button_update,
G_CALLBACK (gimp_radio_button_update),
&mbvals.mblur_type, (gpointer) mbvals.mblur_type,
_("Linear"), (gpointer) MBLUR_LINEAR, NULL,
......
......@@ -1075,7 +1075,8 @@ new_channel (const chan_tmpl *ct)
gtk_object_set_user_data (GTK_OBJECT (chst->menuitem[i]),
GINT_TO_POINTER (i));
gtk_widget_show (chst->menuitem[i]);
gtk_menu_append (GTK_MENU (menu), GTK_WIDGET (chst->menuitem[i]));
gtk_menu_shell_append (GTK_MENU_SHELL (menu),
GTK_WIDGET (chst->menuitem[i]));
sf++;
i++;
}
......
......@@ -391,7 +391,7 @@ pluginCoreIA (struct piArgs *argp)
nlfilt_do_preview (preview);
frame = gimp_radio_group_new2 (TRUE, _("Filter"),
nlfilt_radio_button_update,
G_CALLBACK (nlfilt_radio_button_update),
&argp->filter, (gpointer) argp->filter,
_("Alpha Trimmed Mean"),
......
......@@ -309,7 +309,7 @@ open_dialog (void)
NULL);
frame = gimp_radio_group_new2 (TRUE, _("Fractional Pixels"),
gimp_radio_button_update,
G_CALLBACK (gimp_radio_button_update),
&p.params.fractional_type,
(gpointer) p.params.fractional_type,
......@@ -373,7 +373,7 @@ open_dialog (void)
gtk_widget_show (button);
frame = gimp_radio_group_new2 (TRUE, _("Background Type"),
gimp_radio_button_update,
G_CALLBACK (gimp_radio_button_update),
&p.params.background_type,
(gpointer) p.params.background_type,
......
......@@ -940,7 +940,7 @@ save_dialog (void)
/* file save type */
frame = gimp_radio_group_new2 (TRUE, _("Data Formatting"),
gimp_radio_button_update,
G_CALLBACK (gimp_radio_button_update),
&psvals.raw, (gpointer) psvals.raw,
_("Raw"), (gpointer) TRUE, NULL,
......
......@@ -2694,7 +2694,7 @@ load_dialog (void)
/* Colouring */
frame = gimp_radio_group_new2 (TRUE, _("Coloring"),
gimp_radio_button_update,
G_CALLBACK (gimp_radio_button_update),
&plvals.pnm_type, (gpointer) plvals.pnm_type,
_("B/W"), (gpointer) 4, NULL,
......@@ -2711,8 +2711,9 @@ load_dialog (void)
gtk_widget_show (hbox);
frame = gimp_radio_group_new2 (TRUE, _("Text Antialiasing"),
gimp_radio_button_update,
&plvals.textalpha, (gpointer) plvals.textalpha,
G_CALLBACK (gimp_radio_button_update),
&plvals.textalpha,
(gpointer) plvals.textalpha,
_("None"), (gpointer) 1, NULL,
_("Weak"), (gpointer) 2, NULL,
......@@ -2723,7 +2724,7 @@ load_dialog (void)
gtk_widget_show (frame);
frame = gimp_radio_group_new2 (TRUE, _("Graphic Antialiasing"),
gimp_radio_button_update,
G_CALLBACK (gimp_radio_button_update),
&plvals.graphicsalpha,
(gpointer) plvals.graphicsalpha,
......@@ -2878,7 +2879,7 @@ save_dialog (void)
/* Unit */
uframe = gimp_radio_group_new2 (TRUE, _("Unit"),
save_unit_toggle_update,
G_CALLBACK (save_unit_toggle_update),
vals, (gpointer) psvals.unit_mm,
_("Inch"), (gpointer) FALSE, NULL,
......@@ -2893,7 +2894,7 @@ save_dialog (void)
/* Rotation */
frame = gimp_radio_group_new2 (TRUE, _("Rotation"),
gimp_radio_button_update,
G_CALLBACK (gimp_radio_button_update),
&psvals.rotate, (gpointer) psvals.rotate,
"0", (gpointer) 0, NULL,
......
......@@ -2694,7 +2694,7 @@ load_dialog (void)
/* Colouring */
frame = gimp_radio_group_new2 (TRUE, _("Coloring"),
gimp_radio_button_update,
G_CALLBACK (gimp_radio_button_update),
&plvals.pnm_type, (gpointer) plvals.pnm_type,
_("B/W"), (gpointer) 4, NULL,
......@@ -2711,8 +2711,9 @@ load_dialog (void)
gtk_widget_show (hbox);
frame = gimp_radio_group_new2 (TRUE, _("Text Antialiasing"),
gimp_radio_button_update,
&plvals.textalpha, (gpointer) plvals.textalpha,
G_CALLBACK (gimp_radio_button_update),
&plvals.textalpha,
(gpointer) plvals.textalpha,
_("None"), (gpointer) 1, NULL,
_("Weak"), (gpointer) 2, NULL,
......@@ -2723,7 +2724,7 @@ load_dialog (void)
gtk_widget_show (frame);
frame = gimp_radio_group_new2 (TRUE, _("Graphic Antialiasing"),