From 7117483fcb00b1f190b828b086a7617e5601c9ca Mon Sep 17 00:00:00 2001 From: Manish Singh Date: Sun, 11 Nov 2001 18:35:25 +0000 Subject: [PATCH] configure.in app/Makefile.am app/plug-in/Makefile.am plug-ins/Makefile.am 2001-11-11 Manish Singh * configure.in * app/Makefile.am * app/plug-in/Makefile.am * plug-ins/Makefile.am * modules/Makefile.am: fixes to build with automake 1.5 (just hacks to get it to work, real fixes to come later) * app/gui/preferences-dialog.c: unset GValue from tree model when we're done with it. * libgimpwidgets/gimpcolorarea.c * libgimpwidgets/gimpcolorbutton.c * libgimpwidgets/gimpsizeentry.[ch] * libgimpwidgets/gimpwidgets.[ch] * plug-ins/common/animationplay.c * plug-ins/common/colorify.c * plug-ins/common/curve_bend.c * plug-ins/common/diffraction.c * plug-ins/common/film.c * plug-ins/common/gbr.c * plug-ins/common/gee.c * plug-ins/common/gee_zoom.c * plug-ins/common/gicon.c * plug-ins/common/gih.c * plug-ins/common/gtm.c * plug-ins/common/jpeg.c * plug-ins/common/mail.c * plug-ins/common/pat.c * plug-ins/common/plugindetails.c * plug-ins/common/png.c * plug-ins/common/ps.c * plug-ins/common/sample_colorize.c * plug-ins/common/sinus.c * plug-ins/common/spheredesigner.c * plug-ins/common/tileit.c * plug-ins/common/uniteditor.c * plug-ins/common/xbm.c: gtk_widget_set_usize is deprecated. Use gtk_widget_set_size_request instead. * libgimpwidgets/gimpunitmenu.[ch]: changed to use GtkTreeView. --- .cvsignore | 1 + ChangeLog | 43 +++++++++ app/Makefile.am | 38 ++++++-- app/dialogs/preferences-dialog.c | 2 + app/gui/preferences-dialog.c | 2 + app/plug-in/Makefile.am | 4 +- configure.in | 8 +- libgimpwidgets/gimpcolorarea.c | 3 +- libgimpwidgets/gimpcolorbutton.c | 2 +- libgimpwidgets/gimpsizeentry.c | 10 +- libgimpwidgets/gimpsizeentry.h | 2 +- libgimpwidgets/gimpunitmenu.c | 143 ++++++++++++++++------------ libgimpwidgets/gimpunitmenu.h | 2 +- libgimpwidgets/gimpwidgets.c | 24 ++--- libgimpwidgets/gimpwidgets.h | 6 +- modules/Makefile.am | 2 +- plug-ins/Makefile.am | 7 +- plug-ins/common/animationplay.c | 8 +- plug-ins/common/colorify.c | 3 +- plug-ins/common/convmatrix.c | 6 +- plug-ins/common/curve_bend.c | 2 +- plug-ins/common/diffraction.c | 2 +- plug-ins/common/film.c | 2 +- plug-ins/common/gbr.c | 2 +- plug-ins/common/gee.c | 2 +- plug-ins/common/gee_zoom.c | 2 +- plug-ins/common/gicon.c | 2 +- plug-ins/common/gih.c | 2 +- plug-ins/common/gtm.c | 8 +- plug-ins/common/jpeg.c | 6 +- plug-ins/common/mail.c | 10 +- plug-ins/common/pat.c | 2 +- plug-ins/common/plugin-browser.c | 9 +- plug-ins/common/plugindetails.c | 9 +- plug-ins/common/png.c | 2 +- plug-ins/common/postscript.c | 2 +- plug-ins/common/ps.c | 2 +- plug-ins/common/sample_colorize.c | 10 +- plug-ins/common/sinus.c | 2 +- plug-ins/common/spheredesigner.c | 30 +++--- plug-ins/common/tileit.c | 4 +- plug-ins/common/uniteditor.c | 6 +- plug-ins/common/xbm.c | 2 +- plug-ins/dbbrowser/plugin-browser.c | 9 +- plug-ins/jpeg/jpeg-load.c | 6 +- plug-ins/jpeg/jpeg-load.h | 6 +- plug-ins/jpeg/jpeg-save.c | 6 +- plug-ins/jpeg/jpeg-save.h | 6 +- plug-ins/jpeg/jpeg.c | 6 +- plug-ins/jpeg/jpeg.h | 6 +- 50 files changed, 293 insertions(+), 188 deletions(-) diff --git a/.cvsignore b/.cvsignore index cbaa047d3b..123c4a3997 100644 --- a/.cvsignore +++ b/.cvsignore @@ -5,6 +5,7 @@ config.log config.h config.cache stamp-h +stamp-h1 gimp.spec gimprc config.status diff --git a/ChangeLog b/ChangeLog index 728e2509ca..ffc5292103 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,46 @@ +2001-11-11 Manish Singh + + * configure.in + * app/Makefile.am + * app/plug-in/Makefile.am + * plug-ins/Makefile.am + * modules/Makefile.am: fixes to build with automake 1.5 (just hacks + to get it to work, real fixes to come later) + + * app/gui/preferences-dialog.c: unset GValue from tree model when + we're done with it. + + * libgimpwidgets/gimpcolorarea.c + * libgimpwidgets/gimpcolorbutton.c + * libgimpwidgets/gimpsizeentry.[ch] + * libgimpwidgets/gimpwidgets.[ch] + * plug-ins/common/animationplay.c + * plug-ins/common/colorify.c + * plug-ins/common/curve_bend.c + * plug-ins/common/diffraction.c + * plug-ins/common/film.c + * plug-ins/common/gbr.c + * plug-ins/common/gee.c + * plug-ins/common/gee_zoom.c + * plug-ins/common/gicon.c + * plug-ins/common/gih.c + * plug-ins/common/gtm.c + * plug-ins/common/jpeg.c + * plug-ins/common/mail.c + * plug-ins/common/pat.c + * plug-ins/common/plugindetails.c + * plug-ins/common/png.c + * plug-ins/common/ps.c + * plug-ins/common/sample_colorize.c + * plug-ins/common/sinus.c + * plug-ins/common/spheredesigner.c + * plug-ins/common/tileit.c + * plug-ins/common/uniteditor.c + * plug-ins/common/xbm.c: gtk_widget_set_usize is deprecated. Use + gtk_widget_set_size_request instead. + + * libgimpwidgets/gimpunitmenu.[ch]: changed to use GtkTreeView. + 2001-11-10 Michael Natterer * app/display/gimpdisplay-marching-ants.h diff --git a/app/Makefile.am b/app/Makefile.am index 48f28d6120..e92757535f 100644 --- a/app/Makefile.am +++ b/app/Makefile.am @@ -6,10 +6,10 @@ scriptdata = bin_PROGRAMS = gimp -gimp_SOURCES = @STRIP_BEGIN@ \ ## ## gui stuff that needs to go to libgimp/, gui/ or /dev/null ## +gui_sources = \ colormaps.c \ colormaps.h \ devices.c \ @@ -21,33 +21,43 @@ gimp_SOURCES = @STRIP_BEGIN@ \ ops_buttons.c \ ops_buttons.h \ undo_history.c \ - undo_history.h \ + undo_history.h + ## ## stuff that needs to be split up in core / ui files ## +core_ui_sources = \ image_map.c \ - image_map.h \ + image_map.h + ## ## stuff for core/ ## +core_sources = \ floating_sel.c \ - floating_sel.h \ + floating_sel.h + ## ## config stuff ## +config_sources = \ appenv.h \ general.c \ general.h \ gimprc.c \ - gimprc.h \ + gimprc.h + ## ## stuff for plug-in/ ## +plug_in_sources = \ plug_in.c \ - plug_in.h \ + plug_in.h + ## ## stuff which is about to be replaced by new subsystems ## +bye_sources = \ path.c \ path.h \ pathP.h \ @@ -58,14 +68,15 @@ gimp_SOURCES = @STRIP_BEGIN@ \ path_bezier.c \ undo.c \ undo.h \ - undo_types.h \ + undo_types.h + ## ## stuff ## +stuff_sources = \ app_procs.c \ app_procs.h \ main.c \ - \ batch.c \ batch.h \ errors.c \ @@ -73,7 +84,16 @@ gimp_SOURCES = @STRIP_BEGIN@ \ gimphelp.c \ gimphelp.h \ libgimp_glue.c \ - libgimp_glue.h \ + libgimp_glue.h + +gimp_SOURCES = @STRIP_BEGIN@ \ + $(gui_sources) \ + $(core_ui_sources) \ + $(core_sources) \ + $(config_sources) \ + $(plug_in_sources) \ + $(bye_sources) \ + $(stuff_sources) \ @STRIP_END@ EXTRA_DIST = \ diff --git a/app/dialogs/preferences-dialog.c b/app/dialogs/preferences-dialog.c index 71d1bba627..f9772bec5b 100644 --- a/app/dialogs/preferences-dialog.c +++ b/app/dialogs/preferences-dialog.c @@ -1392,6 +1392,8 @@ prefs_tree_select_callback (GtkTreeSelection *sel, gtk_notebook_set_current_page (GTK_NOTEBOOK (notebook), g_value_get_int (&val)); + + g_value_unset (&val); } /* create a frame with title and a vbox */ diff --git a/app/gui/preferences-dialog.c b/app/gui/preferences-dialog.c index 71d1bba627..f9772bec5b 100644 --- a/app/gui/preferences-dialog.c +++ b/app/gui/preferences-dialog.c @@ -1392,6 +1392,8 @@ prefs_tree_select_callback (GtkTreeSelection *sel, gtk_notebook_set_current_page (GTK_NOTEBOOK (notebook), g_value_get_int (&val)); + + g_value_unset (&val); } /* create a frame with title and a vbox */ diff --git a/app/plug-in/Makefile.am b/app/plug-in/Makefile.am index 14669f44e9..5ccfc7e6d0 100644 --- a/app/plug-in/Makefile.am +++ b/app/plug-in/Makefile.am @@ -3,10 +3,10 @@ noinst_LIBRARIES = libappplug-in.a libappplug_in_a_SOURCES = @STRIP_BEGIN@ \ - plug-in-types.h \ + plug-in-types.h \ +@STRIP_END@ ## plug-in.c \ ## plug-in.h \ -@STRIP_END@ AM_CPPFLAGS = @STRIP_BEGIN@ \ -DG_LOG_DOMAIN=\"Gimp-Plug-In\" \ diff --git a/configure.in b/configure.in index 2173490c65..497bbed743 100644 --- a/configure.in +++ b/configure.in @@ -8,7 +8,7 @@ AC_INIT(gimprc.in) # GIMP_BINARY_AGE += 1; # if any functions have been added, set GIMP_INTERFACE_AGE to 0. # if backwards compatibility has been broken, -# set GIMP_BINARY_AGE _and_ GIMP_INTERFACE_AGE to 0. +# set GIMP_BINARY_AGE and GIMP_INTERFACE_AGE to 0. # GIMP_MAJOR_VERSION=1 GIMP_MINOR_VERSION=3 @@ -38,6 +38,12 @@ AM_CONFIG_HEADER(config.h) dnl Initialize libtool AM_PROG_LIBTOOL +dnl Set AS and ASFLAGS so that automake 1.5 will be happy +AS="\${CC}" +ASFLAGS="\$(DEFS) \$(DEFAULT_INCLUDES) \$(INCLUDES) \$(AM_CPPFLAGS) \$(CPPFLAGS) \$(AM_CFLAGS) \$(CFLAGS)" +AC_SUBST(AS) +AC_SUBST(ASFLAGS) + dnl Initialize maintainer mode AM_MAINTAINER_MODE diff --git a/libgimpwidgets/gimpcolorarea.c b/libgimpwidgets/gimpcolorarea.c index 96d8945660..402cc86f98 100644 --- a/libgimpwidgets/gimpcolorarea.c +++ b/libgimpwidgets/gimpcolorarea.c @@ -477,7 +477,8 @@ gimp_color_area_drag_begin (GtkWidget *widget, GIMP_COLOR_AREA (widget)->type, 0); - gtk_widget_set_usize (color_area, DRAG_PREVIEW_SIZE, DRAG_PREVIEW_SIZE); + gtk_widget_set_size_request (color_area, + DRAG_PREVIEW_SIZE, DRAG_PREVIEW_SIZE); gtk_container_add (GTK_CONTAINER (frame), color_area); gtk_widget_show (color_area); gtk_widget_show (frame); diff --git a/libgimpwidgets/gimpcolorbutton.c b/libgimpwidgets/gimpcolorbutton.c index e086ede636..dd70b2b31d 100644 --- a/libgimpwidgets/gimpcolorbutton.c +++ b/libgimpwidgets/gimpcolorbutton.c @@ -247,7 +247,7 @@ gimp_color_button_new (const gchar *title, gcb->title = g_strdup (title); - gtk_widget_set_usize (GTK_WIDGET (gcb->color_area), width, height); + gtk_widget_set_size_request (GTK_WIDGET (gcb->color_area), width, height); gimp_color_area_set_color (GIMP_COLOR_AREA (gcb->color_area), color); gimp_color_area_set_type (GIMP_COLOR_AREA (gcb->color_area), type); diff --git a/libgimpwidgets/gimpsizeentry.c b/libgimpwidgets/gimpsizeentry.c index f25aaa9b7e..970dfade99 100644 --- a/libgimpwidgets/gimpsizeentry.c +++ b/libgimpwidgets/gimpsizeentry.c @@ -211,7 +211,7 @@ gimp_size_entry_finalize (GObject *object) * GIMP_UNIT_PERCENT. * @show_refval: #TRUE if you want an extra "refenence value" * spinbutton per input field. - * @spinbutton_usize: The minimal horizontal size of the #GtkSpinButton's. + * @spinbutton_width: The minimal horizontal size of the #GtkSpinButton's. * @update_policy: How the automatic pixel <-> real-world-unit calculations * should be performed. * @@ -250,7 +250,7 @@ gimp_size_entry_new (gint number_of_fields, gboolean menu_show_pixels, gboolean menu_show_percent, gboolean show_refval, - gint spinbutton_usize, + gint spinbutton_width, GimpSizeEntryUpdatePolicy update_policy) { GimpSizeEntry *gse; @@ -318,7 +318,8 @@ gimp_size_entry_new (gint number_of_fields, (unit == GIMP_UNIT_PIXEL) ? gsef->refval_digits : (unit == GIMP_UNIT_PERCENT) ? 2 : GIMP_SIZE_ENTRY_DIGITS (unit)); - gtk_widget_set_usize (gsef->value_spinbutton, spinbutton_usize, 0); + gtk_widget_set_size_request (gsef->value_spinbutton, + spinbutton_width, -1); gtk_table_attach_defaults (GTK_TABLE (gse), gsef->value_spinbutton, i+1, i+2, gse->show_refval+1, gse->show_refval+2); @@ -338,7 +339,8 @@ gimp_size_entry_new (gint number_of_fields, gtk_spin_button_new (GTK_ADJUSTMENT (gsef->refval_adjustment), 1.0, gsef->refval_digits); - gtk_widget_set_usize (gsef->refval_spinbutton, spinbutton_usize, 0); + gtk_widget_set_size_request (gsef->refval_spinbutton, + spinbutton_width, -1); gtk_table_attach_defaults (GTK_TABLE (gse), gsef->refval_spinbutton, i + 1, i + 2, 1, 2); g_signal_connect (G_OBJECT (gsef->refval_adjustment), diff --git a/libgimpwidgets/gimpsizeentry.h b/libgimpwidgets/gimpsizeentry.h index e74082d60c..cb2755f512 100644 --- a/libgimpwidgets/gimpsizeentry.h +++ b/libgimpwidgets/gimpsizeentry.h @@ -79,7 +79,7 @@ GtkWidget * gimp_size_entry_new (gint number_of_fields, gboolean menu_show_pixels, gboolean menu_show_percent, gboolean show_refval, - gint spinbutton_usize, + gint spinbutton_width, GimpSizeEntryUpdatePolicy update_policy); void gimp_size_entry_add_field (GimpSizeEntry *gse, diff --git a/libgimpwidgets/gimpunitmenu.c b/libgimpwidgets/gimpunitmenu.c index 4a8d036d90..633dad5196 100644 --- a/libgimpwidgets/gimpunitmenu.c +++ b/libgimpwidgets/gimpunitmenu.c @@ -41,6 +41,14 @@ enum LAST_SIGNAL }; +enum +{ + UNIT_COLUMN, + FACTOR_COLUMN, + DATA_COLUMN, + NUM_COLUMNS +}; + static void gimp_unit_menu_class_init (GimpUnitMenuClass *klass); static void gimp_unit_menu_init (GimpUnitMenu *gum); @@ -117,7 +125,7 @@ gimp_unit_menu_init (GimpUnitMenu *gum) gum->show_pixels = FALSE; gum->show_percent = FALSE; gum->selection = NULL; - gum->clist = NULL; + gum->tv = NULL; } static void @@ -197,7 +205,7 @@ gimp_unit_menu_new (const gchar *format, (gimp_unit_menu_build_string (format, GIMP_UNIT_PERCENT)); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); g_object_set_data (G_OBJECT (menuitem), "gimp_unit_menu", - (gpointer) GIMP_UNIT_PERCENT); + GINT_TO_POINTER (GIMP_UNIT_PERCENT)); gtk_widget_show (menuitem); g_signal_connect (G_OBJECT (menuitem), "activate", @@ -218,7 +226,7 @@ gimp_unit_menu_new (const gchar *format, gtk_menu_item_new_with_label (gimp_unit_menu_build_string (format, u)); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); g_object_set_data (G_OBJECT (menuitem), "gimp_unit_menu", - (gpointer) u); + GINT_TO_POINTER (u)); gtk_widget_show (menuitem); g_signal_connect (G_OBJECT (menuitem), "activate", @@ -238,7 +246,7 @@ gimp_unit_menu_new (const gchar *format, gtk_menu_item_new_with_label (gimp_unit_menu_build_string (format, unit)); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); g_object_set_data (G_OBJECT (menuitem), "gimp_unit_menu", - (gpointer) unit); + GINT_TO_POINTER (unit)); gtk_widget_show (menuitem); g_signal_connect (G_OBJECT (menuitem), "activate", @@ -257,7 +265,7 @@ gimp_unit_menu_new (const gchar *format, gtk_menu_item_new_with_label (_("More...")); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); g_object_set_data (G_OBJECT (menuitem), "gimp_unit_menu", - (gpointer) (GIMP_UNIT_PERCENT + 1)); + GINT_TO_POINTER (GIMP_UNIT_PERCENT + 1)); gtk_widget_show (menuitem); g_signal_connect (G_OBJECT (menuitem), "activate", @@ -320,7 +328,8 @@ gimp_unit_menu_set_unit (GimpUnitMenu *gum, } menuitem = gtk_menu_item_new (); - gtk_menu_shell_append (GTK_MENU_SHELL (GTK_OPTION_MENU (gum)->menu), menuitem); + gtk_menu_shell_append (GTK_MENU_SHELL (GTK_OPTION_MENU (gum)->menu), + menuitem); gtk_widget_set_sensitive (menuitem, FALSE); gtk_menu_reorder_child (GTK_MENU (GTK_OPTION_MENU (gum)->menu), menuitem, user_unit - 1); @@ -332,7 +341,7 @@ gimp_unit_menu_set_unit (GimpUnitMenu *gum, gtk_menu_shell_append (GTK_MENU_SHELL (GTK_OPTION_MENU (gum)->menu), menuitem); g_object_set_data (G_OBJECT (menuitem), "gimp_unit_menu", - (gpointer) unit); + GINT_TO_POINTER (unit)); gtk_menu_reorder_child (GTK_MENU (GTK_OPTION_MENU (gum)->menu), menuitem, user_unit); gtk_widget_show (menuitem); @@ -467,16 +476,22 @@ static void gimp_unit_menu_selection_ok_callback (GtkWidget *widget, gpointer data) { - GimpUnitMenu *gum; - GimpUnit unit; + GimpUnitMenu *gum; + GimpUnit unit; + GtkTreeSelection *sel; + GtkTreeModel *model; + GtkTreeIter iter; + GValue val = { 0, }; gum = GIMP_UNIT_MENU (data); - if (gum->selection && GTK_CLIST (gum->clist)->selection) + sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (gum->tv)); + if (gum->selection && gtk_tree_selection_get_selected (sel, &model, &iter)) { - unit = (GimpUnit) - gtk_clist_get_row_data (GTK_CLIST (gum->clist), - (gint) (GTK_CLIST (gum->clist)->selection->data)); + gtk_tree_model_get_value(model, &iter, 2, &val); + unit = (GimpUnit) g_value_get_int (&val); + g_value_unset (&val); + gimp_unit_menu_set_unit (gum, unit); g_signal_emit (G_OBJECT (gum), gimp_unit_menu_signals[UNIT_CHANGED], 0); @@ -486,28 +501,26 @@ gimp_unit_menu_selection_ok_callback (GtkWidget *widget, } static void -gimp_unit_menu_selection_select_row_callback (GtkWidget *widget, - gint row, - gint column, - GdkEventButton *bevent, - gpointer data) +gimp_unit_menu_selection_row_activated_callback (GtkTreeView *tv, + GtkTreePath *path, + GtkTreeViewColumn *column, + gpointer data) { - if (bevent && bevent->type == GDK_2BUTTON_PRESS) - gimp_unit_menu_selection_ok_callback (NULL, data); + gimp_unit_menu_selection_ok_callback (NULL, data); } /* private function of gimp_unit_menu_callback () */ static void gimp_unit_menu_create_selection (GimpUnitMenu *gum) { - GtkWidget *vbox; - GtkWidget *scrolled_win; - gchar *titles[2]; - gchar *row[2]; - GimpUnit unit; - gint num_units; - gint unit_width; - gint factor_width; + GtkWidget *vbox; + GtkWidget *scrolled_win; + GtkListStore *list; + GtkTreeSelection *sel; + GtkTreeIter iter; + GtkTreePath *path; + GimpUnit unit; + gint num_units; gum->selection = gimp_dialog_new (_("Unit Selection"), "unit_selection", @@ -540,61 +553,71 @@ gimp_unit_menu_create_selection (GimpUnitMenu *gum) /* the selection list */ scrolled_win = gtk_scrolled_window_new (NULL, NULL); + gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_win), + GTK_SHADOW_ETCHED_IN); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_win), GTK_POLICY_NEVER, GTK_POLICY_ALWAYS); gtk_container_add (GTK_CONTAINER (vbox), scrolled_win); gtk_widget_show (scrolled_win); - titles[0] = _("Unit"); - titles[1] = _("Factor"); - gum->clist = gtk_clist_new_with_titles (2, titles); - gtk_clist_set_shadow_type (GTK_CLIST (gum->clist), GTK_SHADOW_IN); - gtk_clist_set_selection_mode (GTK_CLIST (gum->clist), GTK_SELECTION_BROWSE); - gtk_clist_column_titles_passive (GTK_CLIST (gum->clist)); + list = gtk_list_store_new (NUM_COLUMNS, G_TYPE_STRING, G_TYPE_STRING, + G_TYPE_INT); + gum->tv = gtk_tree_view_new_with_model (GTK_TREE_MODEL (list)); + g_object_unref (list); + + gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (gum->tv), + -1, _("Unit"), + gtk_cell_renderer_text_new (), + "text", UNIT_COLUMN, NULL); + gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (gum->tv), + -1, _("Factor"), + gtk_cell_renderer_text_new (), + "text", FACTOR_COLUMN, NULL); + /* the unit lines */ num_units = gimp_unit_get_number_of_units (); for (unit = GIMP_UNIT_END; unit < num_units; unit++) { - row[0] = g_strdup (gimp_unit_menu_build_string (gum->format, unit)); - row[1] = g_strdup (gimp_unit_menu_build_string ("(%f)", unit)); - - gtk_clist_append (GTK_CLIST (gum->clist), row); - gtk_clist_set_row_data (GTK_CLIST (gum->clist), - unit - GIMP_UNIT_END, - (gpointer) unit); - - g_free (row[0]); - g_free (row[1]); + gtk_list_store_append (list, &iter); + gtk_list_store_set (list, &iter, + UNIT_COLUMN, + gimp_unit_menu_build_string (gum->format, unit), + -1); + gtk_list_store_set (list, &iter, + FACTOR_COLUMN, + gimp_unit_menu_build_string ("(%f)", unit), + -1); + gtk_list_store_set (list, &iter, DATA_COLUMN, unit, -1); } - unit_width = gtk_clist_optimal_column_width (GTK_CLIST (gum->clist), 0); - factor_width = gtk_clist_optimal_column_width (GTK_CLIST (gum->clist), 1); + gtk_widget_set_size_request (gum->tv, -1, 150); - gtk_clist_set_column_width (GTK_CLIST (gum->clist), 0, unit_width); - gtk_clist_set_column_width (GTK_CLIST (gum->clist), 1, factor_width); + gtk_container_add (GTK_CONTAINER (scrolled_win), gum->tv); - gtk_widget_set_usize (gum->clist, -1, 150); - - gtk_container_add (GTK_CONTAINER (scrolled_win), gum->clist); - g_signal_connect (G_OBJECT (gum->clist), "select_row", - G_CALLBACK (gimp_unit_menu_selection_select_row_callback), + g_signal_connect (G_OBJECT (gum->tv), "row_activated", + G_CALLBACK (gimp_unit_menu_selection_row_activated_callback), gum); - gtk_widget_show (gum->clist); - g_signal_connect (G_OBJECT (gum->clist), "destroy", + gtk_widget_show (gum->tv); + + g_signal_connect (G_OBJECT (gum->tv), "destroy", G_CALLBACK (gtk_widget_destroyed), - &gum->clist); + &gum->tv); gtk_widget_show (vbox); gtk_widget_show (gum->selection); if (gum->unit >= GIMP_UNIT_END) { - gtk_clist_select_row (GTK_CLIST (gum->clist), - gum->unit - GIMP_UNIT_END, 0); - gtk_clist_moveto (GTK_CLIST (gum->clist), - gum->unit - GIMP_UNIT_END, 0, 0.0, 0.0); + path = gtk_tree_path_new (); + gtk_tree_path_append_index (path, gum->unit - GIMP_UNIT_END); + + sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (gum->tv)); + gtk_tree_selection_select_path (sel, path); + + gtk_tree_view_scroll_to_cell (GTK_TREE_VIEW (gum->tv), path, NULL, + FALSE, 0.0, 0.0); } } diff --git a/libgimpwidgets/gimpunitmenu.h b/libgimpwidgets/gimpunitmenu.h index cd71fdbf51..3206a63b0e 100644 --- a/libgimpwidgets/gimpunitmenu.h +++ b/libgimpwidgets/gimpunitmenu.h @@ -53,7 +53,7 @@ struct _GimpUnitMenu /* private */ GtkWidget *selection; - GtkWidget *clist; + GtkWidget *tv; }; struct _GimpUnitMenuClass diff --git a/libgimpwidgets/gimpwidgets.c b/libgimpwidgets/gimpwidgets.c index a45c687973..8c6d74928a 100644 --- a/libgimpwidgets/gimpwidgets.c +++ b/libgimpwidgets/gimpwidgets.c @@ -511,7 +511,7 @@ gimp_spin_button_new (GtkObject **adjustment, /* return value */ spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (*adjustment), climb_rate, digits); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE); - gtk_widget_set_usize (spinbutton, 75, -1); + gtk_widget_set_size_request (spinbutton, 75, -1); return spinbutton; } @@ -538,8 +538,8 @@ gimp_scale_entry_unconstrained_adjustment_callback (GtkAdjustment *adjustment, * @row: The row to attach the widgets. * @text: The text for the #GtkLabel which will appear * left of the #GtkHScale. - * @scale_usize: The minimum horizontal size of the #GtkHScale. - * @spinbutton_usize: The minimum horizontal size of the #GtkSpinButton. + * @scale_width: The minimum horizontal size of the #GtkHScale. + * @spinbutton_width: The minimum horizontal size of the #GtkSpinButton. * @value: The initial value. * @lower: The lower boundary. * @upper: The upper boundary. @@ -568,8 +568,8 @@ gimp_scale_entry_new (GtkTable *table, gint column, gint row, const gchar *text, - gint scale_usize, - gint spinbutton_usize, + gint scale_width, + gint spinbutton_width, gfloat value, gfloat lower, gfloat upper, @@ -634,12 +634,12 @@ gimp_scale_entry_new (GtkTable *table, return_adj = adjustment; } - if (spinbutton_usize > 0) - gtk_widget_set_usize (spinbutton, spinbutton_usize, -1); + if (spinbutton_width > 0) + gtk_widget_set_size_request (spinbutton, spinbutton_width, -1); scale = gtk_hscale_new (GTK_ADJUSTMENT (adjustment)); - if (scale_usize > 0) - gtk_widget_set_usize (scale, scale_usize, -1); + if (scale_width > 0) + gtk_widget_set_size_request (scale, scale_width, -1); gtk_scale_set_digits (GTK_SCALE (scale), digits); gtk_scale_set_draw_value (GTK_SCALE (scale), FALSE); gtk_table_attach (GTK_TABLE (table), scale, @@ -835,7 +835,7 @@ gimp_coordinates_callback (GtkWidget *widget, * GIMP_UNIT_PIXEL. * @menu_show_percent: #TRUE if the #GimpUnitMenu should contain an item for * GIMP_UNIT_PERCENT. - * @spinbutton_usize: The horizontal usize of the #GimpSizeEntry's + * @spinbutton_width: The horizontal size of the #GimpSizeEntry's * #GtkSpinButton's. * @update_policy: The update policy for the #GimpSizeEntry. * @chainbutton_active: #TRUE if the attached #GimpChainButton should be @@ -867,7 +867,7 @@ gimp_coordinates_new (GimpUnit unit, const gchar *unit_format, gboolean menu_show_pixels, gboolean menu_show_percent, - gint spinbutton_usize, + gint spinbutton_width, GimpSizeEntryUpdatePolicy update_policy, gboolean chainbutton_active, @@ -900,7 +900,7 @@ gimp_coordinates_new (GimpUnit unit, menu_show_pixels, menu_show_percent, FALSE, - spinbutton_usize, + spinbutton_width, update_policy); gtk_table_set_col_spacing (GTK_TABLE (sizeentry), 0, 4); gtk_table_set_col_spacing (GTK_TABLE (sizeentry), 2, 4); diff --git a/libgimpwidgets/gimpwidgets.h b/libgimpwidgets/gimpwidgets.h index 0e1c594aad..2d4237c968 100644 --- a/libgimpwidgets/gimpwidgets.h +++ b/libgimpwidgets/gimpwidgets.h @@ -140,8 +140,8 @@ GtkObject * gimp_scale_entry_new (GtkTable *table, gint column, gint row, const gchar *text, - gint scale_usize, - gint spinbutton_usize, + gint scale_width, + gint spinbutton_width, gfloat value, gfloat lower, gfloat upper, @@ -177,7 +177,7 @@ GtkWidget * gimp_coordinates_new (GimpUnit unit, const gchar *unit_format, gboolean menu_show_pixels, gboolean menu_show_percent, - gint spinbutton_usize, + gint spinbutton_width, GimpSizeEntryUpdatePolicy update_policy, gboolean chainbutton_active, diff --git a/modules/Makefile.am b/modules/Makefile.am index 44fe0cd367..da98ad215e 100644 --- a/modules/Makefile.am +++ b/modules/Makefile.am @@ -23,9 +23,9 @@ EXTRA_DIST = \ libexec_LTLIBRARIES = @STRIP_BEGIN@ \ libcolorsel_triangle.la \ +@STRIP_END@ ## libcolorsel_gtk.la \ ## libcolorsel_water.la \ -@STRIP_END@ EXTRA_LTLIBRARIES += diff --git a/plug-ins/Makefile.am b/plug-ins/Makefile.am index baab65acb3..dce7c8484a 100644 --- a/plug-ins/Makefile.am +++ b/plug-ins/Makefile.am @@ -32,7 +32,6 @@ SUBDIRS = \ libgck \ dbbrowser \ script-fu \ -## $(GIMP_PERL) \ FractalExplorer \ Lighting \ MapObject \ @@ -41,8 +40,6 @@ SUBDIRS = \ fits \ flame \ fp \ -## gap \ -## gdyntext \ gfig \ gflare \ gfli \ @@ -62,6 +59,10 @@ SUBDIRS = \ plugin-helper \ common +## $(GIMP_PERL) \ +## gap \ +## gdyntext \ + .PHONY: files files: diff --git a/plug-ins/common/animationplay.c b/plug-ins/common/animationplay.c index 0633581283..14dadf38fb 100644 --- a/plug-ins/common/animationplay.c +++ b/plug-ins/common/animationplay.c @@ -758,7 +758,7 @@ build_dialog (GimpImageBaseType basetype, { #ifdef RAPH_IS_HOME drawing_area = gtk_drawing_area_new (); - gtk_widget_set_usize (drawing_area, width, height); + gtk_widget_set_size_request (drawing_area, width, height); gtk_container_add (GTK_CONTAINER (eventbox), GTK_WIDGET (drawing_area)); gtk_widget_show (drawing_area); @@ -789,7 +789,7 @@ build_dialog (GimpImageBaseType basetype, gtk_progress_set_format_string (GTK_PROGRESS (progress), _("Frame %v of %u")); gtk_progress_set_show_text (GTK_PROGRESS (progress), TRUE); - /* gtk_widget_set_usize (GTK_WIDGET (progress), 150, 15);*/ + /* gtk_widget_set_size_request (GTK_WIDGET (progress), 150, 15); */ gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (progress), TRUE, TRUE, 0); } @@ -814,7 +814,7 @@ build_dialog (GimpImageBaseType basetype, #ifdef RAPH_IS_HOME shape_drawing_area = gtk_drawing_area_new (); { - gtk_widget_set_usize (shape_drawing_area, width, height); + gtk_widget_set_size_request (shape_drawing_area, width, height); gtk_container_add (GTK_CONTAINER (shape_window), shape_drawing_area); } gtk_widget_show (shape_drawing_area); @@ -824,7 +824,7 @@ build_dialog (GimpImageBaseType basetype, #else shape_fixed = gtk_fixed_new (); { - gtk_widget_set_usize (shape_fixed, width,height); + gtk_widget_set_size_request (shape_fixed, width, height); gtk_container_add (GTK_CONTAINER (shape_window), shape_fixed); shape_preview = diff --git a/plug-ins/common/colorify.c b/plug-ins/common/colorify.c index 6c69ab0621..fa25303d86 100644 --- a/plug-ins/common/colorify.c +++ b/plug-ins/common/colorify.c @@ -355,7 +355,8 @@ colorify_dialog (GimpRGB *color) color_area = gimp_color_area_new (&button_color[i], GIMP_COLOR_AREA_FLAT, GDK_BUTTON2_MASK); - gtk_widget_set_usize (GTK_WIDGET (color_area), COLOR_SIZE, COLOR_SIZE); + gtk_widget_set_size_request (GTK_WIDGET (color_area), + COLOR_SIZE, COLOR_SIZE); gtk_container_add (GTK_CONTAINER (button), color_area); gtk_signal_connect (GTK_OBJECT (button), "clicked", (GtkSignalFunc) predefined_color_callback, diff --git a/plug-ins/common/convmatrix.c b/plug-ins/common/convmatrix.c index 2b3ee7d176..85b43b08d0 100644 --- a/plug-ins/common/convmatrix.c +++ b/plug-ins/common/convmatrix.c @@ -891,7 +891,7 @@ dialog (void) for (x = 0; x < 5; x++) { my_widgets.matrix[x][y] = entry = gtk_entry_new (); - gtk_widget_set_usize (entry, 40, 0); + gtk_widget_set_size_request (entry, 40, -1); gtk_table_attach (GTK_TABLE (table), entry, x, x+1, y, y+1, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0); gtk_entry_set_text (GTK_ENTRY (entry), buffer); @@ -916,7 +916,7 @@ dialog (void) gtk_widget_show (label); my_widgets.divisor = entry = gtk_entry_new (); - gtk_widget_set_usize (entry, 40, 0); + gtk_widget_set_size_request (entry, 40, -1); gtk_table_attach_defaults (GTK_TABLE (table), entry, 1, 2, 0, 1); gtk_signal_connect (GTK_OBJECT (entry), "changed", GTK_SIGNAL_FUNC (entry_callback), @@ -935,7 +935,7 @@ dialog (void) gtk_widget_show (label); my_widgets.offset = entry = gtk_entry_new (); - gtk_widget_set_usize (entry, 40, 0); + gtk_widget_set_size_request (entry, 40, -1); gtk_table_attach_defaults (GTK_TABLE (table), entry, 1, 2, 0, 1); gtk_signal_connect (GTK_OBJECT (entry), "changed", (GtkSignalFunc) entry_callback, diff --git a/plug-ins/common/curve_bend.c b/plug-ins/common/curve_bend.c index 0636233969..6f9c6196f2 100644 --- a/plug-ins/common/curve_bend.c +++ b/plug-ins/common/curve_bend.c @@ -1406,7 +1406,7 @@ bender_new_dialog (GimpDrawable *drawable) cd->rotate_data = GTK_ADJUSTMENT (data); spinbutton = gtk_spin_button_new (cd->rotate_data, 0.5, 1); - gtk_widget_set_usize (spinbutton, ENTRY_WIDTH, -1); + gtk_widget_set_size_request (spinbutton, ENTRY_WIDTH, -1); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE); gtk_box_pack_start (GTK_BOX (outline_hbox), spinbutton, FALSE, FALSE, 2); diff --git a/plug-ins/common/diffraction.c b/plug-ins/common/diffraction.c index 1820747cf0..b5a693e795 100644 --- a/plug-ins/common/diffraction.c +++ b/plug-ins/common/diffraction.c @@ -568,7 +568,7 @@ diffraction_dialog (void) gtk_widget_show (dint.preview); dint.progress = gtk_progress_bar_new (); - gtk_widget_set_usize (dint.progress, PROGRESS_WIDTH, PROGRESS_HEIGHT); + gtk_widget_set_size_request (dint.progress, PROGRESS_WIDTH, PROGRESS_HEIGHT); gtk_box_pack_start (GTK_BOX (vbox), dint.progress, TRUE, FALSE, 0); gtk_widget_show (dint.progress); diff --git a/plug-ins/common/film.c b/plug-ins/common/film.c index eec91bb094..c61d7e05ce 100644 --- a/plug-ins/common/film.c +++ b/plug-ins/common/film.c @@ -1279,7 +1279,7 @@ film_dialog (gint32 image_ID) /* Fontfamily for numbering */ filmint.font_entry = entry = gtk_entry_new (); - gtk_widget_set_usize (entry, 60, 0); + gtk_widget_set_size_request (entry, 60, -1); gtk_entry_set_text (GTK_ENTRY (entry), filmvals.number_fontf); gimp_table_attach_aligned (GTK_TABLE (table), 0, 1, _("Font:"), 1.0, 0.5, diff --git a/plug-ins/common/gbr.c b/plug-ins/common/gbr.c index 096fbffb92..fe99308c6c 100644 --- a/plug-ins/common/gbr.c +++ b/plug-ins/common/gbr.c @@ -594,7 +594,7 @@ save_dialog (void) &info.spacing); entry = gtk_entry_new (); - gtk_widget_set_usize (entry, 200, 0); + gtk_widget_set_size_request (entry, 200, -1); gimp_table_attach_aligned (GTK_TABLE (table), 0, 1, _("Description:"), 1.0, 0.5, entry, 1, FALSE); diff --git a/plug-ins/common/gee.c b/plug-ins/common/gee.c index 162e89e45f..69c211428b 100644 --- a/plug-ins/common/gee.c +++ b/plug-ins/common/gee.c @@ -238,7 +238,7 @@ build_dialog (GimpImageBaseType basetype, gtk_container_add (GTK_CONTAINER (frame2), GTK_WIDGET (eventbox)); drawing_area = gtk_drawing_area_new (); - gtk_widget_set_usize (drawing_area, IWIDTH, IHEIGHT); + gtk_widget_set_size_request (drawing_area, IWIDTH, IHEIGHT); gtk_container_add (GTK_CONTAINER (eventbox), drawing_area); gtk_widget_show (drawing_area); diff --git a/plug-ins/common/gee_zoom.c b/plug-ins/common/gee_zoom.c index 6850b3575b..8bdbb755f4 100644 --- a/plug-ins/common/gee_zoom.c +++ b/plug-ins/common/gee_zoom.c @@ -256,7 +256,7 @@ build_dialog (GimpImageBaseType basetype, #ifdef RAPH_IS_HOME drawing_area = gtk_drawing_area_new (); - gtk_widget_set_usize (drawing_area, width, height); + gtk_widget_set_size_request (drawing_area, width, height); gtk_container_add (GTK_CONTAINER (eventbox), drawing_area); gtk_widget_show (drawing_area); #else diff --git a/plug-ins/common/gicon.c b/plug-ins/common/gicon.c index bba9bc1a81..dd0eb724fe 100644 --- a/plug-ins/common/gicon.c +++ b/plug-ins/common/gicon.c @@ -459,7 +459,7 @@ save_dialog (void) entry = gtk_entry_new (); - gtk_widget_set_usize (entry, 200, 0); + gtk_widget_set_size_request (entry, 200, -1); gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, _("Icon Name:"), 1.0, 0.5, entry, 1, FALSE); diff --git a/plug-ins/common/gih.c b/plug-ins/common/gih.c index 606056130f..ed39d8806c 100644 --- a/plug-ins/common/gih.c +++ b/plug-ins/common/gih.c @@ -886,7 +886,7 @@ gih_save_dialog (gint32 image_ID) * Description: ___________ */ entry = gtk_entry_new (); - gtk_widget_set_usize (entry, 200, 0); + gtk_widget_set_size_request (entry, 200, -1); gtk_entry_set_text (GTK_ENTRY (entry), info.description); gimp_table_attach_aligned (GTK_TABLE (table), 0, 1, _("Description:"), 1.0, 0.5, diff --git a/plug-ins/common/gtm.c b/plug-ins/common/gtm.c index 18497ab656..dd915a752c 100644 --- a/plug-ins/common/gtm.c +++ b/plug-ins/common/gtm.c @@ -496,7 +496,7 @@ save_dialog (image_ID) entry = gtk_entry_new (); gtk_table_attach (GTK_TABLE (table), entry, 1, 2, 2, 3, GTK_FILL | GTK_EXPAND, 0, 0, 0); - gtk_widget_set_usize (entry, 200, 0); + gtk_widget_set_size_request (entry, 200, -1); gtk_signal_connect (GTK_OBJECT (entry), "changed", GTK_SIGNAL_FUNC (gtm_caption_callback), NULL); @@ -508,7 +508,7 @@ save_dialog (image_ID) gtk_widget_set_sensitive (entry, gtmvals.caption); entry = gtk_entry_new (); - gtk_widget_set_usize (entry, 200, 0); + gtk_widget_set_size_request (entry, 200, -1); gimp_table_attach_aligned (GTK_TABLE (table), 0, 3, _("Cell Content:"), 1.0, 0.5, entry, 1, FALSE); @@ -546,7 +546,7 @@ save_dialog (image_ID) NULL); entry = gtk_entry_new (); - gtk_widget_set_usize (entry, 60, 0); + gtk_widget_set_size_request (entry, 60, -1); gimp_table_attach_aligned (GTK_TABLE (table), 0, 1, _("Width:"), 1.0, 0.5, entry, 1, TRUE); @@ -560,7 +560,7 @@ save_dialog (image_ID) NULL); entry = gtk_entry_new (); - gtk_widget_set_usize (entry, 60, 0); + gtk_widget_set_size_request (entry, 60, -1); gimp_table_attach_aligned (GTK_TABLE (table), 0, 2, _("Height:"), 1.0, 0.5, entry, 1, TRUE); diff --git a/plug-ins/common/jpeg.c b/plug-ins/common/jpeg.c index 4e9f771cb6..ad1982a8ea 100644 --- a/plug-ins/common/jpeg.c +++ b/plug-ins/common/jpeg.c @@ -1644,7 +1644,7 @@ save_dialog (void) scale_data = gtk_adjustment_new (jsvals.quality, 0.0, 1.0, 0.01, 0.01, 0.0); scale = gtk_hscale_new (GTK_ADJUSTMENT (scale_data)); - gtk_widget_set_usize (scale, SCALE_WIDTH, 0); + gtk_widget_set_size_request (scale, SCALE_WIDTH, -1); gtk_table_attach (GTK_TABLE (table), scale, 1, 3, 0, 1, GTK_FILL | GTK_EXPAND, GTK_FILL, 0, 0); gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP); @@ -1666,7 +1666,7 @@ save_dialog (void) scale_data = gtk_adjustment_new (jsvals.smoothing, 0.0, 1.0, 0.01, 0.01, 0.0); scale = gtk_hscale_new (GTK_ADJUSTMENT (scale_data)); - gtk_widget_set_usize (scale, SCALE_WIDTH, 0); + gtk_widget_set_size_request (scale, SCALE_WIDTH, -1); gtk_table_attach (GTK_TABLE (table), scale, 1, 3, 1, 2, GTK_FILL | GTK_EXPAND, GTK_FILL, 0, 0); gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP); @@ -1704,7 +1704,7 @@ save_dialog (void) GTK_EXPAND | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); gtk_widget_show (abox); - gtk_widget_set_usize (restart_markers_scale, SCALE_WIDTH, 0); + gtk_widget_set_size_request (restart_markers_scale, SCALE_WIDTH, -1); gtk_container_add (GTK_CONTAINER (abox), restart_markers_scale); gtk_scale_set_value_pos (GTK_SCALE (restart_markers_scale), GTK_POS_TOP); gtk_scale_set_digits (GTK_SCALE (restart_markers_scale), 0); diff --git a/plug-ins/common/mail.c b/plug-ins/common/mail.c index cb34da283e..0cf3b4263a 100644 --- a/plug-ins/common/mail.c +++ b/plug-ins/common/mail.c @@ -486,7 +486,7 @@ save_dialog (void) /* to: dialog */ entry = gtk_entry_new (); - gtk_widget_set_usize (entry, 200, 0); + gtk_widget_set_size_request (entry, 200, -1); g_snprintf (buffer, sizeof (buffer), "%s", mail_info.receipt); gtk_entry_set_text (GTK_ENTRY (entry), buffer); gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, @@ -498,7 +498,7 @@ save_dialog (void) /* From entry */ entry = gtk_entry_new (); - gtk_widget_set_usize (entry, 200, 0); + gtk_widget_set_size_request (entry, 200, -1); g_snprintf (buffer, sizeof (buffer), "%s", mail_info.from); gtk_entry_set_text (GTK_ENTRY (entry), buffer); gimp_table_attach_aligned (GTK_TABLE (table), 0, 1, @@ -510,7 +510,7 @@ save_dialog (void) /* Subject entry */ entry = gtk_entry_new (); - gtk_widget_set_usize (entry, 200, 0); + gtk_widget_set_size_request (entry, 200, -1); g_snprintf (buffer, sizeof (buffer), "%s", mail_info.subject); gtk_entry_set_text (GTK_ENTRY (entry), buffer); gimp_table_attach_aligned (GTK_TABLE (table), 0, 2, @@ -522,7 +522,7 @@ save_dialog (void) /* Comment entry */ entry = gtk_entry_new (); - gtk_widget_set_usize (entry, 200, 0); + gtk_widget_set_size_request (entry, 200, -1); g_snprintf (buffer, sizeof (buffer), "%s", mail_info.comment); gtk_entry_set_text (GTK_ENTRY (entry), buffer); gimp_table_attach_aligned (GTK_TABLE (table), 0, 3, @@ -534,7 +534,7 @@ save_dialog (void) /* Filename entry */ entry = gtk_entry_new (); - gtk_widget_set_usize (entry, 200, 0); + gtk_widget_set_size_request (entry, 200, -1); g_snprintf (buffer, sizeof (buffer), "%s", mail_info.filename); gtk_entry_set_text (GTK_ENTRY (entry), buffer); gimp_table_attach_aligned (GTK_TABLE (table), 0, 4, diff --git a/plug-ins/common/pat.c b/plug-ins/common/pat.c index f281af86ed..819e3bf074 100644 --- a/plug-ins/common/pat.c +++ b/plug-ins/common/pat.c @@ -472,7 +472,7 @@ save_dialog (void) gtk_widget_show (table); entry = gtk_entry_new (); - gtk_widget_set_usize (entry, 200, 0); + gtk_widget_set_size_request (entry, 200, -1); gtk_entry_set_text (GTK_ENTRY (entry), description); gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, _("Description:"), 1.0, 0.5, diff --git a/plug-ins/common/plugin-browser.c b/plug-ins/common/plugin-browser.c index 22b0234bfe..01babd28f6 100644 --- a/plug-ins/common/plugin-browser.c +++ b/plug-ins/common/plugin-browser.c @@ -205,7 +205,8 @@ details_callback (GtkWidget *widget, gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (pdesc->descr_scroll), GTK_POLICY_ALWAYS, GTK_POLICY_ALWAYS); - gtk_widget_set_usize (pdesc->descr_scroll, DBL_WIDTH - DBL_LIST_WIDTH, -1); + gtk_widget_set_size_request (pdesc->descr_scroll, + DBL_WIDTH - DBL_LIST_WIDTH, -1); gtk_paned_pack2 (GTK_PANED (pdesc->paned), pdesc->descr_scroll, FALSE, TRUE); gtk_clist_select_row (GTK_CLIST(pdesc->clist), pdesc->clist_row, -1); @@ -417,7 +418,7 @@ procedure_general_select_callback (PDesc *pdesc, gtk_text_view_set_editable (GTK_TEXT_VIEW (text_view), FALSE); gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (text_view), GTK_WRAP_WORD); - gtk_widget_set_usize (text_view, -1, 60); + gtk_widget_set_size_request (text_view, -1, 60); gtk_table_attach (GTK_TABLE (help), text_view, 0, 1, 0, 1, GTK_EXPAND | GTK_SHRINK | GTK_FILL, GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0); @@ -1047,7 +1048,7 @@ gimp_plugin_desc (void) gtk_clist_set_selection_mode (GTK_CLIST (plugindesc->clist), GTK_SELECTION_BROWSE); - gtk_widget_set_usize (plugindesc->clist, DBL_LIST_WIDTH, DBL_HEIGHT); + gtk_widget_set_size_request (plugindesc->clist, DBL_LIST_WIDTH, DBL_HEIGHT); gtk_signal_connect (GTK_OBJECT (plugindesc->clist), "select_row", GTK_SIGNAL_FUNC (procedure_clist_select_callback), plugindesc); @@ -1067,7 +1068,7 @@ gimp_plugin_desc (void) swindow = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (swindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - gtk_widget_set_usize (plugindesc->ctree, DBL_LIST_WIDTH, DBL_HEIGHT); + gtk_widget_set_size_request (plugindesc->ctree, DBL_LIST_WIDTH, DBL_HEIGHT); gtk_signal_connect (GTK_OBJECT (plugindesc->ctree), "tree_select_row", GTK_SIGNAL_FUNC (procedure_ctree_select_callback), plugindesc); diff --git a/plug-ins/common/plugindetails.c b/plug-ins/common/plugindetails.c index 22b0234bfe..01babd28f6 100644 --- a/plug-ins/common/plugindetails.c +++ b/plug-ins/common/plugindetails.c @@ -205,7 +205,8 @@ details_callback (GtkWidget *widget, gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (pdesc->descr_scroll), GTK_POLICY_ALWAYS, GTK_POLICY_ALWAYS); - gtk_widget_set_usize (pdesc->descr_scroll, DBL_WIDTH - DBL_LIST_WIDTH, -1); + gtk_widget_set_size_request (pdesc->descr_scroll, + DBL_WIDTH - DBL_LIST_WIDTH, -1); gtk_paned_pack2 (GTK_PANED (pdesc->paned), pdesc->descr_scroll, FALSE, TRUE); gtk_clist_select_row (GTK_CLIST(pdesc->clist), pdesc->clist_row, -1); @@ -417,7 +418,7 @@ procedure_general_select_callback (PDesc *pdesc, gtk_text_view_set_editable (GTK_TEXT_VIEW (text_view), FALSE); gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (text_view), GTK_WRAP_WORD); - gtk_widget_set_usize (text_view, -1, 60); + gtk_widget_set_size_request (text_view, -1, 60); gtk_table_attach (GTK_TABLE (help), text_view, 0, 1, 0, 1, GTK_EXPAND | GTK_SHRINK | GTK_FILL, GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0); @@ -1047,7 +1048,7 @@ gimp_plugin_desc (void) gtk_clist_set_selection_mode (GTK_CLIST (plugindesc->clist), GTK_SELECTION_BROWSE); - gtk_widget_set_usize (plugindesc->clist, DBL_LIST_WIDTH, DBL_HEIGHT); + gtk_widget_set_size_request (plugindesc->clist, DBL_LIST_WIDTH, DBL_HEIGHT); gtk_signal_connect (GTK_OBJECT (plugindesc->clist), "select_row", GTK_SIGNAL_FUNC (procedure_clist_select_callback), plugindesc); @@ -1067,7 +1068,7 @@ gimp_plugin_desc (void) swindow = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (swindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - gtk_widget_set_usize (plugindesc->ctree, DBL_LIST_WIDTH, DBL_HEIGHT); + gtk_widget_set_size_request (plugindesc->ctree, DBL_LIST_WIDTH, DBL_HEIGHT); gtk_signal_connect (GTK_OBJECT (plugindesc->ctree), "tree_select_row", GTK_SIGNAL_FUNC (procedure_ctree_select_callback), plugindesc); diff --git a/plug-ins/common/png.c b/plug-ins/common/png.c index 687241f47e..8d1aa1ef2d 100644 --- a/plug-ins/common/png.c +++ b/plug-ins/common/png.c @@ -1130,7 +1130,7 @@ save_dialog (void) scale_data = gtk_adjustment_new (pngvals.compression_level, 1.0, 9.0, 1.0, 1.0, 0.0); scale = gtk_hscale_new (GTK_ADJUSTMENT (scale_data)); - gtk_widget_set_usize (scale, SCALE_WIDTH, 0); + gtk_widget_set_size_request (scale, SCALE_WIDTH, -1); gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP); gtk_scale_set_digits (GTK_SCALE (scale), 0); gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED); diff --git a/plug-ins/common/postscript.c b/plug-ins/common/postscript.c index 8d1a46666e..0aae884a39 100644 --- a/plug-ins/common/postscript.c +++ b/plug-ins/common/postscript.c @@ -2672,7 +2672,7 @@ load_dialog (void) &plvals.height); pages_entry = gtk_entry_new (); - gtk_widget_set_usize (pages_entry, 80, 0); + gtk_widget_set_size_request (pages_entry, 80, -1); gtk_entry_set_text (GTK_ENTRY (pages_entry), plvals.pages); gimp_table_attach_aligned (GTK_TABLE (table), 0, 3, _("Pages:"), 1.0, 0.5, diff --git a/plug-ins/common/ps.c b/plug-ins/common/ps.c index 8d1a46666e..0aae884a39 100644 --- a/plug-ins/common/ps.c +++ b/plug-ins/common/ps.c @@ -2672,7 +2672,7 @@ load_dialog (void) &plvals.height); pages_entry = gtk_entry_new (); - gtk_widget_set_usize (pages_entry, 80, 0); + gtk_widget_set_size_request (pages_entry, 80, -1); gtk_entry_set_text (GTK_ENTRY (pages_entry), plvals.pages); gimp_table_attach_aligned (GTK_TABLE (table), 0, 3, _("Pages:"), 1.0, 0.5, diff --git a/plug-ins/common/sample_colorize.c b/plug-ins/common/sample_colorize.c index 2fa4f57e3d..c5086b6cbb 100644 --- a/plug-ins/common/sample_colorize.c +++ b/plug-ins/common/sample_colorize.c @@ -1612,7 +1612,7 @@ p_smp_dialog (void) g_di.adj_lvl_in_min = GTK_ADJUSTMENT (data); spinbutton = gtk_spin_button_new (g_di.adj_lvl_in_min, 0.5, 0); - gtk_widget_set_usize (spinbutton, TEXT_WIDTH, 25); + gtk_widget_set_size_request (spinbutton, TEXT_WIDTH, -1); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE); gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0); @@ -1627,7 +1627,7 @@ p_smp_dialog (void) g_di.adj_lvl_in_gamma = GTK_ADJUSTMENT (data); spinbutton = gtk_spin_button_new (g_di.adj_lvl_in_gamma, 0.5, 2); - gtk_widget_set_usize (spinbutton, TEXT_WIDTH, 25); + gtk_widget_set_size_request (spinbutton, TEXT_WIDTH, -1); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE); gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0); @@ -1641,7 +1641,7 @@ p_smp_dialog (void) g_di.adj_lvl_in_max = GTK_ADJUSTMENT (data); spinbutton = gtk_spin_button_new (g_di.adj_lvl_in_max, 0.5, 0); - gtk_widget_set_usize (spinbutton, TEXT_WIDTH, 25); + gtk_widget_set_size_request (spinbutton, TEXT_WIDTH, -1); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE); gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0); @@ -1665,7 +1665,7 @@ p_smp_dialog (void) g_di.adj_lvl_out_min = GTK_ADJUSTMENT (data); spinbutton = gtk_spin_button_new (g_di.adj_lvl_out_min, 0.5, 0); - gtk_widget_set_usize (spinbutton, TEXT_WIDTH, 25); + gtk_widget_set_size_request (spinbutton, TEXT_WIDTH, -1); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE); gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0); @@ -1679,7 +1679,7 @@ p_smp_dialog (void) g_di.adj_lvl_out_max = GTK_ADJUSTMENT (data); spinbutton = gtk_spin_button_new (g_di.adj_lvl_out_max, 0.5, 0); - gtk_widget_set_usize (spinbutton, TEXT_WIDTH, 25); + gtk_widget_set_size_request (spinbutton, TEXT_WIDTH, -1); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE); gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0); diff --git a/plug-ins/common/sinus.c b/plug-ins/common/sinus.c index 7aa4f2628c..f7a060772f 100644 --- a/plug-ins/common/sinus.c +++ b/plug-ins/common/sinus.c @@ -1805,7 +1805,7 @@ sinus_dialog (void) spinbutton = gimp_spin_button_new (&adj, svals.seed, -10000000000.0, 1000000000.0, 1.0, 10.0, 0.0, 0.0, 0); - gtk_widget_set_usize (spinbutton, 100, -1); + gtk_widget_set_size_request (spinbutton, 100, -1); gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0); gtk_signal_connect (GTK_OBJECT (adj), "value_changed", GTK_SIGNAL_FUNC (sinus_int_adjustment_update), diff --git a/plug-ins/common/spheredesigner.c b/plug-ins/common/spheredesigner.c index 722dbd2f12..763b94ac56 100644 --- a/plug-ins/common/spheredesigner.c +++ b/plug-ins/common/spheredesigner.c @@ -2237,7 +2237,7 @@ GtkWidget* makewindow (void) gtk_object_set_data (GTK_OBJECT (window), "drawarea", drawarea); gtk_widget_show (drawarea); gtk_container_add (GTK_CONTAINER (frame2), drawarea); - gtk_widget_set_usize (drawarea, PREVIEWSIZE, PREVIEWSIZE); + gtk_widget_set_size_request (drawarea, PREVIEWSIZE, PREVIEWSIZE); gtk_signal_connect (GTK_OBJECT (drawarea), "expose_event", (GtkSignalFunc) expose_event, NULL); @@ -2258,7 +2258,7 @@ GtkWidget* makewindow (void) viewport2 = gtk_viewport_new (NULL, NULL); gtk_object_set_data (GTK_OBJECT (window), "viewport2", viewport2); - gtk_widget_set_usize (viewport2, 150, -1); + gtk_widget_set_size_request (viewport2, 150, -1); gtk_widget_show (viewport2); gtk_container_add (GTK_CONTAINER (frame3), viewport2); @@ -2389,7 +2389,7 @@ GtkWidget* makewindow (void) gtk_misc_set_alignment (GTK_MISC (label5), 1.0, 1.0); _scalescale = gtk_hscale_new (GTK_ADJUSTMENT (scalescale = gtk_adjustment_new (1.0, 0.0, 5.1, 0.1, 0.1, 0.1))); - gtk_widget_set_usize(_scalescale, 100, -1); + gtk_widget_set_size_request (_scalescale, 100, -1); gtk_object_set_data (GTK_OBJECT (window), "_scalescale", _scalescale); gtk_widget_show (_scalescale); gtk_table_attach (GTK_TABLE (table2), _scalescale, 1, 2, 3, 4, @@ -2406,7 +2406,7 @@ GtkWidget* makewindow (void) gtk_misc_set_alignment (GTK_MISC (label5), 1.0, 1.0); _turbulencescale = gtk_hscale_new (GTK_ADJUSTMENT (turbulencescale = gtk_adjustment_new (0.0, 0.0, 5.1, 0.1, 0.1, 0.1))); - gtk_widget_set_usize(_turbulencescale, 100, -1); + gtk_widget_set_size_request (_turbulencescale, 100, -1); gtk_object_set_data (GTK_OBJECT (window), "_turbulencescale", _turbulencescale); gtk_widget_show (_turbulencescale); gtk_table_attach (GTK_TABLE (table2), _turbulencescale, 1, 2, 4, 5, @@ -2423,7 +2423,7 @@ GtkWidget* makewindow (void) gtk_misc_set_alignment (GTK_MISC (label6), 1.0, 1.0); _scalescale = gtk_hscale_new (GTK_ADJUSTMENT (scalexscale = gtk_adjustment_new (1.0, 0.0, 5.1, 0.1, 0.1, 0.1))); - gtk_widget_set_usize(_scalescale, 100, -1); + gtk_widget_set_size_request (_scalescale, 100, -1); gtk_object_set_data (GTK_OBJECT (window), "_scalescale", _scalescale); gtk_scale_set_digits (GTK_SCALE (_scalescale), 2); gtk_widget_show (_scalescale); @@ -2440,7 +2440,7 @@ GtkWidget* makewindow (void) gtk_misc_set_alignment (GTK_MISC (label6), 1.0, 1.0); _scalescale = gtk_hscale_new (GTK_ADJUSTMENT (scaleyscale = gtk_adjustment_new (1.0, 0.0, 5.1, 0.1, 0.1, 0.1))); - gtk_widget_set_usize(_scalescale, 100, -1); + gtk_widget_set_size_request (_scalescale, 100, -1); gtk_object_set_data (GTK_OBJECT (window), "_scalescale", _scalescale); gtk_scale_set_digits (GTK_SCALE (_scalescale), 2); gtk_widget_show (_scalescale); @@ -2457,7 +2457,7 @@ GtkWidget* makewindow (void) gtk_misc_set_alignment (GTK_MISC (label6), 1.0, 1.0); _scalescale = gtk_hscale_new (GTK_ADJUSTMENT (scalezscale = gtk_adjustment_new (1.0, 0.0, 5.1, 0.1, 0.1, 0.1))); - gtk_widget_set_usize(_scalescale, 100, -1); + gtk_widget_set_size_request (_scalescale, 100, -1); gtk_object_set_data (GTK_OBJECT (window), "_scalescale", _scalescale); gtk_scale_set_digits (GTK_SCALE (_scalescale), 2); gtk_widget_show (_scalescale); @@ -2475,7 +2475,7 @@ GtkWidget* makewindow (void) gtk_misc_set_alignment (GTK_MISC (label6), 1.0, 1.0); _rotscale = gtk_hscale_new (GTK_ADJUSTMENT (rotxscale = gtk_adjustment_new (1.0, 0.0, 360.1, 0.1, 0.1, 0.1))); - gtk_widget_set_usize(_rotscale, 100, -1); + gtk_widget_set_size_request (_rotscale, 100, -1); gtk_object_set_data (GTK_OBJECT (window), "_rotscale", _rotscale); gtk_scale_set_digits (GTK_SCALE (_rotscale), 2); gtk_widget_show (_rotscale); @@ -2492,7 +2492,7 @@ GtkWidget* makewindow (void) gtk_misc_set_alignment (GTK_MISC (label6), 1.0, 1.0); _rotscale = gtk_hscale_new (GTK_ADJUSTMENT (rotyscale = gtk_adjustment_new (1.0, 0.0, 360.1, 0.1, 0.1, 0.1))); - gtk_widget_set_usize(_rotscale, 100, -1); + gtk_widget_set_size_request (_rotscale, 100, -1); gtk_object_set_data (GTK_OBJECT (window), "_rotscale", _rotscale); gtk_scale_set_digits (GTK_SCALE (_rotscale), 2); gtk_widget_show (_rotscale); @@ -2509,7 +2509,7 @@ GtkWidget* makewindow (void) gtk_misc_set_alignment (GTK_MISC (label6), 1.0, 1.0); _rotscale = gtk_hscale_new (GTK_ADJUSTMENT (rotzscale = gtk_adjustment_new (1.0, 0.0, 360.1, 0.1, 0.1, 0.1))); - gtk_widget_set_usize(_rotscale, 100, -1); + gtk_widget_set_size_request (_rotscale, 100, -1); gtk_object_set_data (GTK_OBJECT (window), "_rotscale", _rotscale); gtk_scale_set_digits (GTK_SCALE (_rotscale), 2); gtk_widget_show (_rotscale); @@ -2526,7 +2526,7 @@ GtkWidget* makewindow (void) gtk_misc_set_alignment (GTK_MISC (label6), 1.0, 1.0); _scalescale = gtk_hscale_new (GTK_ADJUSTMENT (posxscale = gtk_adjustment_new (0.0, -20.0, 20.1, 0.1, 0.1, 0.1))); - gtk_widget_set_usize(_scalescale, 100, -1); + gtk_widget_set_size_request (_scalescale, 100, -1); gtk_object_set_data (GTK_OBJECT (window), "_scalescale", _scalescale); gtk_scale_set_digits (GTK_SCALE (_scalescale), 2); gtk_widget_show (_scalescale); @@ -2543,7 +2543,7 @@ GtkWidget* makewindow (void) gtk_misc_set_alignment (GTK_MISC (label6), 1.0, 1.0); _scalescale = gtk_hscale_new (GTK_ADJUSTMENT (posyscale = gtk_adjustment_new (1.0, -20.0, 20.1, 0.1, 0.1, 0.1))); - gtk_widget_set_usize(_scalescale, 100, -1); + gtk_widget_set_size_request (_scalescale, 100, -1); gtk_object_set_data (GTK_OBJECT (window), "_scalescale", _scalescale); gtk_scale_set_digits (GTK_SCALE (_scalescale), 2); gtk_widget_show (_scalescale); @@ -2560,7 +2560,7 @@ GtkWidget* makewindow (void) gtk_misc_set_alignment (GTK_MISC (label6), 1.0, 1.0); _scalescale = gtk_hscale_new (GTK_ADJUSTMENT (poszscale = gtk_adjustment_new (1.0, -20.0, 20.1, 0.1, 0.1, 0.1))); - gtk_widget_set_usize(_scalescale, 100, -1); + gtk_widget_set_size_request (_scalescale, 100, -1); gtk_object_set_data (GTK_OBJECT (window), "_scalescale", _scalescale); gtk_scale_set_digits (GTK_SCALE (_scalescale), 2); gtk_widget_show (_scalescale); @@ -2614,7 +2614,7 @@ GtkWidget* makewindow (void) gtk_misc_set_alignment (GTK_MISC (label7), 1.0, 1.0); _amountscale = gtk_hscale_new (GTK_ADJUSTMENT (amountscale = gtk_adjustment_new (1.0, 0, 1.01, .01, .01, .01))); - gtk_widget_set_usize(_amountscale, 100, -1); + gtk_widget_set_size_request (_amountscale, 100, -1); gtk_object_set_data (GTK_OBJECT (window), "_amountscale", _amountscale); gtk_widget_show (_amountscale); gtk_table_attach (GTK_TABLE (table2), _amountscale, 1, 2, 5, 6, @@ -2631,7 +2631,7 @@ GtkWidget* makewindow (void) gtk_misc_set_alignment (GTK_MISC (label8), 1.0, 1.0); _expscale = gtk_hscale_new (GTK_ADJUSTMENT (expscale = gtk_adjustment_new (1.0, 0, 1.01, .01, .01, .01))); - gtk_widget_set_usize(_expscale, 100, -1); + gtk_widget_set_size_request (_expscale, 100, -1); gtk_object_set_data (GTK_OBJECT (window), "_expscale", _expscale); gtk_widget_show (_expscale); gtk_table_attach (GTK_TABLE (table2), _expscale, 1, 2, 6, 7, diff --git a/plug-ins/common/tileit.c b/plug-ins/common/tileit.c index ca710e5d04..73423f9a9e 100644 --- a/plug-ins/common/tileit.c +++ b/plug-ins/common/tileit.c @@ -523,7 +523,7 @@ tileit_dialog (void) gtk_object_set_data (GTK_OBJECT (toggle), "set_sensitive", label); spinbutton = gimp_spin_button_new (&adj, 2, 1, 6, 1, 1, 0, 1, 0); - gtk_widget_set_usize (spinbutton, ENTRY_WIDTH, -1); + gtk_widget_set_size_request (spinbutton, ENTRY_WIDTH, -1); gtk_table_attach (GTK_TABLE (table), spinbutton, 2, 3, 2, 3, GTK_FILL | GTK_SHRINK, GTK_FILL, 0, 0); gtk_signal_connect (GTK_OBJECT (adj), "value_changed", @@ -545,7 +545,7 @@ tileit_dialog (void) gtk_object_set_data (GTK_OBJECT (spinbutton), "set_sensitive", label); spinbutton = gimp_spin_button_new (&adj, 2, 1, 6, 1, 1, 0, 1, 0); - gtk_widget_set_usize (spinbutton, ENTRY_WIDTH, -1); + gtk_widget_set_size_request (spinbutton, ENTRY_WIDTH, -1); gtk_table_attach (GTK_TABLE (table), spinbutton, 2, 3, 3, 4, GTK_FILL | GTK_EXPAND, GTK_FILL, 0, 0); gtk_signal_connect (GTK_OBJECT (adj), "value_changed", diff --git a/plug-ins/common/uniteditor.c b/plug-ins/common/uniteditor.c index 977a6caf4b..0c6be914c8 100644 --- a/plug-ins/common/uniteditor.c +++ b/plug-ins/common/uniteditor.c @@ -207,7 +207,7 @@ new_unit (GimpUnit template) gimp_unit_get_factor (template) : 1.0, GIMP_MIN_RESOLUTION, GIMP_MAX_RESOLUTION, 0.01, 0.1, 0.0, 0.01, 5); - gtk_widget_set_usize (spinbutton, 100, -1); + gtk_widget_set_size_request (spinbutton, 100, -1); gimp_table_attach_aligned (GTK_TABLE (table), 0, 1, _("Factor:"), 1.0, 0.5, spinbutton, 1, TRUE); @@ -218,7 +218,7 @@ new_unit (GimpUnit template) (template != GIMP_UNIT_PIXEL) ? gimp_unit_get_digits (template) : 2.0, 0, 5, 1, 1, 0, 1, 0); - gtk_widget_set_usize (spinbutton, 50, -1); + gtk_widget_set_size_request (spinbutton, 50, -1); gimp_table_attach_aligned (GTK_TABLE (table), 0, 2, _("Digits:"), 1.0, 0.5, spinbutton, 1, TRUE); @@ -614,7 +614,7 @@ unit_editor_dialog (void) clist_init (); - gtk_widget_set_usize (clist, -1, 200); + gtk_widget_set_size_request (clist, -1, 200); gtk_container_add (GTK_CONTAINER (scrolled_win), clist); gtk_widget_show (clist); diff --git a/plug-ins/common/xbm.c b/plug-ins/common/xbm.c index 102ce2a2b0..1bdbef995e 100644 --- a/plug-ins/common/xbm.c +++ b/plug-ins/common/xbm.c @@ -1201,7 +1201,7 @@ save_dialog (gint32 drawable_ID) /* comment string. */ entry = gtk_entry_new_with_max_length (MAX_COMMENT); - gtk_widget_set_usize (entry, 240, 0); + gtk_widget_set_size_request (entry, 240, -1); gtk_entry_set_text (GTK_ENTRY (entry), xsvals.comment); gimp_table_attach_aligned (GTK_TABLE (table), 0, 1, _("Comment:"), 1.0, 0.5, diff --git a/plug-ins/dbbrowser/plugin-browser.c b/plug-ins/dbbrowser/plugin-browser.c index 22b0234bfe..01babd28f6 100644 --- a/plug-ins/dbbrowser/plugin-browser.c +++ b/plug-ins/dbbrowser/plugin-browser.c @@ -205,7 +205,8 @@ details_callback (GtkWidget *widget, gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (pdesc->descr_scroll), GTK_POLICY_ALWAYS, GTK_POLICY_ALWAYS); - gtk_widget_set_usize (pdesc->descr_scroll, DBL_WIDTH - DBL_LIST_WIDTH, -1); + gtk_widget_set_size_request (pdesc->descr_scroll, + DBL_WIDTH - DBL_LIST_WIDTH, -1); gtk_paned_pack2 (GTK_PANED (pdesc->paned), pdesc->descr_scroll, FALSE, TRUE); gtk_clist_select_row (GTK_CLIST(pdesc->clist), pdesc->clist_row, -1); @@ -417,7 +418,7 @@ procedure_general_select_callback (PDesc *pdesc, gtk_text_view_set_editable (GTK_TEXT_VIEW (text_view), FALSE); gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (text_view), GTK_WRAP_WORD); - gtk_widget_set_usize (text_view, -1, 60); + gtk_widget_set_size_request (text_view, -1, 60); gtk_table_attach (GTK_TABLE (help), text_view, 0, 1, 0, 1, GTK_EXPAND | GTK_SHRINK | GTK_FILL, GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0); @@ -1047,7 +1048,7 @@ gimp_plugin_desc (void) gtk_clist_set_selection_mode (GTK_CLIST (plugindesc->clist), GTK_SELECTION_BROWSE); - gtk_widget_set_usize (plugindesc->clist, DBL_LIST_WIDTH, DBL_HEIGHT); + gtk_widget_set_size_request (plugindesc->clist, DBL_LIST_WIDTH, DBL_HEIGHT); gtk_signal_connect (GTK_OBJECT (plugindesc->clist), "select_row", GTK_SIGNAL_FUNC (procedure_clist_select_callback), plugindesc); @@ -1067,7 +1068,7 @@ gimp_plugin_desc (void) swindow = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (swindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - gtk_widget_set_usize (plugindesc->ctree, DBL_LIST_WIDTH, DBL_HEIGHT); + gtk_widget_set_size_request (plugindesc->ctree, DBL_LIST_WIDTH, DBL_HEIGHT); gtk_signal_connect (GTK_OBJECT (plugindesc->ctree), "tree_select_row", GTK_SIGNAL_FUNC (procedure_ctree_select_callback), plugindesc); diff --git a/plug-ins/jpeg/jpeg-load.c b/plug-ins/jpeg/jpeg-load.c index 4e9f771cb6..ad1982a8ea 100644 --- a/plug-ins/jpeg/jpeg-load.c +++ b/plug-ins/jpeg/jpeg-load.c @@ -1644,7 +1644,7 @@ save_dialog (void) scale_data = gtk_adjustment_new (jsvals.quality, 0.0, 1.0, 0.01, 0.01, 0.0); scale = gtk_hscale_new (GTK_ADJUSTMENT (scale_data)); - gtk_widget_set_usize (scale, SCALE_WIDTH, 0); + gtk_widget_set_size_request (scale, SCALE_WIDTH, -1); gtk_table_attach (GTK_TABLE (table), scale, 1, 3, 0, 1, GTK_FILL | GTK_EXPAND, GTK_FILL, 0, 0); gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP); @@ -1666,7 +1666,7 @@ save_dialog (void) scale_data = gtk_adjustment_new (jsvals.smoothing, 0.0, 1.0, 0.01, 0.01, 0.0); scale = gtk_hscale_new (GTK_ADJUSTMENT (scale_data)); - gtk_widget_set_usize (scale, SCALE_WIDTH, 0); + gtk_widget_set_size_request (scale, SCALE_WIDTH, -1); gtk_table_attach (GTK_TABLE (table), scale, 1, 3, 1, 2, GTK_FILL | GTK_EXPAND, GTK_FILL, 0, 0); gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP); @@ -1704,7 +1704,7 @@ save_dialog (void) GTK_EXPAND | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); gtk_widget_show (abox); - gtk_widget_set_usize (restart_markers_scale, SCALE_WIDTH, 0); + gtk_widget_set_size_request (restart_markers_scale, SCALE_WIDTH, -1); gtk_container_add (GTK_CONTAINER (abox), restart_markers_scale); gtk_scale_set_value_pos (GTK_SCALE (restart_markers_scale), GTK_POS_TOP); gtk_scale_set_digits (GTK_SCALE (restart_markers_scale), 0); diff --git a/plug-ins/jpeg/jpeg-load.h b/plug-ins/jpeg/jpeg-load.h index 4e9f771cb6..ad1982a8ea 100644 --- a/plug-ins/jpeg/jpeg-load.h +++ b/plug-ins/jpeg/jpeg-load.h @@ -1644,7 +1644,7 @@ save_dialog (void) scale_data = gtk_adjustment_new (jsvals.quality, 0.0, 1.0, 0.01, 0.01, 0.0); scale = gtk_hscale_new (GTK_ADJUSTMENT (scale_data)); - gtk_widget_set_usize (scale, SCALE_WIDTH, 0); + gtk_widget_set_size_request (scale, SCALE_WIDTH, -1); gtk_table_attach (GTK_TABLE (table), scale, 1, 3, 0, 1, GTK_FILL | GTK_EXPAND, GTK_FILL, 0, 0); gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP); @@ -1666,7 +1666,7 @@ save_dialog (void) scale_data = gtk_adjustment_new (jsvals.smoothing, 0.0, 1.0, 0.01, 0.01, 0.0); scale = gtk_hscale_new (GTK_ADJUSTMENT (scale_data)); - gtk_widget_set_usize (scale, SCALE_WIDTH, 0); + gtk_widget_set_size_request (scale, SCALE_WIDTH, -1); gtk_table_attach (GTK_TABLE (table), scale, 1, 3, 1, 2, GTK_FILL | GTK_EXPAND, GTK_FILL, 0, 0); gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP); @@ -1704,7 +1704,7 @@ save_dialog (void) GTK_EXPAND | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); gtk_widget_show (abox); - gtk_widget_set_usize (restart_markers_scale, SCALE_WIDTH, 0); + gtk_widget_set_size_request (restart_markers_scale, SCALE_WIDTH, -1); gtk_container_add (GTK_CONTAINER (abox), restart_markers_scale); gtk_scale_set_value_pos (GTK_SCALE (restart_markers_scale), GTK_POS_TOP); gtk_scale_set_digits (GTK_SCALE (restart_markers_scale), 0); diff --git a/plug-ins/jpeg/jpeg-save.c b/plug-ins/jpeg/jpeg-save.c index 4e9f771cb6..ad1982a8ea 100644 --- a/plug-ins/jpeg/jpeg-save.c +++ b/plug-ins/jpeg/jpeg-save.c @@ -1644,7 +1644,7 @@ save_dialog (void) scale_data = gtk_adjustment_new (jsvals.quality, 0.0, 1.0, 0.01, 0.01, 0.0); scale = gtk_hscale_new (GTK_ADJUSTMENT (scale_data)); - gtk_widget_set_usize (scale, SCALE_WIDTH, 0); + gtk_widget_set_size_request (scale, SCALE_WIDTH, -1); gtk_table_attach (GTK_TABLE (table), scale, 1, 3, 0, 1, GTK_FILL | GTK_EXPAND, GTK_FILL, 0, 0); gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP); @@ -1666,7 +1666,7 @@ save_dialog (void) scale_data = gtk_adjustment_new (jsvals.smoothing, 0.0, 1.0, 0.01, 0.01, 0.0); scale = gtk_hscale_new (GTK_ADJUSTMENT (scale_data)); - gtk_widget_set_usize (scale, SCALE_WIDTH, 0); + gtk_widget_set_size_request (scale, SCALE_WIDTH, -1); gtk_table_attach (GTK_TABLE (table), scale, 1, 3, 1, 2, GTK_FILL | GTK_EXPAND, GTK_FILL, 0, 0); gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP); @@ -1704,7 +1704,7 @@ save_dialog (void) GTK_EXPAND | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); gtk_widget_show (abox); - gtk_widget_set_usize (restart_markers_scale, SCALE_WIDTH, 0); + gtk_widget_set_size_request (restart_markers_scale, SCALE_WIDTH, -1); gtk_container_add (GTK_CONTAINER (abox), restart_markers_scale); gtk_scale_set_value_pos (GTK_SCALE (restart_markers_scale), GTK_POS_TOP); gtk_scale_set_digits (GTK_SCALE (restart_markers_scale), 0); diff --git a/plug-ins/jpeg/jpeg-save.h b/plug-ins/jpeg/jpeg-save.h index 4e9f771cb6..ad1982a8ea 100644 --- a/plug-ins/jpeg/jpeg-save.h +++ b/plug-ins/jpeg/jpeg-save.h @@ -1644,7 +1644,7 @@ save_dialog (void) scale_data = gtk_adjustment_new (jsvals.quality, 0.0, 1.0, 0.01, 0.01, 0.0); scale = gtk_hscale_new (GTK_ADJUSTMENT (scale_data)); - gtk_widget_set_usize (scale, SCALE_WIDTH, 0); + gtk_widget_set_size_request (scale, SCALE_WIDTH, -1); gtk_table_attach (GTK_TABLE (table), scale, 1, 3, 0, 1, GTK_FILL | GTK_EXPAND, GTK_FILL, 0, 0); gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP); @@ -1666,7 +1666,7 @@ save_dialog (void) scale_data = gtk_adjustment_new (jsvals.smoothing, 0.0, 1.0, 0.01, 0.01, 0.0); scale = gtk_hscale_new (GTK_ADJUSTMENT (scale_data)); - gtk_widget_set_usize (scale, SCALE_WIDTH, 0); + gtk_widget_set_size_request (scale, SCALE_WIDTH, -1); gtk_table_attach (GTK_TABLE (table), scale, 1, 3, 1, 2, GTK_FILL | GTK_EXPAND, GTK_FILL, 0, 0); gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP); @@ -1704,7 +1704,7 @@ save_dialog (void) GTK_EXPAND | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); gtk_widget_show (abox); - gtk_widget_set_usize (restart_markers_scale, SCALE_WIDTH, 0); + gtk_widget_set_size_request (restart_markers_scale, SCALE_WIDTH, -1); gtk_container_add (GTK_CONTAINER (abox), restart_markers_scale); gtk_scale_set_value_pos (GTK_SCALE (restart_markers_scale), GTK_POS_TOP); gtk_scale_set_digits (GTK_SCALE (restart_markers_scale), 0); diff --git a/plug-ins/jpeg/jpeg.c b/plug-ins/jpeg/jpeg.c index 4e9f771cb6..ad1982a8ea 100644 --- a/plug-ins/jpeg/jpeg.c +++ b/plug-ins/jpeg/jpeg.c @@ -1644,7 +1644,7 @@ save_dialog (void) scale_data = gtk_adjustment_new (jsvals.quality, 0.0, 1.0, 0.01, 0.01, 0.0); scale = gtk_hscale_new (GTK_ADJUSTMENT (scale_data)); - gtk_widget_set_usize (scale, SCALE_WIDTH, 0); + gtk_widget_set_size_request (scale, SCALE_WIDTH, -1); gtk_table_attach (GTK_TABLE (table), scale, 1, 3, 0, 1, GTK_FILL | GTK_EXPAND, GTK_FILL, 0, 0); gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP); @@ -1666,7 +1666,7 @@ save_dialog (void) scale_data = gtk_adjustment_new (jsvals.smoothing, 0.0, 1.0, 0.01, 0.01, 0.0); scale = gtk_hscale_new (GTK_ADJUSTMENT (scale_data)); - gtk_widget_set_usize (scale, SCALE_WIDTH, 0); + gtk_widget_set_size_request (scale, SCALE_WIDTH, -1); gtk_table_attach (GTK_TABLE (table), scale, 1, 3, 1, 2, GTK_FILL | GTK_EXPAND, GTK_FILL, 0, 0); gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP); @@ -1704,7 +1704,7 @@ save_dialog (void) GTK_EXPAND | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); gtk_widget_show (abox); - gtk_widget_set_usize (restart_markers_scale, SCALE_WIDTH, 0); + gtk_widget_set_size_request (restart_markers_scale, SCALE_WIDTH, -1); gtk_container_add (GTK_CONTAINER (abox), restart_markers_scale); gtk_scale_set_value_pos (GTK_SCALE (restart_markers_scale), GTK_POS_TOP); gtk_scale_set_digits (GTK_SCALE (restart_markers_scale), 0); diff --git a/plug-ins/jpeg/jpeg.h b/plug-ins/jpeg/jpeg.h index 4e9f771cb6..ad1982a8ea 100644 --- a/plug-ins/jpeg/jpeg.h +++ b/plug-ins/jpeg/jpeg.h @@ -1644,7 +1644,7 @@ save_dialog (void) scale_data = gtk_adjustment_new (jsvals.quality, 0.0, 1.0, 0.01, 0.01, 0.0); scale = gtk_hscale_new (GTK_ADJUSTMENT (scale_data)); - gtk_widget_set_usize (scale, SCALE_WIDTH, 0); + gtk_widget_set_size_request (scale, SCALE_WIDTH, -1); gtk_table_attach (GTK_TABLE (table), scale, 1, 3, 0, 1, GTK_FILL | GTK_EXPAND, GTK_FILL, 0, 0); gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP); @@ -1666,7 +1666,7 @@ save_dialog (void) scale_data = gtk_adjustment_new (jsvals.smoothing, 0.0, 1.0, 0.01, 0.01, 0.0); scale = gtk_hscale_new (GTK_ADJUSTMENT (scale_data)); - gtk_widget_set_usize (scale, SCALE_WIDTH, 0); + gtk_widget_set_size_request (scale, SCALE_WIDTH, -1); gtk_table_attach (GTK_TABLE (table), scale, 1, 3, 1, 2, GTK_FILL | GTK_EXPAND, GTK_FILL, 0, 0); gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP); @@ -1704,7 +1704,7 @@ save_dialog (void) GTK_EXPAND | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); gtk_widget_show (abox); - gtk_widget_set_usize (restart_markers_scale, SCALE_WIDTH, 0); + gtk_widget_set_size_request (restart_markers_scale, SCALE_WIDTH, -1); gtk_container_add (GTK_CONTAINER (abox), restart_markers_scale); gtk_scale_set_value_pos (GTK_SCALE (restart_markers_scale), GTK_POS_TOP); gtk_scale_set_digits (GTK_SCALE (restart_markers_scale), 0);