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

added -DGTK_DISABLE_COMPAT_H to CPPFLAGS. 

2000-08-28  Michael Natterer  <mitch@gimp.org>

	* configure.in: added -DGTK_DISABLE_COMPAT_H to CPPFLAGS.

	* app/app_procs.c
	* app/gdisplay.c
	* app/layers_dialog.c
	* app/menus.c
	* app/tips_dialog.c
	* libgimp/gimpcolorbutton.c
	* plug-ins/FractalExplorer/Dialogs.c
	* plug-ins/FractalExplorer/FractalExplorer.c
	* plug-ins/bmp/bmpwrite.c
	* plug-ins/common/AlienMap.c
	* plug-ins/common/AlienMap2.c
	* plug-ins/common/CML_explorer.c
	* plug-ins/common/animationplay.c
	* plug-ins/common/cubism.c
	* plug-ins/common/curve_bend.c
	* plug-ins/common/deinterlace.c
	* plug-ins/common/gee.c
	* plug-ins/common/glasstile.c
	* plug-ins/common/iwarp.c
	* plug-ins/common/mail.c
	* plug-ins/common/pat.c
	* plug-ins/common/pixelize.c
	* plug-ins/common/plugindetails.c
	* plug-ins/common/png.c
	* plug-ins/common/sample_colorize.c
	* plug-ins/common/sel_gauss.c
	* plug-ins/common/sinus.c
	* plug-ins/common/sparkle.c
	* plug-ins/common/spheredesigner.c
	* plug-ins/common/tga.c
	* plug-ins/common/tileit.c
	* plug-ins/common/vpropagate.c
	* plug-ins/common/warp.c
	* plug-ins/common/waves.c
	* plug-ins/common/wmf.c
	* plug-ins/flame/flame.c
	* plug-ins/fp/fp_gtk.c
	* plug-ins/gap/gap_arr_dialog.c
	* plug-ins/gap/gap_dbbrowser_utils.c
	* plug-ins/gap/gap_mov_dialog.c
	* plug-ins/gap/gap_navigator_dialog.c
	* plug-ins/gap/gap_resi_dialog.c
	* plug-ins/gdyntext/gdyntext_ui.c
	* plug-ins/gfig/gfig.c
	* plug-ins/gimpressionist/brush.c
	* plug-ins/gimpressionist/gimpressionist.c
	* plug-ins/pagecurl/pagecurl.c
	* plug-ins/print/gimp_main_window.c
	* plug-ins/rcm/rcm_callback.c
	* plug-ins/rcm/rcm_dialog.c
	* plug-ins/script-fu/script-fu-console.c
	* plug-ins/script-fu/script-fu-scripts.c
	* plug-ins/script-fu/script-fu-server.c
	* plug-ins/sel2path/sel2path_adv_dialog.c
	* plug-ins/xjt/xjt.c: removed COMPAT_CRUFT.
This commit is contained in:
Michael Natterer 2000-08-28 00:42:32 +00:00 committed by Michael Natterer
parent 778560992a
commit b9413eb038
69 changed files with 285 additions and 208 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
ChangeLog
View File

@ -1,3 +1,63 @@
2000-08-28 Michael Natterer <mitch@gimp.org>
* configure.in: added -DGTK_DISABLE_COMPAT_H to CPPFLAGS.
* app/app_procs.c
* app/gdisplay.c
* app/layers_dialog.c
* app/menus.c
* app/tips_dialog.c
* libgimp/gimpcolorbutton.c
* plug-ins/FractalExplorer/Dialogs.c
* plug-ins/FractalExplorer/FractalExplorer.c
* plug-ins/bmp/bmpwrite.c
* plug-ins/common/AlienMap.c
* plug-ins/common/AlienMap2.c
* plug-ins/common/CML_explorer.c
* plug-ins/common/animationplay.c
* plug-ins/common/cubism.c
* plug-ins/common/curve_bend.c
* plug-ins/common/deinterlace.c
* plug-ins/common/gee.c
* plug-ins/common/glasstile.c
* plug-ins/common/iwarp.c
* plug-ins/common/mail.c
* plug-ins/common/pat.c
* plug-ins/common/pixelize.c
* plug-ins/common/plugindetails.c
* plug-ins/common/png.c
* plug-ins/common/sample_colorize.c
* plug-ins/common/sel_gauss.c
* plug-ins/common/sinus.c
* plug-ins/common/sparkle.c
* plug-ins/common/spheredesigner.c
* plug-ins/common/tga.c
* plug-ins/common/tileit.c
* plug-ins/common/vpropagate.c
* plug-ins/common/warp.c
* plug-ins/common/waves.c
* plug-ins/common/wmf.c
* plug-ins/flame/flame.c
* plug-ins/fp/fp_gtk.c
* plug-ins/gap/gap_arr_dialog.c
* plug-ins/gap/gap_dbbrowser_utils.c
* plug-ins/gap/gap_mov_dialog.c
* plug-ins/gap/gap_navigator_dialog.c
* plug-ins/gap/gap_resi_dialog.c
* plug-ins/gdyntext/gdyntext_ui.c
* plug-ins/gfig/gfig.c
* plug-ins/gimpressionist/brush.c
* plug-ins/gimpressionist/gimpressionist.c
* plug-ins/pagecurl/pagecurl.c
* plug-ins/print/gimp_main_window.c
* plug-ins/rcm/rcm_callback.c
* plug-ins/rcm/rcm_dialog.c
* plug-ins/script-fu/script-fu-console.c
* plug-ins/script-fu/script-fu-scripts.c
* plug-ins/script-fu/script-fu-server.c
* plug-ins/sel2path/sel2path_adv_dialog.c
* plug-ins/xjt/xjt.c: removed COMPAT_CRUFT.
2000-08-28 Sven Neumann <sven@gimp.org>
* plug-ins/script-fu/script-fu.c: add missing cases to switch

2
app/app_procs.c
View File

@ -439,7 +439,7 @@ app_init_update_status (gchar *label1val,
if (!no_interface && !no_splash && win_initstatus)
{
if (label1val && strcmp (label1val, GTK_LABEL (label1)->label))
gtk_label_set (GTK_LABEL (label1), label1val);
gtk_label_set_text (GTK_LABEL (label1), label1val);
if (label2val && strcmp (label2val, GTK_LABEL (label2)->label))
{

4
app/core/gimpprojection.c
View File

@ -1072,7 +1072,7 @@ gdisplay_update_cursor (GDisplay *gdisp,
t_x >= gdisp->gimage->width ||
t_y >= gdisp->gimage->height)
{
gtk_label_set (GTK_LABEL (gdisp->cursor_label), "");
gtk_label_set_text (GTK_LABEL (gdisp->cursor_label), "");
info_window_update_RGB (gdisp, -1, -1);
}
else
@ -1093,7 +1093,7 @@ gdisplay_update_cursor (GDisplay *gdisp,
", ",
(gdouble) t_y * unit_factor / gdisp->gimage->yresolution);
}
gtk_label_set (GTK_LABEL (gdisp->cursor_label), buffer);
gtk_label_set_text (GTK_LABEL (gdisp->cursor_label), buffer);
info_window_update_RGB (gdisp, t_x, t_y);
}

4
app/dialogs/tips-dialog.c
View File

@ -235,7 +235,7 @@ tips_show_previous (GtkWidget *widget,
if (last_tip < 0)
last_tip = tips_count - 1;
gtk_label_set (GTK_LABEL (tips_label), tips_text[last_tip]);
gtk_label_set_text (GTK_LABEL (tips_label), tips_text[last_tip]);
}
static void
@ -247,7 +247,7 @@ tips_show_next (GtkWidget *widget,
if (last_tip >= tips_count)
last_tip = 0;
gtk_label_set (GTK_LABEL (tips_label), tips_text[last_tip]);
gtk_label_set_text (GTK_LABEL (tips_label), tips_text[last_tip]);
}
static void

4
app/display/gimpdisplay.c
View File

@ -1072,7 +1072,7 @@ gdisplay_update_cursor (GDisplay *gdisp,
t_x >= gdisp->gimage->width ||
t_y >= gdisp->gimage->height)
{
gtk_label_set (GTK_LABEL (gdisp->cursor_label), "");
gtk_label_set_text (GTK_LABEL (gdisp->cursor_label), "");
info_window_update_RGB (gdisp, -1, -1);
}
else
@ -1093,7 +1093,7 @@ gdisplay_update_cursor (GDisplay *gdisp,
", ",
(gdouble) t_y * unit_factor / gdisp->gimage->yresolution);
}
gtk_label_set (GTK_LABEL (gdisp->cursor_label), buffer);
gtk_label_set_text (GTK_LABEL (gdisp->cursor_label), buffer);
info_window_update_RGB (gdisp, t_x, t_y);
}

4
app/gdisplay.c
View File

@ -1072,7 +1072,7 @@ gdisplay_update_cursor (GDisplay *gdisp,
t_x >= gdisp->gimage->width ||
t_y >= gdisp->gimage->height)
{
gtk_label_set (GTK_LABEL (gdisp->cursor_label), "");
gtk_label_set_text (GTK_LABEL (gdisp->cursor_label), "");
info_window_update_RGB (gdisp, -1, -1);
}
else
@ -1093,7 +1093,7 @@ gdisplay_update_cursor (GDisplay *gdisp,
", ",
(gdouble) t_y * unit_factor / gdisp->gimage->yresolution);
}
gtk_label_set (GTK_LABEL (gdisp->cursor_label), buffer);
gtk_label_set_text (GTK_LABEL (gdisp->cursor_label), buffer);
info_window_update_RGB (gdisp, t_x, t_y);
}

2
app/gui/layers-dialog.c
View File

@ -3330,7 +3330,7 @@ layer_widget_layer_flush (GtkWidget *widget,
/* we need to set the name label if necessary */
gtk_label_get (GTK_LABEL (layer_widget->label), &label_name);
if (strcmp (name, label_name))
gtk_label_set (GTK_LABEL (layer_widget->label), name);
gtk_label_set_text (GTK_LABEL (layer_widget->label), name);
/* show the layer mask preview if necessary */
if (layer_get_mask (layer_widget->layer) == NULL &&

4
app/gui/menus.c
View File

@ -1319,8 +1319,8 @@ menus_last_opened_update_labels (void)
{
gtk_widget_show (widget);
gtk_label_set (GTK_LABEL (GTK_BIN (widget)->child),
entry_filename->str);
gtk_label_set_text (GTK_LABEL (GTK_BIN (widget)->child),
entry_filename->str);
gimp_help_set_help_data (widget,
((GString *) filename_slist->data)->str, NULL);
}

4
app/gui/tips-dialog.c
View File

@ -235,7 +235,7 @@ tips_show_previous (GtkWidget *widget,
if (last_tip < 0)
last_tip = tips_count - 1;
gtk_label_set (GTK_LABEL (tips_label), tips_text[last_tip]);
gtk_label_set_text (GTK_LABEL (tips_label), tips_text[last_tip]);
}
static void
@ -247,7 +247,7 @@ tips_show_next (GtkWidget *widget,
if (last_tip >= tips_count)
last_tip = 0;
gtk_label_set (GTK_LABEL (tips_label), tips_text[last_tip]);
gtk_label_set_text (GTK_LABEL (tips_label), tips_text[last_tip]);
}
static void

2
app/layers_dialog.c
View File

@ -3330,7 +3330,7 @@ layer_widget_layer_flush (GtkWidget *widget,
/* we need to set the name label if necessary */
gtk_label_get (GTK_LABEL (layer_widget->label), &label_name);
if (strcmp (name, label_name))
gtk_label_set (GTK_LABEL (layer_widget->label), name);
gtk_label_set_text (GTK_LABEL (layer_widget->label), name);
/* show the layer mask preview if necessary */
if (layer_get_mask (layer_widget->layer) == NULL &&

4
app/menus.c
View File

@ -1319,8 +1319,8 @@ menus_last_opened_update_labels (void)
{
gtk_widget_show (widget);
gtk_label_set (GTK_LABEL (GTK_BIN (widget)->child),
entry_filename->str);
gtk_label_set_text (GTK_LABEL (GTK_BIN (widget)->child),
entry_filename->str);
gimp_help_set_help_data (widget,
((GString *) filename_slist->data)->str, NULL);
}

4
app/menus/menus.c
View File

@ -1319,8 +1319,8 @@ menus_last_opened_update_labels (void)
{
gtk_widget_show (widget);
gtk_label_set (GTK_LABEL (GTK_BIN (widget)->child),
entry_filename->str);
gtk_label_set_text (GTK_LABEL (GTK_BIN (widget)->child),
entry_filename->str);
gimp_help_set_help_data (widget,
((GString *) filename_slist->data)->str, NULL);
}

4
app/tips_dialog.c
View File

@ -235,7 +235,7 @@ tips_show_previous (GtkWidget *widget,
if (last_tip < 0)
last_tip = tips_count - 1;
gtk_label_set (GTK_LABEL (tips_label), tips_text[last_tip]);
gtk_label_set_text (GTK_LABEL (tips_label), tips_text[last_tip]);
}
static void
@ -247,7 +247,7 @@ tips_show_next (GtkWidget *widget,
if (last_tip >= tips_count)
last_tip = 0;
gtk_label_set (GTK_LABEL (tips_label), tips_text[last_tip]);
gtk_label_set_text (GTK_LABEL (tips_label), tips_text[last_tip]);
}
static void

4
app/widgets/gimpitemfactory.c
View File

@ -1319,8 +1319,8 @@ menus_last_opened_update_labels (void)
{
gtk_widget_show (widget);
gtk_label_set (GTK_LABEL (GTK_BIN (widget)->child),
entry_filename->str);
gtk_label_set_text (GTK_LABEL (GTK_BIN (widget)->child),
entry_filename->str);
gimp_help_set_help_data (widget,
((GString *) filename_slist->data)->str, NULL);
}

2
configure.in
View File

@ -690,6 +690,8 @@ rm -f confauthorsgen
AM_CONDITIONAL(STATICLIBS, test x$enable_static = xyes)
CPPFLAGS="${CPPFLAGS} -DGTK_DISABLE_COMPAT_H"
AC_SUBST(GIMP_MAJOR_VERSION)
AC_SUBST(GIMP_MINOR_VERSION)
AC_SUBST(GIMP_MICRO_VERSION)

2
libgimp/gimpcolorbutton.c
View File

@ -477,7 +477,7 @@ gimp_color_button_clicked (GtkButton *button)
gtk_signal_connect (GTK_OBJECT (GTK_COLOR_SELECTION_DIALOG (gcb->dialog)->cancel_button),
"clicked",
(GtkSignalFunc) gimp_color_button_dialog_cancel, gcb);
gtk_window_position (GTK_WINDOW (gcb->dialog), GTK_WIN_POS_MOUSE);
gtk_window_set_position (GTK_WINDOW (gcb->dialog), GTK_WIN_POS_MOUSE);
}
gtk_color_selection_set_color (GTK_COLOR_SELECTION (GTK_COLOR_SELECTION_DIALOG (gcb->dialog)->colorsel),
gcb->dcolor);

2
libgimpwidgets/gimpcolorbutton.c
View File

@ -477,7 +477,7 @@ gimp_color_button_clicked (GtkButton *button)
gtk_signal_connect (GTK_OBJECT (GTK_COLOR_SELECTION_DIALOG (gcb->dialog)->cancel_button),
"clicked",
(GtkSignalFunc) gimp_color_button_dialog_cancel, gcb);
gtk_window_position (GTK_WINDOW (gcb->dialog), GTK_WIN_POS_MOUSE);
gtk_window_set_position (GTK_WINDOW (gcb->dialog), GTK_WIN_POS_MOUSE);
}
gtk_color_selection_set_color (GTK_COLOR_SELECTION (GTK_COLOR_SELECTION_DIALOG (gcb->dialog)->colorsel),
gcb->dcolor);

14
plug-ins/FractalExplorer/Dialogs.c
View File

@ -354,7 +354,7 @@ explorer_dialog (void)
gtk_signal_connect (GTK_OBJECT (toggle), "toggled",
GTK_SIGNAL_FUNC (explorer_toggle_update),
&wvals.alwayspreview);
gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (toggle), wvals.alwayspreview);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), wvals.alwayspreview);
gtk_widget_show (toggle);
gimp_help_set_help_data (toggle, _("If you enable this option the preview "
"will be redrawn automatically"), NULL);
@ -650,7 +650,7 @@ explorer_dialog (void)
gtk_signal_connect (GTK_OBJECT (toggle), "toggled",
(GtkSignalFunc) explorer_toggle_update,
&wvals.useloglog);
gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (toggle), wvals.useloglog);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), wvals.useloglog);
gtk_widget_show (toggle);
gimp_help_set_help_data (toggle, _("Use log log smoothing to eliminate "
"\"banding\" in the result"), NULL);
@ -821,7 +821,7 @@ explorer_dialog (void)
elements->blueinvert = toggle =
gtk_check_button_new_with_label (_("Inversion"));
gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON( toggle), wvals.blueinvert);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON( toggle), wvals.blueinvert);
gtk_box_pack_start (GTK_BOX (toggle_vbox), toggle, FALSE, FALSE, 0);
gtk_signal_connect (GTK_OBJECT (toggle), "toggled",
GTK_SIGNAL_FUNC (explorer_toggle_update),
@ -851,8 +851,8 @@ explorer_dialog (void)
gtk_signal_connect (GTK_OBJECT (toggle), "toggled",
GTK_SIGNAL_FUNC (explorer_radio_update),
&wvals.colormode);
gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (toggle),
wvals.colormode == 0);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle),
wvals.colormode == 0);
gtk_widget_show (toggle);
gimp_help_set_help_data (toggle,
_("Create a color-map with the options you "
@ -1663,7 +1663,7 @@ create_load_file_selection (void)
if (!window)
{
window = gtk_file_selection_new (_("Load Fractal Parameters"));
gtk_window_position (GTK_WINDOW (window), GTK_WIN_POS_NONE);
gtk_window_set_position (GTK_WINDOW (window), GTK_WIN_POS_NONE);
gtk_signal_connect (GTK_OBJECT (window), "destroy",
GTK_SIGNAL_FUNC (gtk_widget_destroyed),
@ -1698,7 +1698,7 @@ create_file_selection (void)
if (!window)
{
window = gtk_file_selection_new (_("Save Fractal Parameters"));
gtk_window_position (GTK_WINDOW (window), GTK_WIN_POS_NONE);
gtk_window_set_position (GTK_WINDOW (window), GTK_WIN_POS_NONE);
gtk_signal_connect (GTK_OBJECT (window), "destroy",
GTK_SIGNAL_FUNC (gtk_widget_destroyed),

2
plug-ins/FractalExplorer/FractalExplorer.c
View File

@ -827,7 +827,7 @@ fractalexplorer_dialog_edit_list (GtkWidget *lwidget,
/* the dialog */
options->query_box = gtk_dialog_new ();
gtk_window_set_title (GTK_WINDOW (options->query_box), _("Edit fractal name"));
gtk_window_position (GTK_WINDOW (options->query_box), GTK_WIN_POS_MOUSE);
gtk_window_set_position (GTK_WINDOW (options->query_box), GTK_WIN_POS_MOUSE);
/* the main vbox */
vbox = gtk_vbox_new (FALSE, 1);

4
plug-ins/bmp/bmpwrite.c
View File

@ -574,11 +574,11 @@ save_dialog (void)
/* parameter settings */
frame = gtk_frame_new (_("Save Options"));
gtk_container_border_width (GTK_CONTAINER (frame), 6);
gtk_container_set_border_width (GTK_CONTAINER (frame), 6);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), frame, TRUE, TRUE, 0);
vbox = gtk_vbox_new (FALSE, 2);
gtk_container_border_width (GTK_CONTAINER (vbox), 4);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
gtk_container_add (GTK_CONTAINER (frame), vbox);
toggle = gtk_check_button_new_with_label (_("RLE encoded"));

2
plug-ins/common/AlienMap.c
View File

@ -1675,7 +1675,7 @@ alienmap_logo_dialog (void)
gtk_box_pack_start (GTK_BOX (GTK_DIALOG(logodlg)->vbox), xframe,
TRUE, TRUE, 0);
xvbox = gtk_vbox_new (FALSE, 4);
gtk_container_border_width (GTK_CONTAINER (xvbox), 4);
gtk_container_set_border_width (GTK_CONTAINER (xvbox), 4);
gtk_container_add (GTK_CONTAINER (xframe), xvbox);
/* The logo frame & drawing area */

8
plug-ins/common/AlienMap2.c
View File

@ -1512,7 +1512,7 @@ alienmap2_dialog (void)
gtk_signal_connect (GTK_OBJECT (toggle), "toggled",
GTK_SIGNAL_FUNC (alienmap2_toggle_update),
&wvals.redmode);
gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (toggle), wvals.redmode);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), wvals.redmode);
gtk_widget_show (toggle);
gimp_help_set_help_data (toggle, _("Use function for red/hue component"),
NULL);
@ -1522,7 +1522,7 @@ alienmap2_dialog (void)
gtk_signal_connect (GTK_OBJECT (toggle), "toggled",
GTK_SIGNAL_FUNC (alienmap2_toggle_update),
&wvals.greenmode);
gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (toggle), wvals.greenmode);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), wvals.greenmode);
gtk_widget_show (toggle);
gimp_help_set_help_data (toggle,
_("Use function for green/saturation component"),
@ -1533,7 +1533,7 @@ alienmap2_dialog (void)
gtk_signal_connect (GTK_OBJECT (toggle), "toggled",
GTK_SIGNAL_FUNC (alienmap2_toggle_update),
&wvals.bluemode);
gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (toggle), wvals.bluemode);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), wvals.bluemode);
gtk_widget_show (toggle);
gimp_help_set_help_data (toggle,
_("Use function for blue/luminance component"),
@ -1690,7 +1690,7 @@ alienmap2_logo_dialog (void)
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (logodlg)->vbox), xframe,
TRUE, TRUE, 0);
xvbox = gtk_vbox_new (FALSE, 4);
gtk_container_border_width (GTK_CONTAINER (xvbox), 4);
gtk_container_set_border_width (GTK_CONTAINER (xvbox), 4);
gtk_container_add (GTK_CONTAINER(xframe), xvbox);
/* The logo frame & drawing area */

4
plug-ins/common/CML_explorer.c
View File

@ -2115,7 +2115,7 @@ CML_save_to_file_callback (GtkWidget *widget,
GtkWidget *filesel;
filesel = gtk_file_selection_new (_("Save Parameters to"));
gtk_window_position (GTK_WINDOW (filesel), GTK_WIN_POS_MOUSE);
gtk_window_set_position (GTK_WINDOW (filesel), GTK_WIN_POS_MOUSE);
gtk_signal_connect (GTK_OBJECT (GTK_FILE_SELECTION (filesel)->ok_button),
"clicked",
@ -2306,7 +2306,7 @@ CML_load_from_file_callback (GtkWidget *widget,
filesel = gtk_file_selection_new (_("Load Parameters from"));
else
filesel = gtk_file_selection_new (_("Selective Load from"));
gtk_window_position (GTK_WINDOW (filesel), GTK_WIN_POS_MOUSE);
gtk_window_set_position (GTK_WINDOW (filesel), GTK_WIN_POS_MOUSE);
gtk_signal_connect (GTK_OBJECT (GTK_FILE_SELECTION (filesel)->ok_button),
"clicked",

10
plug-ins/common/animationplay.c
View File

@ -697,23 +697,23 @@ build_dialog (GimpImageBaseType basetype,
frame = gtk_frame_new (windowname);
g_free (windowname);
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_ETCHED_IN);
gtk_container_border_width (GTK_CONTAINER (frame), 3);
gtk_container_set_border_width (GTK_CONTAINER (frame), 3);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox),
frame, TRUE, TRUE, 0);
{
hbox = gtk_hbox_new (FALSE, 5);
gtk_container_border_width (GTK_CONTAINER (hbox), 3);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 3);
gtk_container_add (GTK_CONTAINER (frame), hbox);
{
vbox = gtk_vbox_new (FALSE, 5);
gtk_container_border_width (GTK_CONTAINER (vbox), 3);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 3);
gtk_container_add (GTK_CONTAINER (hbox), vbox);
{
hbox2 = gtk_hbox_new (FALSE, 0);
gtk_container_border_width (GTK_CONTAINER (hbox2), 0);
gtk_container_set_border_width (GTK_CONTAINER (hbox2), 0);
gtk_box_pack_start (GTK_BOX (vbox), hbox2, TRUE, TRUE, 0);
{
@ -744,7 +744,7 @@ build_dialog (GimpImageBaseType basetype,
gtk_widget_show(hbox2);
hbox2 = gtk_hbox_new (TRUE, 0);
gtk_container_border_width (GTK_CONTAINER (hbox2), 0);
gtk_container_set_border_width (GTK_CONTAINER (hbox2), 0);
gtk_box_pack_start (GTK_BOX (vbox), hbox2, FALSE, FALSE, 0);
{
frame2 = gtk_frame_new (NULL);

2
plug-ins/common/cubism.c
View File

@ -321,7 +321,7 @@ cubism_dialog (void)
gtk_table_set_col_spacings (GTK_TABLE (table), 4);
gtk_table_set_row_spacings (GTK_TABLE (table), 2);
gtk_table_set_row_spacing (GTK_TABLE (table), 0, 4);
gtk_container_border_width (GTK_CONTAINER (table), 6);
gtk_container_set_border_width (GTK_CONTAINER (table), 6);
gtk_container_add (GTK_CONTAINER (frame), table);
toggle = gtk_check_button_new_with_label (_("Use Background Color"));

4
plug-ins/common/curve_bend.c
View File

@ -2164,7 +2164,7 @@ bender_load_callback (GtkWidget *w,
filesel = gtk_file_selection_new ( _("Load Curve Points from file"));
cd->filesel = filesel;
gtk_window_position (GTK_WINDOW (filesel), GTK_WIN_POS_MOUSE);
gtk_window_set_position (GTK_WINDOW (filesel), GTK_WIN_POS_MOUSE);
gtk_signal_connect (GTK_OBJECT (GTK_FILE_SELECTION (filesel)->ok_button),
"clicked", (GtkSignalFunc) p_points_load_from_file,
cd);
@ -2194,7 +2194,7 @@ bender_save_callback (GtkWidget *w,
filesel = gtk_file_selection_new ( _("Save Curve Points to file"));
cd->filesel = filesel;
gtk_window_position (GTK_WINDOW (filesel), GTK_WIN_POS_MOUSE);
gtk_window_set_position (GTK_WINDOW (filesel), GTK_WIN_POS_MOUSE);
gtk_signal_connect (GTK_OBJECT (GTK_FILE_SELECTION (filesel)->ok_button),
"clicked", (GtkSignalFunc) p_points_save_to_file,
cd);

2
plug-ins/common/deinterlace.c
View File

@ -280,7 +280,7 @@ deinterlace_dialog (void)
NULL);
vbox = gtk_vbox_new (FALSE, 0);
gtk_container_border_width (GTK_CONTAINER (vbox), 6);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 6);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), vbox, TRUE, TRUE, 0);
gtk_widget_show (vbox);

10
plug-ins/common/gee.c
View File

@ -199,7 +199,7 @@ build_dialog (GimpImageBaseType basetype,
dlg = gtk_dialog_new ();
gtk_window_set_title (GTK_WINDOW (dlg), _("GEE! The GIMP E'er Egg!"));
gtk_window_position (GTK_WINDOW (dlg), GTK_WIN_POS_MOUSE);
gtk_window_set_position (GTK_WINDOW (dlg), GTK_WIN_POS_MOUSE);
gtk_signal_connect (GTK_OBJECT (dlg), "delete_event",
(GtkSignalFunc) window_delete_callback,
NULL);
@ -223,19 +223,19 @@ build_dialog (GimpImageBaseType basetype,
frame = gtk_frame_new (NULL);
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_ETCHED_IN);
gtk_container_border_width (GTK_CONTAINER (frame), 3);
gtk_container_set_border_width (GTK_CONTAINER (frame), 3);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), frame, TRUE, TRUE, 0);
hbox = gtk_hbox_new (FALSE, 5);
gtk_container_border_width (GTK_CONTAINER (hbox), 3);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 3);
gtk_container_add (GTK_CONTAINER (frame), hbox);
vbox = gtk_vbox_new (FALSE, 5);
gtk_container_border_width (GTK_CONTAINER (vbox), 3);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 3);
gtk_container_add (GTK_CONTAINER (hbox), vbox);
hbox2 = gtk_hbox_new (TRUE, 0);
gtk_container_border_width (GTK_CONTAINER (hbox2), 0);
gtk_container_set_border_width (GTK_CONTAINER (hbox2), 0);
gtk_box_pack_start (GTK_BOX (vbox), hbox2, FALSE, FALSE, 0);
frame2 = gtk_frame_new (NULL);

4
plug-ins/common/glasstile.c
View File

@ -292,13 +292,13 @@ glass_dialog (GimpDrawable *drawable)
/* Parameter settings */
frame = gtk_frame_new (_("Parameter Settings"));
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_ETCHED_IN);
gtk_container_border_width (GTK_CONTAINER (frame), 6);
gtk_container_set_border_width (GTK_CONTAINER (frame), 6);
gtk_box_pack_start (GTK_BOX (main_vbox), frame, TRUE, TRUE, 0);
table = gtk_table_new (2, 3, FALSE);
gtk_table_set_col_spacings (GTK_TABLE (table), 4);
gtk_table_set_row_spacings (GTK_TABLE (table), 2);
gtk_container_border_width (GTK_CONTAINER (table), 4);
gtk_container_set_border_width (GTK_CONTAINER (table), 4);
gtk_container_add (GTK_CONTAINER (frame), table);
/* Horizontal scale - Width */

2
plug-ins/common/iwarp.c
View File

@ -989,7 +989,7 @@ iwarp_settings_dialog (GtkWidget *dlg,
gint i;
vbox = gtk_vbox_new (FALSE, 4);
gtk_container_border_width (GTK_CONTAINER (vbox), 6);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 6);
table = gtk_table_new (2, 3, FALSE);
gtk_table_set_row_spacings (GTK_TABLE (table), 2);

2
plug-ins/common/mail.c
View File

@ -475,7 +475,7 @@ save_dialog (void)
/* table */
table = gtk_table_new (7, 2, FALSE);
gtk_container_border_width (GTK_CONTAINER (table), 6);
gtk_container_set_border_width (GTK_CONTAINER (table), 6);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), table, TRUE, TRUE, 0);
gtk_widget_show (table);

2
plug-ins/common/pat.c
View File

@ -424,7 +424,7 @@ save_dialog (void)
table = gtk_table_new (1, 2, FALSE);
gtk_table_set_row_spacings (GTK_TABLE (table), 2);
gtk_table_set_col_spacings (GTK_TABLE (table), 4);
gtk_container_border_width (GTK_CONTAINER (table), 6);
gtk_container_set_border_width (GTK_CONTAINER (table), 6);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), table, TRUE, TRUE, 0);
gtk_widget_show (table);

4
plug-ins/common/pixelize.c
View File

@ -291,12 +291,12 @@ pixelize_dialog (void)
/* parameter settings */
frame = gtk_frame_new (_("Parameter Settings"));
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_ETCHED_IN);
gtk_container_border_width (GTK_CONTAINER (frame), 6);
gtk_container_set_border_width (GTK_CONTAINER (frame), 6);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), frame, TRUE, TRUE, 0);
table = gtk_table_new (1, 3, FALSE);
gtk_table_set_col_spacings (GTK_TABLE (table), 4);
gtk_container_border_width (GTK_CONTAINER (table), 4);
gtk_container_set_border_width (GTK_CONTAINER (table), 4);
gtk_container_add (GTK_CONTAINER (frame), table);
adjustment =

2
plug-ins/common/plugin-browser.c
View File

@ -1030,7 +1030,7 @@ gimp_plugin_desc (void)
/* left = vbox : the list and the search entry */
plugindesc->left_paned = vbox = gtk_vbox_new (FALSE, 0);
gtk_container_border_width (GTK_CONTAINER (vbox), 3);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 3);
gtk_paned_pack1 (GTK_PANED (hbox), vbox, FALSE, FALSE);
gtk_widget_show (vbox);

2
plug-ins/common/plugindetails.c
View File

@ -1030,7 +1030,7 @@ gimp_plugin_desc (void)
/* left = vbox : the list and the search entry */
plugindesc->left_paned = vbox = gtk_vbox_new (FALSE, 0);
gtk_container_border_width (GTK_CONTAINER (vbox), 3);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 3);
gtk_paned_pack1 (GTK_PANED (hbox), vbox, FALSE, FALSE);
gtk_widget_show (vbox);

2
plug-ins/common/png.c
View File

@ -1055,7 +1055,7 @@ save_dialog (void)
frame = gtk_frame_new (_("Parameter Settings"));
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_ETCHED_IN);
gtk_container_border_width (GTK_CONTAINER (frame), 6);
gtk_container_set_border_width (GTK_CONTAINER (frame), 6);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), frame, TRUE, TRUE, 0);
gtk_widget_show (frame);

32
plug-ins/common/sample_colorize.c
View File

@ -1466,8 +1466,8 @@ p_smp_dialog (void)
gtk_signal_connect (GTK_OBJECT (check_button), "toggled",
(GtkSignalFunc) p_smp_toggle_callback,
&g_di.dst_show_selection);
gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (check_button),
g_di.dst_show_selection);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button),
g_di.dst_show_selection);
gtk_widget_show (check_button);
/* check button */
@ -1476,8 +1476,8 @@ p_smp_dialog (void)
gtk_signal_connect (GTK_OBJECT (check_button), "toggled",
(GtkSignalFunc) p_smp_toggle_callback,
&g_di.dst_show_color);
gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (check_button),
g_di.dst_show_color);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button),
g_di.dst_show_color);
gtk_widget_show (check_button);
hbox = gtk_hbox_new (FALSE, 4);
@ -1491,8 +1491,8 @@ p_smp_dialog (void)
gtk_signal_connect (GTK_OBJECT (check_button), "toggled",
(GtkSignalFunc)p_smp_toggle_callback ,
&g_di.sample_show_selection);
gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (check_button),
g_di.sample_show_selection);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button),
g_di.sample_show_selection);
gtk_widget_show (check_button);
/* check button */
@ -1501,8 +1501,8 @@ p_smp_dialog (void)
gtk_signal_connect (GTK_OBJECT (check_button), "toggled",
(GtkSignalFunc)p_smp_toggle_callback ,
&g_di.sample_show_color);
gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (check_button),
g_di.sample_show_color);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button),
g_di.sample_show_color);
gtk_widget_show (check_button);
l_ty++;
@ -1701,8 +1701,8 @@ p_smp_dialog (void)
gtk_signal_connect (GTK_OBJECT (check_button), "toggled",
(GtkSignalFunc) p_smp_toggle_callback,
&g_values.hold_inten);
gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (check_button),
g_values.hold_inten);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button),
g_values.hold_inten);
gtk_widget_show (check_button);
/* check button */
@ -1712,8 +1712,8 @@ p_smp_dialog (void)
gtk_signal_connect (GTK_OBJECT (check_button), "toggled",
(GtkSignalFunc) p_smp_toggle_callback,
&g_values.orig_inten);
gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (check_button),
g_values.orig_inten);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button),
g_values.orig_inten);
gtk_widget_set_sensitive (g_di.orig_inten_button, g_values.hold_inten);
gtk_widget_show (check_button);
@ -1728,8 +1728,8 @@ p_smp_dialog (void)
gtk_signal_connect (GTK_OBJECT (check_button), "toggled",
(GtkSignalFunc) p_smp_toggle_callback,
&g_values.rnd_subcolors);
gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (check_button),
g_values.rnd_subcolors);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button),
g_values.rnd_subcolors);
gtk_widget_show (check_button);
/* check button */
@ -1738,8 +1738,8 @@ p_smp_dialog (void)
gtk_signal_connect (GTK_OBJECT (check_button), "toggled",
(GtkSignalFunc) p_smp_toggle_callback,
&g_values.guess_missing);
gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (check_button),
g_values.guess_missing);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button),
g_values.guess_missing);
gtk_widget_show (check_button);
l_ty++;

2
plug-ins/common/sel_gauss.c
View File

@ -253,7 +253,7 @@ sel_gauss_dialog (void)
/* parameter settings */
frame = gtk_frame_new (_("Parameter Settings"));
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_ETCHED_IN);
gtk_container_border_width (GTK_CONTAINER (frame), 6);
gtk_container_set_border_width (GTK_CONTAINER (frame), 6);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), frame,
TRUE, TRUE, 0);

2
plug-ins/common/sinus.c
View File

@ -1977,7 +1977,7 @@ sinus_dialog (void)
vbox = gtk_vbox_new (FALSE, 4);
gtk_container_add (GTK_CONTAINER (frame), vbox);
gtk_container_border_width (GTK_CONTAINER (vbox), 4);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
gtk_widget_show (vbox);
frame =

8
plug-ins/common/sparkle.c
View File

@ -484,8 +484,8 @@ sparkle_dialog (void)
toggle = gtk_check_button_new_with_label (_("Preserve Luminosity"));
gtk_box_pack_start (GTK_BOX (vbox), toggle, FALSE, FALSE, 0);
gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (toggle),
svals.preserve_luminosity);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle),
svals.preserve_luminosity);
gtk_signal_connect (GTK_OBJECT (toggle), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update),
&svals.preserve_luminosity);
@ -495,7 +495,7 @@ sparkle_dialog (void)
toggle = gtk_check_button_new_with_label (_("Inverse"));
gtk_box_pack_start (GTK_BOX (vbox), toggle, FALSE, FALSE, 0);
gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (toggle), svals.invers);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), svals.invers);
gtk_signal_connect (GTK_OBJECT (toggle), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update),
&svals.invers);
@ -504,7 +504,7 @@ sparkle_dialog (void)
toggle = gtk_check_button_new_with_label (_("Add Border"));
gtk_box_pack_start (GTK_BOX (vbox), toggle, FALSE, FALSE, 0);
gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (toggle), svals.border);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), svals.border);
gtk_signal_connect (GTK_OBJECT (toggle), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update),
&svals.border);

4
plug-ins/common/spheredesigner.c
View File

@ -1852,7 +1852,7 @@ void fileselect(int action)
if(!windows[action]) {
windows[action] = gtk_file_selection_new( gettext(titles[action]));
gtk_window_position (GTK_WINDOW (windows[action]), GTK_WIN_POS_MOUSE);
gtk_window_set_position (GTK_WINDOW (windows[action]), GTK_WIN_POS_MOUSE);
gtk_signal_connect (GTK_OBJECT (windows[action]), "destroy",
GTK_SIGNAL_FUNC(gtk_widget_destroy),
@ -2350,7 +2350,7 @@ GtkWidget* makewindow (void)
gtk_object_set_data (GTK_OBJECT (window), "table2", table2);
gtk_widget_show (table2);
gtk_container_add (GTK_CONTAINER (frame4), table2);
gtk_container_border_width (GTK_CONTAINER (table2), 5);
gtk_container_set_border_width (GTK_CONTAINER (table2), 5);
gtk_table_set_col_spacings (GTK_TABLE (table2), 4);
gtk_table_set_row_spacings (GTK_TABLE (table2), 2);

4
plug-ins/common/tga.c
View File

@ -1459,11 +1459,11 @@ save_dialog (void)
/* regular tga parameter settings */
frame = gtk_frame_new (_("Targa Options"));
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_ETCHED_IN);
gtk_container_border_width (GTK_CONTAINER (frame), 6);
gtk_container_set_border_width (GTK_CONTAINER (frame), 6);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), frame, TRUE, TRUE, 0);
vbox = gtk_vbox_new (FALSE, 2);
gtk_container_border_width (GTK_CONTAINER (vbox), 4);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
gtk_container_add (GTK_CONTAINER (frame), vbox);
/* rle */

2
plug-ins/common/tileit.c
View File

@ -480,7 +480,7 @@ tileit_dialog (void)
table = gtk_table_new (6, 4, FALSE);
gtk_table_set_col_spacings (GTK_TABLE (table), 4);
gtk_table_set_row_spacings (GTK_TABLE (table), 2);
gtk_container_border_width (GTK_CONTAINER (table), 4);
gtk_container_set_border_width (GTK_CONTAINER (table), 4);
gtk_container_add (GTK_CONTAINER (xframe), table);
gtk_widget_show (table);

2
plug-ins/common/vpropagate.c
View File

@ -979,7 +979,7 @@ vpropagate_dialog (GimpImageBaseType image_type)
table = gtk_table_new (10, 3, FALSE); /* 4 raw, 2 columns(name and value) */
gtk_table_set_col_spacings (GTK_TABLE (table), 4);
gtk_table_set_row_spacings (GTK_TABLE (table), 2);
gtk_container_border_width (GTK_CONTAINER (table), 4);
gtk_container_set_border_width (GTK_CONTAINER (table), 4);
gtk_container_add (GTK_CONTAINER (frame), table);
adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 0,

20
plug-ins/common/warp.c
View File

@ -516,8 +516,8 @@ warp_dialog (GimpDrawable *drawable)
gtk_signal_connect (GTK_OBJECT (toggle), "toggled",
(GtkSignalFunc) gimp_radio_button_update,
&dvals.wrap_type);
gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (toggle),
dvals.wrap_type == WRAP);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle),
dvals.wrap_type == WRAP);
gtk_widget_show (toggle);
toggle = gtk_radio_button_new_with_label (group, _("Smear"));
@ -527,8 +527,8 @@ warp_dialog (GimpDrawable *drawable)
gtk_signal_connect (GTK_OBJECT (toggle), "toggled",
(GtkSignalFunc) gimp_radio_button_update,
&dvals.wrap_type);
gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (toggle),
dvals.wrap_type == SMEAR);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle),
dvals.wrap_type == SMEAR);
gtk_widget_show (toggle);
toggle = gtk_radio_button_new_with_label (group, _("Black"));
@ -538,8 +538,8 @@ warp_dialog (GimpDrawable *drawable)
gtk_signal_connect (GTK_OBJECT (toggle), "toggled",
(GtkSignalFunc) gimp_radio_button_update,
&dvals.wrap_type);
gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (toggle),
dvals.wrap_type == BLACK);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle),
dvals.wrap_type == BLACK);
gtk_widget_show (toggle);
toggle = gtk_radio_button_new_with_label (group, _("FG Color"));
@ -549,8 +549,8 @@ warp_dialog (GimpDrawable *drawable)
gtk_signal_connect (GTK_OBJECT (toggle), "toggled",
(GtkSignalFunc) gimp_radio_button_update,
&dvals.wrap_type);
gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (toggle),
dvals.wrap_type == COLOR);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle),
dvals.wrap_type == COLOR);
gtk_widget_show (toggle);
gtk_widget_show (toggle_hbox);
@ -614,7 +614,7 @@ warp_dialog (GimpDrawable *drawable)
/* Magnitude Usage */
toggle_hbox = gtk_hbox_new (FALSE, 4);
gtk_container_border_width (GTK_CONTAINER (toggle_hbox), 1);
gtk_container_set_border_width (GTK_CONTAINER (toggle_hbox), 1);
gtk_table_attach (GTK_TABLE (table), toggle_hbox, 2, 3, 2, 3,
GTK_FILL, GTK_FILL, 0, 0);
@ -623,7 +623,7 @@ warp_dialog (GimpDrawable *drawable)
gtk_signal_connect (GTK_OBJECT (toggle), "toggled",
(GtkSignalFunc) gimp_toggle_button_update,
&dvals.mag_use);
gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (toggle), dvals.mag_use);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), dvals.mag_use);
gtk_widget_show (toggle);
gtk_widget_show (toggle_hbox);

2
plug-ins/common/waves.c
View File

@ -404,7 +404,7 @@ pluginCoreIA (struct piArgs *argp,
table = gtk_table_new (3, 3, FALSE);
gtk_table_set_col_spacings (GTK_TABLE (table), 4);
gtk_table_set_row_spacings (GTK_TABLE (table), 2);
gtk_container_border_width (GTK_CONTAINER (table), 4);
gtk_container_set_border_width (GTK_CONTAINER (table), 4);
gtk_container_add (GTK_CONTAINER (frame), table);
adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 0,

2
plug-ins/common/wmf.c
View File

@ -947,7 +947,7 @@ load_dialog (gchar *file_name)
TRUE, TRUE, 0);
vbox = gtk_vbox_new (FALSE, 4);
gtk_container_border_width (GTK_CONTAINER (vbox), 4);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
gtk_container_add (GTK_CONTAINER (frame), vbox);
/* Scale label */

2
plug-ins/dbbrowser/plugin-browser.c
View File

@ -1030,7 +1030,7 @@ gimp_plugin_desc (void)
/* left = vbox : the list and the search entry */
plugindesc->left_paned = vbox = gtk_vbox_new (FALSE, 0);
gtk_container_border_width (GTK_CONTAINER (vbox), 3);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 3);
gtk_paned_pack1 (GTK_PANED (hbox), vbox, FALSE, FALSE);
gtk_widget_show (vbox);

2
plug-ins/flame/flame.c
View File

@ -473,7 +473,7 @@ make_file_dlg (void)
file_dlg = gtk_file_selection_new (NULL);
gtk_quit_add_destroy (1, GTK_OBJECT (file_dlg));
gtk_window_position (GTK_WINDOW (file_dlg), GTK_WIN_POS_MOUSE);
gtk_window_set_position (GTK_WINDOW (file_dlg), GTK_WIN_POS_MOUSE);
gtk_signal_connect_object (GTK_OBJECT (file_dlg), "delete_event",
GTK_SIGNAL_FUNC (file_cancel_callback),
GTK_OBJECT (file_dlg));

12
plug-ins/fp/fp_gtk.c
View File

@ -147,7 +147,7 @@ fp_create_circle_palette (void)
frame = gtk_frame_new (NULL);
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_ETCHED_IN);
gtk_container_border_width (GTK_CONTAINER (frame), 4);
gtk_container_set_border_width (GTK_CONTAINER (frame), 4);
gtk_widget_show (frame);
table = gtk_table_new (11, 11, FALSE);
@ -318,7 +318,7 @@ fp_create_lnd (void)
frame = gtk_frame_new (NULL);
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_ETCHED_IN);
gtk_container_border_width (GTK_CONTAINER (frame), 6);
gtk_container_set_border_width (GTK_CONTAINER (frame), 6);
gtk_widget_show (frame);
table = gtk_table_new (1, 11, FALSE);
@ -367,7 +367,7 @@ fp_create_msnls (void)
frame = gtk_frame_new (NULL);
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_ETCHED_IN);
gtk_container_border_width (GTK_CONTAINER (frame), 4);
gtk_container_set_border_width (GTK_CONTAINER (frame), 4);
gtk_widget_show (frame);
table = gtk_table_new (1, 11, FALSE);
@ -464,7 +464,7 @@ fp_create_frame_select (void)
GtkWidget *frame, *box;
frame = gtk_frame_new (_("Display"));
gtk_container_border_width (GTK_CONTAINER (frame), 4);
gtk_container_set_border_width (GTK_CONTAINER (frame), 4);
gtk_widget_show (frame);
box = gtk_hbox_new (FALSE, 8);
@ -571,7 +571,7 @@ Create_A_Table_Entry (GtkWidget **box,
GtkWidget *label, *button, *table;
*box = gtk_vbox_new (FALSE, 1);
gtk_container_border_width (GTK_CONTAINER (*box), PR_BX_BRDR);
gtk_container_set_border_width (GTK_CONTAINER (*box), PR_BX_BRDR);
gtk_widget_show (*box);
/* Delayed translation applied here */
@ -1044,7 +1044,7 @@ fp_advanced_dialog (void)
graphFrame = gtk_frame_new (NULL);
gtk_frame_set_shadow_type (GTK_FRAME (graphFrame), GTK_SHADOW_IN);
gtk_container_border_width (GTK_CONTAINER (graphFrame),0);
gtk_container_set_border_width (GTK_CONTAINER (graphFrame),0);
gtk_widget_show (graphFrame);
gtk_table_attach (GTK_TABLE (table), graphFrame, 0, 1, 0, 1,
GTK_EXPAND, 0, 0, 0);

12
plug-ins/gap/gap_arr_dialog.c
View File

@ -258,7 +258,7 @@ filesel_open_cb(GtkWidget *widget, t_arr_arg *arr_ptr)
filesel = gtk_file_selection_new (arr_ptr->label_txt);
arr_ptr->text_filesel = filesel;
gtk_window_position (GTK_WINDOW (filesel), GTK_WIN_POS_MOUSE);
gtk_window_set_position (GTK_WINDOW (filesel), GTK_WIN_POS_MOUSE);
gtk_signal_connect (GTK_OBJECT (GTK_FILE_SELECTION (filesel)->ok_button),
"clicked", (GtkSignalFunc) filesel_ok_cb,
@ -418,8 +418,8 @@ toggle_create_value(char *title, GtkTable *table, int row, t_arr_arg *arr_ptr)
gtk_signal_connect (GTK_OBJECT (check_button), "toggled",
(GtkSignalFunc) toggle_update_cb,
arr_ptr);
gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (check_button),
arr_ptr->int_ret);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button),
arr_ptr->int_ret);
if(arr_ptr->help_txt != NULL)
{
gimp_help_set_help_data(check_button, arr_ptr->help_txt,NULL);
@ -504,7 +504,7 @@ radio_create_value(char *title, GtkTable *table, int row, t_arr_arg *arr_ptr)
(GtkSignalFunc) radio_update_cb,
radio_ptr);
gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (radio_button),
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio_button),
l_radio_pressed);
if(l_radio_help_txt != NULL)
{
@ -749,7 +749,7 @@ gint p_array_std_dialog(char *title_txt,
/* dialog */
g_arrint.dlg = gtk_dialog_new ();
gtk_window_set_title (GTK_WINDOW (g_arrint.dlg), title_txt);
gtk_window_position (GTK_WINDOW (g_arrint.dlg), GTK_WIN_POS_MOUSE);
gtk_window_set_position (GTK_WINDOW (g_arrint.dlg), GTK_WIN_POS_MOUSE);
gtk_signal_connect (GTK_OBJECT (g_arrint.dlg), "destroy",
(GtkSignalFunc) arr_close_callback,
NULL);
@ -794,7 +794,7 @@ gint p_array_std_dialog(char *title_txt,
if (frame_txt == NULL) frame = gtk_frame_new ( _("Enter Values"));
else frame = gtk_frame_new (frame_txt);
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_ETCHED_IN);
gtk_container_border_width (GTK_CONTAINER (frame), 6);
gtk_container_set_border_width (GTK_CONTAINER (frame), 6);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (g_arrint.dlg)->vbox), frame, TRUE, TRUE, 0);
if(argc > 0)

7
plug-ins/gap/gap_dbbrowser_utils.c
View File

@ -84,7 +84,7 @@ gap_db_browser_dialog(char *title_txt,
dbbrowser->dlg = gtk_dialog_new ();
gtk_window_set_title (GTK_WINDOW (dbbrowser->dlg), _("Animated Filter apply (init)"));
gtk_window_position (GTK_WINDOW (dbbrowser->dlg), GTK_WIN_POS_MOUSE);
gtk_window_set_position (GTK_WINDOW (dbbrowser->dlg), GTK_WIN_POS_MOUSE);
gtk_signal_connect (GTK_OBJECT (dbbrowser->dlg), "destroy",
(GtkSignalFunc) dialog_close_callback,
dbbrowser);
@ -104,7 +104,7 @@ gap_db_browser_dialog(char *title_txt,
/* left = vbox : the list and the search entry */
vbox = gtk_vbox_new( FALSE, 0 );
gtk_container_border_width (GTK_CONTAINER (vbox), 3);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 3);
gtk_box_pack_start (GTK_BOX (hbox),
vbox, FALSE, TRUE, 0);
gtk_widget_show(vbox);
@ -159,8 +159,7 @@ gap_db_browser_dialog(char *title_txt,
/* buttons in dlg->action_aera */
gtk_container_border_width (GTK_CONTAINER (GTK_DIALOG(dbbrowser->dlg)->action_area), 0);
gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG(dbbrowser->dlg)->action_area), 0);
if (gap_debug) {
button = gtk_button_new_with_label ( _("Gen Code by name"));

44
plug-ins/gap/gap_mov_dialog.c
View File

@ -467,7 +467,7 @@ mov_dialog ( GimpDrawable *drawable, t_mov_path_preview *path_ptr,
ok_data.dlg = dlg;
ok_data.path_ptr = path_ptr;
gtk_window_set_title (GTK_WINDOW (dlg), _("Move Path"));
gtk_window_position (GTK_WINDOW (dlg), GTK_WIN_POS_MOUSE);
gtk_window_set_position (GTK_WINDOW (dlg), GTK_WIN_POS_MOUSE);
gtk_signal_connect (GTK_OBJECT (dlg), "destroy",
(GtkSignalFunc) mov_close_callback,
NULL);
@ -526,7 +526,7 @@ mov_dialog ( GimpDrawable *drawable, t_mov_path_preview *path_ptr,
/* parameter settings */
frame = gtk_frame_new ( _("Copy moving source-layer(s) into frames"));
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_ETCHED_IN);
gtk_container_border_width (GTK_CONTAINER (frame), 4);
gtk_container_set_border_width (GTK_CONTAINER (frame), 4);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), frame, TRUE, TRUE, 0);
/* the vbox */
@ -627,7 +627,8 @@ mov_dialog ( GimpDrawable *drawable, t_mov_path_preview *path_ptr,
gtk_signal_connect (GTK_OBJECT (check_button), "toggled",
(GtkSignalFunc) mov_gint_toggle_callback,
&pvals->src_force_visible);
gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (check_button), pvals->src_force_visible);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button),
pvals->src_force_visible);
gimp_help_set_help_data(check_button,
_("Force visibility for all copied Src-Layers")
, NULL);
@ -639,7 +640,8 @@ mov_dialog ( GimpDrawable *drawable, t_mov_path_preview *path_ptr,
gtk_signal_connect (GTK_OBJECT (check_button), "toggled",
(GtkSignalFunc) mov_gint_toggle_callback,
&pvals->clip_to_img);
gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (check_button), pvals->clip_to_img);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button),
pvals->clip_to_img);
gimp_help_set_help_data(check_button,
_("Clip all copied Src-Layers at Frame Boundaries")
, NULL);
@ -1343,7 +1345,7 @@ mov_pload_callback (GtkWidget *widget,
filesel = gtk_file_selection_new ( _("Load Path Points from file"));
path_ptr->filesel = filesel;
gtk_window_position (GTK_WINDOW (filesel), GTK_WIN_POS_MOUSE);
gtk_window_set_position (GTK_WINDOW (filesel), GTK_WIN_POS_MOUSE);
gtk_signal_connect (GTK_OBJECT (GTK_FILE_SELECTION (filesel)->ok_button),
"clicked", (GtkSignalFunc) p_points_load_from_file,
@ -1379,7 +1381,7 @@ mov_psave_callback (GtkWidget *widget,
filesel = gtk_file_selection_new ( _("Save Path Points to file"));
path_ptr->filesel = filesel;
gtk_window_position (GTK_WINDOW (filesel), GTK_WIN_POS_MOUSE);
gtk_window_set_position (GTK_WINDOW (filesel), GTK_WIN_POS_MOUSE);
gtk_signal_connect (GTK_OBJECT (GTK_FILE_SELECTION (filesel)->ok_button),
"clicked", (GtkSignalFunc) p_points_save_to_file,
@ -1721,13 +1723,15 @@ p_points_to_tab(t_mov_path_preview *path_ptr)
void
p_update_point_labels(t_mov_path_preview *path_ptr)
{
g_snprintf (&path_ptr->PointIndex_Label[0], LABEL_LENGTH, _("Current Point: [ %3d ] of [ %3d ]"),
g_snprintf (&path_ptr->PointIndex_Label[0], LABEL_LENGTH,
_("Current Point: [ %3d ] of [ %3d ]"),
pvals->point_idx + 1, pvals->point_idx_max +1);
if(NULL != path_ptr->PointIndex_LabelPtr)
{ gtk_label_set(GTK_LABEL(path_ptr->PointIndex_LabelPtr),
&path_ptr->PointIndex_Label[0]);
}
if (NULL != path_ptr->PointIndex_LabelPtr)
{
gtk_label_set_text (GTK_LABEL (path_ptr->PointIndex_LabelPtr),
&path_ptr->PointIndex_Label[0]);
}
}
@ -1918,12 +1922,11 @@ mov_src_sel_create()
(GtkSignalFunc) mov_src_sel_destroy,
path_ptr );
*/
gtk_frame_set_shadow_type( GTK_FRAME( frame ) ,GTK_SHADOW_ETCHED_IN );
gtk_container_border_width( GTK_CONTAINER( frame ), 2 );
gtk_frame_set_shadow_type (GTK_FRAME (frame) ,GTK_SHADOW_ETCHED_IN);
gtk_container_set_border_width (GTK_CONTAINER (frame), 2);
table = gtk_table_new ( 2, 4, FALSE );
gtk_container_border_width (GTK_CONTAINER (table), 2);
table = gtk_table_new (2, 4, FALSE);
gtk_container_set_border_width (GTK_CONTAINER (table), 2);
gtk_container_add (GTK_CONTAINER (frame), table);
gtk_table_set_row_spacings (GTK_TABLE (table), 2);
gtk_table_set_col_spacings (GTK_TABLE (table), 4);
@ -2079,7 +2082,7 @@ mov_path_prevw_create ( GimpDrawable *drawable, t_mov_path_preview *path_ptr)
(GtkSignalFunc) mov_path_prevw_destroy,
path_ptr );
gtk_frame_set_shadow_type( GTK_FRAME( frame ) ,GTK_SHADOW_ETCHED_IN );
gtk_container_border_width( GTK_CONTAINER( frame ), 2 );
gtk_container_set_border_width( GTK_CONTAINER( frame ), 2 );
/* the vbox */
vbox = gtk_vbox_new (FALSE, 3);
@ -2089,7 +2092,7 @@ mov_path_prevw_create ( GimpDrawable *drawable, t_mov_path_preview *path_ptr)
/* the table (4 rows) */
table = gtk_table_new ( 4, 6, FALSE );
gtk_container_border_width (GTK_CONTAINER (table), 2 );
gtk_container_set_border_width (GTK_CONTAINER (table), 2 );
gtk_table_set_row_spacings (GTK_TABLE (table), 2);
gtk_table_set_col_spacings (GTK_TABLE (table), 4);
gtk_box_pack_start (GTK_BOX (vbox), table, TRUE, TRUE, 0);
@ -2228,7 +2231,7 @@ mov_path_prevw_create ( GimpDrawable *drawable, t_mov_path_preview *path_ptr)
/* the preview table (1 rows) */
pv_table = gtk_table_new ( 1, 1, FALSE );
gtk_container_border_width (GTK_CONTAINER (pv_table), 2 );
gtk_container_set_border_width (GTK_CONTAINER (pv_table), 2 );
gtk_table_set_row_spacings (GTK_TABLE (pv_table), 2);
gtk_table_set_col_spacings (GTK_TABLE (pv_table), 4);
gtk_box_pack_start (GTK_BOX (hbox), pv_table, TRUE, TRUE, 0);
@ -2303,7 +2306,8 @@ mov_path_prevw_create ( GimpDrawable *drawable, t_mov_path_preview *path_ptr)
gtk_signal_connect (GTK_OBJECT (check_button), "toggled",
(GtkSignalFunc) mov_show_path_callback,
path_ptr);
gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (check_button), path_ptr->show_path);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button),
path_ptr->show_path);
gimp_help_set_help_data(check_button,
_("Show Path Lines and enable "
"pick/drag with left button "

5
plug-ins/gap/gap_navigator_dialog.c
View File

@ -887,7 +887,8 @@ void navi_reload_ainfo_force(gint32 image_id)
sprintf(frame_nr_to_char, "%04d - %04d"
, (int)naviD->ainfo_ptr->first_frame_nr
, (int)naviD->ainfo_ptr->last_frame_nr );
gtk_label_set (GTK_LABEL (naviD->framerange_number_label), frame_nr_to_char);
gtk_label_set_text (GTK_LABEL (naviD->framerange_number_label),
frame_nr_to_char);
}
if(old_ainfo_ptr) p_free_ainfo(&old_ainfo_ptr);
@ -2714,7 +2715,7 @@ frame_widget_time_label_update(FrameWidget *fw)
navi_calc_frametiming(fw->frame_nr, frame_nr_to_time);
gtk_label_set (GTK_LABEL (fw->time_label), frame_nr_to_time);
gtk_label_set_text (GTK_LABEL (fw->time_label), frame_nr_to_time);
}
static FrameWidget *

4
plug-ins/gap/gap_resi_dialog.c
View File

@ -125,7 +125,7 @@ p_resi_dialog (gint32 image_id, t_gap_asiz asiz_mode, char *title_text,
image_resize->shell = gtk_dialog_new ();
l_resint.dlg = image_resize->shell;
gtk_window_set_title (GTK_WINDOW (image_resize->shell), title_text);
gtk_window_position (GTK_WINDOW (image_resize->shell), GTK_WIN_POS_MOUSE);
gtk_window_set_position (GTK_WINDOW (image_resize->shell), GTK_WIN_POS_MOUSE);
gtk_signal_connect (GTK_OBJECT (image_resize->shell), "destroy",
(GtkSignalFunc) res_cancel_callback,
NULL);
@ -141,7 +141,7 @@ p_resi_dialog (gint32 image_id, t_gap_asiz asiz_mode, char *title_text,
/* the main vbox */
vbox = gtk_vbox_new (FALSE, 1);
gtk_container_border_width (GTK_CONTAINER (vbox), 1);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 1);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (image_resize->shell)->vbox), vbox, TRUE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (vbox), image_resize->resize->resize_widget, FALSE, FALSE, 0);

50
plug-ins/gdyntext/gdyntext_ui.c
View File

@ -123,11 +123,16 @@ static guchar col[3];
static GtkWidget *
create_message_window (GtkWidget **mw)
{
*mw = message_window_new(_("GDynText: Messages Window"));
gtk_widget_set_usize(*mw, 430, 170);
gtk_window_position(GTK_WINDOW(*mw), GTK_WIN_POS_CENTER);
gtk_signal_connect(GTK_OBJECT(*mw), "destroy", GTK_SIGNAL_FUNC(on_window_destroy), mw);
gtk_signal_connect(GTK_OBJECT(MESSAGE_WINDOW(*mw)->dismiss_button), "clicked", GTK_SIGNAL_FUNC(on_window_close), *mw);
*mw = message_window_new (_("GDynText: Messages Window"));
gtk_widget_set_usize (*mw, 430, 170);
gtk_window_set_position (GTK_WINDOW (*mw), GTK_WIN_POS_CENTER);
gtk_signal_connect (GTK_OBJECT (*mw), "destroy",
GTK_SIGNAL_FUNC (on_window_destroy),
mw);
gtk_signal_connect (GTK_OBJECT (MESSAGE_WINDOW (*mw)->dismiss_button),
"clicked",
GTK_SIGNAL_FUNC (on_window_close),
*mw);
return *mw;
}
@ -148,10 +153,10 @@ create_about_dialog (void)
GtkWidget *vbox1;
window = gtk_window_new(GTK_WINDOW_DIALOG);
gtk_container_border_width(GTK_CONTAINER(window), 0);
gtk_container_set_border_width(GTK_CONTAINER(window), 0);
gtk_window_set_title(GTK_WINDOW(window), _("GDynText: About ..."));
gtk_window_set_policy(GTK_WINDOW(window), FALSE, FALSE, FALSE);
gtk_window_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
gimp_dialog_set_icon (GTK_WINDOW (window));
gtk_signal_connect(GTK_OBJECT(window), "destroy",
GTK_SIGNAL_FUNC(on_about_dialog_destroy), NULL);
@ -265,7 +270,7 @@ create_main_window (GdtMainWindow **main_window,
g_free (title);
gtk_window_set_policy(GTK_WINDOW(mw->window), TRUE, TRUE, FALSE);
gtk_widget_set_usize(mw->window, 550, 400);
gtk_container_border_width(GTK_CONTAINER(mw->window), 0);
gtk_container_set_border_width(GTK_CONTAINER(mw->window), 0);
gtk_signal_connect(GTK_OBJECT(mw->window), "destroy",
GTK_SIGNAL_FUNC(on_main_window_cancel_clicked), &mw->ok_pressed);
gtk_widget_realize(mw->window);
@ -299,7 +304,7 @@ create_main_window (GdtMainWindow **main_window,
NULL, _("Toggle creation of a new layer"), NULL,
gtk_icon,
NULL, NULL);
gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(telem), data->new_layer);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (telem), data->new_layer);
gtk_signal_connect(GTK_OBJECT(telem), "toggled", GTK_SIGNAL_FUNC(on_button_toggled), &data->new_layer);
gtk_widget_set_sensitive(telem, !data->new_layer);
@ -339,7 +344,7 @@ create_main_window (GdtMainWindow **main_window,
NULL, _("Toggle anti-aliased text"), NULL,
gtk_icon,
NULL, NULL);
gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(telem), data->antialias);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (telem), data->antialias);
gtk_signal_connect(GTK_OBJECT(telem), "clicked", GTK_SIGNAL_FUNC(on_button_toggled), &data->antialias);
gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
@ -352,7 +357,8 @@ create_main_window (GdtMainWindow **main_window,
NULL, _("Left aligned text"), NULL,
gtk_icon,
GTK_SIGNAL_FUNC(on_main_window_align_l_clicked), &data->alignment);
gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(telem), data->alignment == LEFT);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (telem),
data->alignment == LEFT);
/* CENTER Align */
icon = gdk_pixmap_create_from_xpm_d(mw->window->window, &mask, &toolbar->style->bg[GTK_STATE_NORMAL], align_center_xpm);
@ -363,7 +369,8 @@ create_main_window (GdtMainWindow **main_window,
NULL, _("Centered text"), NULL,
gtk_icon,
GTK_SIGNAL_FUNC(on_main_window_align_c_clicked), &data->alignment);
gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(telem), data->alignment == CENTER);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (telem),
data->alignment == CENTER);
/* RIGHT Align */
icon = gdk_pixmap_create_from_xpm_d(mw->window->window, &mask, &toolbar->style->bg[GTK_STATE_NORMAL], align_right_xpm);
@ -374,7 +381,8 @@ create_main_window (GdtMainWindow **main_window,
NULL, _("Right aligned text"), NULL,
gtk_icon,
GTK_SIGNAL_FUNC(on_main_window_align_r_clicked), &data->alignment);
gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(telem), data->alignment == RIGHT);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (telem),
data->alignment == RIGHT);
gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
@ -385,7 +393,7 @@ create_main_window (GdtMainWindow **main_window,
NULL, _("Toggle text font preview"), NULL,
gtk_icon,
NULL, NULL);
gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(font_preview_toggle), FALSE);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (font_preview_toggle), FALSE);
gtk_signal_connect(GTK_OBJECT(font_preview_toggle), "toggled", GTK_SIGNAL_FUNC(on_font_preview_toggled), NULL);
gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
@ -598,7 +606,8 @@ create_main_window (GdtMainWindow **main_window,
/* setup font preview */
if (data->preview)
{
gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(font_preview_toggle), TRUE);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (font_preview_toggle),
TRUE);
gtk_toggle_button_toggled(GTK_TOGGLE_BUTTON(font_preview_toggle));
}
@ -666,7 +675,7 @@ on_main_window_apply_clicked (GtkWidget *widget,
gimp_set_data("plug_in_gdyntext", data, sizeof(GdtVals));
if (data->new_layer)
{
gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(main_window->new_layer_toggle), FALSE);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (main_window->new_layer_toggle), FALSE);
if (!GTK_WIDGET_SENSITIVE(main_window->new_layer_toggle))
gtk_widget_set_sensitive(main_window->new_layer_toggle, TRUE);
}
@ -785,7 +794,7 @@ gtk_text_set_font (GtkText *text,
gtk_text_insert(text, style->font, NULL, NULL, " ", -1);
gtk_editable_delete_text(GTK_EDITABLE(text), 0, -1);
}
gtk_widget_set_style(GTK_WIDGET(text), style);
gtk_widget_set_style (GTK_WIDGET(text), style);
gtk_text_set_point(GTK_TEXT(main_window->textarea), pos);
gtk_text_thaw(text);
}
@ -853,7 +862,8 @@ on_charmap_button_toggled (GtkWidget *widget,
{
charmap_window = charmap_window_new(_("GDynText: CharMap"));
gtk_widget_set_usize(charmap_window, 430, 270);
gtk_window_position(GTK_WINDOW(charmap_window), GTK_WIN_POS_CENTER);
gtk_window_set_position (GTK_WINDOW (charmap_window),
GTK_WIN_POS_CENTER);
gtk_signal_connect(GTK_OBJECT(charmap_window), "destroy", GTK_SIGNAL_FUNC(on_window_destroy), &charmap_window);
gtk_signal_connect(GTK_OBJECT(CHARMAP_WINDOW(charmap_window)->close_button), "clicked", GTK_SIGNAL_FUNC(on_window_close), charmap_window);
gtk_signal_connect(GTK_OBJECT(CHARMAP_WINDOW(charmap_window)->insert_button), "clicked", GTK_SIGNAL_FUNC(on_charmap_window_insert), charmap_window);
@ -874,8 +884,8 @@ static void
toggle_button_update (GtkWidget *widget,
GtkWidget *window)
{
gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(widget),
window ? GTK_WIDGET_VISIBLE(window) : FALSE);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget),
window ? GTK_WIDGET_VISIBLE (window) : FALSE);
}

6
plug-ins/gfig/gfig.c
View File

@ -1553,7 +1553,7 @@ create_file_selection (GFigObj *obj,
if (!window)
{
window = gtk_file_selection_new ("Save gfig drawing");
gtk_window_position (GTK_WINDOW (window), GTK_WIN_POS_MOUSE);
gtk_window_set_position (GTK_WINDOW (window), GTK_WIN_POS_MOUSE);
gtk_signal_connect (GTK_OBJECT (window), "destroy",
GTK_SIGNAL_FUNC (gtk_widget_destroyed),
@ -2314,7 +2314,7 @@ gfig_brush_preview (GtkWidget **pv)
frame = gtk_frame_new (NULL);
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
gtk_container_border_width (GTK_CONTAINER (frame), 0);
gtk_container_set_border_width (GTK_CONTAINER (frame), 0);
gtk_widget_show (frame);
*pv = gtk_preview_new (GTK_PREVIEW_COLOR);
@ -4561,7 +4561,7 @@ load_button_callback (GtkWidget *widget,
/* Load a single object */
window = gtk_file_selection_new (_("Load Gfig obj"));
gtk_window_position (GTK_WINDOW (window), GTK_WIN_POS_MOUSE);
gtk_window_set_position (GTK_WINDOW (window), GTK_WIN_POS_MOUSE);
gtk_signal_connect (GTK_OBJECT (window), "destroy",
GTK_SIGNAL_FUNC (gtk_widget_destroyed),

6
plug-ins/gimpressionist/brush.c
View File

@ -187,7 +187,7 @@ void savebrush(GtkWidget *wg, gpointer data)
sprintf(path, "%s/Brushes/", (char *)thispath->data);
window = gtk_file_selection_new( _("Save brush"));
gtk_window_position (GTK_WINDOW (window), GTK_WIN_POS_MOUSE);
gtk_window_set_position (GTK_WINDOW (window), GTK_WIN_POS_MOUSE);
gtk_file_selection_set_filename(GTK_FILE_SELECTION(window), path);
@ -358,7 +358,7 @@ void create_brushpage(GtkNotebook *notebook)
gtk_widget_show_all(menubox);
thispage = gtk_vbox_new(FALSE, 0);
gtk_container_border_width (GTK_CONTAINER (thispage), 5);
gtk_container_set_border_width (GTK_CONTAINER (thispage), 5);
gtk_widget_show(thispage);
box1 = gtk_hbox_new (FALSE, 0);
@ -387,7 +387,7 @@ void create_brushpage(GtkNotebook *notebook)
box2 = gtk_vbox_new (FALSE, 0);
gtk_box_pack_start(GTK_BOX(box1), box2,FALSE,FALSE,0);
gtk_widget_show (box2);
gtk_container_border_width (GTK_CONTAINER (box2), 5);
gtk_container_set_border_width (GTK_CONTAINER (box2), 5);
tmpw = gtk_label_new( _("Brush Preview:"));
gtk_box_pack_start(GTK_BOX(box2), tmpw,FALSE,FALSE,0);

20
plug-ins/gimpressionist/gimpressionist.c
View File

@ -182,15 +182,15 @@ void restorevals(void)
gtk_adjustment_set_value(GTK_ADJUSTMENT(paperreliefadjust), pcvals.paperrelief);
gtk_adjustment_set_value(GTK_ADJUSTMENT(paperscaleadjust), pcvals.paperscale);
gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(paperinvert), pcvals.paperinvert);
gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(generalpaintedges), pcvals.generalpaintedges);
gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(generaltileable), pcvals.generaltileable);
gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(generaldropshadow), pcvals.generaldropshadow);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(paperinvert), pcvals.paperinvert);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(generalpaintedges), pcvals.generalpaintedges);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(generaltileable), pcvals.generaltileable);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(generaldropshadow), pcvals.generaldropshadow);
gtk_adjustment_set_value(GTK_ADJUSTMENT(generalshadowdepth), pcvals.generalshadowdepth);
gtk_adjustment_set_value(GTK_ADJUSTMENT(generalshadowblur), pcvals.generalshadowblur);
gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(placecenter), pcvals.placecenter);
gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(paperoverlay), pcvals.paperoverlay);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(placecenter), pcvals.placecenter);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(paperoverlay), pcvals.paperoverlay);
drawcolor(NULL);
@ -344,7 +344,7 @@ void showabout(void)
}
window = gtk_dialog_new();
gtk_window_set_title(GTK_WINDOW(window), _("The GIMPressionist!"));
gtk_window_position(GTK_WINDOW(window), GTK_WIN_POS_MOUSE);
gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_MOUSE);
gtk_signal_connect(GTK_OBJECT(window), "destroy",
GTK_SIGNAL_FUNC (gtk_widget_destroyed),
&window);
@ -364,7 +364,7 @@ void showabout(void)
gtk_widget_show(tmpw);
tmpvbox = gtk_vbox_new(FALSE, 5);
gtk_container_border_width(GTK_CONTAINER(tmpvbox), 5);
gtk_container_set_border_width(GTK_CONTAINER(tmpvbox), 5);
gtk_container_add(GTK_CONTAINER(GTK_DIALOG(window)->vbox), tmpvbox);
tmphbox = gtk_hbox_new(TRUE, 5);
@ -440,7 +440,7 @@ int create_dialog(void)
NULL);
gtk_window_set_title (GTK_WINDOW (window), _("The GIMPressionist!"));
gtk_container_border_width (GTK_CONTAINER (window), 5);
gtk_container_set_border_width (GTK_CONTAINER (window), 5);
box1 = gtk_hbox_new (FALSE, 0);
gtk_container_add (GTK_CONTAINER (window), box1);
@ -453,7 +453,7 @@ int create_dialog(void)
notebook = gtk_notebook_new ();
gtk_notebook_set_tab_pos (GTK_NOTEBOOK (notebook), GTK_POS_TOP);
gtk_box_pack_start (GTK_BOX (box1), notebook, TRUE, TRUE, 5);
gtk_container_border_width (GTK_CONTAINER (notebook), 0);
gtk_container_set_border_width (GTK_CONTAINER (notebook), 0);
gtk_widget_realize (notebook);
gtk_widget_show(notebook);

2
plug-ins/pagecurl/pagecurl.c
View File

@ -637,7 +637,7 @@ do_dialog (void)
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
hbox = gtk_hbox_new (FALSE, 4);
gtk_container_border_width (GTK_CONTAINER (hbox), 2);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 2);
gtk_container_add (GTK_CONTAINER (frame), hbox);
{

2
plug-ins/print/gimp_main_window.c
View File

@ -751,7 +751,7 @@ gimp_create_main_window (void)
*/
table = gtk_table_new (5, 2, FALSE);
gtk_container_border_width (GTK_CONTAINER (table), 6);
gtk_container_set_border_width (GTK_CONTAINER (table), 6);
gtk_table_set_col_spacings (GTK_TABLE (table), 4);
gtk_table_set_row_spacings (GTK_TABLE (table), 8);
gtk_table_set_row_spacing (GTK_TABLE (table), 0, 100);

11
plug-ins/rcm/rcm_callback.c
View File

@ -146,8 +146,9 @@ rcm_cw_ccw (GtkWidget *button,
rcm_set_pixmap(&circle->cw_ccw_pixmap, circle->cw_ccw_button->parent,
circle->cw_ccw_box, (circle->angle->cw_ccw>0) ? rcm_cw : rcm_ccw);
gtk_label_set(GTK_LABEL(circle->cw_ccw_label),
(circle->angle->cw_ccw>0) ? _("Switch to clockwise") : _("Switch to c/clockwise"));
gtk_label_set_text (GTK_LABEL (circle->cw_ccw_label),
(circle->angle->cw_ccw>0) ?
_("Switch to clockwise") : _("Switch to c/clockwise"));
rcm_a_to_b(button, circle);
}
@ -186,7 +187,7 @@ rcm_spinbutton_to_degrees (GtkWidget *button,
adj->page_increment = 1.0;
gtk_spin_button_set_digits(GTK_SPIN_BUTTON(button), 2);
gtk_label_set(GTK_LABEL(label), rcm_units_string(Current.Units));
gtk_label_set_text (GTK_LABEL(label), rcm_units_string(Current.Units));
}
void
@ -239,7 +240,7 @@ rcm_spinbutton_to_radians (GtkWidget *button,
adj->page_increment = 0.001;
gtk_spin_button_set_digits(GTK_SPIN_BUTTON(button), 4);
gtk_label_set(GTK_LABEL(label), rcm_units_string(Current.Units));
gtk_label_set_text (GTK_LABEL(label), rcm_units_string(Current.Units));
}
void
@ -292,7 +293,7 @@ rcm_spinbutton_to_radians_over_PI (GtkWidget *button,
adj->page_increment = 0.001;
gtk_spin_button_set_digits(GTK_SPIN_BUTTON(button), 4);
gtk_label_set(GTK_LABEL(label), rcm_units_string(Current.Units));
gtk_label_set_text (GTK_LABEL(label), rcm_units_string(Current.Units));
}
void

8
plug-ins/rcm/rcm_dialog.c
View File

@ -84,7 +84,7 @@ rcm_create_one_preview (GtkWidget **preview,
{
*frame = gtk_frame_new(NULL);
gtk_frame_set_shadow_type(GTK_FRAME(*frame), GTK_SHADOW_IN);
gtk_container_border_width(GTK_CONTAINER(*frame), 0);
gtk_container_set_border_width(GTK_CONTAINER(*frame), 0);
gtk_widget_show(*frame);
*preview = gtk_preview_new(GTK_PREVIEW_COLOR);
@ -217,7 +217,7 @@ rcm_create_one_circle (gint height,
/** Main: Circle: create (main) frame **/
st->frame = gtk_frame_new(label_content);
gtk_container_border_width(GTK_CONTAINER(st->frame), 0);
gtk_container_set_border_width(GTK_CONTAINER(st->frame), 0);
gtk_widget_show(st->frame);
/** Main: Circle: create frame & preview **/
@ -225,7 +225,7 @@ rcm_create_one_circle (gint height,
/* create frame */
frame = gtk_frame_new(NULL);
gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_IN);
gtk_container_border_width(GTK_CONTAINER(frame), 0);
gtk_container_set_border_width(GTK_CONTAINER(frame), 0);
gtk_widget_show(frame);
/* create preview */
@ -634,7 +634,7 @@ rcm_create_misc (void)
button = gtk_check_button_new_with_label (_("Continuous update"));
gtk_box_pack_start(GTK_BOX(preview_vbox), button, FALSE, FALSE, 0);
gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (button), Current.RealTime);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), Current.RealTime);
gtk_signal_connect (GTK_OBJECT (button), "clicked",
(GtkSignalFunc) (GtkSignalFunc) rcm_preview_as_you_drag,

6
plug-ins/script-fu/script-fu-console.c
View File

@ -192,8 +192,8 @@ script_fu_console_interface (void)
gtk_signal_connect (GTK_OBJECT (dlg), "destroy",
GTK_SIGNAL_FUNC (gtk_widget_destroyed),
&dlg);
gtk_container_border_width (GTK_CONTAINER (GTK_DIALOG (dlg)->vbox), 2);
gtk_container_border_width (GTK_CONTAINER (GTK_DIALOG (dlg)->action_area), 0);
gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dlg)->vbox), 2);
gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dlg)->action_area), 0);
/* Action area */
button = gtk_button_new_with_label (_("Close"));
@ -227,7 +227,7 @@ script_fu_console_interface (void)
GTK_EXPAND | GTK_SHRINK | GTK_FILL,
GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0);
gtk_container_border_width (GTK_CONTAINER (table), 2);
gtk_container_set_border_width (GTK_CONTAINER (table), 2);
cint.font_strong = gdk_font_load ("-*-helvetica-bold-r-normal-*-*-120-*-*-*-*-*-*");
cint.font_emphasis = gdk_font_load ("-*-helvetica-medium-o-normal-*-*-100-*-*-*-*-*-*");

4
plug-ins/script-fu/script-fu-interface.c
View File

@ -1865,7 +1865,7 @@ script_fu_about_callback (GtkWidget *widget,
dialog = gtk_dialog_new ();
gtk_window_set_title (GTK_WINDOW (dialog), title);
gtk_window_position (GTK_WINDOW (dialog), GTK_WIN_POS_MOUSE);
gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_MOUSE);
gtk_signal_connect (GTK_OBJECT (dialog), "delete_event",
GTK_SIGNAL_FUNC (script_fu_about_dialog_delete),
dialog);
@ -2123,7 +2123,7 @@ script_fu_font_preview_callback (GtkWidget *widget,
fsd = GTK_FONT_SELECTION_DIALOG (font->dialog);
gtk_font_selection_dialog_set_font_name (fsd, font->fontname);
gtk_window_position (GTK_WINDOW (font->dialog), GTK_WIN_POS_MOUSE);
gtk_window_set_position (GTK_WINDOW (font->dialog), GTK_WIN_POS_MOUSE);
gtk_widget_show (font->dialog);
}

4
plug-ins/script-fu/script-fu-scripts.c
View File

@ -1865,7 +1865,7 @@ script_fu_about_callback (GtkWidget *widget,
dialog = gtk_dialog_new ();
gtk_window_set_title (GTK_WINDOW (dialog), title);
gtk_window_position (GTK_WINDOW (dialog), GTK_WIN_POS_MOUSE);
gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_MOUSE);
gtk_signal_connect (GTK_OBJECT (dialog), "delete_event",
GTK_SIGNAL_FUNC (script_fu_about_dialog_delete),
dialog);
@ -2123,7 +2123,7 @@ script_fu_font_preview_callback (GtkWidget *widget,
fsd = GTK_FONT_SELECTION_DIALOG (font->dialog);
gtk_font_selection_dialog_set_font_name (fsd, font->fontname);
gtk_window_position (GTK_WINDOW (font->dialog), GTK_WIN_POS_MOUSE);
gtk_window_set_position (GTK_WINDOW (font->dialog), GTK_WIN_POS_MOUSE);
gtk_widget_show (font->dialog);
}

2
plug-ins/script-fu/script-fu-server.c
View File

@ -556,7 +556,7 @@ server_interface (void)
table = gtk_table_new (2, 2, FALSE);
gtk_table_set_col_spacings (GTK_TABLE (table), 4);
gtk_table_set_row_spacings (GTK_TABLE (table), 2);
gtk_container_border_width (GTK_CONTAINER (table), 4);
gtk_container_set_border_width (GTK_CONTAINER (table), 4);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), table, TRUE, TRUE, 0);
/* The server port */

6
plug-ins/sel2path/sel2path_adv_dialog.c
View File

@ -61,8 +61,8 @@ reset_adv_dialog (void)
}
else if (GTK_IS_TOGGLE_BUTTON (widget))
{
gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (widget),
(gboolean)(*value));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget),
(gboolean)(*value));
}
else
g_warning ("Internal widget list error");
@ -249,7 +249,7 @@ dialog_create_selection_area (SELVALS *sels)
gtk_object_set_data (GTK_OBJECT (adj), "default_value", def_val (2.0));
check = gtk_check_button_new_with_label ("Keep Knees");
gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (check), sels->keep_knees);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), sels->keep_knees);
gtk_table_attach (GTK_TABLE (table), check, 1, 3, row, row + 1,
GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
gimp_help_set_help_data (GTK_WIDGET (check),

4
plug-ins/xjt/xjt.c
View File

@ -814,7 +814,7 @@ save_dialog (void)
gtk_container_add (GTK_CONTAINER (frame), table);
toggle = gtk_check_button_new_with_label (_("Optimize"));
gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (toggle), jsvals.optimize);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), jsvals.optimize);
gtk_table_attach (GTK_TABLE (table), toggle, 0, 3, 0, 1,
GTK_FILL, 0, 0, 0);
gtk_signal_connect (GTK_OBJECT (toggle), "toggled",
@ -823,7 +823,7 @@ save_dialog (void)
gtk_widget_show (toggle);
toggle = gtk_check_button_new_with_label (_("Clear Transparent"));
gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (toggle),
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle),
jsvals.clr_transparent);
gtk_table_attach (GTK_TABLE (table), toggle, 0, 3, 1, 2,
GTK_FILL, 0, 0, 0);