Commit b9413eb0 authored by Michael Natterer's avatar Michael Natterer 😴 Committed by Michael Natterer
Browse files

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.
parent 77856099
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
......
......@@ -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))
{
......
......@@ -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);
}
......
......@@ -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
......
......@@ -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);
}
......
......@@ -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);
}
......
......@@ -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 &&
......
......@@ -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);
}
......
......@@ -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
......
......@@ -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 &&
......
......@@ -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);
}
......
......@@ -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);
}
......
......@@ -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
......
......@@ -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);
}
......
......@@ -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)
......
......@@ -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);
......
......@@ -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);
......
......@@ -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),
......
......@@ -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);
......
......@@ -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"));
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment