Commit 14d0a3ff authored by Michael Natterer's avatar Michael Natterer 😴 Committed by Michael Natterer

app/gimpprogress.c app/nav_window.c app/ops_buttons.c app/undo_history.c

2001-12-29  Michael Natterer  <mitch@gimp.org>

	* app/gimpprogress.c
	* app/nav_window.c
	* app/ops_buttons.c
	* app/undo_history.c
	* app/display/gimpdisplayshell.c
	* app/gui/about-dialog.c
	* app/gui/brush-editor.c
	* app/gui/channels-commands.c
	* app/gui/color-area.c
	* app/gui/color-notebook.c
	* app/gui/color-select.c
	* app/gui/colormap-dialog.c
	* app/gui/convert-dialog.c
	* app/gui/device-status-dialog.c
	* app/gui/file-new-dialog.c
	* app/gui/file-open-dialog.c
	* app/gui/file-save-dialog.c
	* app/gui/gradient-editor.c
	* app/gui/info-dialog.c
	* app/gui/layers-commands.c
	* app/gui/module-browser.c
	* app/gui/offset-dialog.c
	* app/gui/palette-editor.c
	* app/gui/palettes-commands.c
	* app/gui/paths-dialog.c
	* app/gui/qmask-commands.c
	* app/gui/resize-dialog.c
	* app/gui/resolution-calibrate-dialog.c
	* app/gui/splash.c
	* app/gui/tips-dialog.c
	* app/gui/toolbox.c
	* app/gui/user-install-dialog.c
	* app/tools/gimpbrightnesscontrasttool.c
	* app/tools/gimpbycolorselecttool.c
	* app/tools/gimpcolorbalancetool.c
	* app/tools/gimpcolorpickertool.c
	* app/tools/gimpcroptool.c
	* app/tools/gimpcurvestool.c
	* app/tools/gimphuesaturationtool.c
	* app/tools/gimpinktool.c
	* app/tools/gimplevelstool.c
	* app/tools/gimpposterizetool.c
	* app/tools/gimprotatetool.c
	* app/tools/gimpthresholdtool.c
	* app/tools/paint_options.c
	* app/tools/selection_options.c
	* app/widgets/gimpchannellistview.c
	* app/widgets/gimpcolorpanel.c
	* app/widgets/gimpcomponentlistitem.c
	* app/widgets/gimpconstrainedhwrapbox.c
	* app/widgets/gimpcontainergridview.c
	* app/widgets/gimpcontainerlistview.c
	* app/widgets/gimpcontainermenuimpl.c
	* app/widgets/gimpdialogfactory.c
	* app/widgets/gimpdnd.c
	* app/widgets/gimpdock.c
	* app/widgets/gimpdockbook.c
	* app/widgets/gimpdrawablelistitem.c
	* app/widgets/gimpdrawablelistview.c
	* app/widgets/gimpfontselection-dialog.c
	* app/widgets/gimphistogramview.c
	* app/widgets/gimpitemfactory.c
	* app/widgets/gimplayerlistitem.c
	* app/widgets/gimplistitem.[ch]
	* app/widgets/gimpmenuitem.c
	* app/widgets/gimppreview.[ch]
	* app/widgets/gtkhwrapbox.c
	* app/widgets/gtkvwrapbox.c
	* app/widgets/gtkwrapbox.c
	* libgimp/gimpbrushmenu.c
	* libgimp/gimpexport.c
	* libgimp/gimpgradientmenu.c
	* libgimp/gimpmenu.c
	* libgimp/gimppatternmenu.c
	* libgimpwidgets/gimpbutton.c
	* libgimpwidgets/gimpchainbutton.[ch]
	* libgimpwidgets/gimpcolorarea.h
	* libgimpwidgets/gimpcolorbutton.c
	* libgimpwidgets/gimpfileselection.c
	* libgimpwidgets/gimphelpui.c
	* libgimpwidgets/gimpoffsetarea.c
	* libgimpwidgets/gimppatheditor.c
	* libgimpwidgets/gimppixmap.h
	* libgimpwidgets/gimpquerybox.c
	* libgimpwidgets/gimpstock.[ch]
	* libgimpwidgets/gimpwidgets.h
	* plug-ins/FractalExplorer/Dialogs.c
	* plug-ins/FractalExplorer/Events.c
	* plug-ins/FractalExplorer/FractalExplorer.c
	* plug-ins/Lighting/lighting_ui.c
	* plug-ins/MapObject/mapobject_ui.c
	* plug-ins/bmp/bmpwrite.c
	* plug-ins/dbbrowser/dbbrowser_utils.c
	* plug-ins/fits/fits.c
	* plug-ins/flame/flame.c
	* plug-ins/fp/fp_gtk.c
	* plug-ins/fp/fp_misc.c
	* plug-ins/gfig/gfig.c
	* plug-ins/gflare/gflare.c
	* plug-ins/gfli/gfli.c
	* plug-ins/gimpressionist/*.c
	* plug-ins/imagemap/*.[ch]
	* plug-ins/maze/maze_face.c
	* plug-ins/mosaic/mosaic.c
	* plug-ins/pagecurl/pagecurl.c
	* plug-ins/print/print_gimp.h
	* plug-ins/rcm/rcm_callback.c
	* plug-ins/rcm/rcm_dialog.c
	* plug-ins/rcm/rcm_misc.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.c
	* plug-ins/sel2path/sel2path_adv_dialog.c
	* plug-ins/sgi/sgi.c
	* plug-ins/webbrowser/webbrowser.c
	* plug-ins/xjt/xjt.c
	* plug-ins/common/[A-n]*.c: compile with GTK_DISABLE_DEPRECATED
	defined. Not everything is fully ported yet, had to #undef
	GTK_DISABLE_DEPRECATED in many places and added #warnings when
	doing so.

	* pixmaps/Makefile.am
	* pixmaps/chain.xpm: removed.

	* themes/Default/Makefile.am
	* themes/Default/images/Makefile.am
	* themes/Default/images/stock-button-hchain-broken.png
	* themes/Default/images/stock-button-hchain.png
	* themes/Default/images/stock-button-vchain-broken.png
	* themes/Default/images/stock-button-vchain.png: new stock icons.
parent 64424f6c
2001-12-29 Michael Natterer <mitch@gimp.org>
* app/gimpprogress.c
* app/nav_window.c
* app/ops_buttons.c
* app/undo_history.c
* app/display/gimpdisplayshell.c
* app/gui/about-dialog.c
* app/gui/brush-editor.c
* app/gui/channels-commands.c
* app/gui/color-area.c
* app/gui/color-notebook.c
* app/gui/color-select.c
* app/gui/colormap-dialog.c
* app/gui/convert-dialog.c
* app/gui/device-status-dialog.c
* app/gui/file-new-dialog.c
* app/gui/file-open-dialog.c
* app/gui/file-save-dialog.c
* app/gui/gradient-editor.c
* app/gui/info-dialog.c
* app/gui/layers-commands.c
* app/gui/module-browser.c
* app/gui/offset-dialog.c
* app/gui/palette-editor.c
* app/gui/palettes-commands.c
* app/gui/paths-dialog.c
* app/gui/qmask-commands.c
* app/gui/resize-dialog.c
* app/gui/resolution-calibrate-dialog.c
* app/gui/splash.c
* app/gui/tips-dialog.c
* app/gui/toolbox.c
* app/gui/user-install-dialog.c
* app/tools/gimpbrightnesscontrasttool.c
* app/tools/gimpbycolorselecttool.c
* app/tools/gimpcolorbalancetool.c
* app/tools/gimpcolorpickertool.c
* app/tools/gimpcroptool.c
* app/tools/gimpcurvestool.c
* app/tools/gimphuesaturationtool.c
* app/tools/gimpinktool.c
* app/tools/gimplevelstool.c
* app/tools/gimpposterizetool.c
* app/tools/gimprotatetool.c
* app/tools/gimpthresholdtool.c
* app/tools/paint_options.c
* app/tools/selection_options.c
* app/widgets/gimpchannellistview.c
* app/widgets/gimpcolorpanel.c
* app/widgets/gimpcomponentlistitem.c
* app/widgets/gimpconstrainedhwrapbox.c
* app/widgets/gimpcontainergridview.c
* app/widgets/gimpcontainerlistview.c
* app/widgets/gimpcontainermenuimpl.c
* app/widgets/gimpdialogfactory.c
* app/widgets/gimpdnd.c
* app/widgets/gimpdock.c
* app/widgets/gimpdockbook.c
* app/widgets/gimpdrawablelistitem.c
* app/widgets/gimpdrawablelistview.c
* app/widgets/gimpfontselection-dialog.c
* app/widgets/gimphistogramview.c
* app/widgets/gimpitemfactory.c
* app/widgets/gimplayerlistitem.c
* app/widgets/gimplistitem.[ch]
* app/widgets/gimpmenuitem.c
* app/widgets/gimppreview.[ch]
* app/widgets/gtkhwrapbox.c
* app/widgets/gtkvwrapbox.c
* app/widgets/gtkwrapbox.c
* libgimp/gimpbrushmenu.c
* libgimp/gimpexport.c
* libgimp/gimpgradientmenu.c
* libgimp/gimpmenu.c
* libgimp/gimppatternmenu.c
* libgimpwidgets/gimpbutton.c
* libgimpwidgets/gimpchainbutton.[ch]
* libgimpwidgets/gimpcolorarea.h
* libgimpwidgets/gimpcolorbutton.c
* libgimpwidgets/gimpfileselection.c
* libgimpwidgets/gimphelpui.c
* libgimpwidgets/gimpoffsetarea.c
* libgimpwidgets/gimppatheditor.c
* libgimpwidgets/gimppixmap.h
* libgimpwidgets/gimpquerybox.c
* libgimpwidgets/gimpstock.[ch]
* libgimpwidgets/gimpwidgets.h
* plug-ins/FractalExplorer/Dialogs.c
* plug-ins/FractalExplorer/Events.c
* plug-ins/FractalExplorer/FractalExplorer.c
* plug-ins/Lighting/lighting_ui.c
* plug-ins/MapObject/mapobject_ui.c
* plug-ins/bmp/bmpwrite.c
* plug-ins/dbbrowser/dbbrowser_utils.c
* plug-ins/fits/fits.c
* plug-ins/flame/flame.c
* plug-ins/fp/fp_gtk.c
* plug-ins/fp/fp_misc.c
* plug-ins/gfig/gfig.c
* plug-ins/gflare/gflare.c
* plug-ins/gfli/gfli.c
* plug-ins/gimpressionist/*.c
* plug-ins/imagemap/*.[ch]
* plug-ins/maze/maze_face.c
* plug-ins/mosaic/mosaic.c
* plug-ins/pagecurl/pagecurl.c
* plug-ins/print/print_gimp.h
* plug-ins/rcm/rcm_callback.c
* plug-ins/rcm/rcm_dialog.c
* plug-ins/rcm/rcm_misc.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.c
* plug-ins/sel2path/sel2path_adv_dialog.c
* plug-ins/sgi/sgi.c
* plug-ins/webbrowser/webbrowser.c
* plug-ins/xjt/xjt.c
* plug-ins/common/[A-n]*.c: compile with GTK_DISABLE_DEPRECATED
defined. Not everything is fully ported yet, had to #undef
GTK_DISABLE_DEPRECATED in many places and added #warnings when
doing so.
* pixmaps/Makefile.am
* pixmaps/chain.xpm: removed.
* themes/Default/Makefile.am
* themes/Default/images/Makefile.am
* themes/Default/images/stock-button-hchain-broken.png
* themes/Default/images/stock-button-hchain.png
* themes/Default/images/stock-button-vchain-broken.png
* themes/Default/images/stock-button-vchain.png: new stock icons.
2001-12-28 Sven Neumann <sven@gimp.org>
* app/config/gimprc.c: write comment to top of gimprc.
......
......@@ -430,7 +430,7 @@ channels_new_channel_query (GimpImage *gimage,
gtk_widget_show (label);
options->name_entry = gtk_entry_new ();
gtk_widget_set_usize (options->name_entry, 150, 0);
gtk_widget_set_size_request (options->name_entry, 150, -1);
gtk_table_attach_defaults (GTK_TABLE (table), options->name_entry,
1, 2, 0, 1);
gtk_entry_set_text (GTK_ENTRY (options->name_entry),
......@@ -589,7 +589,7 @@ channels_edit_channel_query (GimpChannel *channel)
gtk_widget_show (label);
options->name_entry = gtk_entry_new ();
gtk_widget_set_usize (options->name_entry, 150, 0);
gtk_widget_set_size_request (options->name_entry, 150, -1);
gtk_table_attach_defaults (GTK_TABLE (table), options->name_entry,
1, 2, 0, 1);
gtk_entry_set_text (GTK_ENTRY (options->name_entry),
......
......@@ -662,7 +662,7 @@ layers_new_layer_query (GimpImage *gimage,
gtk_widget_show (label);
options->name_entry = gtk_entry_new ();
gtk_widget_set_usize (options->name_entry, 75, 0);
gtk_widget_set_size_request (options->name_entry, 75, -1);
gtk_table_attach_defaults (GTK_TABLE (table),
options->name_entry, 1, 2, 0, 1);
gtk_entry_set_text (GTK_ENTRY (options->name_entry),
......@@ -686,7 +686,7 @@ layers_new_layer_query (GimpImage *gimage,
adjustment = gtk_adjustment_new (1, 1, 1, 1, 10, 1);
spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (adjustment), 1, 2);
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE);
gtk_widget_set_usize (spinbutton, 75, 0);
gtk_widget_set_size_request (spinbutton, 75, -1);
options->size_se = gimp_size_entry_new (1, gimage->unit, "%a",
TRUE, TRUE, FALSE, 75,
......
......@@ -38,6 +38,12 @@
#include "palette-import-dialog.h"
#include "palettes-commands.h"
#ifdef __GNUC__
#warning GTK_DISABLE_DEPRECATED
#endif
#undef GTK_DISABLE_DEPRECATED
#include <gtk/gtklist.h>
#include "libgimp/gimpintl.h"
......
......@@ -211,7 +211,7 @@ qmask_channel_query (GimpDisplayShell *shell)
gtk_adjustment_new (options->gimage->qmask_color.a * 100.0,
0.0, 100.0, 1.0, 1.0, 0.0);
opacity_scale = gtk_hscale_new (GTK_ADJUSTMENT (opacity_scale_data));
gtk_widget_set_usize (opacity_scale, 100, -1);
gtk_widget_set_size_request (opacity_scale, 100, -1);
gtk_scale_set_value_pos (GTK_SCALE (opacity_scale), GTK_POS_TOP);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
......
......@@ -211,7 +211,7 @@ qmask_channel_query (GimpDisplayShell *shell)
gtk_adjustment_new (options->gimage->qmask_color.a * 100.0,
0.0, 100.0, 1.0, 1.0, 0.0);
opacity_scale = gtk_hscale_new (GTK_ADJUSTMENT (opacity_scale_data));
gtk_widget_set_usize (opacity_scale, 100, -1);
gtk_widget_set_size_request (opacity_scale, 100, -1);
gtk_scale_set_value_pos (GTK_SCALE (opacity_scale), GTK_POS_TOP);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
......
......@@ -351,7 +351,7 @@ color_balance_dialog_new (void)
cbd->cyan_red_data = GTK_ADJUSTMENT (data);
spinbutton = gtk_spin_button_new (cbd->cyan_red_data, 1.0, 0);
gtk_widget_set_usize (spinbutton, 75, -1);
gtk_widget_set_size_request (spinbutton, 75, -1);
gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0);
gtk_widget_show (spinbutton);
......@@ -360,7 +360,7 @@ color_balance_dialog_new (void)
cbd->magenta_green_data = GTK_ADJUSTMENT (data);
spinbutton = gtk_spin_button_new (cbd->magenta_green_data, 1.0, 0);
gtk_widget_set_usize (spinbutton, 75, -1);
gtk_widget_set_size_request (spinbutton, 75, -1);
gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0);
gtk_widget_show (spinbutton);
......@@ -369,7 +369,7 @@ color_balance_dialog_new (void)
cbd->yellow_blue_data = GTK_ADJUSTMENT (data);
spinbutton = gtk_spin_button_new (cbd->yellow_blue_data, 1.0, 0);
gtk_widget_set_usize (spinbutton, 75, -1);
gtk_widget_set_size_request (spinbutton, 75, -1);
gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0);
gtk_widget_show (spinbutton);
......@@ -467,7 +467,7 @@ color_balance_dialog_new (void)
{
radio_button =
gtk_radio_button_new_with_label (group, gettext (appl_mode_names[i]));
group = gtk_radio_button_group (GTK_RADIO_BUTTON (radio_button));
group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio_button));
gtk_box_pack_start (GTK_BOX (hbox), radio_button, TRUE, FALSE, 0);
g_object_set_data (G_OBJECT (radio_button), "transfer_mode",
......
......@@ -726,9 +726,9 @@ curves_dialog_new (void)
GTK_SHRINK | GTK_FILL, 0, 0);
cd->graph = gtk_drawing_area_new ();
gtk_drawing_area_size (GTK_DRAWING_AREA (cd->graph),
GRAPH_WIDTH + RADIUS * 2,
GRAPH_HEIGHT + RADIUS * 2);
gtk_widget_set_size_request (cd->graph,
GRAPH_WIDTH + RADIUS * 2,
GRAPH_HEIGHT + RADIUS * 2);
gtk_widget_set_events (cd->graph, GRAPH_MASK);
gtk_container_add (GTK_CONTAINER (frame), cd->graph);
......@@ -793,7 +793,7 @@ curves_dialog_new (void)
/* Horizontal button box for load / save */
hbbox = gtk_hbutton_box_new ();
gtk_button_box_set_spacing (GTK_BUTTON_BOX (hbbox), 4);
gtk_box_set_spacing (GTK_BOX (hbbox), 4);
gtk_button_box_set_layout (GTK_BUTTON_BOX (hbbox), GTK_BUTTONBOX_SPREAD);
gtk_box_pack_end (GTK_BOX (vbox), hbbox, FALSE, FALSE, 0);
......@@ -876,12 +876,11 @@ static void
curves_update (CurvesDialog *cd,
gint update)
{
GdkRectangle area;
gint i, j;
gchar buf[32];
gint offset;
gint height;
gint sel_channel;
gint i, j;
gchar buf[32];
gint offset;
gint height;
gint sel_channel;
if(cd->color) {
sel_channel = cd->channel;
......@@ -939,11 +938,9 @@ curves_update (CurvesDialog *cd,
if (update & DRAW)
{
area.x = 0;
area.y = 0;
area.width = XRANGE_WIDTH;
area.height = XRANGE_HEIGHT / 2;
gtk_widget_draw (cd->xrange, &area);
gtk_widget_queue_draw_area (cd->xrange,
0, 0,
XRANGE_WIDTH, XRANGE_HEIGHT / 2);
}
}
if (update & XRANGE_BOTTOM)
......@@ -962,11 +959,9 @@ curves_update (CurvesDialog *cd,
if (update & DRAW)
{
area.x = 0;
area.y = XRANGE_HEIGHT / 2;
area.width = XRANGE_WIDTH;
area.height = XRANGE_HEIGHT / 2;
gtk_widget_draw (cd->xrange, &area);
gtk_widget_queue_draw_area (cd->xrange,
0, XRANGE_HEIGHT / 2,
XRANGE_WIDTH, XRANGE_HEIGHT / 2);
}
}
if (update & YRANGE)
......@@ -1004,7 +999,7 @@ curves_update (CurvesDialog *cd,
}
if (update & DRAW)
gtk_widget_draw (cd->yrange, NULL);
gtk_widget_queue_draw (cd->yrange);
}
if ((update & GRAPH) && (update & DRAW) && cd->pixmap != NULL)
{
......
......@@ -455,7 +455,7 @@ hue_saturation_dialog_new (void)
for (i = 0; i < 7; i++)
{
radio_button = gtk_radio_button_new_with_label (group, gettext (hue_partition_names[i]));
group = gtk_radio_button_group (GTK_RADIO_BUTTON (radio_button));
group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio_button));
g_object_set_data (G_OBJECT (radio_button), "hue_partition",
(gpointer) i);
......@@ -521,7 +521,7 @@ hue_saturation_dialog_new (void)
hsd->hue_data = GTK_ADJUSTMENT (data);
slider = gtk_hscale_new (hsd->hue_data);
gtk_widget_set_usize (slider, SLIDER_WIDTH, -1);
gtk_widget_set_size_request (slider, SLIDER_WIDTH, -1);
gtk_scale_set_digits (GTK_SCALE (slider), 0);
gtk_scale_set_value_pos (GTK_SCALE (slider), GTK_POS_TOP);
gtk_range_set_update_policy (GTK_RANGE (slider), GTK_UPDATE_DELAYED);
......@@ -531,7 +531,7 @@ hue_saturation_dialog_new (void)
abox = gtk_vbox_new (FALSE, 0);
spinbutton = gtk_spin_button_new (hsd->hue_data, 1.0, 0);
gtk_widget_set_usize (spinbutton, 74, -1);
gtk_widget_set_size_request (spinbutton, 74, -1);
gtk_box_pack_end (GTK_BOX (abox), spinbutton, FALSE, FALSE, 0);
gtk_table_attach (GTK_TABLE (table), abox, 2, 3, 0, 1,
GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
......@@ -555,7 +555,7 @@ hue_saturation_dialog_new (void)
hsd->lightness_data = GTK_ADJUSTMENT (data);
slider = gtk_hscale_new (hsd->lightness_data);
gtk_widget_set_usize (slider, SLIDER_WIDTH, -1);
gtk_widget_set_size_request (slider, SLIDER_WIDTH, -1);
gtk_scale_set_digits (GTK_SCALE (slider), 0);
gtk_scale_set_value_pos (GTK_SCALE (slider), GTK_POS_TOP);
gtk_range_set_update_policy (GTK_RANGE (slider), GTK_UPDATE_DELAYED);
......@@ -565,7 +565,7 @@ hue_saturation_dialog_new (void)
abox = gtk_vbox_new (FALSE, 0);
spinbutton = gtk_spin_button_new (hsd->lightness_data, 1.0, 0);
gtk_widget_set_usize (spinbutton, 75, -1);
gtk_widget_set_size_request (spinbutton, 75, -1);
gtk_box_pack_end (GTK_BOX (abox), spinbutton, FALSE, FALSE, 0);
gtk_table_attach (GTK_TABLE (table), abox, 2, 3, 1, 2,
GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
......@@ -589,7 +589,7 @@ hue_saturation_dialog_new (void)
hsd->saturation_data = GTK_ADJUSTMENT (data);
slider = gtk_hscale_new (hsd->saturation_data);
gtk_widget_set_usize (slider, SLIDER_WIDTH, -1);
gtk_widget_set_size_request (slider, SLIDER_WIDTH, -1);
gtk_scale_set_digits (GTK_SCALE (slider), 0);
gtk_scale_set_value_pos (GTK_SCALE (slider), GTK_POS_TOP);
gtk_range_set_update_policy (GTK_RANGE (slider), GTK_UPDATE_DELAYED);
......@@ -599,7 +599,7 @@ hue_saturation_dialog_new (void)
abox = gtk_vbox_new (FALSE, 0);
spinbutton = gtk_spin_button_new (hsd->saturation_data, 1.0, 0);
gtk_widget_set_usize (spinbutton, 75, -1);
gtk_widget_set_size_request (spinbutton, 75, -1);
gtk_box_pack_end (GTK_BOX (abox), spinbutton, FALSE, FALSE, 0);
gtk_table_attach (GTK_TABLE (table), abox, 2, 3, 2, 3,
GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
......@@ -695,7 +695,7 @@ hue_saturation_update (HueSaturationDialog *hsd,
buf, 0, j, DA_WIDTH);
if (update & DRAW)
gtk_widget_draw (hsd->hue_partition_da[i], NULL);
gtk_widget_queue_draw (hsd->hue_partition_da[i]);
}
}
......
......@@ -361,7 +361,7 @@ threshold_dialog_new (void)
td->low_threshold_data = GTK_ADJUSTMENT (data);
spinbutton = gtk_spin_button_new (td->low_threshold_data, 1.0, 0);
gtk_widget_set_usize (spinbutton, 75, -1);
gtk_widget_set_size_request (spinbutton, 75, -1);
gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0);
gtk_widget_show (spinbutton);
......@@ -374,7 +374,7 @@ threshold_dialog_new (void)
td->high_threshold_data = GTK_ADJUSTMENT (data);
spinbutton = gtk_spin_button_new (td->high_threshold_data, 1.0, 0);
gtk_widget_set_usize (spinbutton, 75, -1);
gtk_widget_set_size_request (spinbutton, 75, -1);
gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0);
gtk_widget_show (spinbutton);
......
......@@ -180,8 +180,7 @@ about_dialog_create (void)
gtk_widget_show (aboutframe);
logo_area = gtk_drawing_area_new ();
gtk_drawing_area_size (GTK_DRAWING_AREA (logo_area),
logo_width, logo_height);
gtk_widget_set_size_request (logo_area, logo_width, logo_height);
gtk_widget_set_events (logo_area, GDK_EXPOSURE_MASK);
gtk_container_add (GTK_CONTAINER (aboutframe), logo_area);
gtk_widget_show (logo_area);
......@@ -240,8 +239,7 @@ about_dialog_create (void)
max_width = MAX (max_width, width);
}
scroll_area = gtk_drawing_area_new ();
gtk_drawing_area_size (GTK_DRAWING_AREA (scroll_area),
max_width + 6, height + 1);
gtk_widget_set_size_request (scroll_area, max_width + 6, height + 1);
gtk_widget_set_events (scroll_area, GDK_BUTTON_PRESS_MASK);
gtk_container_add (GTK_CONTAINER (aboutframe), scroll_area);
gtk_widget_show (scroll_area);
......
......@@ -312,7 +312,6 @@ color_notebook_new (const gchar *title,
if (selector_info->next)
{
cnp->notebook = gtk_notebook_new ();
gtk_notebook_set_tab_border (GTK_NOTEBOOK (cnp->notebook), 0);
gtk_box_pack_start (GTK_BOX (left_vbox), cnp->notebook,
TRUE, TRUE, 0);
gtk_widget_show (cnp->notebook);
......@@ -381,7 +380,7 @@ color_notebook_new (const gchar *title,
/* The new color area */
color_frame = gtk_frame_new (NULL);
gtk_frame_set_shadow_type (GTK_FRAME (color_frame), GTK_SHADOW_IN);
gtk_widget_set_usize (color_frame, -1, COLOR_AREA_SIZE);
gtk_widget_set_size_request (color_frame, -1, COLOR_AREA_SIZE);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Current:"), 1.0, 0.5,
......@@ -402,7 +401,7 @@ color_notebook_new (const gchar *title,
/* The old color area */
color_frame = gtk_frame_new (NULL);
gtk_frame_set_shadow_type (GTK_FRAME (color_frame), GTK_SHADOW_IN);
gtk_widget_set_usize (color_frame, -1, COLOR_AREA_SIZE);
gtk_widget_set_size_request (color_frame, -1, COLOR_AREA_SIZE);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("Old:"), 1.0, 0.5,
......@@ -445,7 +444,7 @@ color_notebook_new (const gchar *title,
GIMP_COLOR_AREA_FLAT,
GDK_BUTTON2_MASK);
gtk_drag_dest_unset (color_area);
gtk_widget_set_usize (button, 16, COLOR_AREA_SIZE);
gtk_widget_set_size_request (button, 16, COLOR_AREA_SIZE);
gtk_container_add (GTK_CONTAINER (button), color_area);
gtk_widget_show (color_area);
......@@ -464,7 +463,7 @@ color_notebook_new (const gchar *title,
GIMP_COLOR_AREA_FLAT,
GDK_BUTTON2_MASK);
gtk_drag_dest_unset (color_area);
gtk_widget_set_usize (button, 16, COLOR_AREA_SIZE);
gtk_widget_set_size_request (button, 16, COLOR_AREA_SIZE);
gtk_container_add (GTK_CONTAINER (button), color_area);
gtk_widget_show (color_area);
......@@ -493,7 +492,7 @@ color_notebook_new (const gchar *title,
gimp_help_set_help_data (cnp->toggles[i],
gettext (slider_tips[i]), NULL);
group = gtk_radio_button_group (GTK_RADIO_BUTTON (cnp->toggles[i]));
group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (cnp->toggles[i]));
gtk_table_attach (GTK_TABLE (table), cnp->toggles[i],
0, 1, i, i + 1,
GTK_SHRINK, GTK_EXPAND, 0, 0);
......@@ -528,7 +527,7 @@ color_notebook_new (const gchar *title,
gtk_widget_show (table);
button = gtk_button_new ();
gtk_widget_set_usize (button, COLOR_AREA_SIZE, COLOR_AREA_SIZE);
gtk_widget_set_size_request (button, COLOR_AREA_SIZE, COLOR_AREA_SIZE);
gtk_table_attach_defaults (GTK_TABLE (table), button, 0, 1, 0, 1);
gimp_help_set_help_data (button,
_("Add the current color to the color history"),
......@@ -546,7 +545,7 @@ color_notebook_new (const gchar *title,
for (i = 0; i < COLOR_HISTORY_SIZE; i++)
{
button = gtk_button_new ();
gtk_widget_set_usize (button, COLOR_AREA_SIZE, COLOR_AREA_SIZE);
gtk_widget_set_size_request (button, COLOR_AREA_SIZE, COLOR_AREA_SIZE);
gtk_table_attach_defaults (GTK_TABLE (table), button,
(i > 7 ? i - 8 : i) + 1,
(i > 7 ? i - 8 : i) + 2,
......@@ -574,11 +573,12 @@ color_notebook_new (const gchar *title,
gtk_box_pack_end (GTK_BOX (right_vbox), hbox, FALSE, FALSE, 0);
gtk_widget_show (hbox);
cnp->hex_entry = gtk_entry_new_with_max_length (7);
cnp->hex_entry = gtk_entry_new ();
gtk_entry_set_max_length (GTK_ENTRY (cnp->hex_entry), 7);
gimp_rgb_get_uchar (&cnp->rgb, &r, &g, &b);
g_snprintf (buffer, sizeof (buffer), "#%.2x%.2x%.2x", r, g, b);
gtk_entry_set_text (GTK_ENTRY (cnp->hex_entry), buffer);
gtk_widget_set_usize (GTK_WIDGET (cnp->hex_entry), 60, 0);
gtk_widget_set_size_request (GTK_WIDGET (cnp->hex_entry), 60, -1);
gtk_box_pack_end (GTK_BOX (hbox), cnp->hex_entry, TRUE, TRUE, 0);
gtk_widget_show (cnp->hex_entry);
......
......@@ -179,7 +179,7 @@ convert_to_indexed (GimpImage *gimage)
toggle =
gtk_radio_button_new_with_label (NULL, _("Generate Optimum Palette:"));
group = gtk_radio_button_group (GTK_RADIO_BUTTON (toggle));
group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (toggle));
gtk_box_pack_start (GTK_BOX (hbox), toggle, FALSE, FALSE, 0);
g_signal_connect (G_OBJECT (toggle), "toggled",
G_CALLBACK (gimp_toggle_button_update),
......@@ -242,7 +242,7 @@ convert_to_indexed (GimpImage *gimage)
hbox = gtk_hbox_new (FALSE, 4);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
toggle = gtk_radio_button_new_with_label (group, _("Use Custom Palette:"));
group = gtk_radio_button_group (GTK_RADIO_BUTTON (toggle));
group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (toggle));
gtk_box_pack_start (GTK_BOX (hbox), toggle, FALSE, FALSE, 0);
g_signal_connect (G_OBJECT (toggle), "toggled",
G_CALLBACK (gimp_toggle_button_update),
......@@ -279,7 +279,7 @@ convert_to_indexed (GimpImage *gimage)
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
toggle =
gtk_radio_button_new_with_label (group, _("Use WWW-Optimized Palette"));
group = gtk_radio_button_group (GTK_RADIO_BUTTON (toggle));
group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (toggle));
gtk_box_pack_start (GTK_BOX (hbox), toggle, FALSE, FALSE, 0);
g_signal_connect (G_OBJECT (toggle), "toggled",
G_CALLBACK (gimp_toggle_button_update),
......@@ -295,7 +295,7 @@ convert_to_indexed (GimpImage *gimage)
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
toggle =
gtk_radio_button_new_with_label (group, _("Use Black and White (1-Bit) Palette"));
group = gtk_radio_button_group (GTK_RADIO_BUTTON (toggle));
group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (toggle));
gtk_box_pack_start (GTK_BOX (hbox), toggle, FALSE, FALSE, 0);
g_signal_connect (G_OBJECT (toggle), "toggled",
G_CALLBACK (gimp_toggle_button_update),
......@@ -319,7 +319,7 @@ convert_to_indexed (GimpImage *gimage)
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
toggle = gtk_radio_button_new_with_label (NULL, _("No Color Dithering"));
group = gtk_radio_button_group (GTK_RADIO_BUTTON (toggle));
group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (toggle));
gtk_box_pack_start (GTK_BOX (hbox), toggle, FALSE, FALSE, 0);
g_signal_connect (G_OBJECT (toggle), "toggled",
G_CALLBACK (gimp_toggle_button_update),
......@@ -333,7 +333,7 @@ convert_to_indexed (GimpImage *gimage)
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
toggle = gtk_radio_button_new_with_label (group, _("Positioned Color Dithering"));
group = gtk_radio_button_group (GTK_RADIO_BUTTON (toggle));
group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (toggle));
gtk_box_pack_start (GTK_BOX (hbox), toggle, FALSE, FALSE, 0);
g_signal_connect (G_OBJECT (toggle), "toggled",
G_CALLBACK (gimp_toggle_button_update),
......@@ -347,7 +347,7 @@ convert_to_indexed (GimpImage *gimage)
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
toggle = gtk_radio_button_new_with_label (group, _("Floyd-Steinberg Color Dithering (Reduced Color Bleeding)"));
group = gtk_radio_button_group (GTK_RADIO_BUTTON (toggle));
group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (toggle));
gtk_box_pack_start (GTK_BOX (hbox), toggle, FALSE, FALSE, 0);
g_signal_connect (G_OBJECT (toggle), "toggled",
G_CALLBACK (gimp_toggle_button_update),
......@@ -360,7 +360,7 @@ convert_to_indexed (GimpImage *gimage)
hbox = gtk_hbox_new (FALSE, 0);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
toggle = gtk_radio_button_new_with_label (group, _("Floyd-Steinberg Color Dithering (Normal)"));
group = gtk_radio_button_group (GTK_RADIO_BUTTON (toggle));
group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (toggle));
gtk_box_pack_start (GTK_BOX (hbox), toggle, FALSE, FALSE, 0);
g_signal_connect (G_OBJECT (toggle), "toggled",
G_CALLBACK (gimp_toggle_button_update),
......