From 14d0a3ff07c22786c03d9d07a933cdb8106ad78d Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Sat, 29 Dec 2001 13:26:29 +0000 Subject: [PATCH] app/gimpprogress.c app/nav_window.c app/ops_buttons.c app/undo_history.c 2001-12-29 Michael Natterer * 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. --- ChangeLog | 134 ++++++++ app/actions/channels-commands.c | 4 +- app/actions/layers-commands.c | 4 +- app/actions/palettes-commands.c | 6 + app/actions/qmask-commands.c | 2 +- app/actions/quick-mask-commands.c | 2 +- app/base/color-balance.c | 8 +- app/base/curves.c | 37 +-- app/base/hue-saturation.c | 16 +- app/base/threshold.c | 4 +- app/dialogs/about-dialog.c | 6 +- app/dialogs/color-dialog.c | 20 +- app/dialogs/convert-dialog.c | 16 +- app/dialogs/file-open-dialog.c | 27 +- app/dialogs/file-save-dialog.c | 15 +- app/dialogs/image-new-dialog.c | 32 +- app/dialogs/info-dialog.c | 4 +- app/dialogs/module-dialog.c | 2 +- app/dialogs/offset-dialog.c | 2 +- app/dialogs/resize-dialog.c | 98 ++++-- app/dialogs/resolution-calibrate-dialog.c | 12 +- app/dialogs/tips-dialog.c | 2 +- app/dialogs/user-install-dialog.c | 28 +- app/display/gimpdisplayshell-draw.c | 16 +- app/display/gimpdisplayshell.c | 16 +- app/display/gimpnavigationeditor.c | 4 +- app/display/gimpnavigationview.c | 4 +- app/display/gimpprogress.c | 12 +- app/gimpprogress.c | 12 +- app/gui/about-dialog.c | 6 +- app/gui/brush-editor.c | 2 +- app/gui/channels-commands.c | 4 +- app/gui/color-area.c | 34 +- app/gui/color-notebook.c | 20 +- app/gui/color-select.c | 4 +- app/gui/colormap-dialog.c | 20 +- app/gui/convert-dialog.c | 16 +- app/gui/device-status-dialog.c | 6 +- app/gui/file-new-dialog.c | 32 +- app/gui/file-open-dialog.c | 27 +- app/gui/file-save-dialog.c | 15 +- app/gui/gradient-editor.c | 10 +- app/gui/info-dialog.c | 4 +- app/gui/layers-commands.c | 4 +- app/gui/module-browser.c | 2 +- app/gui/offset-dialog.c | 2 +- app/gui/palette-editor.c | 6 +- app/gui/palettes-commands.c | 6 + app/gui/paths-dialog.c | 5 + app/gui/qmask-commands.c | 2 +- app/gui/resize-dialog.c | 98 ++++-- app/gui/resolution-calibrate-dialog.c | 12 +- app/gui/splash.c | 4 +- app/gui/tips-dialog.c | 2 +- app/gui/toolbox.c | 2 +- app/gui/user-install-dialog.c | 28 +- app/nav_window.c | 4 +- app/ops_buttons.c | 2 +- app/paint/gimpink.c | 12 +- app/tools/gimpbrightnesscontrasttool.c | 8 +- app/tools/gimpbycolorselecttool.c | 4 +- app/tools/gimpcolorbalancetool.c | 8 +- app/tools/gimpcolorpickertool.c | 2 +- app/tools/gimpcroptool.c | 2 +- app/tools/gimpcurvestool.c | 37 +-- app/tools/gimphuesaturationtool.c | 16 +- app/tools/gimpinktool.c | 12 +- app/tools/gimplevelstool.c | 20 +- app/tools/gimppaintoptions-gui.c | 4 +- app/tools/gimpposterizetool.c | 2 +- app/tools/gimprotatetool.c | 2 +- app/tools/gimpselectionoptions.c | 6 +- app/tools/gimpthresholdtool.c | 4 +- app/tools/paint_options.c | 4 +- app/tools/selection_options.c | 6 +- app/undo_history.c | 5 + app/widgets/gimpbrusheditor.c | 2 +- app/widgets/gimpchannellistview.c | 6 + app/widgets/gimpchanneltreeview.c | 6 + app/widgets/gimpcolordialog.c | 20 +- app/widgets/gimpcolormapeditor.c | 20 +- app/widgets/gimpcolorpanel.c | 2 +- app/widgets/gimpcomponentlistitem.c | 22 +- app/widgets/gimpconstrainedhwrapbox.c | 7 + app/widgets/gimpcontainergridview.c | 6 +- app/widgets/gimpcontainerlistview.c | 12 +- app/widgets/gimpcontainermenuimpl.c | 8 +- app/widgets/gimpdialogfactory.c | 2 +- app/widgets/gimpdnd.c | 2 +- app/widgets/gimpdock.c | 11 +- app/widgets/gimpdockbook.c | 12 +- app/widgets/gimpdrawablelistitem.c | 22 +- app/widgets/gimpdrawablelistview.c | 12 +- app/widgets/gimpdrawabletreeview.c | 12 +- app/widgets/gimpfontselection-dialog.c | 17 +- app/widgets/gimpgradienteditor.c | 10 +- app/widgets/gimphistogramview.c | 4 +- app/widgets/gimpitemfactory.c | 17 +- app/widgets/gimpitemlistview.c | 12 +- app/widgets/gimpitemtreeview.c | 12 +- app/widgets/gimplayerlistitem.c | 22 +- app/widgets/gimplistitem.c | 25 +- app/widgets/gimplistitem.h | 5 + app/widgets/gimpmenuitem.c | 2 +- app/widgets/gimppaletteeditor.c | 6 +- app/widgets/gimppreview.c | 2 +- app/widgets/gimppreview.h | 5 + app/widgets/gimppreviewrenderer.c | 2 +- app/widgets/gimppreviewrenderer.h | 5 + app/widgets/gimptoolbox-color-area.c | 34 +- app/widgets/gimptoolbox.c | 2 +- app/widgets/gimpview.c | 2 +- app/widgets/gimpview.h | 5 + app/widgets/gimpviewrenderer.c | 2 +- app/widgets/gimpviewrenderer.h | 5 + app/widgets/gtkhwrapbox.c | 5 + app/widgets/gtkvwrapbox.c | 5 + app/widgets/gtkwrapbox.c | 5 + libgimp/gimpbrushmenu.c | 13 +- libgimp/gimpexport.c | 6 +- libgimp/gimpgradientmenu.c | 3 +- libgimp/gimpmenu.c | 24 +- libgimp/gimppatternmenu.c | 10 +- libgimp/gimpprocbrowserdialog.c | 17 +- libgimp/gimpprocview.c | 17 +- libgimpwidgets/gimpbutton.c | 2 +- libgimpwidgets/gimpchainbutton.c | 178 ++--------- libgimpwidgets/gimpchainbutton.h | 31 +- libgimpwidgets/gimpcolorarea.h | 10 + libgimpwidgets/gimpcolorbutton.c | 63 ++-- libgimpwidgets/gimpcolorselect.c | 4 +- libgimpwidgets/gimpfileentry.c | 2 +- libgimpwidgets/gimpfileselection.c | 2 +- libgimpwidgets/gimphelpui.c | 14 +- libgimpwidgets/gimpoffsetarea.c | 14 +- libgimpwidgets/gimppatheditor.c | 7 + libgimpwidgets/gimppixmap.h | 13 + libgimpwidgets/gimpquerybox.c | 3 +- libgimpwidgets/gimpstock.c | 26 +- libgimpwidgets/gimpstock.h | 45 +-- libgimpwidgets/gimpwidgets.h | 4 +- pixmaps/Makefile.am | 1 - pixmaps/chain.xpm | 118 ------- plug-ins/FractalExplorer/Dialogs.c | 274 ++++++++-------- plug-ins/FractalExplorer/Events.c | 15 +- plug-ins/FractalExplorer/FractalExplorer.c | 62 ++-- plug-ins/Lighting/lighting_ui.c | 191 ++++++------ plug-ins/MapObject/mapobject_ui.c | 295 ++++++++++-------- plug-ins/bmp/bmpwrite.c | 18 +- plug-ins/common/AlienMap.c | 32 +- plug-ins/common/AlienMap2.c | 72 +++-- plug-ins/common/CEL.c | 20 +- plug-ins/common/CML_explorer.c | 127 ++++---- plug-ins/common/aa.c | 22 +- plug-ins/common/align_layers.c | 40 +-- plug-ins/common/animationplay.c | 5 + plug-ins/common/apply_lens.c | 40 +-- plug-ins/common/blinds.c | 39 ++- plug-ins/common/blur.c | 18 +- plug-ins/common/borderaverage.c | 12 +- plug-ins/common/bumpmap.c | 95 +++--- plug-ins/common/checkerboard.c | 61 ++-- plug-ins/common/colorify.c | 14 +- plug-ins/common/colortoalpha.c | 15 +- plug-ins/common/compose.c | 125 ++++---- plug-ins/common/convmatrix.c | 59 ++-- plug-ins/common/csource.c | 86 ++--- plug-ins/common/cubism.c | 28 +- plug-ins/common/curve_bend.c | 140 +++++---- plug-ins/common/decompose.c | 62 ++-- plug-ins/common/deinterlace.c | 48 +-- plug-ins/common/depthmerge.c | 66 ++-- plug-ins/common/despeckle.c | 53 ++-- plug-ins/common/destripe.c | 68 ++-- plug-ins/common/diffraction.c | 97 +++--- plug-ins/common/displace.c | 169 +++++----- plug-ins/common/edge.c | 93 +++--- plug-ins/common/emboss.c | 39 +-- plug-ins/common/engrave.c | 63 ++-- plug-ins/common/exchange.c | 156 ++++----- plug-ins/common/film.c | 206 ++++++------ plug-ins/common/flarefx.c | 113 ++++--- plug-ins/common/fractaltrace.c | 62 ++-- plug-ins/common/gauss_iir.c | 47 +-- plug-ins/common/gauss_rle.c | 47 +-- plug-ins/common/gbr.c | 27 +- plug-ins/common/gee.c | 77 ++--- plug-ins/common/gee_zoom.c | 74 ++--- plug-ins/common/gicon.c | 62 ++-- plug-ins/common/gif.c | 63 ++-- plug-ins/common/gih.c | 82 +++-- plug-ins/common/glasstile.c | 65 ++-- plug-ins/common/gqbist.c | 74 +++-- plug-ins/common/grid.c | 156 +++++---- plug-ins/common/gtm.c | 129 ++++---- plug-ins/common/hot.c | 95 +++--- plug-ins/common/illusion.c | 93 +++--- plug-ins/common/iwarp.c | 130 ++++---- plug-ins/common/jigsaw.c | 94 +++--- plug-ins/common/jpeg.c | 122 ++++---- plug-ins/common/laplace.c | 48 +-- plug-ins/common/lic.c | 49 ++- plug-ins/common/mail.c | 43 +-- plug-ins/common/mapcolor.c | 37 +-- plug-ins/common/max_rgb.c | 34 +- plug-ins/common/mblur.c | 48 +-- plug-ins/common/mosaic.c | 78 ++--- plug-ins/common/newsprint.c | 242 +++++++------- plug-ins/dbbrowser/dbbrowser_utils.c | 17 +- plug-ins/dbbrowser/gimpprocbrowser.c | 17 +- plug-ins/dbbrowser/gimpprocview.c | 17 +- plug-ins/fits/fits.c | 17 +- plug-ins/flame/flame.c | 209 +++++++------ plug-ins/fp/fp_gtk.c | 139 +++++---- plug-ins/fp/fp_misc.c | 15 +- plug-ins/gfig/gfig.c | 6 + plug-ins/gflare/gflare.c | 5 + plug-ins/gfli/gfli.c | 42 +-- plug-ins/gimpressionist/brush.c | 63 ++-- plug-ins/gimpressionist/color.c | 17 +- plug-ins/gimpressionist/general.c | 18 +- plug-ins/gimpressionist/gimpressionist.c | 7 +- plug-ins/gimpressionist/orientation.c | 12 +- plug-ins/gimpressionist/orientmap.c | 13 +- plug-ins/gimpressionist/paper.c | 18 +- plug-ins/gimpressionist/placement.c | 17 +- plug-ins/gimpressionist/presets.c | 20 +- plug-ins/gimpressionist/preview.c | 19 +- plug-ins/gimpressionist/size.c | 18 +- plug-ins/gimpressionist/sizemap.c | 14 +- plug-ins/ifscompose/ifscompose.c | 8 +- plug-ins/imagemap/imap_about.c | 7 + plug-ins/imagemap/imap_browse.c | 7 + plug-ins/imagemap/imap_browse.h | 2 - plug-ins/imagemap/imap_circle.c | 25 +- plug-ins/imagemap/imap_cmd_clear.c | 2 + plug-ins/imagemap/imap_cmd_copy.c | 7 + plug-ins/imagemap/imap_cmd_copy_object.c | 2 + plug-ins/imagemap/imap_cmd_create.c | 5 +- plug-ins/imagemap/imap_cmd_cut.c | 2 + plug-ins/imagemap/imap_cmd_cut_object.c | 2 + plug-ins/imagemap/imap_cmd_delete.c | 2 + plug-ins/imagemap/imap_cmd_delete_point.c | 2 + plug-ins/imagemap/imap_cmd_edit_object.c | 2 + plug-ins/imagemap/imap_cmd_guides.c | 34 +- plug-ins/imagemap/imap_cmd_insert_point.c | 2 + plug-ins/imagemap/imap_cmd_move.c | 20 +- plug-ins/imagemap/imap_cmd_move_down.c | 2 + plug-ins/imagemap/imap_cmd_move_sash.c | 18 +- plug-ins/imagemap/imap_cmd_move_selected.c | 2 + plug-ins/imagemap/imap_cmd_move_to_front.c | 2 + plug-ins/imagemap/imap_cmd_move_up.c | 2 + plug-ins/imagemap/imap_cmd_object_down.c | 2 + plug-ins/imagemap/imap_cmd_object_move.c | 2 + plug-ins/imagemap/imap_cmd_object_up.c | 2 + plug-ins/imagemap/imap_cmd_paste.c | 2 + plug-ins/imagemap/imap_cmd_select.c | 2 + plug-ins/imagemap/imap_cmd_select_all.c | 2 + plug-ins/imagemap/imap_cmd_select_next.c | 2 + plug-ins/imagemap/imap_cmd_select_prev.c | 2 + plug-ins/imagemap/imap_cmd_select_region.c | 18 +- plug-ins/imagemap/imap_cmd_send_to_back.c | 2 + plug-ins/imagemap/imap_cmd_unselect.c | 2 + plug-ins/imagemap/imap_cmd_unselect_all.c | 7 +- plug-ins/imagemap/imap_command.c | 5 + plug-ins/imagemap/imap_default_dialog.c | 22 +- plug-ins/imagemap/imap_default_dialog.h | 2 - plug-ins/imagemap/imap_edit_area_info.c | 71 +++-- plug-ins/imagemap/imap_edit_area_info.h | 2 - plug-ins/imagemap/imap_file.c | 20 +- plug-ins/imagemap/imap_file.h | 2 - plug-ins/imagemap/imap_grid.c | 50 +-- plug-ins/imagemap/imap_main.c | 5 + plug-ins/imagemap/imap_menu.c | 9 +- plug-ins/imagemap/imap_menu_funcs.c | 9 + plug-ins/imagemap/imap_menu_funcs.h | 2 - plug-ins/imagemap/imap_misc.c | 9 + plug-ins/imagemap/imap_misc.h | 2 - plug-ins/imagemap/imap_mru.c | 4 + plug-ins/imagemap/imap_mru.h | 2 - plug-ins/imagemap/imap_object.c | 21 +- plug-ins/imagemap/imap_object.h | 2 - plug-ins/imagemap/imap_object_popup.c | 4 + plug-ins/imagemap/imap_polygon.c | 7 + plug-ins/imagemap/imap_popup.c | 5 +- plug-ins/imagemap/imap_preferences.c | 10 +- plug-ins/imagemap/imap_preview.c | 9 + plug-ins/imagemap/imap_preview.h | 3 - plug-ins/imagemap/imap_rectangle.c | 7 + plug-ins/imagemap/imap_selection.c | 7 + plug-ins/imagemap/imap_settings.c | 11 +- plug-ins/imagemap/imap_source.c | 11 +- plug-ins/imagemap/imap_statusbar.c | 13 +- plug-ins/imagemap/imap_statusbar.h | 2 - plug-ins/imagemap/imap_string.c | 4 + plug-ins/imagemap/imap_string.h | 2 - plug-ins/imagemap/imap_table.c | 4 + plug-ins/imagemap/imap_table.h | 2 - plug-ins/imagemap/imap_taglist.c | 5 + plug-ins/imagemap/imap_toolbar.c | 2 + plug-ins/imagemap/imap_toolbar.h | 2 - plug-ins/imagemap/imap_tools.c | 2 + plug-ins/jpeg/jpeg-load.c | 122 ++++---- plug-ins/jpeg/jpeg-load.h | 122 ++++---- plug-ins/jpeg/jpeg-save.c | 122 ++++---- plug-ins/jpeg/jpeg-save.h | 122 ++++---- plug-ins/jpeg/jpeg.c | 122 ++++---- plug-ins/jpeg/jpeg.h | 122 ++++---- plug-ins/maze/maze_face.c | 132 ++++---- plug-ins/mosaic/mosaic.c | 78 ++--- plug-ins/pagecurl/pagecurl.c | 59 ++-- plug-ins/print/print_gimp.h | 5 + plug-ins/rcm/rcm_callback.c | 57 ++-- plug-ins/rcm/rcm_dialog.c | 174 +++++++---- plug-ins/rcm/rcm_misc.c | 17 +- plug-ins/script-fu/script-fu-console.c | 40 +-- plug-ins/script-fu/script-fu-interface.c | 31 +- plug-ins/script-fu/script-fu-scripts.c | 31 +- plug-ins/script-fu/script-fu-server.c | 6 +- plug-ins/sel2path/sel2path.c | 19 +- plug-ins/sel2path/sel2path_adv_dialog.c | 168 +++++----- plug-ins/sgi/sgi.c | 61 ++-- plug-ins/webbrowser/webbrowser.c | 38 ++- plug-ins/xjt/xjt.c | 32 +- themes/Default/Makefile.am | 9 + themes/Default/images/Makefile.am | 4 + .../images/stock-button-hchain-broken.png | Bin 0 -> 325 bytes themes/Default/images/stock-button-hchain.png | Bin 0 -> 302 bytes .../images/stock-button-vchain-broken.png | Bin 0 -> 333 bytes themes/Default/images/stock-button-vchain.png | Bin 0 -> 326 bytes 330 files changed, 5707 insertions(+), 4575 deletions(-) delete mode 100644 pixmaps/chain.xpm create mode 100644 themes/Default/images/stock-button-hchain-broken.png create mode 100644 themes/Default/images/stock-button-hchain.png create mode 100644 themes/Default/images/stock-button-vchain-broken.png create mode 100644 themes/Default/images/stock-button-vchain.png diff --git a/ChangeLog b/ChangeLog index ede7cc3789..c2e302a8bf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,137 @@ +2001-12-29 Michael Natterer + + * 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 * app/config/gimprc.c: write comment to top of gimprc. diff --git a/app/actions/channels-commands.c b/app/actions/channels-commands.c index 0b070bf265..c931cf1e62 100644 --- a/app/actions/channels-commands.c +++ b/app/actions/channels-commands.c @@ -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), diff --git a/app/actions/layers-commands.c b/app/actions/layers-commands.c index f096989bdd..bbc9fcf701 100644 --- a/app/actions/layers-commands.c +++ b/app/actions/layers-commands.c @@ -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, diff --git a/app/actions/palettes-commands.c b/app/actions/palettes-commands.c index a5121a2e93..717990eb56 100644 --- a/app/actions/palettes-commands.c +++ b/app/actions/palettes-commands.c @@ -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 + #include "libgimp/gimpintl.h" diff --git a/app/actions/qmask-commands.c b/app/actions/qmask-commands.c index e34e197a10..ea0bf2541d 100644 --- a/app/actions/qmask-commands.c +++ b/app/actions/qmask-commands.c @@ -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, diff --git a/app/actions/quick-mask-commands.c b/app/actions/quick-mask-commands.c index e34e197a10..ea0bf2541d 100644 --- a/app/actions/quick-mask-commands.c +++ b/app/actions/quick-mask-commands.c @@ -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, diff --git a/app/base/color-balance.c b/app/base/color-balance.c index e7ad29aa1a..e7ebbf363f 100644 --- a/app/base/color-balance.c +++ b/app/base/color-balance.c @@ -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", diff --git a/app/base/curves.c b/app/base/curves.c index 8076b3d6ca..34b91f3b75 100644 --- a/app/base/curves.c +++ b/app/base/curves.c @@ -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) { diff --git a/app/base/hue-saturation.c b/app/base/hue-saturation.c index 3ee70f7bd1..8c22e832c7 100644 --- a/app/base/hue-saturation.c +++ b/app/base/hue-saturation.c @@ -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]); } } diff --git a/app/base/threshold.c b/app/base/threshold.c index 511d1c7bdb..4afbaaf879 100644 --- a/app/base/threshold.c +++ b/app/base/threshold.c @@ -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); diff --git a/app/dialogs/about-dialog.c b/app/dialogs/about-dialog.c index 62db77d454..84422112cc 100644 --- a/app/dialogs/about-dialog.c +++ b/app/dialogs/about-dialog.c @@ -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); diff --git a/app/dialogs/color-dialog.c b/app/dialogs/color-dialog.c index 4dc6c0e2c5..44f5408924 100644 --- a/app/dialogs/color-dialog.c +++ b/app/dialogs/color-dialog.c @@ -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); diff --git a/app/dialogs/convert-dialog.c b/app/dialogs/convert-dialog.c index 7852bc4038..8f3481d33c 100644 --- a/app/dialogs/convert-dialog.c +++ b/app/dialogs/convert-dialog.c @@ -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), diff --git a/app/dialogs/file-open-dialog.c b/app/dialogs/file-open-dialog.c index 67288720e4..47e687444d 100644 --- a/app/dialogs/file-open-dialog.c +++ b/app/dialogs/file-open-dialog.c @@ -61,6 +61,12 @@ #include "undo.h" +#ifdef __GNUC__ +#warning GTK_DISABLE_DEPRECATED +#endif +#undef GTK_DISABLE_DEPRECATED +#include + #include "libgimp/gimpintl.h" @@ -218,12 +224,12 @@ file_open_dialog_create (Gimp *gimp) "open/dialogs/file_open.html"); { - GtkWidget *frame; - GtkWidget *vbox; - GtkWidget *hbox; - GtkWidget *option_menu; - GtkWidget *load_menu; - GtkWidget *open_options_genbutton; + GtkItemFactory *item_factory; + GtkWidget *frame; + GtkWidget *vbox; + GtkWidget *hbox; + GtkWidget *option_menu; + GtkWidget *open_options_genbutton; open_options = gtk_hbox_new (TRUE, 1); @@ -244,8 +250,9 @@ file_open_dialog_create (Gimp *gimp) gtk_box_pack_start (GTK_BOX (hbox), option_menu, FALSE, FALSE, 0); gtk_widget_show (option_menu); - load_menu = gtk_item_factory_from_path ("")->widget; - gtk_option_menu_set_menu (GTK_OPTION_MENU (option_menu), load_menu); + item_factory = gtk_item_factory_from_path (""); + gtk_option_menu_set_menu (GTK_OPTION_MENU (option_menu), + item_factory->widget); gtk_widget_show (vbox); gtk_widget_show (frame); @@ -273,7 +280,7 @@ file_open_dialog_create (Gimp *gimp) fileload); open_options_fixed = gtk_fixed_new (); - gtk_widget_set_usize (open_options_fixed, 80, 60); + gtk_widget_set_size_request (open_options_fixed, 80, 60); gtk_container_add (GTK_CONTAINER (GTK_BIN (open_options_genbutton)), open_options_fixed); gtk_widget_show (open_options_fixed); @@ -288,7 +295,7 @@ file_open_dialog_create (Gimp *gimp) gtk_widget_show (sbox); align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0); - gtk_widget_set_usize (align, 80, 60); + gtk_widget_set_size_request (align, 80, 60); gtk_box_pack_start (GTK_BOX (sbox), align, FALSE, TRUE, 0); gtk_widget_show (align); diff --git a/app/dialogs/file-save-dialog.c b/app/dialogs/file-save-dialog.c index 97e5dad21c..1e944ff2d9 100644 --- a/app/dialogs/file-save-dialog.c +++ b/app/dialogs/file-save-dialog.c @@ -250,11 +250,11 @@ file_save_dialog_create (void) "save/dialogs/file_save.html"); { - GtkWidget *frame; - GtkWidget *hbox; - GtkWidget *label; - GtkWidget *option_menu; - GtkWidget *save_menu; + GtkItemFactory *item_factory; + GtkWidget *frame; + GtkWidget *hbox; + GtkWidget *label; + GtkWidget *option_menu; save_options = gtk_hbox_new (TRUE, 1); @@ -275,8 +275,9 @@ file_save_dialog_create (void) gtk_box_pack_start (GTK_BOX (hbox), option_menu, TRUE, TRUE, 0); gtk_widget_show (option_menu); - save_menu = gtk_item_factory_from_path ("")->widget; - gtk_option_menu_set_menu (GTK_OPTION_MENU (option_menu), save_menu); + item_factory = gtk_item_factory_from_path (""); + gtk_option_menu_set_menu (GTK_OPTION_MENU (option_menu), + item_factory->widget); gtk_widget_show (frame); diff --git a/app/dialogs/image-new-dialog.c b/app/dialogs/image-new-dialog.c index bdda11a2a6..65017d94a1 100644 --- a/app/dialogs/image-new-dialog.c +++ b/app/dialogs/image-new-dialog.c @@ -200,7 +200,7 @@ file_new_dialog_create (Gimp *gimp, 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); /* add the "height in units" spinbutton to the sizeentry */ gtk_table_attach_defaults (GTK_TABLE (info->size_se), spinbutton, 0, 1, 2, 3); @@ -211,7 +211,7 @@ file_new_dialog_create (Gimp *gimp, adjustment = gtk_adjustment_new (1, 1, 1, 1, 10, 1); spinbutton2 = gtk_spin_button_new (GTK_ADJUSTMENT (adjustment), 1, 0); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton2), TRUE); - gtk_widget_set_usize (spinbutton2, 75, 0); + gtk_widget_set_size_request (spinbutton2, 75, -1); gtk_box_pack_start (GTK_BOX (hbox), spinbutton2, FALSE, FALSE, 0); gtk_widget_show (spinbutton2); @@ -232,7 +232,7 @@ file_new_dialog_create (Gimp *gimp, 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); /* add the "width in units" spinbutton to the sizeentry */ gtk_table_attach_defaults (GTK_TABLE (info->size_se), spinbutton, 0, 1, 1, 2); @@ -244,7 +244,7 @@ file_new_dialog_create (Gimp *gimp, adjustment = gtk_adjustment_new (1, 1, 1, 1, 10, 1); spinbutton2 = gtk_spin_button_new (GTK_ADJUSTMENT (adjustment), 1, 0); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton2), TRUE); - gtk_widget_set_usize (spinbutton2, 75, 0); + gtk_widget_set_size_request (spinbutton2, 75, -1); /* add the "width in pixels" spinbutton to the main table */ gtk_container_add (GTK_CONTAINER (abox), spinbutton2); gtk_widget_show (spinbutton2); @@ -300,7 +300,7 @@ file_new_dialog_create (Gimp *gimp, 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); info->resolution_se = gimp_size_entry_new (1, gimp->config->default_resolution_units, @@ -371,7 +371,7 @@ file_new_dialog_create (Gimp *gimp, name_info = (GimpImageBaseTypeName*) list->data; button = gtk_radio_button_new_with_label (group, name_info->name); - group = gtk_radio_button_group (GTK_RADIO_BUTTON (button)); + group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (button)); gtk_box_pack_start (GTK_BOX (radio_box), button, FALSE, TRUE, 0); g_object_set_data (G_OBJECT (button), "gimp-item-data", (gpointer) name_info->type); @@ -412,7 +412,7 @@ file_new_dialog_create (Gimp *gimp, button = gtk_radio_button_new_with_label (group, name_info->name); - group = gtk_radio_button_group (GTK_RADIO_BUTTON (button)); + group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (button)); gtk_box_pack_start (GTK_BOX (radio_box), button, TRUE, TRUE, 0); g_object_set_data (G_OBJECT (button), "gimp-item-data", (gpointer) name_info->type); @@ -488,7 +488,9 @@ file_new_reset_callback (GtkWidget *widget, info = (NewImageInfo *) data; - gtk_signal_handler_block_by_data (GTK_OBJECT (info->resolution_se), info); + g_signal_handlers_block_by_func (G_OBJECT (info->resolution_se), + file_new_resolution_callback, + info); gimp_chain_button_set_active (GIMP_CHAIN_BUTTON (info->couple_resolutions), @@ -502,7 +504,9 @@ file_new_reset_callback (GtkWidget *widget, gimp_size_entry_set_unit (GIMP_SIZE_ENTRY (info->resolution_se), info->gimp->config->default_resolution_units); - gtk_signal_handler_unblock_by_data (GTK_OBJECT (info->resolution_se), info); + g_signal_handlers_unblock_by_func (G_OBJECT (info->resolution_se), + file_new_resolution_callback, + info); gimp_size_entry_set_resolution (GIMP_SIZE_ENTRY (info->size_se), 0, info->gimp->config->default_xresolution, TRUE); @@ -623,8 +627,9 @@ file_new_resolution_callback (GtkWidget *widget, if (gimp_chain_button_get_active (GIMP_CHAIN_BUTTON (info->couple_resolutions))) { - gtk_signal_handler_block_by_data - (GTK_OBJECT (info->resolution_se), info); + g_signal_handlers_block_by_func (G_OBJECT (info->resolution_se), + file_new_resolution_callback, + info); if (new_xres != xres) { @@ -638,8 +643,9 @@ file_new_resolution_callback (GtkWidget *widget, gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (widget), 0, xres); } - gtk_signal_handler_unblock_by_data - (GTK_OBJECT (info->resolution_se), info); + g_signal_handlers_unblock_by_func (G_OBJECT (info->resolution_se), + file_new_resolution_callback, + info); } else { diff --git a/app/dialogs/info-dialog.c b/app/dialogs/info-dialog.c index 3dcc829b52..dd9fffe1fb 100644 --- a/app/dialogs/info-dialog.c +++ b/app/dialogs/info-dialog.c @@ -322,7 +322,7 @@ info_dialog_add_entry (InfoDialog *idialog, g_return_val_if_fail (idialog != NULL, NULL); entry = gtk_entry_new (); - gtk_widget_set_usize (entry, 50, 0); + gtk_widget_set_size_request (entry, 50, -1); gtk_entry_set_text (GTK_ENTRY (entry), text_ptr ? text_ptr : ""); if (callback) @@ -403,7 +403,7 @@ info_dialog_add_spinbutton (InfoDialog *idialog, spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (adjustment), climb_rate, MAX (MIN (digits, 6), 0)); 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); if (callback) g_signal_connect (G_OBJECT (adjustment), "value_changed", diff --git a/app/dialogs/module-dialog.c b/app/dialogs/module-dialog.c index fe1624e380..73773cefba 100644 --- a/app/dialogs/module-dialog.c +++ b/app/dialogs/module-dialog.c @@ -126,7 +126,7 @@ module_browser_new (Gimp *gimp) GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); gtk_box_pack_start (GTK_BOX (vbox), listbox, TRUE, TRUE, 0); - gtk_widget_set_usize (listbox, 125, 100); + gtk_widget_set_size_request (listbox, 125, 100); gtk_widget_show (listbox); st = g_new0 (BrowserState, 1); diff --git a/app/dialogs/offset-dialog.c b/app/dialogs/offset-dialog.c index 0abeffcdbd..be18dff9a6 100644 --- a/app/dialogs/offset-dialog.c +++ b/app/dialogs/offset-dialog.c @@ -137,7 +137,7 @@ offset_dialog_create (GimpDrawable *drawable) 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, 0); off_d->off_se = gimp_size_entry_new (1, off_d->gimage->unit, "%a", TRUE, TRUE, FALSE, 75, diff --git a/app/dialogs/resize-dialog.c b/app/dialogs/resize-dialog.c index ba76e5fade..cfe335a5dc 100644 --- a/app/dialogs/resize-dialog.c +++ b/app/dialogs/resize-dialog.c @@ -304,7 +304,7 @@ resize_widget_new (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); private->size_se = gimp_size_entry_new (1, unit, "%a", TRUE, TRUE, FALSE, 75, @@ -381,7 +381,7 @@ resize_widget_new (GimpImage *gimage, 0.01, 0.1, 1); spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (private->ratio_x_adj), 1, 4); 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); gtk_table_attach_defaults (GTK_TABLE (table2), spinbutton, 0, 1, 0, 1); gtk_widget_show (spinbutton); @@ -396,7 +396,7 @@ resize_widget_new (GimpImage *gimage, 0.01, 0.1, 1); spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (private->ratio_y_adj), 1, 4); 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); gtk_table_attach_defaults (GTK_TABLE (table2), spinbutton, 0, 1, 1, 2); gtk_widget_show (spinbutton); @@ -434,7 +434,7 @@ resize_widget_new (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); private->offset_se = gimp_size_entry_new (1, unit, "%a", TRUE, FALSE, FALSE, 75, @@ -542,7 +542,7 @@ resize_widget_new (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); gtk_container_add (GTK_CONTAINER (abox), spinbutton); gtk_widget_show (spinbutton); gtk_table_attach (GTK_TABLE (table), abox, 1, 2, 0, 1, @@ -602,7 +602,7 @@ resize_widget_new (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); private->resolution_se = gimp_size_entry_new (1, gimage->gimp->config->default_resolution_units, @@ -906,23 +906,35 @@ size_update (Resize *resize, gimp_offset_area_set_size (GIMP_OFFSET_AREA (private->offset_area), resize->width, resize->height); - gtk_signal_handler_block_by_data (GTK_OBJECT (private->size_se), resize); + g_signal_handlers_block_by_func (G_OBJECT (private->size_se), + size_callback, + resize); gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (private->size_se), 0, width); gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (private->size_se), 1, height); - gtk_signal_handler_unblock_by_data (GTK_OBJECT (private->size_se), resize); + g_signal_handlers_unblock_by_func (G_OBJECT (private->size_se), + size_callback, + resize); - gtk_signal_handler_block_by_data (GTK_OBJECT (private->ratio_x_adj), resize); - gtk_signal_handler_block_by_data (GTK_OBJECT (private->ratio_y_adj), resize); + g_signal_handlers_block_by_func (G_OBJECT (private->ratio_x_adj), + ratio_callback, + resize); + g_signal_handlers_block_by_func (G_OBJECT (private->ratio_y_adj), + ratio_callback, + resize); gtk_adjustment_set_value (GTK_ADJUSTMENT (private->ratio_x_adj), ratio_x); gtk_adjustment_set_value (GTK_ADJUSTMENT (private->ratio_y_adj), ratio_y); - gtk_signal_handler_unblock_by_data (GTK_OBJECT (private->ratio_x_adj), resize); - gtk_signal_handler_unblock_by_data (GTK_OBJECT (private->ratio_y_adj), resize); + g_signal_handlers_unblock_by_func (G_OBJECT (private->ratio_x_adj), + ratio_callback, + resize); + g_signal_handlers_unblock_by_func (G_OBJECT (private->ratio_y_adj), + ratio_callback, + resize); if (resize->type == ResizeWidget) { @@ -938,16 +950,18 @@ size_update (Resize *resize, if ((resize->type == ScaleWidget) && (resize->target == ResizeImage)) { - gtk_signal_handler_block_by_data (GTK_OBJECT (private->printsize_se), - resize); + g_signal_handlers_block_by_func (G_OBJECT (private->printsize_se), + printsize_update, + resize); gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (private->printsize_se), 0, width); gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (private->printsize_se), 1, height); - gtk_signal_handler_unblock_by_data (GTK_OBJECT (private->printsize_se), - resize); + g_signal_handlers_unblock_by_func (G_OBJECT (private->printsize_se), + printsize_update, + resize); } } @@ -1021,17 +1035,22 @@ printsize_update (GtkWidget *widget, resize->resolution_x = res_x; resize->resolution_y = res_y; - gtk_signal_handler_block_by_data (GTK_OBJECT (private->resolution_se), resize); + g_signal_handlers_block_by_func (G_OBJECT (private->resolution_se), + resolution_callback, + resize); gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (private->resolution_se), 0, res_x); gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (private->resolution_se), 1, res_y); - gtk_signal_handler_unblock_by_data (GTK_OBJECT (private->resolution_se), - resize); + g_signal_handlers_unblock_by_func (G_OBJECT (private->resolution_se), + resolution_callback, + resize); - gtk_signal_handler_block_by_data (GTK_OBJECT (private->size_se), resize); + g_signal_handlers_block_by_func (GTK_OBJECT (private->size_se), + size_callback, + resize); gimp_size_entry_set_resolution (GIMP_SIZE_ENTRY (private->size_se), 0, res_x, TRUE); @@ -1042,9 +1061,13 @@ printsize_update (GtkWidget *widget, gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (private->size_se), 1, height); - gtk_signal_handler_unblock_by_data (GTK_OBJECT (private->size_se), resize); + g_signal_handlers_unblock_by_func (G_OBJECT (private->size_se), + size_callback, + resize); - gtk_signal_handler_block_by_data (GTK_OBJECT (private->printsize_se), resize); + g_signal_handlers_block_by_func (G_OBJECT (private->printsize_se), + printsize_update, + resize); gimp_size_entry_set_resolution (GIMP_SIZE_ENTRY (private->printsize_se), 0, res_x, TRUE); @@ -1055,8 +1078,9 @@ printsize_update (GtkWidget *widget, gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (private->printsize_se), 1, height); - gtk_signal_handler_unblock_by_data (GTK_OBJECT (private->printsize_se), - resize); + g_signal_handlers_unblock_by_func (G_OBJECT (private->printsize_se), + printsize_update, + resize); } /* Callback for resolution change. */ @@ -1105,32 +1129,42 @@ resolution_update (Resize *resize, resize->resolution_x = res_x; resize->resolution_y = res_y; - gtk_signal_handler_block_by_data (GTK_OBJECT (private->resolution_se), resize); + g_signal_handlers_block_by_func (G_OBJECT (private->resolution_se), + resolution_callback, + resize); gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (private->resolution_se), 0, res_x); gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (private->resolution_se), 1, res_y); - gtk_signal_handler_unblock_by_data (GTK_OBJECT (private->resolution_se), - resize); + g_signal_handlers_unblock_by_func (G_OBJECT (private->resolution_se), + resolution_callback, + resize); - gtk_signal_handler_block_by_data (GTK_OBJECT (private->size_se), resize); + g_signal_handlers_block_by_func (GTK_OBJECT (private->size_se), + size_callback, + resize); gimp_size_entry_set_resolution (GIMP_SIZE_ENTRY (private->size_se), 0, res_x, TRUE); gimp_size_entry_set_resolution (GIMP_SIZE_ENTRY (private->size_se), 1, res_y, TRUE); - gtk_signal_handler_unblock_by_data (GTK_OBJECT (private->size_se), resize); + g_signal_handlers_unblock_by_func (G_OBJECT (private->size_se), + size_callback, + resize); - gtk_signal_handler_block_by_data (GTK_OBJECT (private->printsize_se), resize); + g_signal_handlers_block_by_func (G_OBJECT (private->printsize_se), + printsize_update, + resize); gimp_size_entry_set_resolution (GIMP_SIZE_ENTRY (private->printsize_se), 0, res_x, TRUE); gimp_size_entry_set_resolution (GIMP_SIZE_ENTRY (private->printsize_se), 1, res_y, TRUE); - gtk_signal_handler_unblock_by_data (GTK_OBJECT (private->printsize_se), - resize); + g_signal_handlers_unblock_by_func (GTK_OBJECT (private->printsize_se), + printsize_update, + resize); } diff --git a/app/dialogs/resolution-calibrate-dialog.c b/app/dialogs/resolution-calibrate-dialog.c index f5123bffa9..480034928c 100644 --- a/app/dialogs/resolution-calibrate-dialog.c +++ b/app/dialogs/resolution-calibrate-dialog.c @@ -145,7 +145,7 @@ resolution_calibrate_dialog (GtkWidget *resolution_entry, ruler = gtk_hruler_new (); SET_STYLE (ruler, ruler_style); - gtk_widget_set_usize (ruler, ruler_width, 32); + gtk_widget_set_size_request (ruler, ruler_width, 32); gtk_ruler_set_range (GTK_RULER (ruler), 0, ruler_width, 0, ruler_width); gtk_table_attach (GTK_TABLE (table), ruler, 1, 3, 0, 1, GTK_SHRINK, GTK_SHRINK, 0, 0); @@ -153,7 +153,7 @@ resolution_calibrate_dialog (GtkWidget *resolution_entry, ruler = gtk_vruler_new (); SET_STYLE (ruler, ruler_style); - gtk_widget_set_usize (ruler, 32, ruler_height); + gtk_widget_set_size_request (ruler, 32, ruler_height); gtk_ruler_set_range (GTK_RULER (ruler), 0, ruler_height, 0, ruler_height); gtk_table_attach (GTK_TABLE (table), ruler, 0, 1, 1, 3, GTK_SHRINK, GTK_SHRINK, 0, 0); @@ -171,7 +171,7 @@ resolution_calibrate_dialog (GtkWidget *resolution_entry, darea = gtk_drawing_area_new (); SET_STYLE (darea, dialog_style); - gtk_drawing_area_size (GTK_DRAWING_AREA (darea), 16, 16); + gtk_widget_set_size_request (darea, 16, 16); if (expose_callback) g_signal_connect (G_OBJECT (darea), "expose_event", G_CALLBACK (expose_callback), @@ -182,7 +182,7 @@ resolution_calibrate_dialog (GtkWidget *resolution_entry, darea = gtk_drawing_area_new (); SET_STYLE (darea, dialog_style); - gtk_drawing_area_size (GTK_DRAWING_AREA (darea), 16, 16); + gtk_widget_set_size_request (darea, 16, 16); if (expose_callback) g_signal_connect (G_OBJECT (darea), "expose_event", G_CALLBACK (expose_callback), @@ -193,7 +193,7 @@ resolution_calibrate_dialog (GtkWidget *resolution_entry, darea = gtk_drawing_area_new (); SET_STYLE (darea, dialog_style); - gtk_drawing_area_size (GTK_DRAWING_AREA (darea), 16, 16); + gtk_widget_set_size_request (darea, 16, 16); if (expose_callback) g_signal_connect (G_OBJECT (darea), "expose_event", G_CALLBACK (expose_callback), @@ -204,7 +204,7 @@ resolution_calibrate_dialog (GtkWidget *resolution_entry, darea = gtk_drawing_area_new (); SET_STYLE (darea, dialog_style); - gtk_drawing_area_size (GTK_DRAWING_AREA (darea), 16, 16); + gtk_widget_set_size_request (darea, 16, 16); if (expose_callback) g_signal_connect (G_OBJECT (darea), "expose_event", G_CALLBACK (expose_callback), diff --git a/app/dialogs/tips-dialog.c b/app/dialogs/tips-dialog.c index 6dfb35e5eb..bfb9ce00d1 100644 --- a/app/dialogs/tips-dialog.c +++ b/app/dialogs/tips-dialog.c @@ -171,7 +171,7 @@ tips_dialog_create (void) bbox = gtk_hbutton_box_new (); gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), GTK_BUTTONBOX_END); - gtk_button_box_set_spacing (GTK_BUTTON_BOX (bbox), 5); + gtk_box_set_spacing (GTK_BOX (bbox), 5); gtk_box_pack_end (GTK_BOX (hbox), bbox, FALSE, FALSE, 0); gtk_widget_show (bbox); diff --git a/app/dialogs/user-install-dialog.c b/app/dialogs/user-install-dialog.c index 91d9bc4491..ac1057121f 100644 --- a/app/dialogs/user-install-dialog.c +++ b/app/dialogs/user-install-dialog.c @@ -47,6 +47,12 @@ #include "appenv.h" #include "gimprc.h" +#ifdef __GNUC__ +#warning GTK_DISABLE_DEPRECATED +#endif +#undef GTK_DISABLE_DEPRECATED +#include + #include "libgimp/gimpintl.h" #include "pixmaps/eek.xpm" @@ -303,9 +309,9 @@ user_install_notebook_set_page (GtkNotebook *notebook, if (index == EEK_PAGE) { - gtk_widget_set_usize (title_pixmap, - title_pixmap->allocation.width, - title_pixmap->allocation.height); + gtk_widget_set_size_request (title_pixmap, + title_pixmap->allocation.width, + title_pixmap->allocation.height); gimp_pixmap_set (GIMP_PIXMAP (title_pixmap), eek_xpm); } @@ -390,11 +396,11 @@ user_install_cancel_callback (GtkWidget *widget, static gint timeout = 0; if (timeout) - gtk_exit (0); + exit (0); gtk_widget_destroy (continue_button); user_install_notebook_set_page (GTK_NOTEBOOK (notebook), EEK_PAGE); - timeout = gtk_timeout_add (1024, (GtkFunction) gtk_exit, (gpointer) 0); + timeout = gtk_timeout_add (1024, (GtkFunction) exit, NULL); } static gboolean @@ -597,7 +603,7 @@ user_install_dialog_create (Gimp *gimp) ebox = gtk_event_box_new (); TITLE_STYLE (ebox); gtk_widget_set_events (ebox, GDK_EXPOSURE_MASK); - gtk_widget_set_usize (ebox, WILBER_WIDTH + 16, -1); + gtk_widget_set_size_request (ebox, WILBER_WIDTH + 16, -1); gtk_box_pack_start (GTK_BOX (vbox), ebox, FALSE, FALSE, 0); gtk_widget_show (ebox); @@ -622,7 +628,7 @@ user_install_dialog_create (Gimp *gimp) ebox = gtk_event_box_new (); TITLE_STYLE (ebox); - gtk_widget_set_usize (ebox, 16, -1); + gtk_widget_set_size_request (ebox, 16, -1); gtk_box_pack_start (GTK_BOX (hbox), ebox, FALSE, FALSE, 0); gtk_widget_show (ebox); @@ -637,8 +643,8 @@ user_install_dialog_create (Gimp *gimp) gtk_widget_show (table); darea = gtk_drawing_area_new (); - TITLE_STYLE (darea); - gtk_drawing_area_size (GTK_DRAWING_AREA (darea), 16, 16); + TITLE_STYLE (darea); + gtk_widget_set_size_request (darea, 16, 16); g_signal_connect (G_OBJECT (darea), "expose_event", G_CALLBACK (user_install_corner_expose), GINT_TO_POINTER (GTK_CORNER_TOP_LEFT)); @@ -648,7 +654,7 @@ user_install_dialog_create (Gimp *gimp) darea = gtk_drawing_area_new (); TITLE_STYLE (darea); - gtk_drawing_area_size (GTK_DRAWING_AREA (darea), 16, 16); + gtk_widget_set_size_request (darea, 16, 16); g_signal_connect (G_OBJECT (darea), "expose_event", G_CALLBACK (user_install_corner_expose), GINT_TO_POINTER (GTK_CORNER_BOTTOM_LEFT)); @@ -816,7 +822,7 @@ user_install_dialog_create (Gimp *gimp) gtk_clist_set_column_width (GTK_CLIST (ctree), 0, gtk_clist_optimal_column_width (GTK_CLIST (ctree), 0)); - gtk_widget_set_usize (ctree, -1, ctree->requisition.height); + gtk_widget_set_size_request (ctree, -1, ctree->requisition.height); g_object_unref (file_pixmap); g_object_unref (file_mask); diff --git a/app/display/gimpdisplayshell-draw.c b/app/display/gimpdisplayshell-draw.c index a82d4adab2..67a31f510e 100644 --- a/app/display/gimpdisplayshell-draw.c +++ b/app/display/gimpdisplayshell-draw.c @@ -594,7 +594,7 @@ gimp_display_shell_new (GimpDisplay *gdisp) /* the canvas */ shell->canvas = gtk_drawing_area_new (); gtk_widget_set_name (shell->canvas, "gimp-canvas"); - gtk_drawing_area_size (GTK_DRAWING_AREA (shell->canvas), n_width, n_height); + gtk_widget_set_size_request (shell->canvas, n_width, n_height); gtk_widget_set_events (shell->canvas, GIMP_DISPLAY_SHELL_CANVAS_EVENT_MASK); gtk_widget_set_extension_events (shell->canvas, GDK_EXTENSION_EVENTS_ALL); GTK_WIDGET_SET_FLAGS (shell->canvas, GTK_CAN_FOCUS); @@ -643,7 +643,7 @@ gimp_display_shell_new (GimpDisplay *gdisp) /* the qmask button */ shell->qmask = gtk_check_button_new (); gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (shell->qmask), FALSE); - gtk_widget_set_usize (GTK_WIDGET (shell->qmask), 16, 16); + gtk_widget_set_size_request (GTK_WIDGET (shell->qmask), 16, 16); GTK_WIDGET_UNSET_FLAGS (shell->qmask, GTK_CAN_FOCUS); if (gdisp->gimage->qmask_state) @@ -705,7 +705,7 @@ gimp_display_shell_new (GimpDisplay *gdisp) /* the statusbar */ shell->statusbar = gtk_statusbar_new (); gtk_statusbar_set_has_resize_grip (GTK_STATUSBAR (shell->statusbar), FALSE); - gtk_widget_set_usize (shell->statusbar, 1, -1); + gtk_widget_set_size_request (shell->statusbar, 1, -1); gtk_container_set_resize_mode (GTK_CONTAINER (shell->statusbar), GTK_RESIZE_QUEUE); @@ -717,7 +717,7 @@ gimp_display_shell_new (GimpDisplay *gdisp) /* the progress bar */ shell->progressbar = gtk_progress_bar_new (); - gtk_widget_set_usize (shell->progressbar, 80, -1); + gtk_widget_set_size_request (shell->progressbar, 80, -1); /* the cancel button */ shell->cancelbutton = gtk_button_new_with_label (_("Cancel")); @@ -1635,12 +1635,14 @@ gimp_display_shell_resize_cursor_label (GimpDisplayShell *shell) shell->cursor_label->parent->allocation.width - shell->cursor_label->allocation.width; - gtk_widget_set_usize (shell->cursor_label, cursor_label_width, -1); + gtk_widget_set_size_request (shell->cursor_label, cursor_label_width, -1); /* don't resize if this is a new display */ if (label_frame_size_difference) - gtk_widget_set_usize (shell->cursor_label->parent, - cursor_label_width + label_frame_size_difference, -1); + gtk_widget_set_size_request (shell->cursor_label->parent, + cursor_label_width + + label_frame_size_difference, + -1); gimp_display_shell_update_cursor (shell, shell->cursor_x, diff --git a/app/display/gimpdisplayshell.c b/app/display/gimpdisplayshell.c index a82d4adab2..67a31f510e 100644 --- a/app/display/gimpdisplayshell.c +++ b/app/display/gimpdisplayshell.c @@ -594,7 +594,7 @@ gimp_display_shell_new (GimpDisplay *gdisp) /* the canvas */ shell->canvas = gtk_drawing_area_new (); gtk_widget_set_name (shell->canvas, "gimp-canvas"); - gtk_drawing_area_size (GTK_DRAWING_AREA (shell->canvas), n_width, n_height); + gtk_widget_set_size_request (shell->canvas, n_width, n_height); gtk_widget_set_events (shell->canvas, GIMP_DISPLAY_SHELL_CANVAS_EVENT_MASK); gtk_widget_set_extension_events (shell->canvas, GDK_EXTENSION_EVENTS_ALL); GTK_WIDGET_SET_FLAGS (shell->canvas, GTK_CAN_FOCUS); @@ -643,7 +643,7 @@ gimp_display_shell_new (GimpDisplay *gdisp) /* the qmask button */ shell->qmask = gtk_check_button_new (); gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (shell->qmask), FALSE); - gtk_widget_set_usize (GTK_WIDGET (shell->qmask), 16, 16); + gtk_widget_set_size_request (GTK_WIDGET (shell->qmask), 16, 16); GTK_WIDGET_UNSET_FLAGS (shell->qmask, GTK_CAN_FOCUS); if (gdisp->gimage->qmask_state) @@ -705,7 +705,7 @@ gimp_display_shell_new (GimpDisplay *gdisp) /* the statusbar */ shell->statusbar = gtk_statusbar_new (); gtk_statusbar_set_has_resize_grip (GTK_STATUSBAR (shell->statusbar), FALSE); - gtk_widget_set_usize (shell->statusbar, 1, -1); + gtk_widget_set_size_request (shell->statusbar, 1, -1); gtk_container_set_resize_mode (GTK_CONTAINER (shell->statusbar), GTK_RESIZE_QUEUE); @@ -717,7 +717,7 @@ gimp_display_shell_new (GimpDisplay *gdisp) /* the progress bar */ shell->progressbar = gtk_progress_bar_new (); - gtk_widget_set_usize (shell->progressbar, 80, -1); + gtk_widget_set_size_request (shell->progressbar, 80, -1); /* the cancel button */ shell->cancelbutton = gtk_button_new_with_label (_("Cancel")); @@ -1635,12 +1635,14 @@ gimp_display_shell_resize_cursor_label (GimpDisplayShell *shell) shell->cursor_label->parent->allocation.width - shell->cursor_label->allocation.width; - gtk_widget_set_usize (shell->cursor_label, cursor_label_width, -1); + gtk_widget_set_size_request (shell->cursor_label, cursor_label_width, -1); /* don't resize if this is a new display */ if (label_frame_size_difference) - gtk_widget_set_usize (shell->cursor_label->parent, - cursor_label_width + label_frame_size_difference, -1); + gtk_widget_set_size_request (shell->cursor_label->parent, + cursor_label_width + + label_frame_size_difference, + -1); gimp_display_shell_update_cursor (shell, shell->cursor_x, diff --git a/app/display/gimpnavigationeditor.c b/app/display/gimpnavigationeditor.c index 624d99727c..02385c04cc 100644 --- a/app/display/gimpnavigationeditor.c +++ b/app/display/gimpnavigationeditor.c @@ -599,7 +599,7 @@ nav_popup_click_handler (GtkWidget *widget, x = (x + nav_dialog->pwidth > scr_w) ? scr_w - nav_dialog->pwidth - 2: x; y = (y + nav_dialog->pheight > scr_h) ? scr_h - nav_dialog->pheight - 2: y; - gtk_widget_set_uposition (nav_dialog->shell, x, y); + gtk_window_move (GTK_WINDOW (nav_dialog->shell), x, y); gtk_widget_show (nav_dialog->shell); gdk_flush(); @@ -784,7 +784,7 @@ nav_dialog_disp_area (NavigationDialog *nav_dialog, { nav_dialog_update_preview (nav_dialog); - gtk_widget_draw (nav_dialog->preview, NULL); + gtk_widget_queue_draw (nav_dialog->preview); } } } diff --git a/app/display/gimpnavigationview.c b/app/display/gimpnavigationview.c index 624d99727c..02385c04cc 100644 --- a/app/display/gimpnavigationview.c +++ b/app/display/gimpnavigationview.c @@ -599,7 +599,7 @@ nav_popup_click_handler (GtkWidget *widget, x = (x + nav_dialog->pwidth > scr_w) ? scr_w - nav_dialog->pwidth - 2: x; y = (y + nav_dialog->pheight > scr_h) ? scr_h - nav_dialog->pheight - 2: y; - gtk_widget_set_uposition (nav_dialog->shell, x, y); + gtk_window_move (GTK_WINDOW (nav_dialog->shell), x, y); gtk_widget_show (nav_dialog->shell); gdk_flush(); @@ -784,7 +784,7 @@ nav_dialog_disp_area (NavigationDialog *nav_dialog, { nav_dialog_update_preview (nav_dialog); - gtk_widget_draw (nav_dialog->preview, NULL); + gtk_widget_queue_draw (nav_dialog->preview); } } } diff --git a/app/display/gimpprogress.c b/app/display/gimpprogress.c index 67a95f7b5c..0b25a7b5a3 100644 --- a/app/display/gimpprogress.c +++ b/app/display/gimpprogress.c @@ -151,7 +151,7 @@ progress_start (GimpDisplay *gdisp, gtk_widget_show (progress->dialog_label); progress->progressbar = gtk_progress_bar_new (); - gtk_widget_set_usize (progress->progressbar, 150, 20); + gtk_widget_set_size_request (progress->progressbar, 150, 20); gtk_box_pack_start (GTK_BOX (vbox), progress->progressbar, TRUE, TRUE, 0); gtk_widget_show (progress->progressbar); @@ -203,7 +203,7 @@ progress_restart (GimpProgress *progress, } /* reset the progress bar */ - gtk_progress_bar_update (GTK_PROGRESS_BAR (bar), 0.0); + gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (bar), 0.0); /* do we need to change the callbacks? */ progress_signal_setup (progress, cancel_callback, cancel_data); @@ -233,7 +233,7 @@ progress_update (GimpProgress *progress, bar = progress->progressbar; } - gtk_progress_bar_update (GTK_PROGRESS_BAR (bar), percentage); + gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (bar), percentage); } @@ -258,7 +258,7 @@ void progress_step (GimpProgress *progress) { GtkWidget *bar; - float val; + gdouble val; g_return_if_fail (progress != NULL); @@ -271,7 +271,7 @@ progress_step (GimpProgress *progress) bar = progress->progressbar; } - val = gtk_progress_get_current_percentage (GTK_PROGRESS (bar)) + 0.01; + val = gtk_progress_bar_get_fraction (GTK_PROGRESS_BAR (bar)) + 0.01; if (val > 1.0) val = 0.0; @@ -302,7 +302,7 @@ progress_end (GimpProgress *progress) "progress"); gtk_statusbar_pop (GTK_STATUSBAR (shell->statusbar), cid); - gtk_progress_bar_update (GTK_PROGRESS_BAR (shell->progressbar), 0.0); + gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (shell->progressbar), 0.0); if (shell->progressid > 0) shell->progressid--; diff --git a/app/gimpprogress.c b/app/gimpprogress.c index 67a95f7b5c..0b25a7b5a3 100644 --- a/app/gimpprogress.c +++ b/app/gimpprogress.c @@ -151,7 +151,7 @@ progress_start (GimpDisplay *gdisp, gtk_widget_show (progress->dialog_label); progress->progressbar = gtk_progress_bar_new (); - gtk_widget_set_usize (progress->progressbar, 150, 20); + gtk_widget_set_size_request (progress->progressbar, 150, 20); gtk_box_pack_start (GTK_BOX (vbox), progress->progressbar, TRUE, TRUE, 0); gtk_widget_show (progress->progressbar); @@ -203,7 +203,7 @@ progress_restart (GimpProgress *progress, } /* reset the progress bar */ - gtk_progress_bar_update (GTK_PROGRESS_BAR (bar), 0.0); + gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (bar), 0.0); /* do we need to change the callbacks? */ progress_signal_setup (progress, cancel_callback, cancel_data); @@ -233,7 +233,7 @@ progress_update (GimpProgress *progress, bar = progress->progressbar; } - gtk_progress_bar_update (GTK_PROGRESS_BAR (bar), percentage); + gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (bar), percentage); } @@ -258,7 +258,7 @@ void progress_step (GimpProgress *progress) { GtkWidget *bar; - float val; + gdouble val; g_return_if_fail (progress != NULL); @@ -271,7 +271,7 @@ progress_step (GimpProgress *progress) bar = progress->progressbar; } - val = gtk_progress_get_current_percentage (GTK_PROGRESS (bar)) + 0.01; + val = gtk_progress_bar_get_fraction (GTK_PROGRESS_BAR (bar)) + 0.01; if (val > 1.0) val = 0.0; @@ -302,7 +302,7 @@ progress_end (GimpProgress *progress) "progress"); gtk_statusbar_pop (GTK_STATUSBAR (shell->statusbar), cid); - gtk_progress_bar_update (GTK_PROGRESS_BAR (shell->progressbar), 0.0); + gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (shell->progressbar), 0.0); if (shell->progressid > 0) shell->progressid--; diff --git a/app/gui/about-dialog.c b/app/gui/about-dialog.c index 62db77d454..84422112cc 100644 --- a/app/gui/about-dialog.c +++ b/app/gui/about-dialog.c @@ -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); diff --git a/app/gui/brush-editor.c b/app/gui/brush-editor.c index a2ae82e0fc..e1019f9f55 100644 --- a/app/gui/brush-editor.c +++ b/app/gui/brush-editor.c @@ -133,7 +133,7 @@ brush_editor_new (Gimp *gimp) gtk_preview_size (GTK_PREVIEW (brush_editor->preview), 125, 100); /* Enable auto-resizing of the preview but ensure a minimal size */ - gtk_widget_set_usize (brush_editor->preview, 125, 100); + gtk_widget_set_size_request (brush_editor->preview, 125, 100); gtk_preview_set_expand (GTK_PREVIEW (brush_editor->preview), TRUE); gtk_container_add (GTK_CONTAINER (brush_editor->frame), brush_editor->preview); gtk_widget_show (brush_editor->preview); diff --git a/app/gui/channels-commands.c b/app/gui/channels-commands.c index 0b070bf265..c931cf1e62 100644 --- a/app/gui/channels-commands.c +++ b/app/gui/channels-commands.c @@ -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), diff --git a/app/gui/color-area.c b/app/gui/color-area.c index 8e39e0cf2e..b2e1f660ca 100644 --- a/app/gui/color-area.c +++ b/app/gui/color-area.c @@ -135,7 +135,7 @@ color_area_create (GimpContext *context, g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL); color_area = gtk_drawing_area_new (); - gtk_drawing_area_size (GTK_DRAWING_AREA (color_area), width, height); + gtk_widget_set_size_request (color_area, width, height); gtk_widget_set_events (color_area, GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK | @@ -331,13 +331,17 @@ color_area_draw (GimpContext *context) (width - rect_w), (height - rect_h), rect_w, rect_h); if (active_color == FOREGROUND) - gtk_draw_shadow (color_area->style, color_area_pixmap, - GTK_STATE_NORMAL, GTK_SHADOW_OUT, - (width - rect_w), (height - rect_h), rect_w, rect_h); + gtk_paint_shadow (color_area->style, color_area_pixmap, GTK_STATE_NORMAL, + GTK_SHADOW_OUT, + NULL, color_area, NULL, + (width - rect_w), (height - rect_h), + rect_w, rect_h); else - gtk_draw_shadow (color_area->style, color_area_pixmap, - GTK_STATE_NORMAL, GTK_SHADOW_IN, - (width - rect_w), (height - rect_h), rect_w, rect_h); + gtk_paint_shadow (color_area->style, color_area_pixmap, GTK_STATE_NORMAL, + GTK_SHADOW_IN, + NULL, color_area, NULL, + (width - rect_w), (height - rect_h), + rect_w, rect_h); /* draw the foreground area */ gimp_context_get_foreground (context, &color); @@ -349,13 +353,17 @@ color_area_draw (GimpContext *context) 0, 0, rect_w, rect_h); if (active_color == FOREGROUND) - gtk_draw_shadow (color_area->style, color_area_pixmap, - GTK_STATE_NORMAL, GTK_SHADOW_IN, - 0, 0, rect_w, rect_h); + gtk_paint_shadow (color_area->style, color_area_pixmap, GTK_STATE_NORMAL, + GTK_SHADOW_IN, + NULL, color_area, NULL, + 0, 0, + rect_w, rect_h); else - gtk_draw_shadow (color_area->style, color_area_pixmap, - GTK_STATE_NORMAL, GTK_SHADOW_OUT, - 0, 0, rect_w, rect_h); + gtk_paint_shadow (color_area->style, color_area_pixmap, GTK_STATE_NORMAL, + GTK_SHADOW_OUT, + NULL, color_area, NULL, + 0, 0, + rect_w, rect_h); /* draw the default pixmap */ gdk_drawable_get_size (default_pixmap, &def_width, &def_height); diff --git a/app/gui/color-notebook.c b/app/gui/color-notebook.c index 4dc6c0e2c5..44f5408924 100644 --- a/app/gui/color-notebook.c +++ b/app/gui/color-notebook.c @@ -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); diff --git a/app/gui/color-select.c b/app/gui/color-select.c index bda1f43c35..b7bc5da25e 100644 --- a/app/gui/color-select.c +++ b/app/gui/color-select.c @@ -357,14 +357,14 @@ color_select_update (ColorSelect *csp, { color_select_image_fill (csp->xy_color, csp->xy_color_fill, &csp->hsv, &csp->rgb); - gtk_widget_draw (csp->xy_color, NULL); + gtk_widget_queue_draw (csp->xy_color); } if (update & UPDATE_Z_COLOR) { color_select_image_fill (csp->z_color, csp->z_color_fill, &csp->hsv, &csp->rgb); - gtk_widget_draw (csp->z_color, NULL); + gtk_widget_queue_draw (csp->z_color); } if (update & UPDATE_CALLER) diff --git a/app/gui/colormap-dialog.c b/app/gui/colormap-dialog.c index 591235edf1..39baa03f81 100644 --- a/app/gui/colormap-dialog.c +++ b/app/gui/colormap-dialog.c @@ -215,7 +215,7 @@ gimp_colormap_dialog_new (GimpImage *gimage) gtk_widget_show (frame); ipal->palette = gtk_preview_new (GTK_PREVIEW_COLOR); - gtk_widget_set_usize (ipal->palette, -1, 60); + gtk_widget_set_size_request (ipal->palette, -1, 60); gtk_preview_set_expand (GTK_PREVIEW (ipal->palette), TRUE); gtk_widget_add_events (ipal->palette, GDK_BUTTON_PRESS_MASK); gtk_container_add (GTK_CONTAINER (frame), ipal->palette); @@ -265,7 +265,8 @@ gimp_colormap_dialog_new (GimpImage *gimage) G_CALLBACK (index_adjustment_change_cb), ipal); - ipal->color_entry = gtk_entry_new_with_max_length (7); + ipal->color_entry = gtk_entry_new (); + gtk_entry_set_max_length (GTK_ENTRY (ipal->color_entry), 7); gimp_table_attach_aligned (GTK_TABLE (table), 0, 1, _("Hex Triplet:"), 1.0, 0.5, ipal->color_entry, 1, TRUE); @@ -540,9 +541,8 @@ static void ipal_draw_cell (GimpColormapDialog *ipal, gint col) { - guchar *row; - gint cellsize, x, y, k; - GdkRectangle rec; + guchar *row; + gint cellsize, x, y, k; g_assert (ipal); g_assert (ipal->image); @@ -597,10 +597,10 @@ ipal_draw_cell (GimpColormapDialog *ipal, gtk_preview_draw_row (GTK_PREVIEW (ipal->palette), row, x, y+k, cellsize); } - rec.x = x; - rec.y = y; - rec.width = rec.height = cellsize; - gtk_widget_draw (ipal->palette, &rec); + + gtk_widget_queue_draw_area (ipal->palette, + x, y, + cellsize, cellsize); } static void @@ -667,7 +667,7 @@ ipal_clear (GimpColormapDialog *ipal, if (width > 0) g_free (row); - gtk_widget_draw (palette, NULL); + gtk_widget_queue_draw (palette); } static void diff --git a/app/gui/convert-dialog.c b/app/gui/convert-dialog.c index 7852bc4038..8f3481d33c 100644 --- a/app/gui/convert-dialog.c +++ b/app/gui/convert-dialog.c @@ -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), diff --git a/app/gui/device-status-dialog.c b/app/gui/device-status-dialog.c index ccdec99a35..e878ea8aac 100644 --- a/app/gui/device-status-dialog.c +++ b/app/gui/device-status-dialog.c @@ -211,7 +211,8 @@ device_status_dialog_create (Gimp *gimp) gimp_color_area_new (&color, GIMP_COLOR_AREA_FLAT, GDK_BUTTON1_MASK | GDK_BUTTON2_MASK); - gtk_widget_set_usize (deviceD->foregrounds[i], CELL_SIZE, CELL_SIZE); + gtk_widget_set_size_request (deviceD->foregrounds[i], + CELL_SIZE, CELL_SIZE); g_signal_connect (G_OBJECT (deviceD->foregrounds[i]), "color_changed", G_CALLBACK (device_status_foreground_changed), device_info); @@ -226,7 +227,8 @@ device_status_dialog_create (Gimp *gimp) gimp_color_area_new (&color, GIMP_COLOR_AREA_FLAT, GDK_BUTTON1_MASK | GDK_BUTTON2_MASK); - gtk_widget_set_usize (deviceD->backgrounds[i], CELL_SIZE, CELL_SIZE); + gtk_widget_set_size_request (deviceD->backgrounds[i], + CELL_SIZE, CELL_SIZE); g_signal_connect (G_OBJECT (deviceD->backgrounds[i]), "color_changed", G_CALLBACK (device_status_background_changed), device_info); diff --git a/app/gui/file-new-dialog.c b/app/gui/file-new-dialog.c index bdda11a2a6..65017d94a1 100644 --- a/app/gui/file-new-dialog.c +++ b/app/gui/file-new-dialog.c @@ -200,7 +200,7 @@ file_new_dialog_create (Gimp *gimp, 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); /* add the "height in units" spinbutton to the sizeentry */ gtk_table_attach_defaults (GTK_TABLE (info->size_se), spinbutton, 0, 1, 2, 3); @@ -211,7 +211,7 @@ file_new_dialog_create (Gimp *gimp, adjustment = gtk_adjustment_new (1, 1, 1, 1, 10, 1); spinbutton2 = gtk_spin_button_new (GTK_ADJUSTMENT (adjustment), 1, 0); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton2), TRUE); - gtk_widget_set_usize (spinbutton2, 75, 0); + gtk_widget_set_size_request (spinbutton2, 75, -1); gtk_box_pack_start (GTK_BOX (hbox), spinbutton2, FALSE, FALSE, 0); gtk_widget_show (spinbutton2); @@ -232,7 +232,7 @@ file_new_dialog_create (Gimp *gimp, 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); /* add the "width in units" spinbutton to the sizeentry */ gtk_table_attach_defaults (GTK_TABLE (info->size_se), spinbutton, 0, 1, 1, 2); @@ -244,7 +244,7 @@ file_new_dialog_create (Gimp *gimp, adjustment = gtk_adjustment_new (1, 1, 1, 1, 10, 1); spinbutton2 = gtk_spin_button_new (GTK_ADJUSTMENT (adjustment), 1, 0); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton2), TRUE); - gtk_widget_set_usize (spinbutton2, 75, 0); + gtk_widget_set_size_request (spinbutton2, 75, -1); /* add the "width in pixels" spinbutton to the main table */ gtk_container_add (GTK_CONTAINER (abox), spinbutton2); gtk_widget_show (spinbutton2); @@ -300,7 +300,7 @@ file_new_dialog_create (Gimp *gimp, 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); info->resolution_se = gimp_size_entry_new (1, gimp->config->default_resolution_units, @@ -371,7 +371,7 @@ file_new_dialog_create (Gimp *gimp, name_info = (GimpImageBaseTypeName*) list->data; button = gtk_radio_button_new_with_label (group, name_info->name); - group = gtk_radio_button_group (GTK_RADIO_BUTTON (button)); + group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (button)); gtk_box_pack_start (GTK_BOX (radio_box), button, FALSE, TRUE, 0); g_object_set_data (G_OBJECT (button), "gimp-item-data", (gpointer) name_info->type); @@ -412,7 +412,7 @@ file_new_dialog_create (Gimp *gimp, button = gtk_radio_button_new_with_label (group, name_info->name); - group = gtk_radio_button_group (GTK_RADIO_BUTTON (button)); + group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (button)); gtk_box_pack_start (GTK_BOX (radio_box), button, TRUE, TRUE, 0); g_object_set_data (G_OBJECT (button), "gimp-item-data", (gpointer) name_info->type); @@ -488,7 +488,9 @@ file_new_reset_callback (GtkWidget *widget, info = (NewImageInfo *) data; - gtk_signal_handler_block_by_data (GTK_OBJECT (info->resolution_se), info); + g_signal_handlers_block_by_func (G_OBJECT (info->resolution_se), + file_new_resolution_callback, + info); gimp_chain_button_set_active (GIMP_CHAIN_BUTTON (info->couple_resolutions), @@ -502,7 +504,9 @@ file_new_reset_callback (GtkWidget *widget, gimp_size_entry_set_unit (GIMP_SIZE_ENTRY (info->resolution_se), info->gimp->config->default_resolution_units); - gtk_signal_handler_unblock_by_data (GTK_OBJECT (info->resolution_se), info); + g_signal_handlers_unblock_by_func (G_OBJECT (info->resolution_se), + file_new_resolution_callback, + info); gimp_size_entry_set_resolution (GIMP_SIZE_ENTRY (info->size_se), 0, info->gimp->config->default_xresolution, TRUE); @@ -623,8 +627,9 @@ file_new_resolution_callback (GtkWidget *widget, if (gimp_chain_button_get_active (GIMP_CHAIN_BUTTON (info->couple_resolutions))) { - gtk_signal_handler_block_by_data - (GTK_OBJECT (info->resolution_se), info); + g_signal_handlers_block_by_func (G_OBJECT (info->resolution_se), + file_new_resolution_callback, + info); if (new_xres != xres) { @@ -638,8 +643,9 @@ file_new_resolution_callback (GtkWidget *widget, gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (widget), 0, xres); } - gtk_signal_handler_unblock_by_data - (GTK_OBJECT (info->resolution_se), info); + g_signal_handlers_unblock_by_func (G_OBJECT (info->resolution_se), + file_new_resolution_callback, + info); } else { diff --git a/app/gui/file-open-dialog.c b/app/gui/file-open-dialog.c index 67288720e4..47e687444d 100644 --- a/app/gui/file-open-dialog.c +++ b/app/gui/file-open-dialog.c @@ -61,6 +61,12 @@ #include "undo.h" +#ifdef __GNUC__ +#warning GTK_DISABLE_DEPRECATED +#endif +#undef GTK_DISABLE_DEPRECATED +#include + #include "libgimp/gimpintl.h" @@ -218,12 +224,12 @@ file_open_dialog_create (Gimp *gimp) "open/dialogs/file_open.html"); { - GtkWidget *frame; - GtkWidget *vbox; - GtkWidget *hbox; - GtkWidget *option_menu; - GtkWidget *load_menu; - GtkWidget *open_options_genbutton; + GtkItemFactory *item_factory; + GtkWidget *frame; + GtkWidget *vbox; + GtkWidget *hbox; + GtkWidget *option_menu; + GtkWidget *open_options_genbutton; open_options = gtk_hbox_new (TRUE, 1); @@ -244,8 +250,9 @@ file_open_dialog_create (Gimp *gimp) gtk_box_pack_start (GTK_BOX (hbox), option_menu, FALSE, FALSE, 0); gtk_widget_show (option_menu); - load_menu = gtk_item_factory_from_path ("")->widget; - gtk_option_menu_set_menu (GTK_OPTION_MENU (option_menu), load_menu); + item_factory = gtk_item_factory_from_path (""); + gtk_option_menu_set_menu (GTK_OPTION_MENU (option_menu), + item_factory->widget); gtk_widget_show (vbox); gtk_widget_show (frame); @@ -273,7 +280,7 @@ file_open_dialog_create (Gimp *gimp) fileload); open_options_fixed = gtk_fixed_new (); - gtk_widget_set_usize (open_options_fixed, 80, 60); + gtk_widget_set_size_request (open_options_fixed, 80, 60); gtk_container_add (GTK_CONTAINER (GTK_BIN (open_options_genbutton)), open_options_fixed); gtk_widget_show (open_options_fixed); @@ -288,7 +295,7 @@ file_open_dialog_create (Gimp *gimp) gtk_widget_show (sbox); align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0); - gtk_widget_set_usize (align, 80, 60); + gtk_widget_set_size_request (align, 80, 60); gtk_box_pack_start (GTK_BOX (sbox), align, FALSE, TRUE, 0); gtk_widget_show (align); diff --git a/app/gui/file-save-dialog.c b/app/gui/file-save-dialog.c index 97e5dad21c..1e944ff2d9 100644 --- a/app/gui/file-save-dialog.c +++ b/app/gui/file-save-dialog.c @@ -250,11 +250,11 @@ file_save_dialog_create (void) "save/dialogs/file_save.html"); { - GtkWidget *frame; - GtkWidget *hbox; - GtkWidget *label; - GtkWidget *option_menu; - GtkWidget *save_menu; + GtkItemFactory *item_factory; + GtkWidget *frame; + GtkWidget *hbox; + GtkWidget *label; + GtkWidget *option_menu; save_options = gtk_hbox_new (TRUE, 1); @@ -275,8 +275,9 @@ file_save_dialog_create (void) gtk_box_pack_start (GTK_BOX (hbox), option_menu, TRUE, TRUE, 0); gtk_widget_show (option_menu); - save_menu = gtk_item_factory_from_path ("")->widget; - gtk_option_menu_set_menu (GTK_OPTION_MENU (option_menu), save_menu); + item_factory = gtk_item_factory_from_path (""); + gtk_option_menu_set_menu (GTK_OPTION_MENU (option_menu), + item_factory->widget); gtk_widget_show (frame); diff --git a/app/gui/gradient-editor.c b/app/gui/gradient-editor.c index 650c2f3f78..8c25c57c95 100644 --- a/app/gui/gradient-editor.c +++ b/app/gui/gradient-editor.c @@ -319,8 +319,8 @@ gradient_editor_new (Gimp *gimp) GRAD_PREVIEW_WIDTH, GRAD_PREVIEW_HEIGHT); /* Enable auto-resizing of the preview but ensure a minimal size */ - gtk_widget_set_usize (editor->preview, - GRAD_PREVIEW_WIDTH, GRAD_PREVIEW_HEIGHT); + gtk_widget_set_size_request (editor->preview, + GRAD_PREVIEW_WIDTH, GRAD_PREVIEW_HEIGHT); gtk_preview_set_expand (GTK_PREVIEW (editor->preview), TRUE); gtk_widget_set_events (editor->preview, GRAD_PREVIEW_EVENT_MASK); @@ -354,8 +354,8 @@ gradient_editor_new (Gimp *gimp) editor->control_orig_pos = 0.0; editor->control = gtk_drawing_area_new (); - gtk_drawing_area_size (GTK_DRAWING_AREA (editor->control), - GRAD_PREVIEW_WIDTH, GRAD_CONTROL_HEIGHT); + gtk_widget_set_size_request (editor->control, + GRAD_PREVIEW_WIDTH, GRAD_CONTROL_HEIGHT); gtk_widget_set_events (editor->control, GRAD_CONTROL_EVENT_MASK); gtk_box_pack_start (GTK_BOX (vbox2), editor->control, FALSE, FALSE, 0); gtk_widget_show (editor->control); @@ -1017,7 +1017,7 @@ preview_update (GradientEditor *editor, adjustment->value, adjustment->value + adjustment->page_size); - gtk_widget_draw (editor->preview, NULL); + gtk_widget_queue_draw (editor->preview); } } diff --git a/app/gui/info-dialog.c b/app/gui/info-dialog.c index 3dcc829b52..dd9fffe1fb 100644 --- a/app/gui/info-dialog.c +++ b/app/gui/info-dialog.c @@ -322,7 +322,7 @@ info_dialog_add_entry (InfoDialog *idialog, g_return_val_if_fail (idialog != NULL, NULL); entry = gtk_entry_new (); - gtk_widget_set_usize (entry, 50, 0); + gtk_widget_set_size_request (entry, 50, -1); gtk_entry_set_text (GTK_ENTRY (entry), text_ptr ? text_ptr : ""); if (callback) @@ -403,7 +403,7 @@ info_dialog_add_spinbutton (InfoDialog *idialog, spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (adjustment), climb_rate, MAX (MIN (digits, 6), 0)); 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); if (callback) g_signal_connect (G_OBJECT (adjustment), "value_changed", diff --git a/app/gui/layers-commands.c b/app/gui/layers-commands.c index f096989bdd..bbc9fcf701 100644 --- a/app/gui/layers-commands.c +++ b/app/gui/layers-commands.c @@ -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, diff --git a/app/gui/module-browser.c b/app/gui/module-browser.c index fe1624e380..73773cefba 100644 --- a/app/gui/module-browser.c +++ b/app/gui/module-browser.c @@ -126,7 +126,7 @@ module_browser_new (Gimp *gimp) GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); gtk_box_pack_start (GTK_BOX (vbox), listbox, TRUE, TRUE, 0); - gtk_widget_set_usize (listbox, 125, 100); + gtk_widget_set_size_request (listbox, 125, 100); gtk_widget_show (listbox); st = g_new0 (BrowserState, 1); diff --git a/app/gui/offset-dialog.c b/app/gui/offset-dialog.c index 0abeffcdbd..be18dff9a6 100644 --- a/app/gui/offset-dialog.c +++ b/app/gui/offset-dialog.c @@ -137,7 +137,7 @@ offset_dialog_create (GimpDrawable *drawable) 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, 0); off_d->off_se = gimp_size_entry_new (1, off_d->gimage->unit, "%a", TRUE, TRUE, FALSE, 75, diff --git a/app/gui/palette-editor.c b/app/gui/palette-editor.c index 3a343f77c4..879dfb7537 100644 --- a/app/gui/palette-editor.c +++ b/app/gui/palette-editor.c @@ -274,7 +274,7 @@ palette_editor_new (Gimp *gimp) palette_editor->scrolled_window = scrolledwindow = gtk_scrolled_window_new (NULL, NULL); - gtk_widget_set_usize (scrolledwindow, -1, PREVIEW_HEIGHT); + gtk_widget_set_size_request (scrolledwindow, -1, PREVIEW_HEIGHT); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS); @@ -959,7 +959,7 @@ palette_editor_draw_entries (PaletteEditor *palette_editor, if (y >= height || row_start >= 0) { /* This row only */ - gtk_widget_draw (palette_editor->color_area, NULL); + gtk_widget_queue_draw (palette_editor->color_area); g_free (buffer); g_free (colors); return; @@ -980,7 +980,7 @@ palette_editor_draw_entries (PaletteEditor *palette_editor, g_free (colors); if (! palette_editor->freeze_update) - gtk_widget_draw (palette_editor->color_area, NULL); + gtk_widget_queue_draw (palette_editor->color_area); } static void diff --git a/app/gui/palettes-commands.c b/app/gui/palettes-commands.c index a5121a2e93..717990eb56 100644 --- a/app/gui/palettes-commands.c +++ b/app/gui/palettes-commands.c @@ -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 + #include "libgimp/gimpintl.h" diff --git a/app/gui/paths-dialog.c b/app/gui/paths-dialog.c index 597c80e9b8..c5075a1a04 100644 --- a/app/gui/paths-dialog.c +++ b/app/gui/paths-dialog.c @@ -24,6 +24,11 @@ #include #include +#ifdef __GNUC__ +#warning GTK_DISABLE_DEPRECATED +#endif +#undef GTK_DISABLE_DEPRECATED + #include #include diff --git a/app/gui/qmask-commands.c b/app/gui/qmask-commands.c index e34e197a10..ea0bf2541d 100644 --- a/app/gui/qmask-commands.c +++ b/app/gui/qmask-commands.c @@ -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, diff --git a/app/gui/resize-dialog.c b/app/gui/resize-dialog.c index ba76e5fade..cfe335a5dc 100644 --- a/app/gui/resize-dialog.c +++ b/app/gui/resize-dialog.c @@ -304,7 +304,7 @@ resize_widget_new (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); private->size_se = gimp_size_entry_new (1, unit, "%a", TRUE, TRUE, FALSE, 75, @@ -381,7 +381,7 @@ resize_widget_new (GimpImage *gimage, 0.01, 0.1, 1); spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (private->ratio_x_adj), 1, 4); 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); gtk_table_attach_defaults (GTK_TABLE (table2), spinbutton, 0, 1, 0, 1); gtk_widget_show (spinbutton); @@ -396,7 +396,7 @@ resize_widget_new (GimpImage *gimage, 0.01, 0.1, 1); spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (private->ratio_y_adj), 1, 4); 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); gtk_table_attach_defaults (GTK_TABLE (table2), spinbutton, 0, 1, 1, 2); gtk_widget_show (spinbutton); @@ -434,7 +434,7 @@ resize_widget_new (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); private->offset_se = gimp_size_entry_new (1, unit, "%a", TRUE, FALSE, FALSE, 75, @@ -542,7 +542,7 @@ resize_widget_new (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); gtk_container_add (GTK_CONTAINER (abox), spinbutton); gtk_widget_show (spinbutton); gtk_table_attach (GTK_TABLE (table), abox, 1, 2, 0, 1, @@ -602,7 +602,7 @@ resize_widget_new (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); private->resolution_se = gimp_size_entry_new (1, gimage->gimp->config->default_resolution_units, @@ -906,23 +906,35 @@ size_update (Resize *resize, gimp_offset_area_set_size (GIMP_OFFSET_AREA (private->offset_area), resize->width, resize->height); - gtk_signal_handler_block_by_data (GTK_OBJECT (private->size_se), resize); + g_signal_handlers_block_by_func (G_OBJECT (private->size_se), + size_callback, + resize); gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (private->size_se), 0, width); gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (private->size_se), 1, height); - gtk_signal_handler_unblock_by_data (GTK_OBJECT (private->size_se), resize); + g_signal_handlers_unblock_by_func (G_OBJECT (private->size_se), + size_callback, + resize); - gtk_signal_handler_block_by_data (GTK_OBJECT (private->ratio_x_adj), resize); - gtk_signal_handler_block_by_data (GTK_OBJECT (private->ratio_y_adj), resize); + g_signal_handlers_block_by_func (G_OBJECT (private->ratio_x_adj), + ratio_callback, + resize); + g_signal_handlers_block_by_func (G_OBJECT (private->ratio_y_adj), + ratio_callback, + resize); gtk_adjustment_set_value (GTK_ADJUSTMENT (private->ratio_x_adj), ratio_x); gtk_adjustment_set_value (GTK_ADJUSTMENT (private->ratio_y_adj), ratio_y); - gtk_signal_handler_unblock_by_data (GTK_OBJECT (private->ratio_x_adj), resize); - gtk_signal_handler_unblock_by_data (GTK_OBJECT (private->ratio_y_adj), resize); + g_signal_handlers_unblock_by_func (G_OBJECT (private->ratio_x_adj), + ratio_callback, + resize); + g_signal_handlers_unblock_by_func (G_OBJECT (private->ratio_y_adj), + ratio_callback, + resize); if (resize->type == ResizeWidget) { @@ -938,16 +950,18 @@ size_update (Resize *resize, if ((resize->type == ScaleWidget) && (resize->target == ResizeImage)) { - gtk_signal_handler_block_by_data (GTK_OBJECT (private->printsize_se), - resize); + g_signal_handlers_block_by_func (G_OBJECT (private->printsize_se), + printsize_update, + resize); gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (private->printsize_se), 0, width); gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (private->printsize_se), 1, height); - gtk_signal_handler_unblock_by_data (GTK_OBJECT (private->printsize_se), - resize); + g_signal_handlers_unblock_by_func (G_OBJECT (private->printsize_se), + printsize_update, + resize); } } @@ -1021,17 +1035,22 @@ printsize_update (GtkWidget *widget, resize->resolution_x = res_x; resize->resolution_y = res_y; - gtk_signal_handler_block_by_data (GTK_OBJECT (private->resolution_se), resize); + g_signal_handlers_block_by_func (G_OBJECT (private->resolution_se), + resolution_callback, + resize); gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (private->resolution_se), 0, res_x); gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (private->resolution_se), 1, res_y); - gtk_signal_handler_unblock_by_data (GTK_OBJECT (private->resolution_se), - resize); + g_signal_handlers_unblock_by_func (G_OBJECT (private->resolution_se), + resolution_callback, + resize); - gtk_signal_handler_block_by_data (GTK_OBJECT (private->size_se), resize); + g_signal_handlers_block_by_func (GTK_OBJECT (private->size_se), + size_callback, + resize); gimp_size_entry_set_resolution (GIMP_SIZE_ENTRY (private->size_se), 0, res_x, TRUE); @@ -1042,9 +1061,13 @@ printsize_update (GtkWidget *widget, gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (private->size_se), 1, height); - gtk_signal_handler_unblock_by_data (GTK_OBJECT (private->size_se), resize); + g_signal_handlers_unblock_by_func (G_OBJECT (private->size_se), + size_callback, + resize); - gtk_signal_handler_block_by_data (GTK_OBJECT (private->printsize_se), resize); + g_signal_handlers_block_by_func (G_OBJECT (private->printsize_se), + printsize_update, + resize); gimp_size_entry_set_resolution (GIMP_SIZE_ENTRY (private->printsize_se), 0, res_x, TRUE); @@ -1055,8 +1078,9 @@ printsize_update (GtkWidget *widget, gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (private->printsize_se), 1, height); - gtk_signal_handler_unblock_by_data (GTK_OBJECT (private->printsize_se), - resize); + g_signal_handlers_unblock_by_func (G_OBJECT (private->printsize_se), + printsize_update, + resize); } /* Callback for resolution change. */ @@ -1105,32 +1129,42 @@ resolution_update (Resize *resize, resize->resolution_x = res_x; resize->resolution_y = res_y; - gtk_signal_handler_block_by_data (GTK_OBJECT (private->resolution_se), resize); + g_signal_handlers_block_by_func (G_OBJECT (private->resolution_se), + resolution_callback, + resize); gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (private->resolution_se), 0, res_x); gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (private->resolution_se), 1, res_y); - gtk_signal_handler_unblock_by_data (GTK_OBJECT (private->resolution_se), - resize); + g_signal_handlers_unblock_by_func (G_OBJECT (private->resolution_se), + resolution_callback, + resize); - gtk_signal_handler_block_by_data (GTK_OBJECT (private->size_se), resize); + g_signal_handlers_block_by_func (GTK_OBJECT (private->size_se), + size_callback, + resize); gimp_size_entry_set_resolution (GIMP_SIZE_ENTRY (private->size_se), 0, res_x, TRUE); gimp_size_entry_set_resolution (GIMP_SIZE_ENTRY (private->size_se), 1, res_y, TRUE); - gtk_signal_handler_unblock_by_data (GTK_OBJECT (private->size_se), resize); + g_signal_handlers_unblock_by_func (G_OBJECT (private->size_se), + size_callback, + resize); - gtk_signal_handler_block_by_data (GTK_OBJECT (private->printsize_se), resize); + g_signal_handlers_block_by_func (G_OBJECT (private->printsize_se), + printsize_update, + resize); gimp_size_entry_set_resolution (GIMP_SIZE_ENTRY (private->printsize_se), 0, res_x, TRUE); gimp_size_entry_set_resolution (GIMP_SIZE_ENTRY (private->printsize_se), 1, res_y, TRUE); - gtk_signal_handler_unblock_by_data (GTK_OBJECT (private->printsize_se), - resize); + g_signal_handlers_unblock_by_func (GTK_OBJECT (private->printsize_se), + printsize_update, + resize); } diff --git a/app/gui/resolution-calibrate-dialog.c b/app/gui/resolution-calibrate-dialog.c index f5123bffa9..480034928c 100644 --- a/app/gui/resolution-calibrate-dialog.c +++ b/app/gui/resolution-calibrate-dialog.c @@ -145,7 +145,7 @@ resolution_calibrate_dialog (GtkWidget *resolution_entry, ruler = gtk_hruler_new (); SET_STYLE (ruler, ruler_style); - gtk_widget_set_usize (ruler, ruler_width, 32); + gtk_widget_set_size_request (ruler, ruler_width, 32); gtk_ruler_set_range (GTK_RULER (ruler), 0, ruler_width, 0, ruler_width); gtk_table_attach (GTK_TABLE (table), ruler, 1, 3, 0, 1, GTK_SHRINK, GTK_SHRINK, 0, 0); @@ -153,7 +153,7 @@ resolution_calibrate_dialog (GtkWidget *resolution_entry, ruler = gtk_vruler_new (); SET_STYLE (ruler, ruler_style); - gtk_widget_set_usize (ruler, 32, ruler_height); + gtk_widget_set_size_request (ruler, 32, ruler_height); gtk_ruler_set_range (GTK_RULER (ruler), 0, ruler_height, 0, ruler_height); gtk_table_attach (GTK_TABLE (table), ruler, 0, 1, 1, 3, GTK_SHRINK, GTK_SHRINK, 0, 0); @@ -171,7 +171,7 @@ resolution_calibrate_dialog (GtkWidget *resolution_entry, darea = gtk_drawing_area_new (); SET_STYLE (darea, dialog_style); - gtk_drawing_area_size (GTK_DRAWING_AREA (darea), 16, 16); + gtk_widget_set_size_request (darea, 16, 16); if (expose_callback) g_signal_connect (G_OBJECT (darea), "expose_event", G_CALLBACK (expose_callback), @@ -182,7 +182,7 @@ resolution_calibrate_dialog (GtkWidget *resolution_entry, darea = gtk_drawing_area_new (); SET_STYLE (darea, dialog_style); - gtk_drawing_area_size (GTK_DRAWING_AREA (darea), 16, 16); + gtk_widget_set_size_request (darea, 16, 16); if (expose_callback) g_signal_connect (G_OBJECT (darea), "expose_event", G_CALLBACK (expose_callback), @@ -193,7 +193,7 @@ resolution_calibrate_dialog (GtkWidget *resolution_entry, darea = gtk_drawing_area_new (); SET_STYLE (darea, dialog_style); - gtk_drawing_area_size (GTK_DRAWING_AREA (darea), 16, 16); + gtk_widget_set_size_request (darea, 16, 16); if (expose_callback) g_signal_connect (G_OBJECT (darea), "expose_event", G_CALLBACK (expose_callback), @@ -204,7 +204,7 @@ resolution_calibrate_dialog (GtkWidget *resolution_entry, darea = gtk_drawing_area_new (); SET_STYLE (darea, dialog_style); - gtk_drawing_area_size (GTK_DRAWING_AREA (darea), 16, 16); + gtk_widget_set_size_request (darea, 16, 16); if (expose_callback) g_signal_connect (G_OBJECT (darea), "expose_event", G_CALLBACK (expose_callback), diff --git a/app/gui/splash.c b/app/gui/splash.c index 7a6067c888..58bbf13d91 100644 --- a/app/gui/splash.c +++ b/app/gui/splash.c @@ -145,8 +145,8 @@ splash_update (const gchar *text1, if (text2) gtk_label_set_text (GTK_LABEL (label2), text2); - gtk_progress_bar_update (GTK_PROGRESS_BAR (progress), - CLAMP (percentage, 0.0, 1.0)); + gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (progress), + CLAMP (percentage, 0.0, 1.0)); while (gtk_events_pending ()) gtk_main_iteration (); diff --git a/app/gui/tips-dialog.c b/app/gui/tips-dialog.c index 6dfb35e5eb..bfb9ce00d1 100644 --- a/app/gui/tips-dialog.c +++ b/app/gui/tips-dialog.c @@ -171,7 +171,7 @@ tips_dialog_create (void) bbox = gtk_hbutton_box_new (); gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), GTK_BUTTONBOX_END); - gtk_button_box_set_spacing (GTK_BUTTON_BOX (bbox), 5); + gtk_box_set_spacing (GTK_BOX (bbox), 5); gtk_box_pack_end (GTK_BOX (hbox), bbox, FALSE, FALSE, 0); gtk_widget_show (bbox); diff --git a/app/gui/toolbox.c b/app/gui/toolbox.c index 377ec7d711..6168efb0a9 100644 --- a/app/gui/toolbox.c +++ b/app/gui/toolbox.c @@ -263,7 +263,7 @@ toolbox_create_tools (GtkWidget *wbox, tool_info = (GimpToolInfo *) list->data; button = gtk_radio_button_new (group); - group = gtk_radio_button_group (GTK_RADIO_BUTTON (button)); + group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (button)); gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (button), FALSE); gtk_wrap_box_pack (GTK_WRAP_BOX (wbox), button, FALSE, FALSE, FALSE, FALSE); diff --git a/app/gui/user-install-dialog.c b/app/gui/user-install-dialog.c index 91d9bc4491..ac1057121f 100644 --- a/app/gui/user-install-dialog.c +++ b/app/gui/user-install-dialog.c @@ -47,6 +47,12 @@ #include "appenv.h" #include "gimprc.h" +#ifdef __GNUC__ +#warning GTK_DISABLE_DEPRECATED +#endif +#undef GTK_DISABLE_DEPRECATED +#include + #include "libgimp/gimpintl.h" #include "pixmaps/eek.xpm" @@ -303,9 +309,9 @@ user_install_notebook_set_page (GtkNotebook *notebook, if (index == EEK_PAGE) { - gtk_widget_set_usize (title_pixmap, - title_pixmap->allocation.width, - title_pixmap->allocation.height); + gtk_widget_set_size_request (title_pixmap, + title_pixmap->allocation.width, + title_pixmap->allocation.height); gimp_pixmap_set (GIMP_PIXMAP (title_pixmap), eek_xpm); } @@ -390,11 +396,11 @@ user_install_cancel_callback (GtkWidget *widget, static gint timeout = 0; if (timeout) - gtk_exit (0); + exit (0); gtk_widget_destroy (continue_button); user_install_notebook_set_page (GTK_NOTEBOOK (notebook), EEK_PAGE); - timeout = gtk_timeout_add (1024, (GtkFunction) gtk_exit, (gpointer) 0); + timeout = gtk_timeout_add (1024, (GtkFunction) exit, NULL); } static gboolean @@ -597,7 +603,7 @@ user_install_dialog_create (Gimp *gimp) ebox = gtk_event_box_new (); TITLE_STYLE (ebox); gtk_widget_set_events (ebox, GDK_EXPOSURE_MASK); - gtk_widget_set_usize (ebox, WILBER_WIDTH + 16, -1); + gtk_widget_set_size_request (ebox, WILBER_WIDTH + 16, -1); gtk_box_pack_start (GTK_BOX (vbox), ebox, FALSE, FALSE, 0); gtk_widget_show (ebox); @@ -622,7 +628,7 @@ user_install_dialog_create (Gimp *gimp) ebox = gtk_event_box_new (); TITLE_STYLE (ebox); - gtk_widget_set_usize (ebox, 16, -1); + gtk_widget_set_size_request (ebox, 16, -1); gtk_box_pack_start (GTK_BOX (hbox), ebox, FALSE, FALSE, 0); gtk_widget_show (ebox); @@ -637,8 +643,8 @@ user_install_dialog_create (Gimp *gimp) gtk_widget_show (table); darea = gtk_drawing_area_new (); - TITLE_STYLE (darea); - gtk_drawing_area_size (GTK_DRAWING_AREA (darea), 16, 16); + TITLE_STYLE (darea); + gtk_widget_set_size_request (darea, 16, 16); g_signal_connect (G_OBJECT (darea), "expose_event", G_CALLBACK (user_install_corner_expose), GINT_TO_POINTER (GTK_CORNER_TOP_LEFT)); @@ -648,7 +654,7 @@ user_install_dialog_create (Gimp *gimp) darea = gtk_drawing_area_new (); TITLE_STYLE (darea); - gtk_drawing_area_size (GTK_DRAWING_AREA (darea), 16, 16); + gtk_widget_set_size_request (darea, 16, 16); g_signal_connect (G_OBJECT (darea), "expose_event", G_CALLBACK (user_install_corner_expose), GINT_TO_POINTER (GTK_CORNER_BOTTOM_LEFT)); @@ -816,7 +822,7 @@ user_install_dialog_create (Gimp *gimp) gtk_clist_set_column_width (GTK_CLIST (ctree), 0, gtk_clist_optimal_column_width (GTK_CLIST (ctree), 0)); - gtk_widget_set_usize (ctree, -1, ctree->requisition.height); + gtk_widget_set_size_request (ctree, -1, ctree->requisition.height); g_object_unref (file_pixmap); g_object_unref (file_mask); diff --git a/app/nav_window.c b/app/nav_window.c index 624d99727c..02385c04cc 100644 --- a/app/nav_window.c +++ b/app/nav_window.c @@ -599,7 +599,7 @@ nav_popup_click_handler (GtkWidget *widget, x = (x + nav_dialog->pwidth > scr_w) ? scr_w - nav_dialog->pwidth - 2: x; y = (y + nav_dialog->pheight > scr_h) ? scr_h - nav_dialog->pheight - 2: y; - gtk_widget_set_uposition (nav_dialog->shell, x, y); + gtk_window_move (GTK_WINDOW (nav_dialog->shell), x, y); gtk_widget_show (nav_dialog->shell); gdk_flush(); @@ -784,7 +784,7 @@ nav_dialog_disp_area (NavigationDialog *nav_dialog, { nav_dialog_update_preview (nav_dialog); - gtk_widget_draw (nav_dialog->preview, NULL); + gtk_widget_queue_draw (nav_dialog->preview); } } } diff --git a/app/ops_buttons.c b/app/ops_buttons.c index 0a5d94b7d4..801d6cd72f 100644 --- a/app/ops_buttons.c +++ b/app/ops_buttons.c @@ -66,7 +66,7 @@ ops_button_box_new (OpsButton *ops_button, case OPS_BUTTON_RADIO: button = gtk_radio_button_new (group); - group = gtk_radio_button_group (GTK_RADIO_BUTTON (button)); + group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (button)); gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (button), FALSE); break; diff --git a/app/paint/gimpink.c b/app/paint/gimpink.c index 2eff1aaa41..137b000ed6 100644 --- a/app/paint/gimpink.c +++ b/app/paint/gimpink.c @@ -662,9 +662,11 @@ brush_widget_expose (GtkWidget *widget, TRUE, /* filled */ rect.x, rect.y, rect.width, rect.height); - gtk_draw_shadow (widget->style, widget->window, widget->state, GTK_SHADOW_OUT, - rect.x, rect.y, - rect.width, rect.height); + gtk_paint_shadow (widget->style, widget->window, widget->state, + GTK_SHADOW_OUT, + NULL, widget, NULL, + rect.x, rect.y, + rect.width, rect.height); } static void @@ -724,7 +726,7 @@ brush_widget_motion_notify (GtkWidget *widget, if (brush_widget->ink_options->aspect > 10.0) brush_widget->ink_options->aspect = 10.0; - gtk_widget_draw (widget, NULL); + gtk_widget_queue_draw (widget); } } } @@ -1653,7 +1655,7 @@ ink_options_new (GimpToolInfo *tool_info) darea = gtk_drawing_area_new(); options->brush_w->widget = darea; - gtk_drawing_area_size (GTK_DRAWING_AREA (darea), 60, 60); + gtk_widget_set_size_request (darea, 60, 60); gtk_container_add (GTK_CONTAINER (frame), darea); gtk_widget_set_events (darea, diff --git a/app/tools/gimpbrightnesscontrasttool.c b/app/tools/gimpbrightnesscontrasttool.c index 6838950ca9..6991713240 100644 --- a/app/tools/gimpbrightnesscontrasttool.c +++ b/app/tools/gimpbrightnesscontrasttool.c @@ -293,7 +293,7 @@ brightness_contrast_dialog_new (void) data = gtk_adjustment_new (0, -127, 127.0, 1.0, 10.0, 0.0); bcd->brightness_data = GTK_ADJUSTMENT (data); slider = gtk_hscale_new (GTK_ADJUSTMENT (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); @@ -301,7 +301,7 @@ brightness_contrast_dialog_new (void) abox = gtk_vbox_new (FALSE, 0); spinbutton = gtk_spin_button_new (bcd->brightness_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, 0, 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); @@ -324,7 +324,7 @@ brightness_contrast_dialog_new (void) data = gtk_adjustment_new (0, -127.0, 127.0, 1.0, 10.0, 0.0); bcd->contrast_data = GTK_ADJUSTMENT (data); slider = gtk_hscale_new (GTK_ADJUSTMENT (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); @@ -332,7 +332,7 @@ brightness_contrast_dialog_new (void) abox = gtk_vbox_new (FALSE, 0); spinbutton = gtk_spin_button_new (bcd->contrast_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); diff --git a/app/tools/gimpbycolorselecttool.c b/app/tools/gimpbycolorselecttool.c index 5b1e1337bd..3b856015ad 100644 --- a/app/tools/gimpbycolorselecttool.c +++ b/app/tools/gimpbycolorselecttool.c @@ -727,10 +727,8 @@ by_color_select_draw (ByColorDialog *bcd, { gchar *basename; - /* Draw the image buf to the preview window */ - gtk_widget_draw (bcd->preview, NULL); + gtk_widget_queue_draw (bcd->preview); - /* Update the gimage label to reflect the displayed gimage name */ basename = g_path_get_basename (gimp_image_get_filename (gimage)); gtk_label_set_text (GTK_LABEL (bcd->gimage_name), basename); diff --git a/app/tools/gimpcolorbalancetool.c b/app/tools/gimpcolorbalancetool.c index e7ad29aa1a..e7ebbf363f 100644 --- a/app/tools/gimpcolorbalancetool.c +++ b/app/tools/gimpcolorbalancetool.c @@ -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", diff --git a/app/tools/gimpcolorpickertool.c b/app/tools/gimpcolorpickertool.c index 50948a2a47..3a65d0d397 100644 --- a/app/tools/gimpcolorpickertool.c +++ b/app/tools/gimpcolorpickertool.c @@ -364,7 +364,7 @@ gimp_color_picker_tool_button_press (GimpTool *tool, GIMP_COLOR_AREA_LARGE_CHECKS : GIMP_COLOR_AREA_FLAT, GDK_BUTTON1_MASK | GDK_BUTTON2_MASK); - gtk_widget_set_usize (color_area, 48, 64); + gtk_widget_set_size_request (color_area, 48, 64); gtk_drag_dest_unset (color_area); gtk_container_add (GTK_CONTAINER (frame), color_area); gtk_widget_show (color_area); diff --git a/app/tools/gimpcroptool.c b/app/tools/gimpcroptool.c index 8a1c2ee45b..520893e211 100644 --- a/app/tools/gimpcroptool.c +++ b/app/tools/gimpcroptool.c @@ -1058,7 +1058,7 @@ crop_info_create (GimpTool *tool) /* Create the area selection buttons */ bbox = gtk_hbutton_box_new (); gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), GTK_BUTTONBOX_SPREAD); - gtk_button_box_set_spacing (GTK_BUTTON_BOX (bbox), 4); + gtk_box_set_spacing (GTK_BOX (bbox), 4); button = gtk_button_new_with_label (_("From Selection")); gtk_container_add (GTK_CONTAINER(bbox), button); diff --git a/app/tools/gimpcurvestool.c b/app/tools/gimpcurvestool.c index 8076b3d6ca..34b91f3b75 100644 --- a/app/tools/gimpcurvestool.c +++ b/app/tools/gimpcurvestool.c @@ -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) { diff --git a/app/tools/gimphuesaturationtool.c b/app/tools/gimphuesaturationtool.c index 3ee70f7bd1..8c22e832c7 100644 --- a/app/tools/gimphuesaturationtool.c +++ b/app/tools/gimphuesaturationtool.c @@ -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]); } } diff --git a/app/tools/gimpinktool.c b/app/tools/gimpinktool.c index 2eff1aaa41..137b000ed6 100644 --- a/app/tools/gimpinktool.c +++ b/app/tools/gimpinktool.c @@ -662,9 +662,11 @@ brush_widget_expose (GtkWidget *widget, TRUE, /* filled */ rect.x, rect.y, rect.width, rect.height); - gtk_draw_shadow (widget->style, widget->window, widget->state, GTK_SHADOW_OUT, - rect.x, rect.y, - rect.width, rect.height); + gtk_paint_shadow (widget->style, widget->window, widget->state, + GTK_SHADOW_OUT, + NULL, widget, NULL, + rect.x, rect.y, + rect.width, rect.height); } static void @@ -724,7 +726,7 @@ brush_widget_motion_notify (GtkWidget *widget, if (brush_widget->ink_options->aspect > 10.0) brush_widget->ink_options->aspect = 10.0; - gtk_widget_draw (widget, NULL); + gtk_widget_queue_draw (widget); } } } @@ -1653,7 +1655,7 @@ ink_options_new (GimpToolInfo *tool_info) darea = gtk_drawing_area_new(); options->brush_w->widget = darea; - gtk_drawing_area_size (GTK_DRAWING_AREA (darea), 60, 60); + gtk_widget_set_size_request (darea, 60, 60); gtk_container_add (GTK_CONTAINER (frame), darea); gtk_widget_set_events (darea, diff --git a/app/tools/gimplevelstool.c b/app/tools/gimplevelstool.c index f2a505eaa0..985a76b75e 100644 --- a/app/tools/gimplevelstool.c +++ b/app/tools/gimplevelstool.c @@ -470,7 +470,7 @@ levels_dialog_new (void) ld->low_input_data = GTK_ADJUSTMENT (data); spinbutton = gtk_spin_button_new (ld->low_input_data, 0.5, 0); - gtk_widget_set_usize (spinbutton, 50, -1); + gtk_widget_set_size_request (spinbutton, 50, -1); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE); gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0); @@ -485,7 +485,7 @@ levels_dialog_new (void) ld->gamma_data = GTK_ADJUSTMENT (data); spinbutton = gtk_spin_button_new (ld->gamma_data, 0.5, 2); - gtk_widget_set_usize (spinbutton, 50, -1); + gtk_widget_set_size_request (spinbutton, 50, -1); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE); gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0); @@ -500,7 +500,7 @@ levels_dialog_new (void) ld->high_input_data = GTK_ADJUSTMENT (data); spinbutton = gtk_spin_button_new (ld->high_input_data, 0.5, 0); - gtk_widget_set_usize (spinbutton, 50, -1); + gtk_widget_set_size_request (spinbutton, 50, -1); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE); gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0); @@ -551,8 +551,8 @@ levels_dialog_new (void) ld); ld->input_levels_da[1] = gtk_drawing_area_new (); - gtk_drawing_area_size (GTK_DRAWING_AREA (ld->input_levels_da[1]), - DA_WIDTH, CONTROL_HEIGHT); + gtk_widget_set_size_request (ld->input_levels_da[1], + DA_WIDTH, CONTROL_HEIGHT); gtk_widget_set_events (ld->input_levels_da[1], LEVELS_DA_MASK); gtk_box_pack_start (GTK_BOX (vbox2), ld->input_levels_da[1], FALSE, TRUE, 0); @@ -579,7 +579,7 @@ levels_dialog_new (void) ld->low_output_data = GTK_ADJUSTMENT (data); spinbutton = gtk_spin_button_new (ld->low_output_data, 0.5, 0); - gtk_widget_set_usize (spinbutton, 50, -1); + gtk_widget_set_size_request (spinbutton, 50, -1); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE); gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0); @@ -594,7 +594,7 @@ levels_dialog_new (void) ld->high_output_data = GTK_ADJUSTMENT (data); spinbutton = gtk_spin_button_new (ld->high_output_data, 0.5, 0); - gtk_widget_set_usize (spinbutton, 50, -1); + gtk_widget_set_size_request (spinbutton, 50, -1); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE); gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0); @@ -660,7 +660,7 @@ levels_dialog_new (void) /* Horizontal button box for auto / 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 (main_vbox), hbbox, FALSE, FALSE, 0); @@ -864,7 +864,7 @@ levels_update (LevelsDialog *ld, buf, 0, i, DA_WIDTH); if (update & DRAW) - gtk_widget_draw (ld->input_levels_da[0], NULL); + gtk_widget_queue_draw (ld->input_levels_da[0]); } if (update & OUTPUT_LEVELS) { @@ -896,7 +896,7 @@ levels_update (LevelsDialog *ld, buf, 0, i, DA_WIDTH); if (update & DRAW) - gtk_widget_draw (ld->output_levels_da[0], NULL); + gtk_widget_queue_draw (ld->output_levels_da[0]); } if (update & INPUT_SLIDERS) { diff --git a/app/tools/gimppaintoptions-gui.c b/app/tools/gimppaintoptions-gui.c index 0db7a97c25..ebc3c183b2 100644 --- a/app/tools/gimppaintoptions-gui.c +++ b/app/tools/gimppaintoptions-gui.c @@ -567,7 +567,7 @@ paint_gradient_options_new (GType tool_type, spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (gradient->fade_out_w), 1.0, 0.0); 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); g_signal_connect (G_OBJECT (gradient->fade_out_w), "value_changed", G_CALLBACK (gimp_double_adjustment_update), &gradient->fade_out); @@ -620,7 +620,7 @@ paint_gradient_options_new (GType tool_type, gtk_spin_button_new (GTK_ADJUSTMENT (gradient->gradient_length_w), 1.0, 0.0); 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); g_signal_connect (G_OBJECT (gradient->gradient_length_w), "value_changed", G_CALLBACK (gimp_double_adjustment_update), &gradient->gradient_length); diff --git a/app/tools/gimpposterizetool.c b/app/tools/gimpposterizetool.c index 361c95af2e..8405577809 100644 --- a/app/tools/gimpposterizetool.c +++ b/app/tools/gimpposterizetool.c @@ -272,7 +272,7 @@ posterize_dialog_new (void) pd->levels_data = GTK_ADJUSTMENT (data); spinbutton = gtk_spin_button_new (pd->levels_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); g_signal_connect (G_OBJECT (pd->levels_data), "value_changed", diff --git a/app/tools/gimprotatetool.c b/app/tools/gimprotatetool.c index 81869fe473..4f4252864c 100644 --- a/app/tools/gimprotatetool.c +++ b/app/tools/gimprotatetool.c @@ -192,7 +192,7 @@ gimp_rotate_tool_transform (GimpTransformTool *transform_tool, -180, 181, 0.01, 0.1, 1, -1, G_CALLBACK (rotate_angle_changed), transform_tool); - gtk_widget_set_usize (widget, 180, 0); + gtk_widget_set_size_request (widget, 180, -1); spinbutton2 = info_dialog_add_spinbutton (transform_tool->info_dialog, diff --git a/app/tools/gimpselectionoptions.c b/app/tools/gimpselectionoptions.c index 511069ff55..b6ec9b1b4b 100644 --- a/app/tools/gimpselectionoptions.c +++ b/app/tools/gimpselectionoptions.c @@ -403,7 +403,7 @@ selection_options_init (SelectionOptions *options, width_spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (options->fixed_width_w), 1.0, 0.0); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (width_spinbutton), TRUE); - gtk_widget_set_usize (width_spinbutton, 75, 0); + gtk_widget_set_size_request (width_spinbutton, 75, -1); gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, _("Width:"), 1.0, 0.5, width_spinbutton, 1, FALSE); @@ -417,8 +417,8 @@ selection_options_init (SelectionOptions *options, 1.0, 50.0, 0.0); height_spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (options->fixed_height_w), 1.0, 0.0); - gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(height_spinbutton), TRUE); - gtk_widget_set_usize (height_spinbutton, 75, 0); + gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (height_spinbutton), TRUE); + gtk_widget_set_size_request (height_spinbutton, 75, -1); gimp_table_attach_aligned (GTK_TABLE (table), 0, 1, _("Height:"), 1.0, 0.5, height_spinbutton, 1, FALSE); diff --git a/app/tools/gimpthresholdtool.c b/app/tools/gimpthresholdtool.c index 511d1c7bdb..4afbaaf879 100644 --- a/app/tools/gimpthresholdtool.c +++ b/app/tools/gimpthresholdtool.c @@ -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); diff --git a/app/tools/paint_options.c b/app/tools/paint_options.c index 0db7a97c25..ebc3c183b2 100644 --- a/app/tools/paint_options.c +++ b/app/tools/paint_options.c @@ -567,7 +567,7 @@ paint_gradient_options_new (GType tool_type, spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (gradient->fade_out_w), 1.0, 0.0); 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); g_signal_connect (G_OBJECT (gradient->fade_out_w), "value_changed", G_CALLBACK (gimp_double_adjustment_update), &gradient->fade_out); @@ -620,7 +620,7 @@ paint_gradient_options_new (GType tool_type, gtk_spin_button_new (GTK_ADJUSTMENT (gradient->gradient_length_w), 1.0, 0.0); 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); g_signal_connect (G_OBJECT (gradient->gradient_length_w), "value_changed", G_CALLBACK (gimp_double_adjustment_update), &gradient->gradient_length); diff --git a/app/tools/selection_options.c b/app/tools/selection_options.c index 511069ff55..b6ec9b1b4b 100644 --- a/app/tools/selection_options.c +++ b/app/tools/selection_options.c @@ -403,7 +403,7 @@ selection_options_init (SelectionOptions *options, width_spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (options->fixed_width_w), 1.0, 0.0); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (width_spinbutton), TRUE); - gtk_widget_set_usize (width_spinbutton, 75, 0); + gtk_widget_set_size_request (width_spinbutton, 75, -1); gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, _("Width:"), 1.0, 0.5, width_spinbutton, 1, FALSE); @@ -417,8 +417,8 @@ selection_options_init (SelectionOptions *options, 1.0, 50.0, 0.0); height_spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (options->fixed_height_w), 1.0, 0.0); - gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(height_spinbutton), TRUE); - gtk_widget_set_usize (height_spinbutton, 75, 0); + gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (height_spinbutton), TRUE); + gtk_widget_set_size_request (height_spinbutton, 75, -1); gimp_table_attach_aligned (GTK_TABLE (table), 0, 1, _("Height:"), 1.0, 0.5, height_spinbutton, 1, FALSE); diff --git a/app/undo_history.c b/app/undo_history.c index 9266b6983b..c8a2b506ca 100644 --- a/app/undo_history.c +++ b/app/undo_history.c @@ -43,6 +43,11 @@ #include "config.h" +#ifdef __GNUC__ +#warning GTK_DISABLE_DEPRECATED +#endif +#undef GTK_DISABLE_DEPRECATED + #include #include "libgimpbase/gimpbase.h" diff --git a/app/widgets/gimpbrusheditor.c b/app/widgets/gimpbrusheditor.c index a2ae82e0fc..e1019f9f55 100644 --- a/app/widgets/gimpbrusheditor.c +++ b/app/widgets/gimpbrusheditor.c @@ -133,7 +133,7 @@ brush_editor_new (Gimp *gimp) gtk_preview_size (GTK_PREVIEW (brush_editor->preview), 125, 100); /* Enable auto-resizing of the preview but ensure a minimal size */ - gtk_widget_set_usize (brush_editor->preview, 125, 100); + gtk_widget_set_size_request (brush_editor->preview, 125, 100); gtk_preview_set_expand (GTK_PREVIEW (brush_editor->preview), TRUE); gtk_container_add (GTK_CONTAINER (brush_editor->frame), brush_editor->preview); gtk_widget_show (brush_editor->preview); diff --git a/app/widgets/gimpchannellistview.c b/app/widgets/gimpchannellistview.c index 2703b86f95..c4657e94e8 100644 --- a/app/widgets/gimpchannellistview.c +++ b/app/widgets/gimpchannellistview.c @@ -41,6 +41,12 @@ #include "gimpimagepreview.h" #include "gimplistitem.h" +#ifdef __GNUC__ +#warning GTK_DISABLE_DEPRECATED +#endif +#undef GTK_DISABLE_DEPRECATED +#include + #include "libgimp/gimpintl.h" diff --git a/app/widgets/gimpchanneltreeview.c b/app/widgets/gimpchanneltreeview.c index 2703b86f95..c4657e94e8 100644 --- a/app/widgets/gimpchanneltreeview.c +++ b/app/widgets/gimpchanneltreeview.c @@ -41,6 +41,12 @@ #include "gimpimagepreview.h" #include "gimplistitem.h" +#ifdef __GNUC__ +#warning GTK_DISABLE_DEPRECATED +#endif +#undef GTK_DISABLE_DEPRECATED +#include + #include "libgimp/gimpintl.h" diff --git a/app/widgets/gimpcolordialog.c b/app/widgets/gimpcolordialog.c index 4dc6c0e2c5..44f5408924 100644 --- a/app/widgets/gimpcolordialog.c +++ b/app/widgets/gimpcolordialog.c @@ -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); diff --git a/app/widgets/gimpcolormapeditor.c b/app/widgets/gimpcolormapeditor.c index 591235edf1..39baa03f81 100644 --- a/app/widgets/gimpcolormapeditor.c +++ b/app/widgets/gimpcolormapeditor.c @@ -215,7 +215,7 @@ gimp_colormap_dialog_new (GimpImage *gimage) gtk_widget_show (frame); ipal->palette = gtk_preview_new (GTK_PREVIEW_COLOR); - gtk_widget_set_usize (ipal->palette, -1, 60); + gtk_widget_set_size_request (ipal->palette, -1, 60); gtk_preview_set_expand (GTK_PREVIEW (ipal->palette), TRUE); gtk_widget_add_events (ipal->palette, GDK_BUTTON_PRESS_MASK); gtk_container_add (GTK_CONTAINER (frame), ipal->palette); @@ -265,7 +265,8 @@ gimp_colormap_dialog_new (GimpImage *gimage) G_CALLBACK (index_adjustment_change_cb), ipal); - ipal->color_entry = gtk_entry_new_with_max_length (7); + ipal->color_entry = gtk_entry_new (); + gtk_entry_set_max_length (GTK_ENTRY (ipal->color_entry), 7); gimp_table_attach_aligned (GTK_TABLE (table), 0, 1, _("Hex Triplet:"), 1.0, 0.5, ipal->color_entry, 1, TRUE); @@ -540,9 +541,8 @@ static void ipal_draw_cell (GimpColormapDialog *ipal, gint col) { - guchar *row; - gint cellsize, x, y, k; - GdkRectangle rec; + guchar *row; + gint cellsize, x, y, k; g_assert (ipal); g_assert (ipal->image); @@ -597,10 +597,10 @@ ipal_draw_cell (GimpColormapDialog *ipal, gtk_preview_draw_row (GTK_PREVIEW (ipal->palette), row, x, y+k, cellsize); } - rec.x = x; - rec.y = y; - rec.width = rec.height = cellsize; - gtk_widget_draw (ipal->palette, &rec); + + gtk_widget_queue_draw_area (ipal->palette, + x, y, + cellsize, cellsize); } static void @@ -667,7 +667,7 @@ ipal_clear (GimpColormapDialog *ipal, if (width > 0) g_free (row); - gtk_widget_draw (palette, NULL); + gtk_widget_queue_draw (palette); } static void diff --git a/app/widgets/gimpcolorpanel.c b/app/widgets/gimpcolorpanel.c index 9311812590..9c900ec1eb 100644 --- a/app/widgets/gimpcolorpanel.c +++ b/app/widgets/gimpcolorpanel.c @@ -191,7 +191,7 @@ gimp_color_panel_new (const gchar *title, gimp_color_button_set_type (GIMP_COLOR_BUTTON (panel), type); gimp_color_button_set_color (GIMP_COLOR_BUTTON (panel), color); - gtk_widget_set_usize (GTK_WIDGET (panel), width, height); + gtk_widget_set_size_request (GTK_WIDGET (panel), width, height); return GTK_WIDGET (panel); } diff --git a/app/widgets/gimpcomponentlistitem.c b/app/widgets/gimpcomponentlistitem.c index a490908075..13f0e02f30 100644 --- a/app/widgets/gimpcomponentlistitem.c +++ b/app/widgets/gimpcomponentlistitem.c @@ -205,9 +205,9 @@ gimp_component_list_item_set_viewable (GimpListItem *list_item, gtk_widget_size_request (component_item->eye_button, &requisition); - gtk_widget_set_usize (component_item->eye_button, - requisition.width, - requisition.height); + gtk_widget_set_size_request (component_item->eye_button, + requisition.width, + requisition.height); gtk_widget_hide (GTK_BIN (component_item->eye_button)->child); } @@ -251,15 +251,15 @@ gimp_component_list_item_eye_toggled (GtkWidget *widget, { if (! visible) { - gtk_widget_set_usize (GTK_WIDGET (widget), - GTK_WIDGET (widget)->allocation.width, - GTK_WIDGET (widget)->allocation.height); + gtk_widget_set_size_request (GTK_WIDGET (widget), + GTK_WIDGET (widget)->allocation.width, + GTK_WIDGET (widget)->allocation.height); gtk_widget_hide (GTK_BIN (widget)->child); } else { gtk_widget_show (GTK_BIN (widget)->child); - gtk_widget_set_usize (GTK_WIDGET (widget), -1, -1); + gtk_widget_set_size_request (GTK_WIDGET (widget), -1, -1); } g_signal_handlers_block_by_func (G_OBJECT (gimage), @@ -301,15 +301,15 @@ gimp_component_list_item_visibility_changed (GimpImage *gimage, { if (! visible) { - gtk_widget_set_usize (GTK_WIDGET (toggle), - GTK_WIDGET (toggle)->allocation.width, - GTK_WIDGET (toggle)->allocation.height); + gtk_widget_set_size_request (GTK_WIDGET (toggle), + GTK_WIDGET (toggle)->allocation.width, + GTK_WIDGET (toggle)->allocation.height); gtk_widget_hide (GTK_BIN (toggle)->child); } else { gtk_widget_show (GTK_BIN (toggle)->child); - gtk_widget_set_usize (GTK_WIDGET (toggle), -1, -1); + gtk_widget_set_size_request (GTK_WIDGET (toggle), -1, -1); } g_signal_handlers_block_by_func (G_OBJECT (toggle), diff --git a/app/widgets/gimpconstrainedhwrapbox.c b/app/widgets/gimpconstrainedhwrapbox.c index 49e836dea1..b1efdc0f24 100644 --- a/app/widgets/gimpconstrainedhwrapbox.c +++ b/app/widgets/gimpconstrainedhwrapbox.c @@ -20,6 +20,13 @@ * Boston, MA 02111-1307, USA. */ +#include "config.h" + +#ifdef __GNUC__ +#warning GTK_DISABLE_DEPRECATED +#endif +#undef GTK_DISABLE_DEPRECATED + #include #include "gimpconstrainedhwrapbox.h" diff --git a/app/widgets/gimpcontainergridview.c b/app/widgets/gimpcontainergridview.c index 6a29ae6ab3..2b310b552a 100644 --- a/app/widgets/gimpcontainergridview.c +++ b/app/widgets/gimpcontainergridview.c @@ -193,9 +193,9 @@ gimp_container_grid_view_new (GimpContainer *container, GTK_SCROLLED_WINDOW_GET_CLASS (grid_view->scrolled_win)->scrollbar_spacing + grid_view->scrolled_win->style->xthickness * 4; - gtk_widget_set_usize (grid_view->scrolled_win, - (preview_size + 2) * min_items_x + window_border, - (preview_size + 2) * min_items_y + window_border); + gtk_widget_set_size_request (grid_view->scrolled_win, + (preview_size + 2) * min_items_x + window_border, + (preview_size + 2) * min_items_y + window_border); if (container) gimp_container_view_set_container (view, container); diff --git a/app/widgets/gimpcontainerlistview.c b/app/widgets/gimpcontainerlistview.c index 5a52b6e5b0..0517896e27 100644 --- a/app/widgets/gimpcontainerlistview.c +++ b/app/widgets/gimpcontainerlistview.c @@ -35,6 +35,12 @@ #include "gimplistitem.h" #include "gimppreview.h" +#ifdef __GNUC__ +#warning GTK_DISABLE_DEPRECATED +#endif +#undef GTK_DISABLE_DEPRECATED +#include + static void gimp_container_list_view_class_init (GimpContainerListViewClass *klass); static void gimp_container_list_view_init (GimpContainerListView *panel); @@ -178,9 +184,9 @@ gimp_container_list_view_new (GimpContainer *container, GTK_SCROLLED_WINDOW_GET_CLASS (list_view->scrolled_win)->scrollbar_spacing + list_view->scrolled_win->style->xthickness * 4; - gtk_widget_set_usize (list_view->gtk_list->parent, - (preview_size + 2) * min_items_x + window_border, - (preview_size + 6) * min_items_y + window_border); + gtk_widget_set_size_request (list_view->gtk_list->parent, + (preview_size + 2) * min_items_x + window_border, + (preview_size + 6) * min_items_y + window_border); if (container) gimp_container_view_set_container (view, container); diff --git a/app/widgets/gimpcontainermenuimpl.c b/app/widgets/gimpcontainermenuimpl.c index b10f87293c..4ad95b2646 100644 --- a/app/widgets/gimpcontainermenuimpl.c +++ b/app/widgets/gimpcontainermenuimpl.c @@ -134,10 +134,10 @@ gimp_container_menu_new (GimpContainer *container, menu->preview_size = preview_size; menu_impl->empty_item = gtk_menu_item_new_with_label ("(none)"); - gtk_widget_set_usize (menu_impl->empty_item, - -1, - preview_size + - 2 * menu_impl->empty_item->style->ythickness); + gtk_widget_set_size_request (menu_impl->empty_item, + -1, + preview_size + + 2 * menu_impl->empty_item->style->ythickness); gtk_widget_set_sensitive (menu_impl->empty_item, FALSE); gtk_widget_show (menu_impl->empty_item); diff --git a/app/widgets/gimpdialogfactory.c b/app/widgets/gimpdialogfactory.c index 296f043e8f..02ee61ea0b 100644 --- a/app/widgets/gimpdialogfactory.c +++ b/app/widgets/gimpdialogfactory.c @@ -1186,7 +1186,7 @@ gimp_dialog_factory_set_window_geometry (GtkWidget *window, info->x = CLAMP (info->x, 0, screen_width - 32); info->y = CLAMP (info->y, 0, screen_height - 32); - gtk_widget_set_uposition (window, info->x, info->y); + gtk_window_move (GTK_WINDOW (window), info->x, info->y); if (! info->toplevel_entry || info->toplevel_entry->remember_size) { diff --git a/app/widgets/gimpdnd.c b/app/widgets/gimpdnd.c index ae7425a8af..0b7508cf1a 100644 --- a/app/widgets/gimpdnd.c +++ b/app/widgets/gimpdnd.c @@ -791,7 +791,7 @@ gimp_dnd_get_color_icon (GtkWidget *widget, get_color_data); color_area = gimp_color_area_new (&color, TRUE, 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); return color_area; } diff --git a/app/widgets/gimpdock.c b/app/widgets/gimpdock.c index dbfc1f01cd..9a254c2f14 100644 --- a/app/widgets/gimpdock.c +++ b/app/widgets/gimpdock.c @@ -140,7 +140,7 @@ gimp_dock_init (GimpDock *dock) gtk_window_set_wmclass (GTK_WINDOW (dock), "dock", "Gimp"); gtk_window_set_policy (GTK_WINDOW (dock), FALSE, TRUE, TRUE); - gtk_widget_set_usize (GTK_WIDGET (dock), GIMP_DOCK_MINIMAL_WIDTH, -1); + gtk_widget_set_size_request (GTK_WIDGET (dock), GIMP_DOCK_MINIMAL_WIDTH, -1); dock->main_vbox = gtk_vbox_new (FALSE, 0); gtk_container_add (GTK_CONTAINER (dock), dock->main_vbox); @@ -200,7 +200,7 @@ gimp_dock_style_set (GtkWidget *widget, if (GTK_IS_EVENT_BOX (child)) { - gtk_widget_set_usize (child, -1, separator_height); + gtk_widget_set_size_request (child, -1, separator_height); } } @@ -214,7 +214,7 @@ gimp_dock_separator_new (GimpDock *dock) GtkWidget *frame; event_box = gtk_event_box_new (); - gtk_widget_set_usize (event_box, -1, 6); + gtk_widget_set_size_request (event_box, -1, 6); frame = gtk_frame_new (NULL); gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_OUT); @@ -484,8 +484,9 @@ gimp_dock_separator_drag_drop (GtkWidget *widget, g_object_set_data (G_OBJECT (src_dockable), "gimp-dock-drag-widget", NULL); - children = gtk_container_children (GTK_CONTAINER (widget->parent)); - index = g_list_index (children, widget) / 2; + children = gtk_container_get_children (GTK_CONTAINER (widget->parent)); + index = g_list_index (children, widget) / 2; + g_list_free (children); dockbook = gimp_dockbook_new (); diff --git a/app/widgets/gimpdockbook.c b/app/widgets/gimpdockbook.c index b28f0fb316..2e25f3d334 100644 --- a/app/widgets/gimpdockbook.c +++ b/app/widgets/gimpdockbook.c @@ -324,15 +324,17 @@ gimp_dockbook_add (GimpDockbook *dockbook, */ { GtkWidget *menu_item; - GList *widget_list; + GList *widget_list, *free_list; GList *page_list; menu_item = menu_widget->parent; - /* EEK: we rely a 1:1 and left-to-right mapping of gtk_container_children() - * and notebook->children + free_list = gtk_container_get_children (GTK_CONTAINER (dockbook)); + + /* EEK: we rely a 1:1 and left-to-right mapping of + * gtk_container_get_children() and notebook->children */ - for (widget_list = gtk_container_children (GTK_CONTAINER (dockbook)), + for (widget_list = free_list, page_list = GTK_NOTEBOOK (dockbook)->children; widget_list && page_list; widget_list = g_list_next (widget_list), @@ -358,6 +360,8 @@ gimp_dockbook_add (GimpDockbook *dockbook, break; } } + + g_list_free (free_list); } gtk_widget_show (GTK_WIDGET (dockable)); diff --git a/app/widgets/gimpdrawablelistitem.c b/app/widgets/gimpdrawablelistitem.c index 4ae70476ec..8283e5082e 100644 --- a/app/widgets/gimpdrawablelistitem.c +++ b/app/widgets/gimpdrawablelistitem.c @@ -156,9 +156,9 @@ gimp_drawable_list_item_set_viewable (GimpListItem *list_item, gtk_widget_size_request (drawable_item->eye_button, &requisition); - gtk_widget_set_usize (drawable_item->eye_button, - requisition.width, - requisition.height); + gtk_widget_set_size_request (drawable_item->eye_button, + requisition.width, + requisition.height); gtk_widget_hide (GTK_BIN (drawable_item->eye_button)->child); } @@ -264,15 +264,15 @@ gimp_drawable_list_item_eye_toggled (GtkWidget *widget, { if (! visible) { - gtk_widget_set_usize (GTK_WIDGET (widget), - GTK_WIDGET (widget)->allocation.width, - GTK_WIDGET (widget)->allocation.height); + gtk_widget_set_size_request (GTK_WIDGET (widget), + GTK_WIDGET (widget)->allocation.width, + GTK_WIDGET (widget)->allocation.height); gtk_widget_hide (GTK_BIN (widget)->child); } else { gtk_widget_show (GTK_BIN (widget)->child); - gtk_widget_set_usize (GTK_WIDGET (widget), -1, -1); + gtk_widget_set_size_request (GTK_WIDGET (widget), -1, -1); } g_signal_handlers_block_by_func (G_OBJECT (drawable), @@ -305,15 +305,15 @@ gimp_drawable_list_item_visibility_changed (GimpDrawable *drawable, { if (! visible) { - gtk_widget_set_usize (GTK_WIDGET (toggle), - GTK_WIDGET (toggle)->allocation.width, - GTK_WIDGET (toggle)->allocation.height); + gtk_widget_set_size_request (GTK_WIDGET (toggle), + GTK_WIDGET (toggle)->allocation.width, + GTK_WIDGET (toggle)->allocation.height); gtk_widget_hide (GTK_BIN (toggle)->child); } else { gtk_widget_show (GTK_BIN (toggle)->child); - gtk_widget_set_usize (GTK_WIDGET (toggle), -1, -1); + gtk_widget_set_size_request (GTK_WIDGET (toggle), -1, -1); } g_signal_handlers_block_by_func (G_OBJECT (toggle), diff --git a/app/widgets/gimpdrawablelistview.c b/app/widgets/gimpdrawablelistview.c index 683ad97c07..38265620e6 100644 --- a/app/widgets/gimpdrawablelistview.c +++ b/app/widgets/gimpdrawablelistview.c @@ -178,7 +178,7 @@ gimp_drawable_list_view_init (GimpDrawableListView *view) container_view = GIMP_CONTAINER_VIEW (view); view->gimage = NULL; - view->drawable_type = GTK_TYPE_NONE; + view->drawable_type = G_TYPE_NONE; view->signal_name = NULL; view->new_button = @@ -720,12 +720,14 @@ gimp_drawable_list_view_floating_selection_changed (GimpImage *gimage { GimpViewable *floating_sel; GList *list; + GList *free_list; floating_sel = (GimpViewable *) gimp_image_floating_sel (gimage); - for (list = GTK_LIST (GIMP_CONTAINER_LIST_VIEW (view)->gtk_list)->children; - list; - list = g_list_next (list)) + list = free_list = gtk_container_get_children + (GTK_CONTAINER (GIMP_CONTAINER_LIST_VIEW (view)->gtk_list)); + + for (; list; list = g_list_next (list)) { if (! (GIMP_PREVIEW (GIMP_LIST_ITEM (list->data)->preview)->viewable == floating_sel)) @@ -735,6 +737,8 @@ gimp_drawable_list_view_floating_selection_changed (GimpImage *gimage } } + g_list_free (free_list); + /* update button states */ gimp_drawable_list_view_drawable_changed (gimage, view); } diff --git a/app/widgets/gimpdrawabletreeview.c b/app/widgets/gimpdrawabletreeview.c index 683ad97c07..38265620e6 100644 --- a/app/widgets/gimpdrawabletreeview.c +++ b/app/widgets/gimpdrawabletreeview.c @@ -178,7 +178,7 @@ gimp_drawable_list_view_init (GimpDrawableListView *view) container_view = GIMP_CONTAINER_VIEW (view); view->gimage = NULL; - view->drawable_type = GTK_TYPE_NONE; + view->drawable_type = G_TYPE_NONE; view->signal_name = NULL; view->new_button = @@ -720,12 +720,14 @@ gimp_drawable_list_view_floating_selection_changed (GimpImage *gimage { GimpViewable *floating_sel; GList *list; + GList *free_list; floating_sel = (GimpViewable *) gimp_image_floating_sel (gimage); - for (list = GTK_LIST (GIMP_CONTAINER_LIST_VIEW (view)->gtk_list)->children; - list; - list = g_list_next (list)) + list = free_list = gtk_container_get_children + (GTK_CONTAINER (GIMP_CONTAINER_LIST_VIEW (view)->gtk_list)); + + for (; list; list = g_list_next (list)) { if (! (GIMP_PREVIEW (GIMP_LIST_ITEM (list->data)->preview)->viewable == floating_sel)) @@ -735,6 +737,8 @@ gimp_drawable_list_view_floating_selection_changed (GimpImage *gimage } } + g_list_free (free_list); + /* update button states */ gimp_drawable_list_view_drawable_changed (gimage, view); } diff --git a/app/widgets/gimpfontselection-dialog.c b/app/widgets/gimpfontselection-dialog.c index 9154219195..94f359da8d 100644 --- a/app/widgets/gimpfontselection-dialog.c +++ b/app/widgets/gimpfontselection-dialog.c @@ -27,9 +27,10 @@ #include #include -#include #include +#include + #include "libgimpwidgets/gimpwidgets.h" #include "widgets-types.h" @@ -37,6 +38,12 @@ #include "gimpfontselection.h" #include "gimpfontselection-dialog.h" +#ifdef __GNUC__ +#warning GTK_DISABLE_DEPRECATED +#endif +#undef GTK_DISABLE_DEPRECATED +#include + #include "libgimp/gimpintl.h" @@ -144,7 +151,7 @@ gimp_font_selection_dialog_new (GimpFontSelection *fontsel) gtk_widget_show (frame); dialog->preview = gtk_drawing_area_new (); - gtk_widget_set_usize (dialog->preview, -1, 30); + gtk_widget_set_size_request (dialog->preview, -1, 30); gtk_container_add (GTK_CONTAINER (frame), dialog->preview); gtk_widget_show (dialog->preview); g_signal_connect (G_OBJECT (dialog->preview), "size_allocate", @@ -165,7 +172,7 @@ gimp_font_selection_dialog_new (GimpFontSelection *fontsel) gtk_clist_set_column_auto_resize (GTK_CLIST (dialog->font_clist), 0, TRUE); GTK_WIDGET_SET_FLAGS (dialog->font_clist, GTK_CAN_FOCUS); scrolled_win = gtk_scrolled_window_new (NULL, NULL); - gtk_widget_set_usize (scrolled_win, FONT_LIST_WIDTH, FONT_LIST_HEIGHT); + gtk_widget_set_size_request (scrolled_win, FONT_LIST_WIDTH, FONT_LIST_HEIGHT); gtk_container_add (GTK_CONTAINER (scrolled_win), dialog->font_clist); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_win), GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS); @@ -182,7 +189,7 @@ gimp_font_selection_dialog_new (GimpFontSelection *fontsel) 0, TRUE); GTK_WIDGET_SET_FLAGS (dialog->font_style_clist, GTK_CAN_FOCUS); scrolled_win = gtk_scrolled_window_new (NULL, NULL); - gtk_widget_set_usize (scrolled_win, FONT_STYLE_LIST_WIDTH, -1); + gtk_widget_set_size_request (scrolled_win, FONT_STYLE_LIST_WIDTH, -1); gtk_container_add (GTK_CONTAINER (scrolled_win), dialog->font_style_clist); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_win), GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS); @@ -562,7 +569,7 @@ gimp_font_selection_dialog_preview (GimpFontSelectionDialog *dialog) pango_layout_get_pixel_extents (dialog->layout, NULL, &rect); if (rect.height + 4 > dialog->preview->allocation.height) - gtk_widget_set_usize (dialog->preview, -1, rect.height + 4); + gtk_widget_set_size_request (dialog->preview, -1, rect.height + 4); /* FIXME: align on baseline */ diff --git a/app/widgets/gimpgradienteditor.c b/app/widgets/gimpgradienteditor.c index 650c2f3f78..8c25c57c95 100644 --- a/app/widgets/gimpgradienteditor.c +++ b/app/widgets/gimpgradienteditor.c @@ -319,8 +319,8 @@ gradient_editor_new (Gimp *gimp) GRAD_PREVIEW_WIDTH, GRAD_PREVIEW_HEIGHT); /* Enable auto-resizing of the preview but ensure a minimal size */ - gtk_widget_set_usize (editor->preview, - GRAD_PREVIEW_WIDTH, GRAD_PREVIEW_HEIGHT); + gtk_widget_set_size_request (editor->preview, + GRAD_PREVIEW_WIDTH, GRAD_PREVIEW_HEIGHT); gtk_preview_set_expand (GTK_PREVIEW (editor->preview), TRUE); gtk_widget_set_events (editor->preview, GRAD_PREVIEW_EVENT_MASK); @@ -354,8 +354,8 @@ gradient_editor_new (Gimp *gimp) editor->control_orig_pos = 0.0; editor->control = gtk_drawing_area_new (); - gtk_drawing_area_size (GTK_DRAWING_AREA (editor->control), - GRAD_PREVIEW_WIDTH, GRAD_CONTROL_HEIGHT); + gtk_widget_set_size_request (editor->control, + GRAD_PREVIEW_WIDTH, GRAD_CONTROL_HEIGHT); gtk_widget_set_events (editor->control, GRAD_CONTROL_EVENT_MASK); gtk_box_pack_start (GTK_BOX (vbox2), editor->control, FALSE, FALSE, 0); gtk_widget_show (editor->control); @@ -1017,7 +1017,7 @@ preview_update (GradientEditor *editor, adjustment->value, adjustment->value + adjustment->page_size); - gtk_widget_draw (editor->preview, NULL); + gtk_widget_queue_draw (editor->preview); } } diff --git a/app/widgets/gimphistogramview.c b/app/widgets/gimphistogramview.c index 3e3e80a010..be03556a38 100644 --- a/app/widgets/gimphistogramview.c +++ b/app/widgets/gimphistogramview.c @@ -257,7 +257,7 @@ gimp_histogram_view_new (gint width, view = g_object_new (GIMP_TYPE_HISTOGRAM_VIEW, NULL); - gtk_drawing_area_size (GTK_DRAWING_AREA (view), width + 2, height + 2); + gtk_widget_set_size_request (GTK_WIDGET (view), width + 2, height + 2); gtk_widget_set_events (GTK_WIDGET (view), HISTOGRAM_MASK); g_signal_connect (G_OBJECT (view), "event", @@ -279,7 +279,7 @@ gimp_histogram_view_update (GimpHistogramView *view, if (view->channel >= gimp_histogram_nchannels (histogram)) gimp_histogram_view_channel (view, 0); - gtk_widget_draw (GTK_WIDGET (view), NULL); + gtk_widget_queue_draw (GTK_WIDGET (view)); g_signal_emit (G_OBJECT (view), histogram_view_signals[RANGE_CHANGED], 0, diff --git a/app/widgets/gimpitemfactory.c b/app/widgets/gimpitemfactory.c index b467873b43..752d31d031 100644 --- a/app/widgets/gimpitemfactory.c +++ b/app/widgets/gimpitemfactory.c @@ -75,7 +75,8 @@ gimp_menu_item_create (GimpItemFactoryEntry *entry, if (!item_factory) { - g_warning ("entry refers to unknown item factory: \"%s\"", path); + g_warning ("%s: Could not find item factory for path \"%s\"", + G_STRLOC, path); return; } @@ -96,9 +97,21 @@ gimp_menu_item_create (GimpItemFactoryEntry *entry, void gimp_menu_item_destroy (gchar *path) { + GtkItemFactory *factory; + g_return_if_fail (path != NULL); - gtk_item_factories_path_delete (NULL, path); + factory = gtk_item_factory_from_path (path); + + if (factory) + { + gtk_item_factory_delete_item (factory, path); + } + else + { + g_warning ("%s: Could not find item factory for path \"%s\"", + G_STRLOC, path); + } } void diff --git a/app/widgets/gimpitemlistview.c b/app/widgets/gimpitemlistview.c index 683ad97c07..38265620e6 100644 --- a/app/widgets/gimpitemlistview.c +++ b/app/widgets/gimpitemlistview.c @@ -178,7 +178,7 @@ gimp_drawable_list_view_init (GimpDrawableListView *view) container_view = GIMP_CONTAINER_VIEW (view); view->gimage = NULL; - view->drawable_type = GTK_TYPE_NONE; + view->drawable_type = G_TYPE_NONE; view->signal_name = NULL; view->new_button = @@ -720,12 +720,14 @@ gimp_drawable_list_view_floating_selection_changed (GimpImage *gimage { GimpViewable *floating_sel; GList *list; + GList *free_list; floating_sel = (GimpViewable *) gimp_image_floating_sel (gimage); - for (list = GTK_LIST (GIMP_CONTAINER_LIST_VIEW (view)->gtk_list)->children; - list; - list = g_list_next (list)) + list = free_list = gtk_container_get_children + (GTK_CONTAINER (GIMP_CONTAINER_LIST_VIEW (view)->gtk_list)); + + for (; list; list = g_list_next (list)) { if (! (GIMP_PREVIEW (GIMP_LIST_ITEM (list->data)->preview)->viewable == floating_sel)) @@ -735,6 +737,8 @@ gimp_drawable_list_view_floating_selection_changed (GimpImage *gimage } } + g_list_free (free_list); + /* update button states */ gimp_drawable_list_view_drawable_changed (gimage, view); } diff --git a/app/widgets/gimpitemtreeview.c b/app/widgets/gimpitemtreeview.c index 683ad97c07..38265620e6 100644 --- a/app/widgets/gimpitemtreeview.c +++ b/app/widgets/gimpitemtreeview.c @@ -178,7 +178,7 @@ gimp_drawable_list_view_init (GimpDrawableListView *view) container_view = GIMP_CONTAINER_VIEW (view); view->gimage = NULL; - view->drawable_type = GTK_TYPE_NONE; + view->drawable_type = G_TYPE_NONE; view->signal_name = NULL; view->new_button = @@ -720,12 +720,14 @@ gimp_drawable_list_view_floating_selection_changed (GimpImage *gimage { GimpViewable *floating_sel; GList *list; + GList *free_list; floating_sel = (GimpViewable *) gimp_image_floating_sel (gimage); - for (list = GTK_LIST (GIMP_CONTAINER_LIST_VIEW (view)->gtk_list)->children; - list; - list = g_list_next (list)) + list = free_list = gtk_container_get_children + (GTK_CONTAINER (GIMP_CONTAINER_LIST_VIEW (view)->gtk_list)); + + for (; list; list = g_list_next (list)) { if (! (GIMP_PREVIEW (GIMP_LIST_ITEM (list->data)->preview)->viewable == floating_sel)) @@ -735,6 +737,8 @@ gimp_drawable_list_view_floating_selection_changed (GimpImage *gimage } } + g_list_free (free_list); + /* update button states */ gimp_drawable_list_view_drawable_changed (gimage, view); } diff --git a/app/widgets/gimplayerlistitem.c b/app/widgets/gimplayerlistitem.c index 79f5a6e665..a032fa2e13 100644 --- a/app/widgets/gimplayerlistitem.c +++ b/app/widgets/gimplayerlistitem.c @@ -198,9 +198,9 @@ gimp_layer_list_item_set_viewable (GimpListItem *list_item, gtk_widget_size_request (layer_item->linked_button, &requisition); - gtk_widget_set_usize (layer_item->linked_button, - requisition.width, - requisition.height); + gtk_widget_set_size_request (layer_item->linked_button, + requisition.width, + requisition.height); gtk_widget_hide (GTK_BIN (layer_item->linked_button)->child); } @@ -369,15 +369,15 @@ gimp_layer_list_item_linked_toggled (GtkWidget *widget, { if (! linked) { - gtk_widget_set_usize (GTK_WIDGET (widget), - GTK_WIDGET (widget)->allocation.width, - GTK_WIDGET (widget)->allocation.height); + gtk_widget_set_size_request (GTK_WIDGET (widget), + GTK_WIDGET (widget)->allocation.width, + GTK_WIDGET (widget)->allocation.height); gtk_widget_hide (GTK_BIN (widget)->child); } else { gtk_widget_show (GTK_BIN (widget)->child); - gtk_widget_set_usize (GTK_WIDGET (widget), -1, -1); + gtk_widget_set_size_request (GTK_WIDGET (widget), -1, -1); } g_signal_handlers_block_by_func (G_OBJECT (layer), @@ -408,15 +408,15 @@ gimp_layer_list_item_linked_changed (GimpLayer *layer, { if (! linked) { - gtk_widget_set_usize (GTK_WIDGET (toggle), - GTK_WIDGET (toggle)->allocation.width, - GTK_WIDGET (toggle)->allocation.height); + gtk_widget_set_size_request (GTK_WIDGET (toggle), + GTK_WIDGET (toggle)->allocation.width, + GTK_WIDGET (toggle)->allocation.height); gtk_widget_hide (GTK_BIN (toggle)->child); } else { gtk_widget_show (GTK_BIN (toggle)->child); - gtk_widget_set_usize (GTK_WIDGET (toggle), -1, -1); + gtk_widget_set_size_request (GTK_WIDGET (toggle), -1, -1); } g_signal_handlers_block_by_func (G_OBJECT (toggle), diff --git a/app/widgets/gimplistitem.c b/app/widgets/gimplistitem.c index 18ea79834b..9635de0bde 100644 --- a/app/widgets/gimplistitem.c +++ b/app/widgets/gimplistitem.c @@ -420,7 +420,6 @@ gimp_list_item_check_drag (GimpListItem *list_item, GimpDropType *drop_type) { GtkWidget *src_widget; - GimpListItem *src_list_item; GimpViewable *my_src_viewable = NULL; GimpViewable *my_dest_viewable = NULL; gint my_src_index = -1; @@ -436,18 +435,28 @@ gimp_list_item_check_drag (GimpListItem *list_item, src_widget && src_widget != GTK_WIDGET (list_item)) { - src_list_item = GIMP_LIST_ITEM (src_widget); + GimpListItem *src_list_item = NULL; + + if (GIMP_IS_LIST_ITEM (src_widget)) + src_list_item = GIMP_LIST_ITEM (src_widget); my_src_viewable = gimp_dnd_get_drag_data (src_widget); my_dest_viewable = GIMP_PREVIEW (list_item->preview)->viewable; if (my_src_viewable && my_dest_viewable && - src_list_item->container && list_item->container) { + GimpContainer *src_container = NULL; + + if (src_list_item) + src_container = src_list_item->container; + + if (! src_container) + src_container = list_item->container; + my_src_index = - gimp_container_get_child_index (src_list_item->container, + gimp_container_get_child_index (src_container, GIMP_OBJECT (my_src_viewable)); my_dest_index = gimp_container_get_child_index (list_item->container, @@ -456,7 +465,7 @@ gimp_list_item_check_drag (GimpListItem *list_item, if (my_src_viewable && my_src_index != -1 && my_dest_viewable && my_dest_index != -1) { - if (src_list_item->container == list_item->container) + if (src_container == list_item->container) { gint difference; @@ -486,8 +495,10 @@ gimp_list_item_check_drag (GimpListItem *list_item, my_drop_type = GIMP_DROP_NONE; } } - else if (src_list_item->convertable && - src_list_item->container->children_type == + else if (src_list_item && + src_list_item->convertable && + src_container && + src_container->children_type == list_item->container->children_type) { if (y < GTK_WIDGET (list_item)->allocation.height / 2) diff --git a/app/widgets/gimplistitem.h b/app/widgets/gimplistitem.h index d4e99b6965..1c12f71076 100644 --- a/app/widgets/gimplistitem.h +++ b/app/widgets/gimplistitem.h @@ -22,8 +22,13 @@ #ifndef __GIMP_LIST_ITEM_H__ #define __GIMP_LIST_ITEM_H__ + +#undef GTK_DISABLE_DEPRECATED + #include +#define GTK_DISABLE_DEPRECATED + #define GIMP_TYPE_LIST_ITEM (gimp_list_item_get_type ()) #define GIMP_LIST_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_LIST_ITEM, GimpListItem)) diff --git a/app/widgets/gimpmenuitem.c b/app/widgets/gimpmenuitem.c index aaafc2becd..b0094eb0c4 100644 --- a/app/widgets/gimpmenuitem.c +++ b/app/widgets/gimpmenuitem.c @@ -134,7 +134,7 @@ gimp_menu_item_real_set_viewable (GimpMenuItem *menu_item, { menu_item->preview = gimp_preview_new (viewable, menu_item->preview_size, 1, FALSE); - gtk_widget_set_usize (menu_item->preview, menu_item->preview_size, -1); + gtk_widget_set_size_request (menu_item->preview, menu_item->preview_size, -1); gtk_box_pack_start (GTK_BOX (menu_item->hbox), menu_item->preview, FALSE, FALSE, 0); gtk_widget_show (menu_item->preview); diff --git a/app/widgets/gimppaletteeditor.c b/app/widgets/gimppaletteeditor.c index 3a343f77c4..879dfb7537 100644 --- a/app/widgets/gimppaletteeditor.c +++ b/app/widgets/gimppaletteeditor.c @@ -274,7 +274,7 @@ palette_editor_new (Gimp *gimp) palette_editor->scrolled_window = scrolledwindow = gtk_scrolled_window_new (NULL, NULL); - gtk_widget_set_usize (scrolledwindow, -1, PREVIEW_HEIGHT); + gtk_widget_set_size_request (scrolledwindow, -1, PREVIEW_HEIGHT); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS); @@ -959,7 +959,7 @@ palette_editor_draw_entries (PaletteEditor *palette_editor, if (y >= height || row_start >= 0) { /* This row only */ - gtk_widget_draw (palette_editor->color_area, NULL); + gtk_widget_queue_draw (palette_editor->color_area); g_free (buffer); g_free (colors); return; @@ -980,7 +980,7 @@ palette_editor_draw_entries (PaletteEditor *palette_editor, g_free (colors); if (! palette_editor->freeze_update) - gtk_widget_draw (palette_editor->color_area, NULL); + gtk_widget_queue_draw (palette_editor->color_area); } static void diff --git a/app/widgets/gimppreview.c b/app/widgets/gimppreview.c index 3561f8b639..55d0d11f63 100644 --- a/app/widgets/gimppreview.c +++ b/app/widgets/gimppreview.c @@ -794,7 +794,7 @@ gimp_preview_popup_timeout (GimpPreview *preview) x = (x + popup_width > scr_width) ? scr_width - popup_width : x; y = (y + popup_height > scr_height) ? scr_height - popup_height : y; - gtk_widget_set_uposition (window, x, y); + gtk_window_move (GTK_WINDOW (window), x, y); gtk_widget_show (window); g_object_set_data_full (G_OBJECT (preview), "preview_popup_window", window, diff --git a/app/widgets/gimppreview.h b/app/widgets/gimppreview.h index 6bf54734df..31506d6f2d 100644 --- a/app/widgets/gimppreview.h +++ b/app/widgets/gimppreview.h @@ -22,8 +22,13 @@ #ifndef __GIMP_PREVIEW_H__ #define __GIMP_PREVIEW_H__ + +#undef GTK_DISABLE_DEPRECATED + #include +#define GTK_DISABLE_DEPRECATED + #define GIMP_TYPE_PREVIEW (gimp_preview_get_type ()) #define GIMP_PREVIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_PREVIEW, GimpPreview)) diff --git a/app/widgets/gimppreviewrenderer.c b/app/widgets/gimppreviewrenderer.c index 3561f8b639..55d0d11f63 100644 --- a/app/widgets/gimppreviewrenderer.c +++ b/app/widgets/gimppreviewrenderer.c @@ -794,7 +794,7 @@ gimp_preview_popup_timeout (GimpPreview *preview) x = (x + popup_width > scr_width) ? scr_width - popup_width : x; y = (y + popup_height > scr_height) ? scr_height - popup_height : y; - gtk_widget_set_uposition (window, x, y); + gtk_window_move (GTK_WINDOW (window), x, y); gtk_widget_show (window); g_object_set_data_full (G_OBJECT (preview), "preview_popup_window", window, diff --git a/app/widgets/gimppreviewrenderer.h b/app/widgets/gimppreviewrenderer.h index 6bf54734df..31506d6f2d 100644 --- a/app/widgets/gimppreviewrenderer.h +++ b/app/widgets/gimppreviewrenderer.h @@ -22,8 +22,13 @@ #ifndef __GIMP_PREVIEW_H__ #define __GIMP_PREVIEW_H__ + +#undef GTK_DISABLE_DEPRECATED + #include +#define GTK_DISABLE_DEPRECATED + #define GIMP_TYPE_PREVIEW (gimp_preview_get_type ()) #define GIMP_PREVIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_PREVIEW, GimpPreview)) diff --git a/app/widgets/gimptoolbox-color-area.c b/app/widgets/gimptoolbox-color-area.c index 8e39e0cf2e..b2e1f660ca 100644 --- a/app/widgets/gimptoolbox-color-area.c +++ b/app/widgets/gimptoolbox-color-area.c @@ -135,7 +135,7 @@ color_area_create (GimpContext *context, g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL); color_area = gtk_drawing_area_new (); - gtk_drawing_area_size (GTK_DRAWING_AREA (color_area), width, height); + gtk_widget_set_size_request (color_area, width, height); gtk_widget_set_events (color_area, GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK | @@ -331,13 +331,17 @@ color_area_draw (GimpContext *context) (width - rect_w), (height - rect_h), rect_w, rect_h); if (active_color == FOREGROUND) - gtk_draw_shadow (color_area->style, color_area_pixmap, - GTK_STATE_NORMAL, GTK_SHADOW_OUT, - (width - rect_w), (height - rect_h), rect_w, rect_h); + gtk_paint_shadow (color_area->style, color_area_pixmap, GTK_STATE_NORMAL, + GTK_SHADOW_OUT, + NULL, color_area, NULL, + (width - rect_w), (height - rect_h), + rect_w, rect_h); else - gtk_draw_shadow (color_area->style, color_area_pixmap, - GTK_STATE_NORMAL, GTK_SHADOW_IN, - (width - rect_w), (height - rect_h), rect_w, rect_h); + gtk_paint_shadow (color_area->style, color_area_pixmap, GTK_STATE_NORMAL, + GTK_SHADOW_IN, + NULL, color_area, NULL, + (width - rect_w), (height - rect_h), + rect_w, rect_h); /* draw the foreground area */ gimp_context_get_foreground (context, &color); @@ -349,13 +353,17 @@ color_area_draw (GimpContext *context) 0, 0, rect_w, rect_h); if (active_color == FOREGROUND) - gtk_draw_shadow (color_area->style, color_area_pixmap, - GTK_STATE_NORMAL, GTK_SHADOW_IN, - 0, 0, rect_w, rect_h); + gtk_paint_shadow (color_area->style, color_area_pixmap, GTK_STATE_NORMAL, + GTK_SHADOW_IN, + NULL, color_area, NULL, + 0, 0, + rect_w, rect_h); else - gtk_draw_shadow (color_area->style, color_area_pixmap, - GTK_STATE_NORMAL, GTK_SHADOW_OUT, - 0, 0, rect_w, rect_h); + gtk_paint_shadow (color_area->style, color_area_pixmap, GTK_STATE_NORMAL, + GTK_SHADOW_OUT, + NULL, color_area, NULL, + 0, 0, + rect_w, rect_h); /* draw the default pixmap */ gdk_drawable_get_size (default_pixmap, &def_width, &def_height); diff --git a/app/widgets/gimptoolbox.c b/app/widgets/gimptoolbox.c index 377ec7d711..6168efb0a9 100644 --- a/app/widgets/gimptoolbox.c +++ b/app/widgets/gimptoolbox.c @@ -263,7 +263,7 @@ toolbox_create_tools (GtkWidget *wbox, tool_info = (GimpToolInfo *) list->data; button = gtk_radio_button_new (group); - group = gtk_radio_button_group (GTK_RADIO_BUTTON (button)); + group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (button)); gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (button), FALSE); gtk_wrap_box_pack (GTK_WRAP_BOX (wbox), button, FALSE, FALSE, FALSE, FALSE); diff --git a/app/widgets/gimpview.c b/app/widgets/gimpview.c index 3561f8b639..55d0d11f63 100644 --- a/app/widgets/gimpview.c +++ b/app/widgets/gimpview.c @@ -794,7 +794,7 @@ gimp_preview_popup_timeout (GimpPreview *preview) x = (x + popup_width > scr_width) ? scr_width - popup_width : x; y = (y + popup_height > scr_height) ? scr_height - popup_height : y; - gtk_widget_set_uposition (window, x, y); + gtk_window_move (GTK_WINDOW (window), x, y); gtk_widget_show (window); g_object_set_data_full (G_OBJECT (preview), "preview_popup_window", window, diff --git a/app/widgets/gimpview.h b/app/widgets/gimpview.h index 6bf54734df..31506d6f2d 100644 --- a/app/widgets/gimpview.h +++ b/app/widgets/gimpview.h @@ -22,8 +22,13 @@ #ifndef __GIMP_PREVIEW_H__ #define __GIMP_PREVIEW_H__ + +#undef GTK_DISABLE_DEPRECATED + #include +#define GTK_DISABLE_DEPRECATED + #define GIMP_TYPE_PREVIEW (gimp_preview_get_type ()) #define GIMP_PREVIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_PREVIEW, GimpPreview)) diff --git a/app/widgets/gimpviewrenderer.c b/app/widgets/gimpviewrenderer.c index 3561f8b639..55d0d11f63 100644 --- a/app/widgets/gimpviewrenderer.c +++ b/app/widgets/gimpviewrenderer.c @@ -794,7 +794,7 @@ gimp_preview_popup_timeout (GimpPreview *preview) x = (x + popup_width > scr_width) ? scr_width - popup_width : x; y = (y + popup_height > scr_height) ? scr_height - popup_height : y; - gtk_widget_set_uposition (window, x, y); + gtk_window_move (GTK_WINDOW (window), x, y); gtk_widget_show (window); g_object_set_data_full (G_OBJECT (preview), "preview_popup_window", window, diff --git a/app/widgets/gimpviewrenderer.h b/app/widgets/gimpviewrenderer.h index 6bf54734df..31506d6f2d 100644 --- a/app/widgets/gimpviewrenderer.h +++ b/app/widgets/gimpviewrenderer.h @@ -22,8 +22,13 @@ #ifndef __GIMP_PREVIEW_H__ #define __GIMP_PREVIEW_H__ + +#undef GTK_DISABLE_DEPRECATED + #include +#define GTK_DISABLE_DEPRECATED + #define GIMP_TYPE_PREVIEW (gimp_preview_get_type ()) #define GIMP_PREVIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_PREVIEW, GimpPreview)) diff --git a/app/widgets/gtkhwrapbox.c b/app/widgets/gtkhwrapbox.c index 24bca058b9..7543bad4d6 100644 --- a/app/widgets/gtkhwrapbox.c +++ b/app/widgets/gtkhwrapbox.c @@ -22,6 +22,11 @@ #include "config.h" +#ifdef __GNUC__ +#warning GTK_DISABLE_DEPRECATED +#endif +#undef GTK_DISABLE_DEPRECATED + #include #include "libgimpmath/gimpmath.h" diff --git a/app/widgets/gtkvwrapbox.c b/app/widgets/gtkvwrapbox.c index 676f5eb7df..a0eb252eea 100644 --- a/app/widgets/gtkvwrapbox.c +++ b/app/widgets/gtkvwrapbox.c @@ -22,6 +22,11 @@ #include "config.h" +#ifdef __GNUC__ +#warning GTK_DISABLE_DEPRECATED +#endif +#undef GTK_DISABLE_DEPRECATED + #include #include "libgimpmath/gimpmath.h" diff --git a/app/widgets/gtkwrapbox.c b/app/widgets/gtkwrapbox.c index 532e91e2a6..dde2b5c25a 100644 --- a/app/widgets/gtkwrapbox.c +++ b/app/widgets/gtkwrapbox.c @@ -22,6 +22,11 @@ #include "config.h" +#ifdef __GNUC__ +#warning GTK_DISABLE_DEPRECATED +#endif +#undef GTK_DISABLE_DEPRECATED + #include "gtkwrapbox.h" diff --git a/libgimp/gimpbrushmenu.c b/libgimp/gimpbrushmenu.c index 810b3a7a50..fc205aa462 100644 --- a/libgimp/gimpbrushmenu.c +++ b/libgimp/gimpbrushmenu.c @@ -110,9 +110,10 @@ brush_popup_open (gint x, y = (y < 0) ? 0 : y; x = (x + bsel->width > scr_w) ? scr_w - bsel->width : x; y = (y + bsel->height > scr_h) ? scr_h - bsel->height : y; - gtk_preview_size (GTK_PREVIEW (bsel->device_brushpreview), bsel->width, bsel->height); + gtk_preview_size (GTK_PREVIEW (bsel->device_brushpreview), + bsel->width, bsel->height); - gtk_widget_set_uposition (bsel->device_brushpopup, x, y); + gtk_window_move (GTK_WINDOW (bsel->device_brushpopup), x, y); gtk_widget_show (bsel->device_brushpopup); /* Draw the brush */ @@ -135,9 +136,8 @@ brush_popup_open (gint x, src += bsel->width; } g_free (buf); - - /* Draw the brush preview */ - gtk_widget_draw (bsel->device_brushpreview, NULL); + + gtk_widget_queue_draw (bsel->device_brushpreview); } static void @@ -246,8 +246,7 @@ brush_pre_update (GtkWidget *brush_preview, } g_free (buf); - /* Draw the brush preview */ - gtk_widget_draw (brush_preview, NULL); + gtk_widget_queue_draw (brush_preview); } static void diff --git a/libgimp/gimpexport.c b/libgimp/gimpexport.c index b38884a1b2..1e81148e41 100644 --- a/libgimp/gimpexport.c +++ b/libgimp/gimpexport.c @@ -364,9 +364,9 @@ confirm_save_dialog (const gchar *saving_what, NULL); - gtk_signal_connect (GTK_OBJECT (dialog), "destroy", - GTK_SIGNAL_FUNC (export_cancel_callback), - NULL); + g_signal_connect (G_OBJECT (dialog), "destroy", + G_CALLBACK (export_cancel_callback), + NULL); vbox = gtk_vbox_new (FALSE, 6); gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), vbox); diff --git a/libgimp/gimpgradientmenu.c b/libgimp/gimpgradientmenu.c index fa66d0978e..5c1718dc90 100644 --- a/libgimp/gimpgradientmenu.c +++ b/libgimp/gimpgradientmenu.c @@ -124,8 +124,7 @@ gradient_pre_update (GtkWidget *gradient_preview, g_free (even); g_free (odd); - /* Draw the brush preview */ - gtk_widget_draw (gradient_preview, NULL); + gtk_widget_queue_draw (gradient_preview); } static void diff --git a/libgimp/gimpmenu.c b/libgimp/gimpmenu.c index f8b7db78bd..b7f80c5371 100644 --- a/libgimp/gimpmenu.c +++ b/libgimp/gimpmenu.c @@ -242,9 +242,9 @@ gimp_layer_menu_new (GimpConstraintFunc constraint, MENU_THUMBNAIL_WIDTH, MENU_THUMBNAIL_HEIGHT); - gtk_widget_set_usize (GTK_WIDGET (wcolor_box), - MENU_THUMBNAIL_WIDTH, - MENU_THUMBNAIL_HEIGHT); + gtk_widget_set_size_request (GTK_WIDGET (wcolor_box), + MENU_THUMBNAIL_WIDTH, + MENU_THUMBNAIL_HEIGHT); gtk_container_add (GTK_CONTAINER (vbox), wcolor_box); gtk_widget_show (wcolor_box); @@ -360,9 +360,9 @@ gimp_channel_menu_new (GimpConstraintFunc constraint, MENU_THUMBNAIL_WIDTH, MENU_THUMBNAIL_HEIGHT); - gtk_widget_set_usize (GTK_WIDGET (wcolor_box), - MENU_THUMBNAIL_WIDTH, - MENU_THUMBNAIL_HEIGHT); + gtk_widget_set_size_request (GTK_WIDGET (wcolor_box), + MENU_THUMBNAIL_WIDTH, + MENU_THUMBNAIL_HEIGHT); gtk_container_add (GTK_CONTAINER(vbox), wcolor_box); gtk_widget_show (wcolor_box); @@ -481,9 +481,9 @@ gimp_drawable_menu_new (GimpConstraintFunc constraint, MENU_THUMBNAIL_WIDTH, MENU_THUMBNAIL_HEIGHT); - gtk_widget_set_usize (GTK_WIDGET (wcolor_box), - MENU_THUMBNAIL_WIDTH , - MENU_THUMBNAIL_HEIGHT); + gtk_widget_set_size_request (GTK_WIDGET (wcolor_box), + MENU_THUMBNAIL_WIDTH , + MENU_THUMBNAIL_HEIGHT); gtk_container_add (GTK_CONTAINER(vbox), wcolor_box); gtk_widget_show (wcolor_box); @@ -545,9 +545,9 @@ gimp_drawable_menu_new (GimpConstraintFunc constraint, MENU_THUMBNAIL_WIDTH, MENU_THUMBNAIL_HEIGHT); - gtk_widget_set_usize (GTK_WIDGET (wcolor_box), - MENU_THUMBNAIL_WIDTH , - MENU_THUMBNAIL_HEIGHT); + gtk_widget_set_size_request (GTK_WIDGET (wcolor_box), + MENU_THUMBNAIL_WIDTH , + MENU_THUMBNAIL_HEIGHT); gtk_container_add (GTK_CONTAINER (vbox), wcolor_box); gtk_widget_show (wcolor_box); diff --git a/libgimp/gimppatternmenu.c b/libgimp/gimppatternmenu.c index 348d6e1324..84afc4c85a 100644 --- a/libgimp/gimppatternmenu.c +++ b/libgimp/gimppatternmenu.c @@ -108,7 +108,7 @@ pattern_popup_open (gint x, gtk_preview_size (GTK_PREVIEW (psel->device_patpreview), psel->width, psel->height); - gtk_widget_set_uposition (psel->device_patpopup, x, y); + gtk_window_move (GTK_WINDOW (psel->device_patpopup), x, y); gtk_widget_show (psel->device_patpopup); /* Draw the pattern */ @@ -135,9 +135,8 @@ pattern_popup_open (gint x, src += psel->width * psel->bytes; } g_free (buf); - - /* Draw the brush preview */ - gtk_widget_draw (psel->device_patpreview, NULL); + + gtk_widget_queue_draw (psel->device_patpreview); } static void @@ -229,8 +228,7 @@ pattern_pre_update (GtkWidget *pattern_preview, } g_free (buf); - /* Draw the brush preview */ - gtk_widget_draw (pattern_preview, NULL); + gtk_widget_queue_draw (pattern_preview); } static void diff --git a/libgimp/gimpprocbrowserdialog.c b/libgimp/gimpprocbrowserdialog.c index 17ac50517a..9a7eb9309e 100644 --- a/libgimp/gimpprocbrowserdialog.c +++ b/libgimp/gimpprocbrowserdialog.c @@ -26,6 +26,12 @@ #include "config.h" #include + +#ifdef __GNUC__ +#warning GTK_DISABLE_DEPRECATED +#endif +#undef GTK_DISABLE_DEPRECATED + #include #include @@ -35,17 +41,18 @@ #include "libgimp/stdplugins-intl.h" -/* FIXME: remove usage of the 'broken' GtkText */ +#ifdef __GNUC__ +#warning GTK_ENABLE_BROKEN +#endif #define GTK_ENABLE_BROKEN + #include -/* configuration */ #define DBL_LIST_WIDTH 220 -#define DBL_WIDTH DBL_LIST_WIDTH+400 -#define DBL_HEIGHT 250 +#define DBL_WIDTH DBL_LIST_WIDTH+400 +#define DBL_HEIGHT 250 -/* end of configuration */ typedef struct { diff --git a/libgimp/gimpprocview.c b/libgimp/gimpprocview.c index 17ac50517a..9a7eb9309e 100644 --- a/libgimp/gimpprocview.c +++ b/libgimp/gimpprocview.c @@ -26,6 +26,12 @@ #include "config.h" #include + +#ifdef __GNUC__ +#warning GTK_DISABLE_DEPRECATED +#endif +#undef GTK_DISABLE_DEPRECATED + #include #include @@ -35,17 +41,18 @@ #include "libgimp/stdplugins-intl.h" -/* FIXME: remove usage of the 'broken' GtkText */ +#ifdef __GNUC__ +#warning GTK_ENABLE_BROKEN +#endif #define GTK_ENABLE_BROKEN + #include -/* configuration */ #define DBL_LIST_WIDTH 220 -#define DBL_WIDTH DBL_LIST_WIDTH+400 -#define DBL_HEIGHT 250 +#define DBL_WIDTH DBL_LIST_WIDTH+400 +#define DBL_HEIGHT 250 -/* end of configuration */ typedef struct { diff --git a/libgimpwidgets/gimpbutton.c b/libgimpwidgets/gimpbutton.c index 55fa908038..cf4584bcc9 100644 --- a/libgimpwidgets/gimpbutton.c +++ b/libgimpwidgets/gimpbutton.c @@ -211,7 +211,7 @@ gimp_button_button_release (GtkWidget *widget, button->in_button = TRUE; gtk_widget_set_state (widget, GTK_STATE_PRELIGHT); - gtk_widget_draw (widget, NULL); + gtk_widget_queue_draw (widget); } return TRUE; diff --git a/libgimpwidgets/gimpchainbutton.c b/libgimpwidgets/gimpchainbutton.c index e344fabde0..24ae5011c7 100644 --- a/libgimpwidgets/gimpchainbutton.c +++ b/libgimpwidgets/gimpchainbutton.c @@ -25,8 +25,8 @@ #include "gimpwidgetstypes.h" #include "gimpchainbutton.h" +#include "gimpstock.h" -#include "pixmaps/chain.xpm" enum { @@ -34,10 +34,9 @@ enum LAST_SIGNAL }; + static void gimp_chain_button_class_init (GimpChainButtonClass *klass); static void gimp_chain_button_init (GimpChainButton *gcb); -static void gimp_chain_button_destroy (GtkObject *object); -static void gimp_chain_button_realize (GtkWidget *widget); static void gimp_chain_button_clicked_callback (GtkWidget *widget, GimpChainButton *gcb); @@ -46,28 +45,12 @@ static gint gimp_chain_button_draw_lines (GtkWidget *widget, GimpChainButton *gcb); -static gchar **gimp_chain_xpm[] = +static const gchar *gimp_chain_stock_items[] = { - chain_hor_xpm, - chain_ver_xpm -}; - -static gchar **gimp_chain_broken_xpm[] = -{ - chain_broken_hor_xpm, - chain_broken_ver_xpm -}; - -static guint gimp_chain_width[] = -{ - 24, - 9 -}; - -static guint gimp_chain_height[] = -{ - 9, - 24 + GIMP_STOCK_HCHAIN, + GIMP_STOCK_HCHAIN_BROKEN, + GIMP_STOCK_VCHAIN, + GIMP_STOCK_VCHAIN_BROKEN }; @@ -107,12 +90,6 @@ gimp_chain_button_get_type (void) static void gimp_chain_button_class_init (GimpChainButtonClass *klass) { - GtkObjectClass *object_class; - GtkWidgetClass *widget_class; - - object_class = GTK_OBJECT_CLASS (klass); - widget_class = GTK_WIDGET_CLASS (klass); - parent_class = g_type_class_peek_parent (klass); gimp_chain_button_signals[TOGGLED] = @@ -124,32 +101,23 @@ gimp_chain_button_class_init (GimpChainButtonClass *klass) g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); - object_class->destroy = gimp_chain_button_destroy; - - widget_class->realize = gimp_chain_button_realize; - - klass->toggled = NULL; + klass->toggled = NULL; } static void gimp_chain_button_init (GimpChainButton *gcb) { gcb->position = GIMP_CHAIN_TOP; + gcb->active = FALSE; + gcb->line1 = gtk_drawing_area_new (); gcb->line2 = gtk_drawing_area_new (); - gcb->pixmap = NULL; - gcb->broken = NULL; - gcb->broken_mask = NULL; - gcb->chain = NULL; - gcb->chain_mask = NULL; - gcb->active = FALSE; + gcb->image = gtk_image_new (); gcb->button = gtk_button_new (); gtk_button_set_relief (GTK_BUTTON (gcb->button), GTK_RELIEF_NONE); - - gcb->pixmap = g_object_new (GTK_TYPE_PIXMAP, NULL); - - gtk_pixmap_set_build_insensitive (GTK_PIXMAP (gcb->pixmap), TRUE); + gtk_container_add (GTK_CONTAINER (gcb->button), gcb->image); + gtk_widget_show (gcb->image); g_signal_connect (G_OBJECT (gcb->button), "clicked", G_CALLBACK (gimp_chain_button_clicked_callback), @@ -162,42 +130,6 @@ gimp_chain_button_init (GimpChainButton *gcb) gcb); } -static void -gimp_chain_button_destroy (GtkObject *object) -{ - GimpChainButton *gcb; - - g_return_if_fail (GIMP_IS_CHAIN_BUTTON (object)); - - gcb = GIMP_CHAIN_BUTTON (object); - - if (gcb->broken) - { - g_object_unref (gcb->broken); - gcb->broken = NULL; - } - - if (gcb->broken_mask) - { - g_object_unref (gcb->broken_mask); - gcb->broken_mask = NULL; - } - - if (gcb->chain) - { - g_object_unref (gcb->chain); - gcb->chain = NULL; - } - - if (gcb->chain_mask) - { - g_object_unref (gcb->chain_mask); - gcb->chain_mask = NULL; - } - - if (GTK_OBJECT_CLASS (parent_class)->destroy) - GTK_OBJECT_CLASS (parent_class)->destroy (object); -} /** * gimp_chain_button_new: @@ -226,14 +158,10 @@ gimp_chain_button_new (GimpChainPosition position) gcb->position = position; - gcb->pixmap->requisition.width = - gimp_chain_width[position % 2] + GTK_MISC (gcb->pixmap)->xpad * 2; - gcb->pixmap->requisition.height = - gimp_chain_height[position % 2] + GTK_MISC (gcb->pixmap)->ypad * 2; - - gtk_container_add (GTK_CONTAINER (gcb->button), gcb->pixmap); - gtk_widget_show (gcb->pixmap); - gtk_widget_show (gcb->button); + gtk_image_set_from_stock + (GTK_IMAGE (gcb->image), + gimp_chain_stock_items[((position & GIMP_CHAIN_LEFT) << 1) + ! gcb->active], + GTK_ICON_SIZE_BUTTON); if (position & GIMP_CHAIN_LEFT) /* are we a vertical chainbutton? */ { @@ -252,6 +180,7 @@ gimp_chain_button_new (GimpChainPosition position) gtk_table_attach_defaults (GTK_TABLE (gcb), gcb->line2, 2, 3, 0, 1); } + gtk_widget_show (gcb->button); gtk_widget_show (gcb->line1); gtk_widget_show (gcb->line2); @@ -260,29 +189,26 @@ gimp_chain_button_new (GimpChainPosition position) /** * gimp_chain_button_set_active: - * @gcb: Pointer to a #GimpChainButton. - * @is_active: The new state. + * @gcb: Pointer to a #GimpChainButton. + * @active: The new state. * - * Sets the state of the #GimpChainButton to be either locked (TRUE) or - * unlocked (FALSE) and changes the showed pixmap to reflect the new state. + * Sets the state of the #GimpChainButton to be either locked (#TRUE) or + * unlocked (#FALSE) and changes the showed pixmap to reflect the new state. */ void gimp_chain_button_set_active (GimpChainButton *gcb, - gboolean is_active) + gboolean active) { g_return_if_fail (GIMP_IS_CHAIN_BUTTON (gcb)); - if (gcb->active != is_active) + if (gcb->active != active) { - gcb->active = is_active; + gcb->active = active ? TRUE : FALSE; - if (!GTK_WIDGET_REALIZED (GTK_WIDGET (gcb))) - return; - - if (gcb->active) - gtk_pixmap_set (GTK_PIXMAP(gcb->pixmap), gcb->chain, gcb->chain_mask); - else - gtk_pixmap_set (GTK_PIXMAP(gcb->pixmap), gcb->broken, gcb->broken_mask); + gtk_image_set_from_stock + (GTK_IMAGE (gcb->image), + gimp_chain_stock_items[((gcb->position & GIMP_CHAIN_LEFT) << 1) + ! gcb->active], + GTK_ICON_SIZE_BUTTON); } } @@ -302,57 +228,13 @@ gimp_chain_button_get_active (GimpChainButton *gcb) return gcb->active; } - -static void -gimp_chain_button_realize (GtkWidget *widget) -{ - GimpChainButton *gcb; - GtkStyle *style; - - gcb = GIMP_CHAIN_BUTTON (widget); - - if (GTK_WIDGET_CLASS (parent_class)->realize) - (* GTK_WIDGET_CLASS (parent_class)->realize) (widget); - - style = gtk_widget_get_style (widget); - gcb->chain = gdk_pixmap_create_from_xpm_d (widget->window, - &gcb->chain_mask, - &style->bg[GTK_STATE_NORMAL], - gimp_chain_xpm[gcb->position % 2]); - gcb->broken = gdk_pixmap_create_from_xpm_d (widget->window, - &gcb->broken_mask, - &style->bg[GTK_STATE_NORMAL], - gimp_chain_broken_xpm[gcb->position % 2]); - - if (gcb->active) - gtk_pixmap_set (GTK_PIXMAP (gcb->pixmap), gcb->chain, gcb->chain_mask); - else - gtk_pixmap_set (GTK_PIXMAP (gcb->pixmap), gcb->broken, gcb->broken_mask); - - gtk_widget_realize (gcb->line1); - gtk_style_set_background (widget->style, gcb->line1->window, GTK_STATE_NORMAL); - gdk_window_set_back_pixmap (gcb->line1->window, NULL, TRUE); - - gtk_widget_realize (gcb->line2); - gtk_style_set_background (widget->style, gcb->line2->window, GTK_STATE_NORMAL); - gdk_window_set_back_pixmap (gcb->line2->window, NULL, TRUE); -} - static void gimp_chain_button_clicked_callback (GtkWidget *widget, GimpChainButton *gcb) { g_return_if_fail (GIMP_IS_CHAIN_BUTTON (gcb)); - gcb->active = !(gcb->active); - - if (!GTK_WIDGET_REALIZED (GTK_WIDGET (gcb))) - return; - - if (gcb->active) - gtk_pixmap_set (GTK_PIXMAP (gcb->pixmap), gcb->chain, gcb->chain_mask); - else - gtk_pixmap_set (GTK_PIXMAP (gcb->pixmap), gcb->broken, gcb->broken_mask); + gimp_chain_button_set_active (gcb, ! gcb->active); g_signal_emit (G_OBJECT (gcb), gimp_chain_button_signals[TOGGLED], 0); } diff --git a/libgimpwidgets/gimpchainbutton.h b/libgimpwidgets/gimpchainbutton.h index 26365f6ed8..02aee7110d 100644 --- a/libgimpwidgets/gimpchainbutton.h +++ b/libgimpwidgets/gimpchainbutton.h @@ -31,9 +31,20 @@ #ifndef __GIMP_CHAIN_BUTTON_H__ #define __GIMP_CHAIN_BUTTON_H__ +#include + G_BEGIN_DECLS +typedef enum +{ + GIMP_CHAIN_TOP, + GIMP_CHAIN_LEFT, + GIMP_CHAIN_BOTTOM, + GIMP_CHAIN_RIGHT +} GimpChainPosition; + + #define GIMP_TYPE_CHAIN_BUTTON (gimp_chain_button_get_type ()) #define GIMP_CHAIN_BUTTON(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CHAIN_BUTTON, GimpChainButton)) #define GIMP_CHAIN_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CHAIN_BUTTON, GimpChainButtonClass)) @@ -44,29 +55,17 @@ G_BEGIN_DECLS typedef struct _GimpChainButtonClass GimpChainButtonClass; -typedef enum -{ - GIMP_CHAIN_TOP, - GIMP_CHAIN_LEFT, - GIMP_CHAIN_BOTTOM, - GIMP_CHAIN_RIGHT -} GimpChainPosition; - - struct _GimpChainButton { GtkTable parent_instance; GimpChainPosition position; + gboolean active; + GtkWidget *button; GtkWidget *line1; GtkWidget *line2; - GtkWidget *pixmap; - GdkPixmap *broken; - GdkBitmap *broken_mask; - GdkPixmap *chain; - GdkBitmap *chain_mask; - gboolean active; + GtkWidget *image; }; struct _GimpChainButtonClass @@ -82,7 +81,7 @@ GType gimp_chain_button_get_type (void) G_GNUC_CONST; GtkWidget * gimp_chain_button_new (GimpChainPosition position); void gimp_chain_button_set_active (GimpChainButton *gcb, - gboolean is_active); + gboolean active); gboolean gimp_chain_button_get_active (GimpChainButton *gcb); diff --git a/libgimpwidgets/gimpcolorarea.h b/libgimpwidgets/gimpcolorarea.h index 57de6cd7b8..ea13f701b1 100644 --- a/libgimpwidgets/gimpcolorarea.h +++ b/libgimpwidgets/gimpcolorarea.h @@ -28,8 +28,18 @@ #ifndef __GIMP_COLOR_AREA_H__ #define __GIMP_COLOR_AREA_H__ +#ifdef GTK_DISABLE_DEPRECATED +#undef GTK_DISABLE_DEPRECATED +#define GIMP_IGNORE_ME_PLEASE_FOOBAR +#endif + #include +#ifdef GIMP_IGNORE_ME_PLEASE_FOOBAR +#undef GIMP_IGNORE_ME_PLEASE_FOOBAR +#define GTK_DISABLE_DEPRECATED +#endif + G_BEGIN_DECLS diff --git a/libgimpwidgets/gimpcolorbutton.c b/libgimpwidgets/gimpcolorbutton.c index ea05afa289..47c8116370 100644 --- a/libgimpwidgets/gimpcolorbutton.c +++ b/libgimpwidgets/gimpcolorbutton.c @@ -36,6 +36,10 @@ #include "libgimp/libgimp-intl.h" +#define TODOUBLE(i) (i / 65535.0) +#define TOUINT16(d) ((guint16) (d * 65535 + 0.5)) + + typedef enum { GIMP_COLOR_BUTTON_COLOR_FG, @@ -351,7 +355,8 @@ gimp_color_button_clicked (GtkButton *button) { GimpColorButton *gcb; GimpRGB color; - gdouble dcolor[4]; + GdkColor gdk_color; + guint16 alpha; g_return_if_fail (GIMP_IS_COLOR_BUTTON (button)); @@ -359,36 +364,36 @@ gimp_color_button_clicked (GtkButton *button) gimp_color_button_get_color (gcb, &color); - dcolor[0] = color.r; - dcolor[1] = color.g; - dcolor[2] = color.b; - dcolor[3] = color.a; + gdk_color.red = TOUINT16 (color.r); + gdk_color.green = TOUINT16 (color.g); + gdk_color.blue = TOUINT16 (color.b); + alpha = TOUINT16 (color.a); if (!gcb->dialog) { gcb->dialog = gtk_color_selection_dialog_new (gcb->title); - gtk_color_selection_set_current_alpha (GTK_COLOR_SELECTION (GTK_COLOR_SELECTION_DIALOG (gcb->dialog)->colorsel), gimp_color_button_has_alpha (gcb)); - gtk_color_selection_set_color (GTK_COLOR_SELECTION (GTK_COLOR_SELECTION_DIALOG (gcb->dialog)->colorsel), dcolor); + gtk_color_selection_set_has_opacity_control (GTK_COLOR_SELECTION (GTK_COLOR_SELECTION_DIALOG (gcb->dialog)->colorsel), TRUE); gtk_widget_destroy (GTK_COLOR_SELECTION_DIALOG (gcb->dialog)->help_button); gtk_container_set_border_width (GTK_CONTAINER (gcb->dialog), 2); g_signal_connect (G_OBJECT (gcb->dialog), "destroy", - G_CALLBACK (gtk_widget_destroyed), + G_CALLBACK (gtk_widget_destroyed), &gcb->dialog); g_signal_connect (G_OBJECT (GTK_COLOR_SELECTION_DIALOG (gcb->dialog)->ok_button), - "clicked", - G_CALLBACK (gimp_color_button_dialog_ok), - gcb); + "clicked", + G_CALLBACK (gimp_color_button_dialog_ok), + gcb); g_signal_connect (G_OBJECT (GTK_COLOR_SELECTION_DIALOG (gcb->dialog)->cancel_button), - "clicked", - G_CALLBACK (gimp_color_button_dialog_cancel), - gcb); + "clicked", + G_CALLBACK (gimp_color_button_dialog_cancel), + gcb); gtk_window_set_position (GTK_WINDOW (gcb->dialog), GTK_WIN_POS_MOUSE); } - gtk_color_selection_set_color (GTK_COLOR_SELECTION (GTK_COLOR_SELECTION_DIALOG (gcb->dialog)->colorsel), dcolor); + gtk_color_selection_set_current_color (GTK_COLOR_SELECTION (GTK_COLOR_SELECTION_DIALOG (gcb->dialog)->colorsel), &gdk_color); + gtk_color_selection_set_current_alpha (GTK_COLOR_SELECTION (GTK_COLOR_SELECTION_DIALOG (gcb->dialog)->colorsel), alpha); gtk_widget_show (gcb->dialog); } @@ -399,15 +404,21 @@ gimp_color_button_dialog_ok (GtkWidget *widget, { GimpColorButton *gcb; GimpRGB color; - gdouble dcolor[4]; + GdkColor gdk_color; + guint16 alpha; g_return_if_fail (GIMP_IS_COLOR_BUTTON (data)); gcb = GIMP_COLOR_BUTTON (data); - gtk_color_selection_get_color (GTK_COLOR_SELECTION (GTK_COLOR_SELECTION_DIALOG (gcb->dialog)->colorsel), dcolor); + gtk_color_selection_get_current_color (GTK_COLOR_SELECTION (GTK_COLOR_SELECTION_DIALOG (gcb->dialog)->colorsel), &gdk_color); + alpha = gtk_color_selection_get_current_alpha (GTK_COLOR_SELECTION (GTK_COLOR_SELECTION_DIALOG (gcb->dialog)->colorsel)); + + color.r = TODOUBLE (gdk_color.red); + color.g = TODOUBLE (gdk_color.green); + color.b = TODOUBLE (gdk_color.blue); + color.a = TODOUBLE (alpha); - gimp_rgba_set (&color, dcolor[0], dcolor[1], dcolor[2], dcolor[3]); gimp_color_button_set_color (gcb, &color); gtk_widget_hide (gcb->dialog); @@ -463,16 +474,18 @@ gimp_color_button_color_changed (GtkObject *object, if (gcb->dialog) { GimpRGB color; - gdouble dcolor[4]; + GdkColor gdk_color; + guint16 alpha; gimp_color_button_get_color (GIMP_COLOR_BUTTON (data), &color); - dcolor[0] = color.r; - dcolor[1] = color.g; - dcolor[2] = color.b; - dcolor[3] = color.a; - - gtk_color_selection_set_color (GTK_COLOR_SELECTION (GTK_COLOR_SELECTION_DIALOG (gcb->dialog)->colorsel), dcolor); + gdk_color.red = TOUINT16 (color.r); + gdk_color.green = TOUINT16 (color.g); + gdk_color.blue = TOUINT16 (color.b); + alpha = TOUINT16 (color.a); + + gtk_color_selection_set_current_color (GTK_COLOR_SELECTION (GTK_COLOR_SELECTION_DIALOG (gcb->dialog)->colorsel), &gdk_color); + gtk_color_selection_set_current_alpha (GTK_COLOR_SELECTION (GTK_COLOR_SELECTION_DIALOG (gcb->dialog)->colorsel), alpha); } g_signal_emit (G_OBJECT (gcb), diff --git a/libgimpwidgets/gimpcolorselect.c b/libgimpwidgets/gimpcolorselect.c index bda1f43c35..b7bc5da25e 100644 --- a/libgimpwidgets/gimpcolorselect.c +++ b/libgimpwidgets/gimpcolorselect.c @@ -357,14 +357,14 @@ color_select_update (ColorSelect *csp, { color_select_image_fill (csp->xy_color, csp->xy_color_fill, &csp->hsv, &csp->rgb); - gtk_widget_draw (csp->xy_color, NULL); + gtk_widget_queue_draw (csp->xy_color); } if (update & UPDATE_Z_COLOR) { color_select_image_fill (csp->z_color, csp->z_color_fill, &csp->hsv, &csp->rgb); - gtk_widget_draw (csp->z_color, NULL); + gtk_widget_queue_draw (csp->z_color); } if (update & UPDATE_CALLER) diff --git a/libgimpwidgets/gimpfileentry.c b/libgimpwidgets/gimpfileentry.c index f430a0c727..58486ca7d8 100644 --- a/libgimpwidgets/gimpfileentry.c +++ b/libgimpwidgets/gimpfileentry.c @@ -297,7 +297,7 @@ gimp_file_selection_entry_callback (GtkWidget *widget, gimp_file_selection_check_filename (gfs); - gtk_entry_set_position (GTK_ENTRY (gfs->entry), -1); + gtk_editable_set_position (GTK_EDITABLE (gfs->entry), -1); g_signal_emit (G_OBJECT (gfs), gimp_file_selection_signals[FILENAME_CHANGED], 0); diff --git a/libgimpwidgets/gimpfileselection.c b/libgimpwidgets/gimpfileselection.c index f430a0c727..58486ca7d8 100644 --- a/libgimpwidgets/gimpfileselection.c +++ b/libgimpwidgets/gimpfileselection.c @@ -297,7 +297,7 @@ gimp_file_selection_entry_callback (GtkWidget *widget, gimp_file_selection_check_filename (gfs); - gtk_entry_set_position (GTK_ENTRY (gfs->entry), -1); + gtk_editable_set_position (GTK_EDITABLE (gfs->entry), -1); g_signal_emit (G_OBJECT (gfs), gimp_file_selection_signals[FILENAME_CHANGED], 0); diff --git a/libgimpwidgets/gimphelpui.c b/libgimpwidgets/gimphelpui.c index 3e45258dd9..d44a76f83e 100644 --- a/libgimpwidgets/gimphelpui.c +++ b/libgimpwidgets/gimphelpui.c @@ -23,8 +23,16 @@ #include "config.h" #include + +#ifdef __GNUC__ +#warning GTK_DISABLE_DEPRECATED +#endif +#undef GTK_DISABLE_DEPRECATED + #include +#define GTK_DISABLE_DEPRECATED + #include "gimpwidgetstypes.h" #include "gimpdialog.h" @@ -165,9 +173,9 @@ gimp_help_connect (GtkWidget *widget, tips_query = gtk_tips_query_new (); - gtk_widget_set (tips_query, - "GtkTipsQuery::emit_always", TRUE, - NULL); + g_object_set (G_OBJECT (tips_query), + "emit_always", TRUE, + NULL); g_signal_connect (G_OBJECT (tips_query), "widget_selected", G_CALLBACK (gimp_help_tips_query_widget_selected), diff --git a/libgimpwidgets/gimpoffsetarea.c b/libgimpwidgets/gimpoffsetarea.c index 10d782ea63..1867a0160e 100644 --- a/libgimpwidgets/gimpoffsetarea.c +++ b/libgimpwidgets/gimpoffsetarea.c @@ -22,6 +22,11 @@ #include +#ifdef __GNUC__ +#warning GTK_DISABLE_DEPRECATED +#endif +#undef GTK_DISABLE_DEPRECATED + #include #include "gimpwidgetstypes.h" @@ -103,7 +108,7 @@ gimp_offset_area_class_init (GimpOffsetAreaClass *klass) G_TYPE_INT, G_TYPE_INT); - widget_class->event = gimp_offset_area_event; + widget_class->event = gimp_offset_area_event; } static void @@ -373,9 +378,10 @@ gimp_offset_area_draw (GimpOffsetArea *offset_area) w = offset_area->display_ratio_x * offset_area->orig_width; h = offset_area->display_ratio_y * offset_area->orig_height; - gtk_draw_shadow (widget->style, widget->window, - GTK_STATE_NORMAL, GTK_SHADOW_OUT, - x, y, w, h); + gtk_paint_shadow (widget->style, widget->window, GTK_STATE_NORMAL, + GTK_SHADOW_OUT, + NULL, widget, NULL, + x, y, w, h); if (offset_area->orig_width > offset_area->width || offset_area->orig_height > offset_area->height) diff --git a/libgimpwidgets/gimppatheditor.c b/libgimpwidgets/gimppatheditor.c index 9bb1b963e9..0656b2a361 100644 --- a/libgimpwidgets/gimppatheditor.c +++ b/libgimpwidgets/gimppatheditor.c @@ -24,8 +24,15 @@ #include +#ifdef __GNUC__ +#warning GTK_DISABLE_DEPRECATED +#endif +#undef GTK_DISABLE_DEPRECATED + #include +#define GTK_DISABLE_DEPRECATED + #include "gimpwidgetstypes.h" #include "gimppatheditor.h" diff --git a/libgimpwidgets/gimppixmap.h b/libgimpwidgets/gimppixmap.h index 4bdbfa8f4f..8d0c404fec 100644 --- a/libgimpwidgets/gimppixmap.h +++ b/libgimpwidgets/gimppixmap.h @@ -23,6 +23,19 @@ #ifndef __GIMP_PIXMAP_H__ #define __GIMP_PIXMAP_H__ +#ifdef GTK_DISABLE_DEPRECATED +#undef GTK_DISABLE_DEPRECATED +#define GIMP_IGNORE_ME_PLEASE_FOOBAR +#endif + +#include + +#ifdef GIMP_IGNORE_ME_PLEASE_FOOBAR +#undef GIMP_IGNORE_ME_PLEASE_FOOBAR +#define GTK_DISABLE_DEPRECATED +#endif + + G_BEGIN_DECLS /* For information look into the C source or the html documentation */ diff --git a/libgimpwidgets/gimpquerybox.c b/libgimpwidgets/gimpquerybox.c index f1fd567bcc..9e6a53f488 100644 --- a/libgimpwidgets/gimpquerybox.c +++ b/libgimpwidgets/gimpquerybox.c @@ -560,8 +560,7 @@ double_query_box_ok_callback (GtkWidget *widget, query_box = query_box_disconnect (data); /* Get the spinbutton data */ - value = - gtk_spin_button_get_value_as_float (GTK_SPIN_BUTTON (query_box->entry)); + value = gtk_spin_button_get_value (GTK_SPIN_BUTTON (query_box->entry)); /* Call the user defined callback */ (* (GimpQueryDoubleCallback) query_box->callback) (query_box->qbox, diff --git a/libgimpwidgets/gimpstock.c b/libgimpwidgets/gimpstock.c index eddaf41d43..1b210799a4 100644 --- a/libgimpwidgets/gimpstock.c +++ b/libgimpwidgets/gimpstock.c @@ -54,7 +54,7 @@ sized_with_same_fallback_icon_set_from_inline (const guchar *inline_data, gtk_icon_source_set_pixbuf (source, pixbuf); - gdk_pixbuf_unref (pixbuf); + g_object_unref (G_OBJECT (pixbuf)); set = gtk_icon_set_new (); @@ -103,14 +103,19 @@ static GtkStockItem gimp_stock_items[] = { GIMP_STOCK_TO_SELECTION, N_("To Sleection"), 0, 0, "gimp-libgimp" }, { GIMP_STOCK_VISIBLE, N_("Visible"), 0, 0, "gimp-libgimp" }, - { GIMP_STOCK_NAVIGATION, NULL, 0, 0, "gimp-libgimp" }, - { GIMP_STOCK_QMASK_OFF, NULL, 0, 0, "gimp-libgimp" }, - { GIMP_STOCK_QMASK_ON, NULL, 0, 0, "gimp-libgimp" }, + { GIMP_STOCK_NAVIGATION, NULL, 0, 0, "gimp-libgimp" }, + { GIMP_STOCK_QMASK_OFF, NULL, 0, 0, "gimp-libgimp" }, + { GIMP_STOCK_QMASK_ON, NULL, 0, 0, "gimp-libgimp" }, - { GIMP_STOCK_SELECTION_REPLACE, NULL, 0, 0, "gimp-libgimp" }, - { GIMP_STOCK_SELECTION_ADD, NULL, 0, 0, "gimp-libgimp" }, - { GIMP_STOCK_SELECTION_SUBTRACT, NULL, 0, 0, "gimp-libgimp" }, - { GIMP_STOCK_SELECTION_INTERSECT, NULL, 0, 0, "gimp-libgimp" }, + { GIMP_STOCK_HCHAIN, NULL, 0, 0, "gimp-libgimp" }, + { GIMP_STOCK_HCHAIN_BROKEN, NULL, 0, 0, "gimp-libgimp" }, + { GIMP_STOCK_VCHAIN, NULL, 0, 0, "gimp-libgimp" }, + { GIMP_STOCK_VCHAIN_BROKEN, NULL, 0, 0, "gimp-libgimp" }, + + { GIMP_STOCK_SELECTION_REPLACE, NULL, 0, 0, "gimp-libgimp" }, + { GIMP_STOCK_SELECTION_ADD, NULL, 0, 0, "gimp-libgimp" }, + { GIMP_STOCK_SELECTION_SUBTRACT, NULL, 0, 0, "gimp-libgimp" }, + { GIMP_STOCK_SELECTION_INTERSECT, NULL, 0, 0, "gimp-libgimp" }, { GIMP_STOCK_TOOL_AIRBRUSH, NULL, 0, 0, "gimp-libgimp" }, { GIMP_STOCK_TOOL_BEZIER_SELECT, NULL, 0, 0, "gimp-libgimp" }, @@ -177,6 +182,11 @@ gimp_stock_button_pixbufs[] = { GIMP_STOCK_TO_SELECTION, stock_button_to_selection }, { GIMP_STOCK_VISIBLE, stock_button_eye }, + { GIMP_STOCK_HCHAIN, stock_button_hchain }, + { GIMP_STOCK_HCHAIN_BROKEN, stock_button_hchain_broken }, + { GIMP_STOCK_VCHAIN, stock_button_vchain }, + { GIMP_STOCK_VCHAIN_BROKEN, stock_button_vchain_broken }, + { GIMP_STOCK_SELECTION_REPLACE, stock_button_selection_replace }, { GIMP_STOCK_SELECTION_ADD, stock_button_selection_add }, { GIMP_STOCK_SELECTION_SUBTRACT, stock_button_selection_subtract }, diff --git a/libgimpwidgets/gimpstock.h b/libgimpwidgets/gimpstock.h index f30604ba26..c3d34ae98a 100644 --- a/libgimpwidgets/gimpstock.h +++ b/libgimpwidgets/gimpstock.h @@ -28,27 +28,32 @@ G_BEGIN_DECLS /* For information look into the C source or the html documentation */ -#define GIMP_STOCK_ANCHOR "gimp-anchor" -#define GIMP_STOCK_DELETE "gimp-delete" -#define GIMP_STOCK_DUPLICATE "gimp-duplicate" -#define GIMP_STOCK_EDIT "gimp-edit" -#define GIMP_STOCK_LINKED "gimp-linked" -#define GIMP_STOCK_LOWER "gimp-lower" -#define GIMP_STOCK_NEW "gimp-new" -#define GIMP_STOCK_PASTE "gimp-paste" -#define GIMP_STOCK_PASTE_AS_NEW "gimp-paste-as-new" -#define GIMP_STOCK_PASTE_INTO "gimp-paste-into" -#define GIMP_STOCK_RAISE "gimp-raise" -#define GIMP_STOCK_REFRESH "gimp-refresh" -#define GIMP_STOCK_RESET "gimp-reset" -#define GIMP_STOCK_STROKE "gimp-stroke" -#define GIMP_STOCK_TO_PATH "gimp-to-path" -#define GIMP_STOCK_TO_SELECTION "gimp-to-selection" -#define GIMP_STOCK_VISIBLE "gimp-visible" +#define GIMP_STOCK_ANCHOR "gimp-anchor" +#define GIMP_STOCK_DELETE "gimp-delete" +#define GIMP_STOCK_DUPLICATE "gimp-duplicate" +#define GIMP_STOCK_EDIT "gimp-edit" +#define GIMP_STOCK_LINKED "gimp-linked" +#define GIMP_STOCK_LOWER "gimp-lower" +#define GIMP_STOCK_NEW "gimp-new" +#define GIMP_STOCK_PASTE "gimp-paste" +#define GIMP_STOCK_PASTE_AS_NEW "gimp-paste-as-new" +#define GIMP_STOCK_PASTE_INTO "gimp-paste-into" +#define GIMP_STOCK_RAISE "gimp-raise" +#define GIMP_STOCK_REFRESH "gimp-refresh" +#define GIMP_STOCK_RESET "gimp-reset" +#define GIMP_STOCK_STROKE "gimp-stroke" +#define GIMP_STOCK_TO_PATH "gimp-to-path" +#define GIMP_STOCK_TO_SELECTION "gimp-to-selection" +#define GIMP_STOCK_VISIBLE "gimp-visible" -#define GIMP_STOCK_NAVIGATION "gimp-navigation" -#define GIMP_STOCK_QMASK_OFF "gimp-qmask-off" -#define GIMP_STOCK_QMASK_ON "gimp-qmask-on" +#define GIMP_STOCK_NAVIGATION "gimp-navigation" +#define GIMP_STOCK_QMASK_OFF "gimp-qmask-off" +#define GIMP_STOCK_QMASK_ON "gimp-qmask-on" + +#define GIMP_STOCK_HCHAIN "gimp-hchain" +#define GIMP_STOCK_HCHAIN_BROKEN "gimp-hchain-broken" +#define GIMP_STOCK_VCHAIN "gimp-vchain" +#define GIMP_STOCK_VCHAIN_BROKEN "gimp-vchain-broken" #define GIMP_STOCK_SELECTION_REPLACE "gimp-selection-replace" #define GIMP_STOCK_SELECTION_ADD "gimp-selection-add" diff --git a/libgimpwidgets/gimpwidgets.h b/libgimpwidgets/gimpwidgets.h index 0a02b8fe47..9d0cb9d062 100644 --- a/libgimpwidgets/gimpwidgets.h +++ b/libgimpwidgets/gimpwidgets.h @@ -174,8 +174,8 @@ GtkWidget * gimp_random_seed_new (gint *seed, gint time_false); #define GIMP_COORDINATES_CHAINBUTTON(sizeentry) \ - GIMP_CHAIN_BUTTON (gtk_object_get_data (GTK_OBJECT (sizeentry), \ - "chainbutton")) + GIMP_CHAIN_BUTTON (g_object_get_data (G_OBJECT (sizeentry), \ + "chainbutton")) GtkWidget * gimp_coordinates_new (GimpUnit unit, const gchar *unit_format, diff --git a/pixmaps/Makefile.am b/pixmaps/Makefile.am index 78c0e68499..d9bc31a595 100644 --- a/pixmaps/Makefile.am +++ b/pixmaps/Makefile.am @@ -13,7 +13,6 @@ EXTRA_DIST = @STRIP_BEGIN@ \ zoom_in.xpm \ zoom_out.xpm \ \ - chain.xpm \ default.xpm \ eek.xpm \ first.xpm \ diff --git a/pixmaps/chain.xpm b/pixmaps/chain.xpm deleted file mode 100644 index 0fbe182f53..0000000000 --- a/pixmaps/chain.xpm +++ /dev/null @@ -1,118 +0,0 @@ -/* XPM */ -static char * chain_hor_xpm[] = { -"24 9 9 1", -" c None", -". c #020204", -"+ c #5A5A5C", -"@ c #E8E8E9", -"# c #D0D0D1", -"$ c #8F8F91", -"% c #B5B5B6", -"& c #6E6E6E", -"* c #9A9A98", -" ", -" ....... ....... ", -" .+@####$. .$%@@@@%. ", -" .%................@. ", -" .#. .&%###%. .#. ", -" .#................@. ", -" .&*##%*$. .&%%%%#&. ", -" ....... ....... ", -" "}; -/* XPM */ -static char * chain_ver_xpm[] = { -"9 24 9 1", -" c None", -". c #020204", -"+ c #6E6E6E", -"@ c #D0D0D1", -"# c #B5B5B6", -"$ c #5A5A5C", -"% c #9A9A98", -"& c #E8E8E9", -"* c #8F8F91", -" ", -" ", -" ..... ", -" .+@@#$. ", -" .%...&. ", -" .@. .@. ", -" .@. .@. ", -" .#. .@. ", -" .%...@. ", -" .*.+.*. ", -" ..#.. ", -" .@. ", -" .@. ", -" ..@.. ", -" .+.#.*. ", -" .#...#. ", -" .#. .&. ", -" .#. .&. ", -" .#. .&. ", -" .@...&. ", -" .+&@&#. ", -" ..... ", -" ", -" "}; -/* XPM */ -static char * chain_broken_hor_xpm[] = { -"24 9 9 1", -" c None", -". c #020204", -"+ c #5A5A5C", -"@ c #E8E8E9", -"# c #D0D0D1", -"$ c #8F8F91", -"% c #B5B5B6", -"& c #6E6E6E", -"* c #9A9A98", -" ", -" ....... ....... ", -".+@####$. .$%@@@@%.", -".%........ ........@.", -".#. .&%# ##%. .#.", -".#........ ........@.", -".&*##%*$. .&%%%%#&.", -" ....... ....... ", -" "}; -/* XPM */ -static char * chain_broken_ver_xpm[] = { -"9 24 9 1", -" c None", -". c #020204", -"+ c #6E6E6E", -"@ c #D0D0D1", -"# c #B5B5B6", -"$ c #5A5A5C", -"% c #9A9A98", -"& c #E8E8E9", -"* c #8F8F91", -" ..... ", -" .+@@#$. ", -" .%...&. ", -" .@. .@. ", -" .@. .@. ", -" .#. .@. ", -" .%...@. ", -" .*.+.*. ", -" ..#.. ", -" .@. ", -" ", -" ", -" ", -" ", -" .@. ", -" ..@.. ", -" .+.#.*. ", -" .#...#. ", -" .#. .&. ", -" .#. .&. ", -" .#. .&. ", -" .@...&. ", -" .+&@&#. ", -" ..... "}; - - - - diff --git a/plug-ins/FractalExplorer/Dialogs.c b/plug-ins/FractalExplorer/Dialogs.c index 05dfe25119..53f9806e27 100644 --- a/plug-ins/FractalExplorer/Dialogs.c +++ b/plug-ins/FractalExplorer/Dialogs.c @@ -289,9 +289,9 @@ explorer_dialog (void) NULL); - gtk_signal_connect (GTK_OBJECT (dialog), "destroy", - GTK_SIGNAL_FUNC (gtk_main_quit), - NULL); + g_signal_connect (G_OBJECT (dialog), "destroy", + G_CALLBACK (gtk_main_quit), + NULL); gimp_help_init (); @@ -328,21 +328,23 @@ explorer_dialog (void) wint.preview = gtk_preview_new (GTK_PREVIEW_COLOR); gtk_preview_size (GTK_PREVIEW (wint.preview), preview_width, preview_height); gtk_container_add (GTK_CONTAINER (pframe), wint.preview); - gtk_signal_connect (GTK_OBJECT (wint.preview), "button_press_event", - (GtkSignalFunc) preview_button_press_event, - NULL); - gtk_signal_connect (GTK_OBJECT (wint.preview), "button_release_event", - (GtkSignalFunc) preview_button_release_event, - NULL); - gtk_signal_connect (GTK_OBJECT (wint.preview), "motion_notify_event", - (GtkSignalFunc) preview_motion_notify_event, - NULL); - gtk_signal_connect (GTK_OBJECT (wint.preview), "leave_notify_event", - (GtkSignalFunc) preview_leave_notify_event, - NULL); - gtk_signal_connect (GTK_OBJECT (wint.preview), "enter_notify_event", - (GtkSignalFunc) preview_enter_notify_event, + + g_signal_connect (G_OBJECT (wint.preview), "button_press_event", + G_CALLBACK (preview_button_press_event), + NULL); + g_signal_connect (G_OBJECT (wint.preview), "button_release_event", + G_CALLBACK (preview_button_release_event), NULL); + g_signal_connect (G_OBJECT (wint.preview), "motion_notify_event", + G_CALLBACK (preview_motion_notify_event), + NULL); + g_signal_connect (G_OBJECT (wint.preview), "leave_notify_event", + G_CALLBACK (preview_leave_notify_event), + NULL); + g_signal_connect (G_OBJECT (wint.preview), "enter_notify_event", + G_CALLBACK (preview_enter_notify_event), + NULL); + gtk_widget_set_events (wint.preview, (GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK | @@ -352,9 +354,9 @@ explorer_dialog (void) toggle = gtk_check_button_new_with_label (_("Realtime Preview")); gtk_box_pack_start (GTK_BOX (vbox), toggle, FALSE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - GTK_SIGNAL_FUNC (explorer_toggle_update), - &wvals.alwayspreview); + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (explorer_toggle_update), + &wvals.alwayspreview); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), wvals.alwayspreview); gtk_widget_show (toggle); gimp_help_set_help_data (toggle, _("If you enable this option the preview " @@ -362,9 +364,9 @@ explorer_dialog (void) button = gtk_button_new_with_label (_("Redraw")); gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (button), "clicked", - GTK_SIGNAL_FUNC (dialog_redraw_callback), - dialog); + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (dialog_redraw_callback), + dialog); gtk_widget_show (button); gimp_help_set_help_data (button, _("Redraw preview"), NULL); @@ -381,32 +383,32 @@ explorer_dialog (void) button = gtk_button_new_with_label (_("Undo Zoom")); gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (button), "clicked", - GTK_SIGNAL_FUNC (dialog_undo_zoom_callback), - dialog); + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (dialog_undo_zoom_callback), + dialog); gtk_widget_show (button); gimp_help_set_help_data (button, _("Undo last zoom"), NULL); button = gtk_button_new_with_label (_("Redo Zoom")); gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (button), "clicked", - GTK_SIGNAL_FUNC (dialog_redo_zoom_callback), - dialog); + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (dialog_redo_zoom_callback), + dialog); gtk_widget_show (button); gimp_help_set_help_data (button, _("Redo last zoom"), NULL); button = gtk_button_new_with_label (_("Step In")); gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (button), "clicked", - GTK_SIGNAL_FUNC (dialog_step_in_callback), - dialog); + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (dialog_step_in_callback), + dialog); gtk_widget_show (button); button = gtk_button_new_with_label (_("Step Out")); gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (button), "clicked", - GTK_SIGNAL_FUNC (dialog_step_out_callback), - dialog); + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (dialog_step_out_callback), + dialog); gtk_widget_show (button); @@ -441,9 +443,9 @@ explorer_dialog (void) TRUE, 0, 0, _("Change the first (minimal) x-coordinate " "delimitation"), NULL); - gtk_signal_connect (GTK_OBJECT (elements->xmin), "value_changed", - GTK_SIGNAL_FUNC (explorer_double_adjustment_update), - &wvals.xmin); + g_signal_connect (G_OBJECT (elements->xmin), "value_changed", + G_CALLBACK (explorer_double_adjustment_update), + &wvals.xmin); elements->xmax = gimp_scale_entry_new (GTK_TABLE (table), 0, 1, @@ -452,9 +454,9 @@ explorer_dialog (void) TRUE, 0, 0, _("Change the second (maximal) x-coordinate " "delimitation"), NULL); - gtk_signal_connect (GTK_OBJECT (elements->xmax), "value_changed", - GTK_SIGNAL_FUNC (explorer_double_adjustment_update), - &wvals.xmax); + g_signal_connect (G_OBJECT (elements->xmax), "value_changed", + G_CALLBACK (explorer_double_adjustment_update), + &wvals.xmax); elements->ymin = gimp_scale_entry_new (GTK_TABLE (table), 0, 2, @@ -463,9 +465,9 @@ explorer_dialog (void) TRUE, 0, 0, _("Change the first (minimal) y-coordinate " "delimitation"), NULL); - gtk_signal_connect (GTK_OBJECT (elements->ymin), "value_changed", - GTK_SIGNAL_FUNC (explorer_double_adjustment_update), - &wvals.ymin); + g_signal_connect (G_OBJECT (elements->ymin), "value_changed", + G_CALLBACK (explorer_double_adjustment_update), + &wvals.ymin); elements->ymax = gimp_scale_entry_new (GTK_TABLE (table), 0, 3, @@ -474,9 +476,9 @@ explorer_dialog (void) TRUE, 0, 0, _("Change the second (maximal) y-coordinate " "delimitation"), NULL); - gtk_signal_connect (GTK_OBJECT (elements->ymax), "value_changed", - GTK_SIGNAL_FUNC (explorer_double_adjustment_update), - &wvals.ymax); + g_signal_connect (G_OBJECT (elements->ymax), "value_changed", + G_CALLBACK (explorer_double_adjustment_update), + &wvals.ymax); elements->iter = gimp_scale_entry_new (GTK_TABLE (table), 0, 4, @@ -486,9 +488,9 @@ explorer_dialog (void) _("Change the iteration value. The higher it " "is, the more details will be calculated, " "which will take more time"), NULL); - gtk_signal_connect (GTK_OBJECT (elements->iter), "value_changed", - GTK_SIGNAL_FUNC (explorer_double_adjustment_update), - &wvals.iter); + g_signal_connect (G_OBJECT (elements->iter), "value_changed", + G_CALLBACK (explorer_double_adjustment_update), + &wvals.iter); elements->cx = gimp_scale_entry_new (GTK_TABLE (table), 0, 5, @@ -498,9 +500,9 @@ explorer_dialog (void) _("Change the CX value (changes aspect of " "fractal, active with every fractal but " "Mandelbrot and Sierpinski)"), NULL); - gtk_signal_connect (GTK_OBJECT (elements->cx), "value_changed", - GTK_SIGNAL_FUNC (explorer_double_adjustment_update), - &wvals.cx); + g_signal_connect (G_OBJECT (elements->cx), "value_changed", + G_CALLBACK (explorer_double_adjustment_update), + &wvals.cx); elements->cy = gimp_scale_entry_new (GTK_TABLE (table), 0, 6, @@ -510,9 +512,9 @@ explorer_dialog (void) _("Change the CY value (changes aspect of " "fractal, active with every fractal but " "Mandelbrot and Sierpinski)"), NULL); - gtk_signal_connect (GTK_OBJECT (elements->cy), "value_changed", - GTK_SIGNAL_FUNC (explorer_double_adjustment_update), - &wvals.cy); + g_signal_connect (G_OBJECT (elements->cy), "value_changed", + G_CALLBACK (explorer_double_adjustment_update), + &wvals.cy); hbbox = gtk_hbox_new (FALSE, 4); gtk_table_attach_defaults (GTK_TABLE (table), hbbox, 0, 3, 7, 8); @@ -520,26 +522,26 @@ explorer_dialog (void) button = gtk_button_new_with_label (_("Load")); gtk_box_pack_start (GTK_BOX (hbbox), button, TRUE, TRUE, 0); - gtk_signal_connect (GTK_OBJECT (button), "clicked", - GTK_SIGNAL_FUNC (create_load_file_selection), - dialog); + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (create_load_file_selection), + dialog); gtk_widget_show (button); gimp_help_set_help_data (button, _("Load a fractal from file"), NULL); button = gtk_button_new_with_label (_("Reset")); gtk_box_pack_start (GTK_BOX (hbbox), button, TRUE, TRUE, 0); - gtk_signal_connect (GTK_OBJECT(button), "clicked", - GTK_SIGNAL_FUNC (dialog_reset_callback), - dialog); + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (dialog_reset_callback), + dialog); gtk_widget_show (button); gimp_help_set_help_data (button, _("Reset parameters to default values"), NULL); button = gtk_button_new_with_label (_("Save")); gtk_box_pack_start (GTK_BOX (hbbox), button, TRUE, TRUE, 0); - gtk_signal_connect (GTK_OBJECT (button), "clicked", - GTK_SIGNAL_FUNC (create_file_selection), - dialog); + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (create_file_selection), + dialog); gtk_widget_show (button); gimp_help_set_help_data (button, _("Save active fractal to file"), NULL); @@ -581,25 +583,29 @@ explorer_dialog (void) toggle_vbox2 = gtk_vbox_new (FALSE, 1); for (i = TYPE_BARNSLEY_2; i <= TYPE_SPIDER; i++) { - gtk_object_ref (GTK_OBJECT (elements->type[i])); + g_object_ref (G_OBJECT (elements->type[i])); + gtk_widget_hide (elements->type[i]); gtk_container_remove (GTK_CONTAINER (toggle_vbox), elements->type[i]); gtk_box_pack_start (GTK_BOX (toggle_vbox2), elements->type[i], FALSE, FALSE, 0); gtk_widget_show (elements->type[i]); - gtk_object_unref (GTK_OBJECT (elements->type[i])); + + g_object_unref (G_OBJECT (elements->type[i])); } toggle_vbox3 = gtk_vbox_new (FALSE, 1); for (i = TYPE_MAN_O_WAR; i <= TYPE_SIERPINSKI; i++) { - gtk_object_ref (GTK_OBJECT (elements->type[i])); + g_object_ref (G_OBJECT (elements->type[i])); + gtk_widget_hide (elements->type[i]); gtk_container_remove (GTK_CONTAINER (toggle_vbox), elements->type[i]); gtk_box_pack_start (GTK_BOX (toggle_vbox3), elements->type[i], FALSE, FALSE, 0); gtk_widget_show (elements->type[i]); - gtk_object_unref (GTK_OBJECT (elements->type[i])); + + g_object_unref (G_OBJECT (elements->type[i])); } gtk_container_set_border_width (GTK_CONTAINER (toggle_vbox), 0); @@ -641,16 +647,16 @@ explorer_dialog (void) TRUE, 0, 0, _("Change the number of colors in the mapping"), NULL); - gtk_signal_connect (GTK_OBJECT (elements->ncol), "value_changed", - GTK_SIGNAL_FUNC (explorer_number_of_colors_callback), - &wvals.ncolors); + g_signal_connect (G_OBJECT (elements->ncol), "value_changed", + G_CALLBACK (explorer_number_of_colors_callback), + &wvals.ncolors); elements->useloglog = toggle = gtk_check_button_new_with_label (_("Use loglog Smoothing")); gtk_table_attach_defaults (GTK_TABLE (table), toggle, 0, 3, 1, 2); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - (GtkSignalFunc) explorer_toggle_update, - &wvals.useloglog); + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (explorer_toggle_update), + &wvals.useloglog); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), wvals.useloglog); gtk_widget_show (toggle); gimp_help_set_help_data (toggle, _("Use log log smoothing to eliminate " @@ -675,9 +681,9 @@ explorer_dialog (void) wvals.redstretch, 0, 1, 0.01, 0.1, 2, TRUE, 0, 0, _("Change the intensity of the red channel"), NULL); - gtk_signal_connect (GTK_OBJECT (elements->red), "value_changed", - GTK_SIGNAL_FUNC (explorer_double_adjustment_update), - &wvals.redstretch); + g_signal_connect (G_OBJECT (elements->red), "value_changed", + G_CALLBACK (explorer_double_adjustment_update), + &wvals.redstretch); elements->green = gimp_scale_entry_new (GTK_TABLE (table), 0, 1, @@ -685,9 +691,9 @@ explorer_dialog (void) wvals.greenstretch, 0, 1, 0.01, 0.1, 2, TRUE, 0, 0, _("Change the intensity of the green channel"), NULL); - gtk_signal_connect (GTK_OBJECT (elements->green), "value_changed", - GTK_SIGNAL_FUNC (explorer_double_adjustment_update), - &wvals.greenstretch); + g_signal_connect (G_OBJECT (elements->green), "value_changed", + G_CALLBACK (explorer_double_adjustment_update), + &wvals.greenstretch); elements->blue = gimp_scale_entry_new (GTK_TABLE (table), 0, 2, @@ -695,9 +701,9 @@ explorer_dialog (void) wvals.bluestretch, 0, 1, 0.01, 0.1, 2, TRUE, 0, 0, _("Change the intensity of the blue channel"), NULL); - gtk_signal_connect (GTK_OBJECT (elements->blue), "value_changed", - GTK_SIGNAL_FUNC (explorer_double_adjustment_update), - &wvals.bluestretch); + g_signal_connect (G_OBJECT (elements->blue), "value_changed", + G_CALLBACK (explorer_double_adjustment_update), + &wvals.bluestretch); /* Color Function frame */ frame = gtk_frame_new (_("Color Function")); @@ -742,9 +748,9 @@ explorer_dialog (void) gtk_check_button_new_with_label (_("Inversion")); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), wvals.redinvert); gtk_box_pack_start (GTK_BOX (toggle_vbox), toggle, FALSE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - GTK_SIGNAL_FUNC (explorer_toggle_update), - &wvals.redinvert); + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (explorer_toggle_update), + &wvals.redinvert); gtk_widget_show (toggle); gimp_help_set_help_data (toggle, _("If you enable this option higher color values " @@ -783,9 +789,9 @@ explorer_dialog (void) gtk_check_button_new_with_label (_("Inversion")); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), wvals.greeninvert); gtk_box_pack_start (GTK_BOX (toggle_vbox), toggle, FALSE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - GTK_SIGNAL_FUNC (explorer_toggle_update), - &wvals.greeninvert); + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (explorer_toggle_update), + &wvals.greeninvert); gtk_widget_show (toggle); gimp_help_set_help_data (toggle, _("If you enable this option higher color values " @@ -824,9 +830,9 @@ explorer_dialog (void) gtk_check_button_new_with_label (_("Inversion")); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON( toggle), wvals.blueinvert); gtk_box_pack_start (GTK_BOX (toggle_vbox), toggle, FALSE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - GTK_SIGNAL_FUNC (explorer_toggle_update), - &wvals.blueinvert); + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (explorer_toggle_update), + &wvals.blueinvert); gtk_widget_show (toggle); gimp_help_set_help_data (toggle, _("If you enable this option higher color values " @@ -846,12 +852,13 @@ explorer_dialog (void) toggle = elements->colormode[0] = gtk_radio_button_new_with_label (group, _("As Specified above")); - 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 (toggle_vbox), toggle, FALSE, FALSE, 0); - gtk_object_set_user_data (GTK_OBJECT (toggle), (gpointer) 0); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - GTK_SIGNAL_FUNC (explorer_radio_update), - &wvals.colormode); + g_object_set_data (G_OBJECT (toggle), "gimp-item-data", + GINT_TO_POINTER (0)); + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (explorer_radio_update), + &wvals.colormode); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), wvals.colormode == 0); gtk_widget_show (toggle); @@ -867,12 +874,13 @@ explorer_dialog (void) toggle = elements->colormode[1] = gtk_radio_button_new_with_label (group, _("Apply Active Gradient to Final Image")); - 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, TRUE, TRUE, 0); - gtk_object_set_user_data (GTK_OBJECT (toggle), (gpointer) 1); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - GTK_SIGNAL_FUNC (explorer_radio_update), - &wvals.colormode); + g_object_set_data (G_OBJECT (toggle), "gimp-item-data", + GINT_TO_POINTER (1)); + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (explorer_radio_update), + &wvals.colormode); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), wvals.colormode == 1); gtk_widget_show (toggle); @@ -902,7 +910,7 @@ explorer_dialog (void) xsize = wvals.ncolors / ysize; while (xsize * ysize < 8192) xsize++; - gtk_widget_set_usize (abox, xsize, ysize * 4); + gtk_widget_set_size_request (abox, xsize, ysize * 4); } gtk_box_pack_start (GTK_BOX (toggle_vbox), abox, FALSE, FALSE, 0); gtk_widget_show (abox); @@ -1177,7 +1185,7 @@ dialog_update_preview (void) p += preview_width * 3; } - gtk_widget_draw (wint.preview, NULL); + gtk_widget_queue_draw (wint.preview); gdk_flush (); } } @@ -1207,8 +1215,8 @@ set_cmap_preview (void) while (xsize * ysize < wvals.ncolors) xsize++; b = g_new (guchar, xsize * 3); - gtk_preview_size (GTK_PREVIEW (cmap_preview), xsize, ysize * 4); - gtk_widget_set_usize (GTK_WIDGET (cmap_preview), xsize, ysize * 4); + gtk_preview_size (GTK_PREVIEW (cmap_preview), xsize, ysize * 4); + gtk_widget_set_size_request (GTK_WIDGET (cmap_preview), xsize, ysize * 4); for (y = 0; y < ysize*4; y += 4) { @@ -1239,7 +1247,7 @@ set_cmap_preview (void) c[x * 3 + j] = colormap[(int)((float)x/(float)GR_WIDTH*256.0)][j]; } - gtk_widget_draw (cmap_preview, NULL); + gtk_widget_queue_draw (cmap_preview); g_free (b); } @@ -1380,9 +1388,9 @@ explorer_logo_dialog (void) NULL); - gtk_signal_connect (GTK_OBJECT (xdlg), "destroy", - GTK_SIGNAL_FUNC (gtk_widget_destroyed), - &logodlg); + g_signal_connect (G_OBJECT (xdlg), "destroy", + G_CALLBACK (gtk_widget_destroyed), + &logodlg); xframe = gtk_frame_new (NULL); gtk_frame_set_shadow_type (GTK_FRAME (xframe), GTK_SHADOW_ETCHED_IN); @@ -1667,21 +1675,21 @@ create_load_file_selection (void) window = gtk_file_selection_new (_("Load Fractal Parameters")); gtk_window_set_position (GTK_WINDOW (window), GTK_WIN_POS_NONE); - gtk_signal_connect (GTK_OBJECT (window), "destroy", - GTK_SIGNAL_FUNC (gtk_widget_destroyed), - &window); + g_signal_connect (G_OBJECT (window), "destroy", + G_CALLBACK (gtk_widget_destroyed), + &window); - gtk_signal_connect (GTK_OBJECT (GTK_FILE_SELECTION (window)->ok_button), - "clicked", - GTK_SIGNAL_FUNC (load_file_selection_ok), - (gpointer) window); + g_signal_connect (G_OBJECT (GTK_FILE_SELECTION (window)->ok_button), + "clicked", + G_CALLBACK (load_file_selection_ok), + window); gimp_help_set_help_data (GTK_FILE_SELECTION(window)->ok_button, _("Click here to load your file"), NULL); - gtk_signal_connect_object (GTK_OBJECT (GTK_FILE_SELECTION (window)->cancel_button), - "clicked", - GTK_SIGNAL_FUNC (gtk_widget_destroy), - GTK_OBJECT (window)); + g_signal_connect_swapped (G_OBJECT (GTK_FILE_SELECTION (window)->cancel_button), + "clicked", + G_CALLBACK (gtk_widget_destroy), + window); gimp_help_set_help_data (GTK_FILE_SELECTION(window)->cancel_button, _("Click here to cancel load procedure"), NULL); } @@ -1704,21 +1712,21 @@ create_file_selection (void) window = gtk_file_selection_new (_("Save Fractal Parameters")); gtk_window_set_position (GTK_WINDOW (window), GTK_WIN_POS_NONE); - gtk_signal_connect (GTK_OBJECT (window), "destroy", - GTK_SIGNAL_FUNC (gtk_widget_destroyed), - &window); + g_signal_connect (G_OBJECT (window), "destroy", + G_CALLBACK (gtk_widget_destroyed), + &window); - gtk_signal_connect (GTK_OBJECT (GTK_FILE_SELECTION (window)->ok_button), - "clicked", - GTK_SIGNAL_FUNC (file_selection_ok), - (gpointer) window); + g_signal_connect (G_OBJECT (GTK_FILE_SELECTION (window)->ok_button), + "clicked", + G_CALLBACK (file_selection_ok), + window); gimp_help_set_help_data (GTK_FILE_SELECTION(window)->ok_button, _("Click here to save your file"), NULL); - gtk_signal_connect_object (GTK_OBJECT (GTK_FILE_SELECTION(window)->cancel_button), - "clicked", - GTK_SIGNAL_FUNC (gtk_widget_destroy), - GTK_OBJECT (window)); + g_signal_connect_swapped (G_OBJECT (GTK_FILE_SELECTION(window)->cancel_button), + "clicked", + G_CALLBACK (gtk_widget_destroy), + window); gimp_help_set_help_data (GTK_FILE_SELECTION (window)->cancel_button, _("Click here to cancel save procedure"), NULL); } diff --git a/plug-ins/FractalExplorer/Events.c b/plug-ins/FractalExplorer/Events.c index 309fe31471..bd5e0b3a12 100644 --- a/plug-ins/FractalExplorer/Events.c +++ b/plug-ins/FractalExplorer/Events.c @@ -4,6 +4,12 @@ #include "Events.h" #include "Dialogs.h" +#ifdef __GNUC__ +#warning GTK_DISABLE_DEPRECATED +#endif +#undef GTK_DISABLE_DEPRECATED +#include + /********************************************************************** FUNCTION: preview_button_press_event *********************************************************************/ @@ -87,8 +93,7 @@ preview_button_press_event (GtkWidget *widget, p += preview_width * 3; } - gtk_widget_draw (wint.preview, NULL); - gdk_flush (); + gtk_widget_queue_draw (wint.preview); } return TRUE; } @@ -207,8 +212,7 @@ preview_motion_notify_event (GtkWidget *widget, p += preview_width * 3; } - gtk_widget_draw (wint.preview, NULL); - gdk_flush (); + gtk_widget_queue_draw (wint.preview); return TRUE; } @@ -282,8 +286,7 @@ preview_leave_notify_event (GtkWidget *widget, p += preview_width * 3; } - gtk_widget_draw (wint.preview, NULL); - gdk_flush (); + gtk_widget_queue_draw (wint.preview); MyCursor = gdk_cursor_new (GDK_TOP_LEFT_ARROW); gdk_window_set_cursor (maindlg->window, MyCursor); diff --git a/plug-ins/FractalExplorer/FractalExplorer.c b/plug-ins/FractalExplorer/FractalExplorer.c index 0c3b8f8167..efbc58525d 100644 --- a/plug-ins/FractalExplorer/FractalExplorer.c +++ b/plug-ins/FractalExplorer/FractalExplorer.c @@ -73,6 +73,12 @@ #include "Events.h" #include "Dialogs.h" +#ifdef __GNUC__ +#warning GTK_DISABLE_DEPRECATED +#endif +#undef GTK_DISABLE_DEPRECATED +#include + #ifdef G_OS_WIN32 #include @@ -662,7 +668,7 @@ delete_dialog_callback (GtkWidget *widget, /* g_print ("list: %i\n", g_list_length (sellist)); */ sel_obj = (fractalexplorerOBJ *) - gtk_object_get_user_data (GTK_OBJECT(sellist->data)); + g_object_get_data (G_OBJECT (sellist->data), "fractalexplorer"); pos = gtk_list_child_position (GTK_LIST (fractalexplorer_gtk_list), sellist->data); @@ -727,7 +733,7 @@ delete_fractal_callback (GtkWidget *widget, sellist = GTK_LIST(list)->selection; sel_obj = (fractalexplorerOBJ *) - gtk_object_get_user_data (GTK_OBJECT ((GtkWidget *) (sellist->data))); + g_object_get_data (G_OBJECT (sellist->data), "fractalexplorer"); str = g_strdup_printf (_("Are you sure you want to delete\n" "\"%s\" from the list and from disk?"), @@ -845,17 +851,17 @@ fractalexplorer_dialog_edit_list (GtkWidget *lwidget, gtk_widget_show (hbox); button = gtk_button_new_from_stock (GTK_STOCK_OK); - gtk_signal_connect (GTK_OBJECT (button), "clicked", - (GtkSignalFunc)fractalexplorer_list_ok_callback, - options); + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (fractalexplorer_list_ok_callback), + options); GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT); gtk_box_pack_start (GTK_BOX (GTK_DIALOG (options->query_box)->action_area), button, TRUE, TRUE, 0); gtk_widget_grab_default (button); gtk_widget_show (button); button = gtk_button_new_from_stock (GTK_STOCK_CANCEL); - gtk_signal_connect (GTK_OBJECT (button), "clicked", - (GtkSignalFunc)fractalexplorer_list_cancel_callback, + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (fractalexplorer_list_cancel_callback), options); GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT); gtk_box_pack_start (GTK_BOX (GTK_DIALOG (options->query_box)->action_area), button, TRUE, TRUE, 0); @@ -1019,7 +1025,8 @@ fractalexplorer_list_add (fractalexplorerOBJ *obj) obj->draw_name, list_pix); - gtk_object_set_user_data (GTK_OBJECT (list_item), (gpointer)obj); + g_object_set_data (G_OBJECT (list_item), "fractalexplorer", + obj); pos = fractalexplorer_list_insert (obj); @@ -1028,9 +1035,9 @@ fractalexplorer_list_add (fractalexplorerOBJ *obj) gtk_widget_show (list_item); gtk_list_select_item (GTK_LIST (fractalexplorer_gtk_list), pos); - gtk_signal_connect (GTK_OBJECT (list_item), "button_press_event", - GTK_SIGNAL_FUNC (list_button_press), - obj); + g_signal_connect (G_OBJECT (list_item), "button_press_event", + G_CALLBACK (list_button_press), + obj); return list_item; } @@ -1072,12 +1079,13 @@ build_list_items (GtkWidget *list) list_item = fractalexplorer_list_item_new_with_label_and_pixmap (g, g->draw_name,list_pix); - gtk_object_set_user_data (GTK_OBJECT (list_item), (gpointer) g); + g_object_set_data (G_OBJECT (list_item), "factralexplorer", + g); gtk_list_append_items (GTK_LIST (list), g_list_append(NULL,list_item)); - gtk_signal_connect (GTK_OBJECT (list_item), "button_press_event", - GTK_SIGNAL_FUNC (list_button_press), - (gpointer) g); + g_signal_connect (G_OBJECT (list_item), "button_press_event", + G_CALLBACK (list_button_press), + g); gtk_widget_show (list_item); tmp = tmp->next; @@ -1388,9 +1396,9 @@ add_objects_list (void) button = gtk_button_new_with_label (_("Rescan")); gtk_table_attach (GTK_TABLE (table), button, 0, 1, 1, 2, GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); - gtk_signal_connect (GTK_OBJECT (button), "clicked", - GTK_SIGNAL_FUNC (fractalexplorer_rescan_list), - NULL); + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (fractalexplorer_rescan_list), + NULL); gimp_help_set_help_data (button, _("Select directory and rescan collection"), NULL); gtk_widget_show (button); @@ -1398,9 +1406,9 @@ add_objects_list (void) button = gtk_button_new_with_label (_("Delete")); gtk_table_attach (GTK_TABLE (table), button, 1, 2, 1, 2, GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); - gtk_signal_connect (GTK_OBJECT (button), "clicked", - GTK_SIGNAL_FUNC (delete_fractal_callback), - (gpointer) list); + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (delete_fractal_callback), + list); gtk_widget_show (button); gimp_help_set_help_data (button, _("Delete currently selected fractal"), NULL); @@ -1420,8 +1428,8 @@ fractalexplorer_rescan_ok_callback (GtkWidget *widget, gimp_path_free (fractalexplorer_path_list); fractalexplorer_path_list = NULL; - patheditor = GTK_WIDGET (gtk_object_get_data (GTK_OBJECT (data), - "patheditor")); + patheditor = GTK_WIDGET (g_object_get_data (G_OBJECT (data), + "patheditor")); raw_path = gimp_path_editor_get_path (GIMP_PATH_EDITOR (patheditor)); @@ -1467,9 +1475,9 @@ fractalexplorer_rescan_list (void) NULL); - gtk_signal_connect (GTK_OBJECT (dlg), "destroy", - GTK_SIGNAL_FUNC (gtk_widget_destroyed), - &dlg); + g_signal_connect (G_OBJECT (dlg), "destroy", + G_CALLBACK (gtk_widget_destroyed), + &dlg); path = gimp_path_to_str (fractalexplorer_path_list); @@ -1481,7 +1489,7 @@ fractalexplorer_rescan_list (void) g_free (path); - gtk_object_set_data (GTK_OBJECT (dlg), "patheditor", patheditor); + g_object_set_data (G_OBJECT (dlg), "patheditor", patheditor); gtk_widget_show (dlg); } diff --git a/plug-ins/Lighting/lighting_ui.c b/plug-ins/Lighting/lighting_ui.c index 6688b2301e..38f8a79934 100644 --- a/plug-ins/Lighting/lighting_ui.c +++ b/plug-ins/Lighting/lighting_ui.c @@ -128,7 +128,7 @@ xyzval_update (GtkEntry *entry) gdouble *valueptr; gdouble value; - valueptr = (gdouble *) gtk_object_get_data (GTK_OBJECT (entry), "ValuePtr"); + valueptr = (gdouble *) g_object_get_data (G_OBJECT (entry), "ValuePtr"); value = atof (gtk_entry_get_text (entry)); *valueptr = value; @@ -407,9 +407,9 @@ create_options_page (void) gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), mapvals.bump_mapped); gtk_box_pack_start (GTK_BOX (vbox), toggle, FALSE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - GTK_SIGNAL_FUNC (togglebump_update), - &mapvals.bump_mapped); + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (togglebump_update), + &mapvals.bump_mapped); gtk_widget_show (toggle); gimp_help_set_help_data (toggle, @@ -420,9 +420,9 @@ create_options_page (void) gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), mapvals.env_mapped); gtk_box_pack_start (GTK_BOX (vbox), toggle, FALSE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - GTK_SIGNAL_FUNC (toggleenvironment_update), - &mapvals.env_mapped); + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (toggleenvironment_update), + &mapvals.env_mapped); gtk_widget_show (toggle); gimp_help_set_help_data (toggle, @@ -433,9 +433,9 @@ create_options_page (void) gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), mapvals.transparent_background); gtk_box_pack_start (GTK_BOX (vbox), toggle, FALSE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - GTK_SIGNAL_FUNC (toggle_update), - &mapvals.transparent_background); + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (toggle_update), + &mapvals.transparent_background); gtk_widget_show (toggle); gimp_help_set_help_data (toggle, @@ -446,9 +446,9 @@ create_options_page (void) gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), mapvals.create_new_image); gtk_box_pack_start (GTK_BOX (vbox), toggle, FALSE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - GTK_SIGNAL_FUNC (gimp_toggle_button_update), - &mapvals.create_new_image); + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (gimp_toggle_button_update), + &mapvals.create_new_image); gtk_widget_show (toggle); gimp_help_set_help_data (toggle, @@ -458,9 +458,9 @@ create_options_page (void) gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), mapvals.previewquality); gtk_box_pack_start (GTK_BOX (vbox), toggle, FALSE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - GTK_SIGNAL_FUNC (toggle_update), - &mapvals.previewquality); + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (toggle_update), + &mapvals.previewquality); gtk_widget_show (toggle); gimp_help_set_help_data (toggle, @@ -481,9 +481,9 @@ create_options_page (void) gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), mapvals.antialiasing); gtk_box_pack_start (GTK_BOX (vbox), toggle, FALSE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - GTK_SIGNAL_FUNC (gimp_toggle_button_update), - &mapvals.antialiasing); + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (gimp_toggle_button_update), + &mapvals.antialiasing); gtk_widget_show (toggle); gimp_help_set_help_data (toggle, @@ -497,7 +497,7 @@ create_options_page (void) gtk_widget_show (table); gtk_widget_set_sensitive (table, mapvals.antialiasing); - gtk_object_set_data (GTK_OBJECT (toggle), "set_sensitive", table); + g_object_set_data (G_OBJECT (toggle), "set_sensitive", table); adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 0, _("Depth:"), 0, 0, @@ -505,9 +505,9 @@ create_options_page (void) 1, TRUE, 0, 0, _("Antialiasing quality. Higher is better, " "but slower"), NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &mapvals.max_depth); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &mapvals.max_depth); adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 1, _("Threshold:"), 0, 0, @@ -515,16 +515,16 @@ create_options_page (void) TRUE, 0, 0, _("Stop when pixel differences are smaller than " "this value"), NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &mapvals.pixel_treshold); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &mapvals.pixel_treshold); /* spinbutton = gimp_spin_button_new (&adj, mapvals.pixel_treshold, 0.001, 1000, 0.1, 1, 1, 0, 3); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &mapvals.pixel_treshold); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &mapvals.pixel_treshold); gimp_table_attach_aligned (GTK_TABLE (table), 0, 1, _("Threshold:"), 1.0, 1.0, spinbutton, 1, TRUE); @@ -592,9 +592,9 @@ create_light_page (void) 64, 16, &mapvals.lightsource.color, GIMP_COLOR_AREA_FLAT); - gtk_signal_connect (GTK_OBJECT (colorbutton), "color_changed", - GTK_SIGNAL_FUNC (gimp_color_button_get_color), - &mapvals.lightsource.color); + g_signal_connect (G_OBJECT (colorbutton), "color_changed", + G_CALLBACK (gimp_color_button_get_color), + &mapvals.lightsource.color); gimp_table_attach_aligned (GTK_TABLE (table), 0, 1, _("Light Color:"), 1.0, 0.5, colorbutton, 1, TRUE); @@ -621,9 +621,9 @@ create_light_page (void) gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, _("X:"), 1.0, 0.5, spinbutton, 1, TRUE); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &mapvals.lightsource.position.x); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &mapvals.lightsource.position.x); gimp_help_set_help_data (spinbutton, _("Light source X position in XYZ space"), NULL); @@ -634,9 +634,9 @@ create_light_page (void) gimp_table_attach_aligned (GTK_TABLE (table), 0, 1, _("Y:"), 1.0, 0.5, spinbutton, 1, TRUE); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &mapvals.lightsource.position.y); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &mapvals.lightsource.position.y); gimp_help_set_help_data (spinbutton, _("Light source Y position in XYZ space"), NULL); @@ -647,9 +647,9 @@ create_light_page (void) gimp_table_attach_aligned (GTK_TABLE (table), 0, 2, _("Z:"), 1.0, 0.5, spinbutton, 1, TRUE); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &mapvals.lightsource.position.z); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &mapvals.lightsource.position.z); gimp_help_set_help_data (spinbutton, _("Light source Z position in XYZ space"), NULL); @@ -673,9 +673,9 @@ create_light_page (void) gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, _("X:"), 1.0, 0.5, spinbutton, 1, TRUE); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &mapvals.lightsource.direction.x); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &mapvals.lightsource.direction.x); gimp_help_set_help_data (spinbutton, _("Light source X direction in XYZ space"), NULL); @@ -685,9 +685,9 @@ create_light_page (void) gimp_table_attach_aligned (GTK_TABLE (table), 0, 1, _("Y:"), 1.0, 0.5, spinbutton, 1, TRUE); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &mapvals.lightsource.direction.y); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &mapvals.lightsource.direction.y); gimp_help_set_help_data (spinbutton, _("Light source Y direction in XYZ space"), NULL); @@ -697,9 +697,9 @@ create_light_page (void) gimp_table_attach_aligned (GTK_TABLE (table), 0, 2, _("Z:"), 1.0, 0.5, spinbutton, 1, TRUE); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &mapvals.lightsource.direction.z); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &mapvals.lightsource.direction.z); gimp_help_set_help_data (spinbutton, _("Light source Z direction in XYZ space"), NULL); @@ -752,9 +752,9 @@ create_material_page (void) 0, G_MAXFLOAT, 0.1, 1.0, 1.0, 0.0, 2); gtk_table_attach (GTK_TABLE (table), spinbutton, 2, 3, 0, 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &mapvals.material.ambient_int); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &mapvals.material.ambient_int); gtk_widget_show (spinbutton); gimp_help_set_help_data (spinbutton, @@ -777,9 +777,9 @@ create_material_page (void) 0, G_MAXFLOAT, 0.1, 1.0, 1.0, 0.0, 2); gtk_table_attach (GTK_TABLE (table), spinbutton, 2, 3, 1, 2, GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &mapvals.material.diffuse_int); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &mapvals.material.diffuse_int); gtk_widget_show (spinbutton); gimp_help_set_help_data (spinbutton, @@ -816,9 +816,9 @@ create_material_page (void) 0, G_MAXFLOAT, 0.1, 1.0, 1.0, 0.0, 2); gtk_table_attach (GTK_TABLE (table), spinbutton, 2, 3, 0, 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &mapvals.material.diffuse_ref); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &mapvals.material.diffuse_ref); gtk_widget_show (spinbutton); gimp_help_set_help_data (spinbutton, @@ -841,9 +841,9 @@ create_material_page (void) 0, G_MAXFLOAT, 0.1, 1.0, 1.0, 0.0, 2); gtk_table_attach (GTK_TABLE (table), spinbutton, 2, 3, 1, 2, GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &mapvals.material.specular_ref); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &mapvals.material.specular_ref); gtk_widget_show (spinbutton); gimp_help_set_help_data (spinbutton, @@ -866,9 +866,9 @@ create_material_page (void) 0, G_MAXFLOAT, 0.1, 1.0, 1.0, 0.0, 2); gtk_table_attach (GTK_TABLE (table), spinbutton, 2, 3, 2, 3, GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &mapvals.material.highlight); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &mapvals.material.highlight); gtk_widget_show (spinbutton); gimp_help_set_help_data (spinbutton, @@ -915,9 +915,9 @@ create_bump_page (void) gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), mapvals.bump_mapped); gtk_box_pack_start (GTK_BOX (vbox), toggle, FALSE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - GTK_SIGNAL_FUNC (gimp_toggle_button_update), - &mapvals.bump_mapped); + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (gimp_toggle_button_update), + &mapvals.bump_mapped); gtk_widget_show (toggle); gimp_help_set_help_data (toggle, @@ -931,7 +931,7 @@ create_bump_page (void) gtk_widget_show (table); gtk_widget_set_sensitive (table, mapvals.bump_mapped); - gtk_object_set_data (GTK_OBJECT (toggle), "set_sensitive", table); + g_object_set_data (G_OBJECT (toggle), "set_sensitive", table); optionmenu = gtk_option_menu_new (); menu = gimp_drawable_menu_new (bumpmap_constrain, bumpmap_drawable_callback, @@ -962,9 +962,9 @@ create_bump_page (void) gimp_table_attach_aligned (GTK_TABLE (table), 0, 2, _("Maximum Height:"), 1.0, 0.5, spinbutton, 1, TRUE); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &mapvals.bumpmax); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &mapvals.bumpmax); gimp_help_set_help_data (spinbutton, _("Maximum height for bumps"), @@ -975,9 +975,9 @@ create_bump_page (void) gimp_table_attach_aligned (GTK_TABLE (table), 0, 3, _("Minimum Height:"), 1.0, 0.5, spinbutton, 1, TRUE); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &mapvals.bumpmin); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &mapvals.bumpmin); gimp_help_set_help_data (spinbutton, _("Minimum height for bumps"), @@ -987,9 +987,9 @@ create_bump_page (void) gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), mapvals.bumpstretch); gtk_table_attach_defaults (GTK_TABLE (table), toggle, 0, 2, 4, 5); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - GTK_SIGNAL_FUNC (gimp_toggle_button_update), - &mapvals.bumpstretch); + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (gimp_toggle_button_update), + &mapvals.bumpstretch); gtk_widget_show (toggle); gimp_help_set_help_data (toggle, @@ -1027,9 +1027,9 @@ create_environment_page (void) gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), mapvals.env_mapped); gtk_box_pack_start (GTK_BOX (vbox), toggle, FALSE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - GTK_SIGNAL_FUNC (gimp_toggle_button_update), - &mapvals.env_mapped); + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (gimp_toggle_button_update), + &mapvals.env_mapped); gtk_widget_show (toggle); gimp_help_set_help_data (toggle, @@ -1043,7 +1043,7 @@ create_environment_page (void) gtk_widget_show (table); gtk_widget_set_sensitive (table, mapvals.env_mapped); - gtk_object_set_data (GTK_OBJECT (toggle), "set_sensitive", table); + g_object_set_data (G_OBJECT (toggle), "set_sensitive", table); optionmenu = gtk_option_menu_new (); menu = gimp_drawable_menu_new (envmap_constrain, envmap_drawable_callback, @@ -1176,15 +1176,14 @@ main_dialog (GimpDrawable *drawable) gtk_widget_realize (appwin); previewarea = gtk_drawing_area_new (); - gtk_drawing_area_size (GTK_DRAWING_AREA (previewarea), - PREVIEW_WIDTH, PREVIEW_HEIGHT); + gtk_widget_set_size_request (previewarea, PREVIEW_WIDTH, PREVIEW_HEIGHT); gtk_widget_set_events (previewarea, (GDK_EXPOSURE_MASK | GDK_BUTTON1_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK)); - gtk_signal_connect (GTK_OBJECT (previewarea), "event", - GTK_SIGNAL_FUNC (preview_events), - (gpointer) previewarea); + g_signal_connect (G_OBJECT (previewarea), "event", + G_CALLBACK (preview_events), + previewarea); gtk_container_add (GTK_CONTAINER (frame), previewarea); gtk_widget_show (previewarea); @@ -1195,9 +1194,9 @@ main_dialog (GimpDrawable *drawable) button = gtk_button_new_with_label (_("Update Preview")); gtk_misc_set_padding (GTK_MISC (GTK_BIN (button)->child), 2, 0); gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (button), "clicked", - GTK_SIGNAL_FUNC (preview_callback), - NULL); + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (preview_callback), + NULL); gtk_widget_show (button); gimp_help_set_help_data (button, _("Recompute preview image"), NULL); @@ -1205,18 +1204,18 @@ main_dialog (GimpDrawable *drawable) /* button = gimp_pixmap_button_new (zoom_out_xpm, NULL); gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (button), "clicked", - GTK_SIGNAL_FUNC (zoomout_callback), - NULL); + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (zoomout_callback), + NULL); gtk_widget_show (button); gimp_help_set_help_data (button, _("Zoom out (make image smaller)"), NULL); button = gimp_pixmap_button_new (zoom_in_xpm, NULL); gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (button), "clicked", - GTK_SIGNAL_FUNC (zoomin_callback), - NULL); + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (zoomin_callback), + NULL); gtk_widget_show (button); gimp_help_set_help_data (button, _("Zoom in (make image bigger)"), NULL); diff --git a/plug-ins/MapObject/mapobject_ui.c b/plug-ins/MapObject/mapobject_ui.c index 6d74168820..2a4a7e4872 100644 --- a/plug-ins/MapObject/mapobject_ui.c +++ b/plug-ins/MapObject/mapobject_ui.c @@ -117,26 +117,32 @@ double_adjustment_update (GtkAdjustment *adjustment, static void update_light_pos_entries (void) { - gtk_signal_handler_block_by_data (GTK_OBJECT (xadj), - &mapvals.lightsource.position.x); + g_signal_handlers_block_by_func (G_OBJECT (xadj), + gimp_double_adjustment_update, + &mapvals.lightsource.position.x); gtk_adjustment_set_value (GTK_ADJUSTMENT (xadj), mapvals.lightsource.position.x); - gtk_signal_handler_unblock_by_data (GTK_OBJECT (xadj), - &mapvals.lightsource.position.x); - - gtk_signal_handler_block_by_data (GTK_OBJECT (yadj), - &mapvals.lightsource.position.y); + g_signal_handlers_unblock_by_func (G_OBJECT (xadj), + gimp_double_adjustment_update, + &mapvals.lightsource.position.x); + + g_signal_handlers_block_by_func (G_OBJECT (yadj), + gimp_double_adjustment_update, + &mapvals.lightsource.position.y); gtk_adjustment_set_value (GTK_ADJUSTMENT (yadj), mapvals.lightsource.position.x); - gtk_signal_handler_unblock_by_data (GTK_OBJECT (yadj), - &mapvals.lightsource.position.y); - - gtk_signal_handler_block_by_data (GTK_OBJECT (zadj), - &mapvals.lightsource.position.z); + g_signal_handlers_unblock_by_func (G_OBJECT (yadj), + gimp_double_adjustment_update, + &mapvals.lightsource.position.y); + + g_signal_handlers_block_by_func (G_OBJECT (zadj), + gimp_double_adjustment_update, + &mapvals.lightsource.position.z); gtk_adjustment_set_value (GTK_ADJUSTMENT (zadj), mapvals.lightsource.position.z); - gtk_signal_handler_unblock_by_data (GTK_OBJECT (zadj), - &mapvals.lightsource.position.z); + g_signal_handlers_unblock_by_func (G_OBJECT (zadj), + gimp_double_adjustment_update, + &mapvals.lightsource.position.z); } /**********************/ @@ -384,7 +390,7 @@ box_drawable_callback (gint32 id, { gint i; - i = (gint) gtk_object_get_data (GTK_OBJECT (data), "_mapwid_id"); + i = (gint) g_object_get_data (G_OBJECT (data), "_mapwid_id"); mapvals.boxmap_id[i] = id; } @@ -407,7 +413,7 @@ cylinder_drawable_callback (gint32 id, { gint i; - i = (gint) gtk_object_get_data (GTK_OBJECT (data), "_mapwid_id"); + i = (gint) g_object_get_data (G_OBJECT (data), "_mapwid_id"); mapvals.cylindermap_id[i] = id; } @@ -580,11 +586,12 @@ create_options_page (void) gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), mapvals.transparent_background); gtk_box_pack_start (GTK_BOX (vbox), toggle, FALSE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - GTK_SIGNAL_FUNC (toggle_update), - &mapvals.transparent_background); gtk_widget_show (toggle); + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (toggle_update), + &mapvals.transparent_background); + gimp_help_set_help_data (toggle, _("Make image transparent outside object"), NULL); @@ -592,11 +599,12 @@ create_options_page (void) gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), mapvals.tiled); gtk_box_pack_start (GTK_BOX (vbox), toggle, FALSE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - GTK_SIGNAL_FUNC (toggle_update), - &mapvals.tiled); gtk_widget_show (toggle); + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (toggle_update), + &mapvals.tiled); + gimp_help_set_help_data (toggle, _("Tile source image: useful for infinite planes"), NULL); @@ -605,11 +613,12 @@ create_options_page (void) gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), mapvals.create_new_image); gtk_box_pack_start (GTK_BOX (vbox), toggle, FALSE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - GTK_SIGNAL_FUNC (gimp_toggle_button_update), - &mapvals.create_new_image); gtk_widget_show (toggle); + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (gimp_toggle_button_update), + &mapvals.create_new_image); + gimp_help_set_help_data (toggle, _("Create a new image when applying filter"), NULL); @@ -617,11 +626,12 @@ create_options_page (void) gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), mapvals.tooltips_enabled); gtk_box_pack_start (GTK_BOX (vbox), toggle, FALSE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - GTK_SIGNAL_FUNC (toggletips_update), - &mapvals.tooltips_enabled); gtk_widget_show (toggle); + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (toggletips_update), + &mapvals.tooltips_enabled); + gimp_help_set_help_data (toggle, _("Enable/disable tooltip messages"), NULL); /* Antialiasing options */ @@ -639,11 +649,12 @@ create_options_page (void) gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), mapvals.antialiasing); gtk_box_pack_start (GTK_BOX (vbox), toggle, FALSE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - GTK_SIGNAL_FUNC (gimp_toggle_button_update), - &mapvals.antialiasing); gtk_widget_show (toggle); + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (gimp_toggle_button_update), + &mapvals.antialiasing); + gimp_help_set_help_data (toggle, _("Enable/disable jagged edges removal " "(antialiasing)"), NULL); @@ -655,7 +666,7 @@ create_options_page (void) gtk_widget_show (table); gtk_widget_set_sensitive (table, mapvals.antialiasing); - gtk_object_set_data (GTK_OBJECT (toggle), "set_sensitive", table); + g_object_set_data (G_OBJECT (toggle), "set_sensitive", table); adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 0, _("Depth:"), 0, 0, @@ -663,19 +674,20 @@ create_options_page (void) 1, TRUE, 0, 0, _("Antialiasing quality. Higher is better, " "but slower"), NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &mapvals.maxdepth); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &mapvals.maxdepth); spinbutton = gimp_spin_button_new (&adj, mapvals.pixeltreshold, 0.001, 1000, 0.1, 1, 1, 0, 3); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &mapvals.pixeltreshold); gimp_table_attach_aligned (GTK_TABLE (table), 0, 1, _("Threshold:"), 1.0, 1.0, spinbutton, 1, TRUE); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &mapvals.pixeltreshold); + gimp_help_set_help_data (spinbutton, _("Stop when pixel differences are smaller than " "this value"), NULL); @@ -736,13 +748,14 @@ create_light_page (void) 64, 16, &mapvals.lightsource.color, GIMP_COLOR_AREA_FLAT); - gtk_signal_connect (GTK_OBJECT (colorbutton), "color_changed", - GTK_SIGNAL_FUNC (gimp_color_button_get_color), - &mapvals.lightsource.color); gimp_table_attach_aligned (GTK_TABLE (table), 0, 1, _("Lightsource Color:"), 1.0, 0.5, colorbutton, 1, TRUE); + g_signal_connect (G_OBJECT (colorbutton), "color_changed", + G_CALLBACK (gimp_color_button_get_color), + &mapvals.lightsource.color); + gimp_help_set_help_data (colorbutton, _("Set light source color"), NULL); @@ -765,9 +778,10 @@ create_light_page (void) gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, _("X:"), 1.0, 0.5, spinbutton, 1, TRUE); - gtk_signal_connect (GTK_OBJECT (xadj), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &mapvals.lightsource.position.x); + + g_signal_connect (G_OBJECT (xadj), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &mapvals.lightsource.position.x); gimp_help_set_help_data (spinbutton, _("Light source X position in XYZ space"), NULL); @@ -778,9 +792,10 @@ create_light_page (void) gimp_table_attach_aligned (GTK_TABLE (table), 0, 1, _("Y:"), 1.0, 0.5, spinbutton, 1, TRUE); - gtk_signal_connect (GTK_OBJECT (yadj), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &mapvals.lightsource.position.y); + + g_signal_connect (G_OBJECT (yadj), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &mapvals.lightsource.position.y); gimp_help_set_help_data (spinbutton, _("Light source Y position in XYZ space"), NULL); @@ -791,9 +806,10 @@ create_light_page (void) gimp_table_attach_aligned (GTK_TABLE (table), 0, 2, _("Z:"), 1.0, 0.5, spinbutton, 1, TRUE); - gtk_signal_connect (GTK_OBJECT (zadj), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &mapvals.lightsource.position.z); + + g_signal_connect (G_OBJECT (zadj), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &mapvals.lightsource.position.z); gimp_help_set_help_data (spinbutton, _("Light source Z position in XYZ space"), NULL); @@ -817,9 +833,10 @@ create_light_page (void) gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, _("X:"), 1.0, 0.5, spinbutton, 1, TRUE); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &mapvals.lightsource.direction.x); + + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &mapvals.lightsource.direction.x); gimp_help_set_help_data (spinbutton, _("Light source X direction in XYZ space"), NULL); @@ -829,9 +846,10 @@ create_light_page (void) gimp_table_attach_aligned (GTK_TABLE (table), 0, 1, _("Y:"), 1.0, 0.5, spinbutton, 1, TRUE); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &mapvals.lightsource.direction.y); + + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &mapvals.lightsource.direction.y); gimp_help_set_help_data (spinbutton, _("Light source Y direction in XYZ space"), NULL); @@ -841,9 +859,10 @@ create_light_page (void) gimp_table_attach_aligned (GTK_TABLE (table), 0, 2, _("Z:"), 1.0, 0.5, spinbutton, 1, TRUE); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &mapvals.lightsource.direction.z); + + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &mapvals.lightsource.direction.z); gimp_help_set_help_data (spinbutton, _("Light source Z direction in XYZ space"), NULL); @@ -896,11 +915,12 @@ create_material_page (void) 0, G_MAXFLOAT, 0.1, 1.0, 1.0, 0.0, 2); gtk_table_attach (GTK_TABLE (table), spinbutton, 2, 3, 0, 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &mapvals.material.ambient_int); gtk_widget_show (spinbutton); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &mapvals.material.ambient_int); + gimp_help_set_help_data (spinbutton, _("Amount of original color to show where no " "direct light falls"), NULL); @@ -921,11 +941,12 @@ create_material_page (void) 0, G_MAXFLOAT, 0.1, 1.0, 1.0, 0.0, 2); gtk_table_attach (GTK_TABLE (table), spinbutton, 2, 3, 1, 2, GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &mapvals.material.diffuse_int); gtk_widget_show (spinbutton); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &mapvals.material.diffuse_int); + gimp_help_set_help_data (spinbutton, _("Intensity of original color when lit by a light " "source"), NULL); @@ -960,11 +981,12 @@ create_material_page (void) 0, G_MAXFLOAT, 0.1, 1.0, 1.0, 0.0, 2); gtk_table_attach (GTK_TABLE (table), spinbutton, 2, 3, 0, 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &mapvals.material.diffuse_ref); gtk_widget_show (spinbutton); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &mapvals.material.diffuse_ref); + gimp_help_set_help_data (spinbutton, _("Higher values makes the object reflect more " "light (appear lighter)"), NULL); @@ -985,11 +1007,12 @@ create_material_page (void) 0, G_MAXFLOAT, 0.1, 1.0, 1.0, 0.0, 2); gtk_table_attach (GTK_TABLE (table), spinbutton, 2, 3, 1, 2, GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &mapvals.material.specular_ref); gtk_widget_show (spinbutton); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &mapvals.material.specular_ref); + gimp_help_set_help_data (spinbutton, _("Controls how intense the highlights will be"), NULL); @@ -1010,11 +1033,12 @@ create_material_page (void) 0, G_MAXFLOAT, 0.1, 1.0, 1.0, 0.0, 2); gtk_table_attach (GTK_TABLE (table), spinbutton, 2, 3, 2, 3, GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &mapvals.material.highlight); gtk_widget_show (spinbutton); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &mapvals.material.highlight); + gimp_help_set_help_data (spinbutton, _("Higher values makes the highlights more focused"), NULL); @@ -1062,9 +1086,10 @@ create_orientation_page (void) _("Object X position in XYZ space"), NULL); gtk_spin_button_configure (GIMP_SCALE_ENTRY_SPINBUTTON (adj), GIMP_SCALE_ENTRY_SPINBUTTON_ADJ (adj), 0.01, 5); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (double_adjustment_update), - &mapvals.position.x); + + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (double_adjustment_update), + &mapvals.position.x); adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 1, _("Y:"), 0, 0, @@ -1073,9 +1098,10 @@ create_orientation_page (void) _("Object Y position in XYZ space"), NULL); gtk_spin_button_configure (GIMP_SCALE_ENTRY_SPINBUTTON (adj), GIMP_SCALE_ENTRY_SPINBUTTON_ADJ (adj), 0.01, 5); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (double_adjustment_update), - &mapvals.position.y); + + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (double_adjustment_update), + &mapvals.position.y); adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 2, _("Z:"), 0, 0, @@ -1084,9 +1110,10 @@ create_orientation_page (void) _("Object Z position in XYZ space"), NULL); gtk_spin_button_configure (GIMP_SCALE_ENTRY_SPINBUTTON (adj), GIMP_SCALE_ENTRY_SPINBUTTON_ADJ (adj), 0.01, 5); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (double_adjustment_update), - &mapvals.position.z); + + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (double_adjustment_update), + &mapvals.position.z); frame = gtk_frame_new (_("Rotation")); gtk_box_pack_start (GTK_BOX (page), frame, FALSE, FALSE, 0); @@ -1104,27 +1131,30 @@ create_orientation_page (void) mapvals.alpha, -180.0, 180.0, 1.0, 15.0, 1, TRUE, 0, 0, _("Rotation angle about X axis"), NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (double_adjustment_update), - &mapvals.alpha); + + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (double_adjustment_update), + &mapvals.alpha); adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 1, _("Y:"), 0, 0, mapvals.beta, -180.0, 180.0, 1.0, 15.0, 1, TRUE, 0, 0, _("Rotation angle about Y axis"), NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (double_adjustment_update), - &mapvals.beta); + + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (double_adjustment_update), + &mapvals.beta); adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 2, _("Z:"), 0, 0, mapvals.gamma, -180.0, 180.0, 1.0, 15.0, 1, TRUE, 0, 0, _("Rotation angle about Z axis"), NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (double_adjustment_update), - &mapvals.gamma); + + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (double_adjustment_update), + &mapvals.gamma); gtk_widget_show (page); @@ -1173,8 +1203,8 @@ create_box_page (void) for (i = 0; i < 6; i++) { optionmenu = gtk_option_menu_new (); - gtk_object_set_data (GTK_OBJECT (optionmenu), "_mapwid_id", - (gpointer) i); + g_object_set_data (G_OBJECT (optionmenu), "_mapwid_id", + GINT_TO_POINTER (i)); menu = gimp_drawable_menu_new (box_constrain, box_drawable_callback, (gpointer) optionmenu, mapvals.boxmap_id[i]); @@ -1200,9 +1230,10 @@ create_box_page (void) _("X scale (size)"), NULL); gtk_spin_button_configure (GIMP_SCALE_ENTRY_SPINBUTTON (adj), GIMP_SCALE_ENTRY_SPINBUTTON_ADJ (adj), 0.1, 2); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (double_adjustment_update), - &mapvals.scale.x); + + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (double_adjustment_update), + &mapvals.scale.x); adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 1, _("Y:"), 0, 0, @@ -1211,9 +1242,10 @@ create_box_page (void) _("Y scale (size)"), NULL); gtk_spin_button_configure (GIMP_SCALE_ENTRY_SPINBUTTON (adj), GIMP_SCALE_ENTRY_SPINBUTTON_ADJ (adj), 0.1, 2); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (double_adjustment_update), - &mapvals.scale.y); + + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (double_adjustment_update), + &mapvals.scale.y); adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 2, _("Z:"), 0, 0, @@ -1222,9 +1254,10 @@ create_box_page (void) _("Z scale (size)"), NULL); gtk_spin_button_configure (GIMP_SCALE_ENTRY_SPINBUTTON (adj), GIMP_SCALE_ENTRY_SPINBUTTON_ADJ (adj), 0.1, 2); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (double_adjustment_update), - &mapvals.scale.z); + + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (double_adjustment_update), + &mapvals.scale.z); gtk_widget_show (page); @@ -1263,8 +1296,8 @@ create_cylinder_page (void) for (i = 0; i < 2; i++) { optionmenu = gtk_option_menu_new (); - gtk_object_set_data (GTK_OBJECT (optionmenu), "_mapwid_id", - (gpointer) i); + g_object_set_data (G_OBJECT (optionmenu), "_mapwid_id", + GINT_TO_POINTER (i)); menu = gimp_drawable_menu_new (cylinder_constrain, cylinder_drawable_callback, (gpointer) optionmenu, @@ -1295,9 +1328,10 @@ create_cylinder_page (void) _("Cylinder radius"), NULL); gtk_spin_button_configure (GIMP_SCALE_ENTRY_SPINBUTTON (adj), GIMP_SCALE_ENTRY_SPINBUTTON_ADJ (adj), 0.1, 2); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (double_adjustment_update), - &mapvals.cylinder_radius); + + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (double_adjustment_update), + &mapvals.cylinder_radius); adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 1, _("Length:"), 0, 0, @@ -1307,9 +1341,10 @@ create_cylinder_page (void) _("Cylinder length"), NULL); gtk_spin_button_configure (GIMP_SCALE_ENTRY_SPINBUTTON (adj), GIMP_SCALE_ENTRY_SPINBUTTON_ADJ (adj), 0.1, 2); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (double_adjustment_update), - &mapvals.cylinder_length); + + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (double_adjustment_update), + &mapvals.cylinder_length); gtk_widget_show (page); @@ -1419,18 +1454,18 @@ main_dialog (GimpDrawable *drawable) gtk_widget_realize (appwin); previewarea = gtk_drawing_area_new (); - gtk_drawing_area_size (GTK_DRAWING_AREA (previewarea), - PREVIEW_WIDTH, PREVIEW_HEIGHT); + gtk_widget_set_size_request (previewarea, PREVIEW_WIDTH, PREVIEW_HEIGHT); gtk_widget_set_events (previewarea, (GDK_EXPOSURE_MASK | GDK_BUTTON1_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK)); - gtk_signal_connect (GTK_OBJECT (previewarea), "event", - GTK_SIGNAL_FUNC (preview_events), - (gpointer) previewarea); gtk_container_add (GTK_CONTAINER (frame), previewarea); gtk_widget_show (previewarea); + g_signal_connect (G_OBJECT (previewarea), "event", + G_CALLBACK (preview_events), + previewarea); + hbox = gtk_hbox_new (FALSE, 4); gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); gtk_widget_show (hbox); @@ -1438,39 +1473,43 @@ main_dialog (GimpDrawable *drawable) button = gtk_button_new_with_label (_("Preview!")); gtk_misc_set_padding (GTK_MISC (GTK_BIN (button)->child), 2, 0); gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (button), "clicked", - GTK_SIGNAL_FUNC (preview_callback), - NULL); gtk_widget_show (button); + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (preview_callback), + NULL); + gimp_help_set_help_data (button, _("Recompute preview image"), NULL); button = gimp_pixmap_button_new (zoom_out_xpm, NULL); gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (button), "clicked", - GTK_SIGNAL_FUNC (zoomout_callback), - NULL); gtk_widget_show (button); + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (zoomout_callback), + NULL); + gimp_help_set_help_data (button, _("Zoom out (make image smaller)"), NULL); button = gimp_pixmap_button_new (zoom_in_xpm, NULL); gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (button), "clicked", - GTK_SIGNAL_FUNC (zoomin_callback), - NULL); gtk_widget_show (button); + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (zoomin_callback), + NULL); + gimp_help_set_help_data (button, _("Zoom in (make image bigger)"), NULL); toggle = gtk_check_button_new_with_label (_("Show Preview Wireframe")); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), mapvals.showgrid); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - GTK_SIGNAL_FUNC (togglegrid_update), - &mapvals.showgrid); gtk_box_pack_start (GTK_BOX (vbox), toggle, FALSE, FALSE, 0); gtk_widget_show (toggle); + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (togglegrid_update), + &mapvals.showgrid); + gimp_help_set_help_data (toggle, _("Show/hide preview wireframe"), NULL); create_main_notebook (main_hbox); diff --git a/plug-ins/bmp/bmpwrite.c b/plug-ins/bmp/bmpwrite.c index 4b6c014105..b8cddea105 100644 --- a/plug-ins/bmp/bmpwrite.c +++ b/plug-ins/bmp/bmpwrite.c @@ -557,16 +557,17 @@ save_dialog (void) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - GTK_STOCK_OK, save_ok_callback, - NULL, NULL, NULL, TRUE, FALSE, GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, + GTK_STOCK_OK, save_ok_callback, + NULL, NULL, NULL, TRUE, FALSE, + NULL); - gtk_signal_connect (GTK_OBJECT (dlg), "destroy", - GTK_SIGNAL_FUNC (gtk_main_quit), - NULL); + g_signal_connect (G_OBJECT (dlg), "destroy", + G_CALLBACK (gtk_main_quit), + NULL); /* parameter settings */ frame = gtk_frame_new (_("Save Options")); @@ -579,12 +580,13 @@ save_dialog (void) toggle = gtk_check_button_new_with_label (_("RLE encoded")); gtk_box_pack_start (GTK_BOX (vbox), toggle, FALSE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - GTK_SIGNAL_FUNC (gimp_toggle_button_update), - &encoded); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), encoded); gtk_widget_show (toggle); + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (gimp_toggle_button_update), + &encoded); + gtk_widget_show (vbox); gtk_widget_show (frame); gtk_widget_show (dlg); diff --git a/plug-ins/common/AlienMap.c b/plug-ins/common/AlienMap.c index e9b9ae4c7c..5c33b09cc9 100644 --- a/plug-ins/common/AlienMap.c +++ b/plug-ins/common/AlienMap.c @@ -1404,9 +1404,9 @@ alienmap_dialog (void) NULL); - gtk_signal_connect (GTK_OBJECT (dialog), "destroy", - GTK_SIGNAL_FUNC (gtk_main_quit), - NULL); + g_signal_connect (G_OBJECT (dialog), "destroy", + G_CALLBACK (gtk_main_quit), + NULL); top_table = gtk_table_new (2, 4, FALSE); gtk_container_set_border_width (GTK_CONTAINER (top_table), 6); @@ -1442,27 +1442,27 @@ alienmap_dialog (void) wvals.redstretch, 0, 128, 1, 8, 2, TRUE, 0, 0, _("Change intensity of the red channel"), NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (dialog_scale_update), - &wvals.redstretch); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (dialog_scale_update), + &wvals.redstretch); adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 1, _("Green:"), SCALE_WIDTH, 0, wvals.greenstretch, 0, 128, 1, 8, 2, TRUE, 0, 0, _("Change intensity of the green channel"), NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (dialog_scale_update), - &wvals.greenstretch); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (dialog_scale_update), + &wvals.greenstretch); adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 2, _("Blue:"), SCALE_WIDTH, 0, wvals.bluestretch, 0, 128, 1, 8, 2, TRUE, 0, 0, _("Change intensity of the blue channel"), NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (dialog_scale_update), - &wvals.bluestretch); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (dialog_scale_update), + &wvals.bluestretch); /* Redmode toggle box */ frame = gimp_radio_group_new2 (TRUE, _("Red"), @@ -1609,7 +1609,7 @@ dialog_update_preview (void) gtk_preview_draw_row(GTK_PREVIEW(wint.preview), p, 0, y, preview_width); p += preview_width * 3; } - gtk_widget_draw(wint.preview, NULL); + gtk_widget_queue_draw(wint.preview); gdk_flush(); } @@ -1666,9 +1666,9 @@ alienmap_logo_dialog (void) NULL); - gtk_signal_connect (GTK_OBJECT (logodlg), "destroy", - GTK_SIGNAL_FUNC (gtk_widget_destroyed), - &logodlg); + g_signal_connect (G_OBJECT (logodlg), "destroy", + G_CALLBACK (gtk_widget_destroyed), + &logodlg); gtk_quit_add_destroy (1, GTK_OBJECT (logodlg)); xframe = gtk_frame_new (NULL); diff --git a/plug-ins/common/AlienMap2.c b/plug-ins/common/AlienMap2.c index 84ae5bcb63..6969fc8919 100644 --- a/plug-ins/common/AlienMap2.c +++ b/plug-ins/common/AlienMap2.c @@ -1396,9 +1396,9 @@ alienmap2_dialog (void) NULL); - gtk_signal_connect (GTK_OBJECT (dialog), "destroy", - GTK_SIGNAL_FUNC (gtk_main_quit), - NULL); + g_signal_connect (G_OBJECT (dialog), "destroy", + G_CALLBACK (gtk_main_quit), + NULL); top_table = gtk_table_new (2, 2, FALSE); gtk_table_set_col_spacings (GTK_TABLE (top_table), 4); @@ -1436,9 +1436,9 @@ alienmap2_dialog (void) TRUE, 0, 0, _("Change frequency of the red/hue channel"), NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (dialog_scale_update), - &wvals.redfrequency); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (dialog_scale_update), + &wvals.redfrequency); adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 1, _("R/H-Phaseshift:"), SCALE_WIDTH, 0, @@ -1446,9 +1446,9 @@ alienmap2_dialog (void) TRUE, 0, 0, _("Change angle of the red/hue channel"), NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (dialog_scale_update), - &wvals.redangle); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (dialog_scale_update), + &wvals.redangle); adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 2, _("G/S-Frequency:"), SCALE_WIDTH, 0, @@ -1456,9 +1456,9 @@ alienmap2_dialog (void) TRUE, 0, 0, _("Change frequency of the green/saturation " "channel"), NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (dialog_scale_update), - &wvals.greenfrequency); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (dialog_scale_update), + &wvals.greenfrequency); adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 3, _("G/S-Phaseshift:"), SCALE_WIDTH, 0, @@ -1466,9 +1466,9 @@ alienmap2_dialog (void) TRUE, 0, 0, _("Change angle of the green/saturation channel"), NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (dialog_scale_update), - &wvals.greenangle); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (dialog_scale_update), + &wvals.greenangle); adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 4, _("B/L-Frequency:"), SCALE_WIDTH, 0, @@ -1476,9 +1476,9 @@ alienmap2_dialog (void) TRUE, 0, 0, _("Change frequency of the blue/luminance " "channel"), NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (dialog_scale_update), - &wvals.bluefrequency); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (dialog_scale_update), + &wvals.bluefrequency); adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 5, _("B/L-Phaseshift:"), SCALE_WIDTH, 0, @@ -1486,9 +1486,9 @@ alienmap2_dialog (void) TRUE, 0, 0, _("Change angle of the blue/luminance channel"), NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (dialog_scale_update), - &wvals.blueangle); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (dialog_scale_update), + &wvals.blueangle); /* Mode toggle box */ frame = @@ -1511,36 +1511,42 @@ alienmap2_dialog (void) toggle = gtk_check_button_new_with_label (_("Modify Red/Hue Channel")); gtk_box_pack_start (GTK_BOX (toggle_vbox), toggle, FALSE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - GTK_SIGNAL_FUNC (alienmap2_toggle_update), - &wvals.redmode); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), wvals.redmode); gtk_widget_show (toggle); + gimp_help_set_help_data (toggle, _("Use function for red/hue component"), NULL); + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (alienmap2_toggle_update), + &wvals.redmode); + toggle = gtk_check_button_new_with_label (_("Modify Green/Saturation Channel")); gtk_box_pack_start (GTK_BOX (toggle_vbox), toggle, FALSE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - GTK_SIGNAL_FUNC (alienmap2_toggle_update), - &wvals.greenmode); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), wvals.greenmode); gtk_widget_show (toggle); + gimp_help_set_help_data (toggle, _("Use function for green/saturation component"), NULL); + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (alienmap2_toggle_update), + &wvals.greenmode); + toggle = gtk_check_button_new_with_label (_("Modify Blue/Luminance Channel")); gtk_box_pack_start (GTK_BOX (toggle_vbox), toggle, FALSE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - GTK_SIGNAL_FUNC (alienmap2_toggle_update), - &wvals.bluemode); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), wvals.bluemode); gtk_widget_show (toggle); + gimp_help_set_help_data (toggle, _("Use function for blue/luminance component"), NULL); + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (alienmap2_toggle_update), + &wvals.bluemode); + gtk_widget_show (frame); gtk_widget_show (dialog); @@ -1614,7 +1620,7 @@ dialog_update_preview (void) gtk_preview_draw_row (GTK_PREVIEW (wint.preview), p, 0, y, preview_width); p += preview_width * 3; } - gtk_widget_draw (wint.preview, NULL); + gtk_widget_queue_draw (wint.preview); gdk_flush (); } @@ -1680,8 +1686,8 @@ alienmap2_logo_dialog (void) NULL); - gtk_signal_connect (GTK_OBJECT (logodlg), "destroy", - GTK_SIGNAL_FUNC (gtk_widget_destroyed), + g_signal_connect (G_OBJECT (logodlg), "destroy", + G_CALLBACK (gtk_widget_destroyed), &logodlg); gtk_quit_add_destroy (1, GTK_OBJECT (logodlg)); diff --git a/plug-ins/common/CEL.c b/plug-ins/common/CEL.c index 78d54496a5..051ffea0ab 100644 --- a/plug-ins/common/CEL.c +++ b/plug-ins/common/CEL.c @@ -609,18 +609,18 @@ palette_dialog (gchar *title) gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_MOUSE); gtk_file_selection_set_filename (GTK_FILE_SELECTION (dialog), palette_file); - gtk_signal_connect - (GTK_OBJECT (GTK_FILE_SELECTION (dialog)->ok_button), "clicked", - GTK_SIGNAL_FUNC (palette_ok), + g_signal_connect + (G_OBJECT (GTK_FILE_SELECTION (dialog)->ok_button), "clicked", + G_CALLBACK (palette_ok), + dialog); + g_signal_connect_swapped + (G_OBJECT (GTK_FILE_SELECTION (dialog)->cancel_button), "clicked", + G_CALLBACK (gtk_widget_destroy), dialog); - gtk_signal_connect_object - (GTK_OBJECT (GTK_FILE_SELECTION (dialog)->cancel_button), "clicked", - GTK_SIGNAL_FUNC (gtk_widget_destroy), - GTK_OBJECT (dialog)); - gtk_signal_connect (GTK_OBJECT (dialog), "destroy", - GTK_SIGNAL_FUNC (gtk_main_quit), - NULL); + g_signal_connect (G_OBJECT (dialog), "destroy", + G_CALLBACK (gtk_main_quit), + NULL); gimp_help_connect (dialog, gimp_standard_help_func, "filters/cel.html"); diff --git a/plug-ins/common/CML_explorer.c b/plug-ins/common/CML_explorer.c index e3baa704e4..1618669810 100644 --- a/plug-ins/common/CML_explorer.c +++ b/plug-ins/common/CML_explorer.c @@ -853,7 +853,7 @@ CML_main_function (gint preview_p) } if (preview_p) { - gtk_widget_draw (preview, NULL); + gtk_widget_queue_draw (preview); gdk_flush (); } else @@ -1179,9 +1179,9 @@ CML_explorer_dialog (void) NULL); - gtk_signal_connect (GTK_OBJECT (dlg), "destroy", - GTK_SIGNAL_FUNC (gtk_main_quit), - NULL); + g_signal_connect (G_OBJECT (dlg), "destroy", + G_CALLBACK (gtk_main_quit), + NULL); memset (&widget_pointers, (gint) 0, sizeof (widget_pointers)); @@ -1220,49 +1220,54 @@ CML_explorer_dialog (void) button = gtk_button_new_with_label (_("Save")); gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (button), "clicked", - GTK_SIGNAL_FUNC (CML_save_to_file_callback), - &VALS); gtk_widget_show (button); + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (CML_save_to_file_callback), + &VALS); + button = gtk_button_new_with_label (_("Load")); gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (button), "clicked", - GTK_SIGNAL_FUNC (CML_load_from_file_callback), - &VALS); gtk_widget_show (button); + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (CML_load_from_file_callback), + &VALS); + hseparator = gtk_hseparator_new (); gtk_box_pack_end (GTK_BOX (vbox), hseparator, FALSE, FALSE, 4); gtk_widget_show (hseparator); button = gtk_button_new_with_label (_("Random Seed")); gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (button), "clicked", - GTK_SIGNAL_FUNC (CML_set_or_randomize_seed_callback), - &VALS); gtk_widget_show (button); + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (CML_set_or_randomize_seed_callback), + &VALS); + random_sensitives[2].widget = button; random_sensitives[2].logic = FALSE; button = gtk_button_new_with_label (_("Fix Seed")); gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (button), "clicked", - GTK_SIGNAL_FUNC (CML_set_or_randomize_seed_callback), - &VALS); gtk_widget_show (button); + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (CML_set_or_randomize_seed_callback), + &VALS); + random_sensitives[1].widget = button; random_sensitives[1].logic = TRUE; button = gtk_button_new_with_label (_("New Seed")); gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (button), "clicked", - GTK_SIGNAL_FUNC (CML_preview_update_callback), - &VALS); gtk_widget_show (button); + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (CML_preview_update_callback), + &VALS); + random_sensitives[0].widget = button; random_sensitives[0].logic = TRUE; @@ -1408,11 +1413,12 @@ CML_explorer_dialog (void) gtk_button_new_with_label (_("Switch to \"From Seed\" with the last Seed")); gtk_table_attach_defaults (GTK_TABLE (table), button, 0, 3, 1, 2); - gtk_signal_connect (GTK_OBJECT (button), "clicked", - GTK_SIGNAL_FUNC (CML_set_or_randomize_seed_callback), - &VALS); gtk_widget_show (button); + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (CML_set_or_randomize_seed_callback), + &VALS); + random_sensitives[4].widget = button; random_sensitives[4].logic = TRUE; @@ -1490,11 +1496,12 @@ CML_explorer_dialog (void) button = gtk_button_new_with_label (_("Copy Parameters")); gtk_table_attach (GTK_TABLE (table), button, 0, 2, 2, 3, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0); - gtk_signal_connect (GTK_OBJECT (button), "clicked", - GTK_SIGNAL_FUNC (CML_copy_parameters_callback), - &VALS); gtk_widget_show (button); + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (CML_copy_parameters_callback), + &VALS); + subframe = gtk_frame_new (_("Selective Load Settings")); gtk_box_pack_start (GTK_BOX (vbox), subframe, FALSE, FALSE, 0); gtk_widget_show (subframe); @@ -1830,10 +1837,12 @@ CML_dialog_channel_panel_new (gchar *name, button = gtk_button_new_with_label (_("Plot the Graph of the Settings")); gtk_table_attach_defaults (GTK_TABLE (table), button, 0, 3, index, index + 1); - gtk_signal_connect (GTK_OBJECT (button), "clicked", - GTK_SIGNAL_FUNC (function_graph_new), - chank); gtk_widget_show (button); + + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (function_graph_new), + chank); + index++; return frame; @@ -1939,9 +1948,9 @@ function_graph_new (GtkWidget *widget, NULL); - gtk_signal_connect (GTK_OBJECT (dlg), "destroy", - GTK_SIGNAL_FUNC (gtk_main_quit), - NULL); + g_signal_connect (G_OBJECT (dlg), "destroy", + G_CALLBACK (gtk_main_quit), + NULL); frame = gtk_frame_new (_("The Graph")); gtk_container_set_border_width (GTK_CONTAINER (frame), 6); @@ -2120,15 +2129,15 @@ CML_save_to_file_callback (GtkWidget *widget, filesel = gtk_file_selection_new (_("Save Parameters to")); gtk_window_set_position (GTK_WINDOW (filesel), GTK_WIN_POS_MOUSE); - gtk_signal_connect (GTK_OBJECT (GTK_FILE_SELECTION (filesel)->ok_button), - "clicked", - GTK_SIGNAL_FUNC (CML_execute_save_to_file), - filesel); + g_signal_connect (G_OBJECT (GTK_FILE_SELECTION (filesel)->ok_button), + "clicked", + G_CALLBACK (CML_execute_save_to_file), + filesel); - gtk_signal_connect_object (GTK_OBJECT (GTK_FILE_SELECTION (filesel)->cancel_button), - "clicked", - GTK_SIGNAL_FUNC (gtk_widget_destroy), - GTK_OBJECT (filesel)); + g_signal_connect_swapped (G_OBJECT (GTK_FILE_SELECTION (filesel)->cancel_button), + "clicked", + G_CALLBACK (gtk_widget_destroy), + filesel); if (strlen (VALS.last_file_name) > 0) gtk_file_selection_set_filename (GTK_FILE_SELECTION (filesel), @@ -2260,9 +2269,9 @@ force_overwrite (const gchar *filename) NULL); - gtk_signal_connect (GTK_OBJECT (dlg), "destroy", - GTK_SIGNAL_FUNC (gtk_main_quit), - NULL); + g_signal_connect (G_OBJECT (dlg), "destroy", + G_CALLBACK (gtk_main_quit), + NULL); hbox = gtk_hbox_new (FALSE, 0); gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), hbox, FALSE, FALSE, 6); @@ -2310,15 +2319,15 @@ CML_load_from_file_callback (GtkWidget *widget, filesel = gtk_file_selection_new (_("Selective Load from")); gtk_window_set_position (GTK_WINDOW (filesel), GTK_WIN_POS_MOUSE); - gtk_signal_connect (GTK_OBJECT (GTK_FILE_SELECTION (filesel)->ok_button), - "clicked", - GTK_SIGNAL_FUNC (CML_execute_load_from_file), - filesel); + g_signal_connect (G_OBJECT (GTK_FILE_SELECTION (filesel)->ok_button), + "clicked", + G_CALLBACK (CML_execute_load_from_file), + filesel); - gtk_signal_connect_object (GTK_OBJECT (GTK_FILE_SELECTION (filesel)->cancel_button), - "clicked", - GTK_SIGNAL_FUNC (gtk_widget_destroy), - GTK_OBJECT (filesel)); + g_signal_connect_swapped (G_OBJECT (GTK_FILE_SELECTION (filesel)->cancel_button), + "clicked", + G_CALLBACK (gtk_widget_destroy), + filesel); if (strlen (VALS.last_file_name) > 0) gtk_file_selection_set_filename (GTK_FILE_SELECTION (filesel), @@ -2590,9 +2599,9 @@ CML_explorer_toggle_entry_init (WidgetEntry *widget_entry, GtkWidget *widget, gpointer value_ptr) { - gtk_signal_connect (GTK_OBJECT (widget), "toggled", - GTK_SIGNAL_FUNC (CML_explorer_toggle_update), - value_ptr); + g_signal_connect (G_OBJECT (widget), "toggled", + G_CALLBACK (CML_explorer_toggle_update), + value_ptr); widget_entry->widget = widget; widget_entry->value = value_ptr; @@ -2623,9 +2632,9 @@ CML_explorer_int_entry_init (WidgetEntry *widget_entry, GtkObject *adjustment, gpointer value_ptr) { - gtk_signal_connect (GTK_OBJECT (adjustment), "value_changed", - GTK_SIGNAL_FUNC (CML_explorer_int_adjustment_update), - value_ptr); + g_signal_connect (G_OBJECT (adjustment), "value_changed", + G_CALLBACK (CML_explorer_int_adjustment_update), + value_ptr); widget_entry->widget = (GtkWidget *) adjustment; widget_entry->value = value_ptr; @@ -2656,9 +2665,9 @@ CML_explorer_double_entry_init (WidgetEntry *widget_entry, GtkObject *adjustment, gpointer value_ptr) { - gtk_signal_connect (GTK_OBJECT (adjustment), "value_changed", - GTK_SIGNAL_FUNC (CML_explorer_double_adjustment_update), - value_ptr); + g_signal_connect (G_OBJECT (adjustment), "value_changed", + G_CALLBACK (CML_explorer_double_adjustment_update), + value_ptr); widget_entry->widget = (GtkWidget *) adjustment; widget_entry->value = value_ptr; diff --git a/plug-ins/common/aa.c b/plug-ins/common/aa.c index 023db760fd..2cb6b0c761 100644 --- a/plug-ins/common/aa.c +++ b/plug-ins/common/aa.c @@ -29,9 +29,9 @@ static void query (void); static void run (gchar *name, gint nparams, - GimpParam *param, + GimpParam *param, gint *nreturn_vals, - GimpParam **return_vals); + GimpParam **return_vals); static gboolean aa_savable (gint32 drawable_ID); static gboolean save_aa (gint output_type, gchar *filename, @@ -348,9 +348,9 @@ type_dialog (int selected) NULL); - gtk_signal_connect (GTK_OBJECT (dlg), "destroy", - GTK_SIGNAL_FUNC (gtk_main_quit), - NULL); + g_signal_connect (G_OBJECT (dlg), "destroy", + G_CALLBACK (gtk_main_quit), + NULL); /* file save type */ frame = gtk_frame_new (_("Data Formatting")); @@ -370,15 +370,17 @@ type_dialog (int selected) while (*p != NULL) { toggle = gtk_radio_button_new_with_label (group, (*p)->formatname); - 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 (toggle_vbox), toggle, FALSE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - GTK_SIGNAL_FUNC (type_dialog_toggle_update), - (gpointer) (*p)->formatname); + gtk_widget_show (toggle); + + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (type_dialog_toggle_update), + (gpointer) (*p)->formatname); + if (current == selected) gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), TRUE); - gtk_widget_show (toggle); p++; current++; } diff --git a/plug-ins/common/align_layers.c b/plug-ins/common/align_layers.c index df5e9a206d..2a7f1b8652 100644 --- a/plug-ins/common/align_layers.c +++ b/plug-ins/common/align_layers.c @@ -78,8 +78,8 @@ static void run (gchar *name, static GimpPDBStatusType align_layers (gint32 image_id); static void align_layers_get_align_offsets (gint32 drawable_id, - gint *x, - gint *y); + gint *x, + gint *y); static gint align_layers_dialog (void); static void align_layers_ok_callback (GtkWidget *widget, @@ -162,18 +162,18 @@ run (gchar *name, gint *nreturn_vals, GimpParam **return_vals) { - static GimpParam values[1]; + static GimpParam values[1]; GimpPDBStatusType status = GIMP_PDB_EXECUTION_ERROR; - GimpRunMode run_mode; + GimpRunMode run_mode; gint image_id, layer_num; - + run_mode = param[0].data.d_int32; image_id = param[1].data.d_int32; *nreturn_vals = 1; - *return_vals = values; + *return_vals = values; - values[0].type = GIMP_PDB_STATUS; + values[0].type = GIMP_PDB_STATUS; values[0].data.d_status = status; switch ( run_mode ) @@ -429,9 +429,9 @@ align_layers_dialog (void) NULL); - gtk_signal_connect (GTK_OBJECT (dlg), "destroy", - GTK_SIGNAL_FUNC (gtk_main_quit), - NULL); + g_signal_connect (G_OBJECT (dlg), "destroy", + G_CALLBACK (gtk_main_quit), + NULL); frame = gtk_frame_new (_("Parameter Settings")); gtk_container_set_border_width (GTK_CONTAINER (frame), 6); @@ -516,30 +516,32 @@ align_layers_dialog (void) (_("Ignore the Bottom Layer even if Visible")); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), VALS.ignore_bottom); gtk_table_attach_defaults (GTK_TABLE (table), toggle, 0, 2, 4, 5); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - GTK_SIGNAL_FUNC (gimp_toggle_button_update), - &VALS.ignore_bottom); gtk_widget_show (toggle); + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (gimp_toggle_button_update), + &VALS.ignore_bottom); + toggle = gtk_check_button_new_with_label (_("Use the (Invisible) Bottom Layer as the Base")); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), VALS.base_is_bottom_layer); gtk_table_attach_defaults (GTK_TABLE (table), toggle, 0, 2, 5, 6); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - GTK_SIGNAL_FUNC (gimp_toggle_button_update), - &VALS.base_is_bottom_layer); gtk_widget_show (toggle); + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (gimp_toggle_button_update), + &VALS.base_is_bottom_layer); + adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 6, _("Grid Size:"), SCALE_WIDTH, 0, VALS.grid_size, 0, 200, 1, 10, 0, TRUE, 0, 0, NULL, NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_int_adjustment_update), - &VALS.grid_size); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_int_adjustment_update), + &VALS.grid_size); gtk_widget_show (table); gtk_widget_show (frame); diff --git a/plug-ins/common/animationplay.c b/plug-ins/common/animationplay.c index 6b127a859d..2006cd40c5 100644 --- a/plug-ins/common/animationplay.c +++ b/plug-ins/common/animationplay.c @@ -113,6 +113,11 @@ #include #include +#ifdef __GNUC__ +#warning GTK_DISABLE_DEPRECATED +#endif +#undef GTK_DISABLE_DEPRECATED + #include #if defined (GDK_WINDOWING_X11) diff --git a/plug-ins/common/apply_lens.c b/plug-ins/common/apply_lens.c index 8574c95d1a..84d6798d9c 100644 --- a/plug-ins/common/apply_lens.c +++ b/plug-ins/common/apply_lens.c @@ -400,9 +400,9 @@ lens_dialog (GimpDrawable *drawable) NULL); - gtk_signal_connect (GTK_OBJECT (dlg), "destroy", - GTK_SIGNAL_FUNC (gtk_main_quit), - NULL); + g_signal_connect (G_OBJECT (dlg), "destroy", + G_CALLBACK (gtk_main_quit), + NULL); frame = gtk_frame_new (_("Parameter Settings")); gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_ETCHED_IN); @@ -415,28 +415,30 @@ lens_dialog (GimpDrawable *drawable) toggle = gtk_radio_button_new_with_label (group, _("Keep Original Surroundings")); - 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 (vbox), toggle, FALSE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - GTK_SIGNAL_FUNC (gimp_toggle_button_update), - &lvals.keep_surr); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), lvals.keep_surr); gtk_widget_show (toggle); + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (gimp_toggle_button_update), + &lvals.keep_surr); + toggle = gtk_radio_button_new_with_label (group, drawtype == GIMP_INDEXEDA_IMAGE || drawtype == GIMP_INDEXED_IMAGE ? _("Set Surroundings to Index 0") : _("Set Surroundings to Background Color")); - 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 (vbox), toggle, FALSE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - GTK_SIGNAL_FUNC (gimp_toggle_button_update), - &lvals.use_bkgr); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), lvals.use_bkgr); gtk_widget_show (toggle); + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (gimp_toggle_button_update), + &lvals.use_bkgr); + if ((drawtype == GIMP_INDEXEDA_IMAGE) || (drawtype == GIMP_GRAYA_IMAGE) || (drawtype == GIMP_RGBA_IMAGE)) @@ -444,14 +446,15 @@ lens_dialog (GimpDrawable *drawable) toggle = gtk_radio_button_new_with_label (group, _("Make Surroundings Transparent")); - 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 (vbox), toggle, FALSE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - GTK_SIGNAL_FUNC (gimp_toggle_button_update), - &lvals.set_transparent); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), lvals.set_transparent); gtk_widget_show (toggle); + + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (gimp_toggle_button_update), + &lvals.set_transparent); } sep = gtk_hseparator_new (); @@ -468,11 +471,12 @@ lens_dialog (GimpDrawable *drawable) spinbutton = gimp_spin_button_new (&adj, lvals.refraction, 1.0, 100.0, 0.1, 1.0, 0, 1, 2); gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &lvals.refraction); gtk_widget_show (spinbutton); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &lvals.refraction); + gtk_widget_show (hbox); gtk_widget_show (vbox); gtk_widget_show (frame); diff --git a/plug-ins/common/blinds.c b/plug-ins/common/blinds.c index a6db25394b..b67ca6bf6f 100644 --- a/plug-ins/common/blinds.c +++ b/plug-ins/common/blinds.c @@ -326,9 +326,9 @@ blinds_dialog (void) NULL); - gtk_signal_connect (GTK_OBJECT (dlg), "destroy", - GTK_SIGNAL_FUNC (gtk_main_quit), - NULL); + g_signal_connect (G_OBJECT (dlg), "destroy", + G_CALLBACK (gtk_main_quit), + NULL); main_vbox = gtk_vbox_new (FALSE, 4); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 6); @@ -378,16 +378,21 @@ blinds_dialog (void) frame = gtk_frame_new (_("Background")); gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0); + gtk_widget_show (frame); toggle_vbox = gtk_vbox_new (FALSE, 2); gtk_container_set_border_width (GTK_CONTAINER (toggle_vbox), 2); gtk_container_add (GTK_CONTAINER (frame), toggle_vbox); + gtk_widget_show (toggle_vbox); toggle = gtk_check_button_new_with_label (_("Transparent")); gtk_box_pack_start (GTK_BOX (toggle_vbox), toggle, FALSE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - GTK_SIGNAL_FUNC (blinds_button_update), - &bvals.bg_trans); + gtk_widget_show (toggle); + + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (blinds_button_update), + &bvals.bg_trans); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), bvals.bg_trans); if (!has_alpha) @@ -396,42 +401,36 @@ blinds_dialog (void) gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), FALSE); } - gtk_widget_show (toggle); - - gtk_widget_show (toggle_vbox); - gtk_widget_show (frame); - frame = gtk_frame_new (_("Parameter Settings")); gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_ETCHED_IN); gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0); + gtk_widget_show (frame); table = gtk_table_new (2, 3, FALSE); gtk_table_set_col_spacings (GTK_TABLE (table), 4); gtk_table_set_row_spacings (GTK_TABLE (table), 2); gtk_container_set_border_width (GTK_CONTAINER (table), 4); gtk_container_add (GTK_CONTAINER (frame), table); + gtk_widget_show (table); size_data = gimp_scale_entry_new (GTK_TABLE (table), 0, 0, _("Displacement:"), SCALE_WIDTH, 0, bvals.angledsp, 1, 90, 1, 15, 0, TRUE, 0, 0, NULL, NULL); - gtk_signal_connect (GTK_OBJECT (size_data), "value_changed", - GTK_SIGNAL_FUNC (blinds_scale_update), - &bvals.angledsp); + g_signal_connect (G_OBJECT (size_data), "value_changed", + G_CALLBACK (blinds_scale_update), + &bvals.angledsp); size_data = gimp_scale_entry_new (GTK_TABLE (table), 0, 1, _("Num Segments:"), SCALE_WIDTH, 0, bvals.numsegs, 1, MAX_FANS, 1, 2, 0, TRUE, 0, 0, NULL, NULL); - gtk_signal_connect (GTK_OBJECT (size_data), "value_changed", - GTK_SIGNAL_FUNC (blinds_scale_update), + g_signal_connect (G_OBJECT (size_data), "value_changed", + G_CALLBACK (blinds_scale_update), &bvals.numsegs); - gtk_widget_show (frame); - gtk_widget_show (table); - gtk_widget_show (dlg); dialog_update_preview (); @@ -839,7 +838,7 @@ dialog_update_preview (void) g_free (dr); } - gtk_widget_draw (bint.preview, NULL); + gtk_widget_queue_draw (bint.preview); gdk_flush (); } diff --git a/plug-ins/common/blur.c b/plug-ins/common/blur.c index 42501db32e..fe9c26bd5a 100644 --- a/plug-ins/common/blur.c +++ b/plug-ins/common/blur.c @@ -616,9 +616,9 @@ blur_dialog (void) NULL); - gtk_signal_connect (GTK_OBJECT (dlg), "destroy", - GTK_SIGNAL_FUNC (gtk_main_quit), - NULL); + g_signal_connect (G_OBJECT (dlg), "destroy", + G_CALLBACK (gtk_main_quit), + NULL); gimp_help_init (); @@ -655,9 +655,9 @@ blur_dialog (void) pivals.blur_pct, 1.0, 100.0, 1.0, 10.0, 0, TRUE, 0, 0, _("Percentage of pixels to be filtered"), NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &pivals.blur_pct); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &pivals.blur_pct); /* * Repeat count label & scale (1 to 100) @@ -667,9 +667,9 @@ blur_dialog (void) pivals.blur_rcount, 1.0, 100.0, 1.0, 10.0, 0, TRUE, 0, 0, _("Number of times to apply filter"), NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &pivals.blur_rcount); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &pivals.blur_rcount); gtk_widget_show (frame); diff --git a/plug-ins/common/borderaverage.c b/plug-ins/common/borderaverage.c index 8afec6da6a..a8b3f8ce8f 100644 --- a/plug-ins/common/borderaverage.c +++ b/plug-ins/common/borderaverage.c @@ -379,9 +379,9 @@ borderaverage_dialog (void) NULL); - gtk_signal_connect (GTK_OBJECT (dlg), "destroy", - GTK_SIGNAL_FUNC (gtk_main_quit), - NULL); + g_signal_connect (G_OBJECT (dlg), "destroy", + G_CALLBACK (gtk_main_quit), + NULL); vbox = gtk_vbox_new (FALSE, 4); gtk_container_set_border_width (GTK_CONTAINER (vbox), 6); @@ -406,9 +406,9 @@ borderaverage_dialog (void) gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0); gtk_widget_show (spinbutton); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_int_adjustment_update), - &borderaverage_thickness); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_int_adjustment_update), + &borderaverage_thickness); frame = gtk_frame_new (_("Number of Colors")); gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0); diff --git a/plug-ins/common/bumpmap.c b/plug-ins/common/bumpmap.c index 794b322e82..239d0a70c3 100644 --- a/plug-ins/common/bumpmap.c +++ b/plug-ins/common/bumpmap.c @@ -109,6 +109,11 @@ #include #endif +#ifdef __GNUC__ +#warning GTK_DISABLE_DEPRECATED +#endif +#undef GTK_DISABLE_DEPRECATED + #include #include @@ -860,9 +865,9 @@ bumpmap_dialog (void) NULL); - gtk_signal_connect (GTK_OBJECT (dialog), "destroy", - GTK_SIGNAL_FUNC (gtk_main_quit), - NULL); + g_signal_connect (G_OBJECT (dialog), "destroy", + G_CALLBACK (gtk_main_quit), + NULL); top_vbox = gtk_vbox_new (FALSE, 4); gtk_container_set_border_width (GTK_CONTAINER (top_vbox), 6); @@ -925,15 +930,16 @@ bumpmap_dialog (void) GDK_BUTTON_RELEASE_MASK | GDK_BUTTON_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK); - gtk_signal_connect (GTK_OBJECT (bmint.preview), "event", - (GtkSignalFunc) dialog_preview_events, - NULL); - gtk_signal_connect (GTK_OBJECT (bmint.preview_adj_x), "value_changed", - GTK_SIGNAL_FUNC (dialog_iscale_update_normal), - &bmint.preview_xofs); - gtk_signal_connect (GTK_OBJECT (bmint.preview_adj_y), "value_changed", - GTK_SIGNAL_FUNC (dialog_iscale_update_normal), - &bmint.preview_yofs); + + g_signal_connect (G_OBJECT (bmint.preview), "event", + G_CALLBACK (dialog_preview_events), + NULL); + g_signal_connect (G_OBJECT (bmint.preview_adj_x), "value_changed", + G_CALLBACK (dialog_iscale_update_normal), + &bmint.preview_xofs); + g_signal_connect (G_OBJECT (bmint.preview_adj_y), "value_changed", + G_CALLBACK (dialog_iscale_update_normal), + &bmint.preview_yofs); dialog_init_preview (); @@ -962,31 +968,34 @@ bumpmap_dialog (void) gtk_box_pack_start (GTK_BOX (right_vbox), button, FALSE, FALSE, 0); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), bmvals.compensate ? TRUE : FALSE); - gtk_signal_connect (GTK_OBJECT (button), "toggled", - GTK_SIGNAL_FUNC (dialog_compensate_callback), - NULL); gtk_widget_show (button); + g_signal_connect (G_OBJECT (button), "toggled", + G_CALLBACK (dialog_compensate_callback), + NULL); + /* Invert bumpmap */ button = gtk_check_button_new_with_label (_("Invert Bumpmap")); gtk_box_pack_start (GTK_BOX (right_vbox), button, FALSE, FALSE, 0); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), bmvals.invert ? TRUE : FALSE); - gtk_signal_connect (GTK_OBJECT (button), "toggled", - GTK_SIGNAL_FUNC (dialog_invert_callback), - NULL); gtk_widget_show (button); + g_signal_connect (G_OBJECT (button), "toggled", + G_CALLBACK (dialog_invert_callback), + NULL); + /* Tile bumpmap */ button = gtk_check_button_new_with_label (_("Tile Bumpmap")); gtk_box_pack_start (GTK_BOX (right_vbox), button, FALSE, FALSE, 0); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), bmvals.tiled ? TRUE : FALSE); - gtk_signal_connect (GTK_OBJECT (button), "toggled", - GTK_SIGNAL_FUNC (dialog_tiled_callback), - NULL); gtk_widget_show (button); + g_signal_connect (G_OBJECT (button), "toggled", + G_CALLBACK (dialog_tiled_callback), + NULL); + frame = gtk_frame_new (_("Parameter Settings")); gtk_box_pack_start (GTK_BOX (top_vbox), frame, FALSE, FALSE, 0); gtk_widget_show (frame); @@ -1032,27 +1041,27 @@ bumpmap_dialog (void) bmvals.azimuth, 0.0, 360.0, 1.0, 15.0, 2, TRUE, 0, 0, NULL, NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (dialog_dscale_update), - &bmvals.azimuth); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (dialog_dscale_update), + &bmvals.azimuth); adj = gimp_scale_entry_new (GTK_TABLE (table), 0, row++, _("Elevation:"), SCALE_WIDTH, 0, bmvals.elevation, 0.5, 90.0, 1.0, 5.0, 2, TRUE, 0, 0, NULL, NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (dialog_dscale_update), - &bmvals.elevation); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (dialog_dscale_update), + &bmvals.elevation); adj = gimp_scale_entry_new (GTK_TABLE (table), 0, row, _("Depth:"), SCALE_WIDTH, 0, bmvals.depth, 1.0, 65.0, 1.0, 5.0, 0, TRUE, 0, 0, NULL, NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (dialog_iscale_update_normal), - &bmvals.depth); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (dialog_iscale_update_normal), + &bmvals.depth); gtk_table_set_row_spacing (GTK_TABLE (table), row++, 8); bmint.offset_adj_x = adj = @@ -1061,9 +1070,9 @@ bumpmap_dialog (void) bmvals.xofs, -1000.0, 1001.0, 1.0, 10.0, 0, TRUE, 0, 0, NULL, NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (dialog_iscale_update_normal), - &bmvals.xofs); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (dialog_iscale_update_normal), + &bmvals.xofs); bmint.offset_adj_y = adj = gimp_scale_entry_new (GTK_TABLE (table), 0, row, @@ -1071,9 +1080,9 @@ bumpmap_dialog (void) bmvals.yofs, -1000.0, 1001.0, 1.0, 10.0, 0, TRUE, 0, 0, NULL, NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (dialog_iscale_update_normal), - &bmvals.yofs); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (dialog_iscale_update_normal), + &bmvals.yofs); gtk_table_set_row_spacing (GTK_TABLE (table), row++, 8); adj = gimp_scale_entry_new (GTK_TABLE (table), 0, row++, @@ -1081,18 +1090,18 @@ bumpmap_dialog (void) bmvals.waterlevel, 0.0, 255.0, 1.0, 8.0, 0, TRUE, 0, 0, NULL, NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (dialog_iscale_update_full), - &bmvals.waterlevel); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (dialog_iscale_update_full), + &bmvals.waterlevel); adj = gimp_scale_entry_new (GTK_TABLE (table), 0, row++, _("Ambient:"), SCALE_WIDTH, 0, bmvals.ambient, 0.0, 255.0, 1.0, 8.0, 0, TRUE, 0, 0, NULL, NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (dialog_iscale_update_normal), - &bmvals.ambient); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (dialog_iscale_update_normal), + &bmvals.ambient); /* Done */ @@ -1431,7 +1440,7 @@ dialog_update_preview (void) preview_row, 0, y, bmint.preview_width); } - gtk_widget_draw (bmint.preview, NULL); + gtk_widget_queue_draw (bmint.preview); gdk_flush (); } diff --git a/plug-ins/common/checkerboard.c b/plug-ins/common/checkerboard.c index 7aa95cd6c5..de39eb0440 100644 --- a/plug-ins/common/checkerboard.c +++ b/plug-ins/common/checkerboard.c @@ -50,15 +50,15 @@ static CheckInterface cint = }; static void query (void); -static void run (gchar *name, - gint nparams, - GimpParam *param, - gint *nreturn_vals, - GimpParam **return_vals); +static void run (gchar *name, + gint nparams, + GimpParam *param, + gint *nreturn_vals, + GimpParam **return_vals); -static void check (GimpDrawable *drawable); -static gint inblock (gint pos, - gint size); +static void check (GimpDrawable *drawable); +static gint inblock (gint pos, + gint size); static gint check_dialog (void); static void check_ok_callback (GtkWidget *widget, @@ -74,8 +74,8 @@ GimpPlugInInfo PLUG_IN_INFO = static CheckVals cvals = { - 0, - 10 + 0, + 10 }; MAIN () @@ -106,25 +106,25 @@ query (void) } static void -run (gchar *name, - gint nparams, - GimpParam *param, - gint *nreturn_vals, - GimpParam **return_vals) +run (gchar *name, + gint nparams, + GimpParam *param, + gint *nreturn_vals, + GimpParam **return_vals) { - static GimpParam values[1]; - GimpDrawable *drawable; - GimpRunMode run_mode; - GimpPDBStatusType status = GIMP_PDB_SUCCESS; + static GimpParam values[1]; + GimpDrawable *drawable; + GimpRunMode run_mode; + GimpPDBStatusType status = GIMP_PDB_SUCCESS; INIT_I18N_UI(); run_mode = param[0].data.d_int32; *nreturn_vals = 1; - *return_vals = values; + *return_vals = values; - values[0].type = GIMP_PDB_STATUS; + values[0].type = GIMP_PDB_STATUS; values[0].data.d_status = status; drawable = gimp_drawable_get (param[2].data.d_drawable); @@ -364,9 +364,9 @@ check_dialog (void) NULL); - gtk_signal_connect (GTK_OBJECT (dlg), "destroy", - GTK_SIGNAL_FUNC (gtk_main_quit), - NULL); + g_signal_connect (G_OBJECT (dlg), "destroy", + G_CALLBACK (gtk_main_quit), + NULL); /* parameter settings */ frame = gtk_frame_new (_("Parameter Settings")); @@ -380,12 +380,13 @@ check_dialog (void) toggle = gtk_check_button_new_with_label (_("Psychobilly")); gtk_box_pack_start (GTK_BOX (vbox), toggle, FALSE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - GTK_SIGNAL_FUNC (gimp_toggle_button_update), - &cvals.mode); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), cvals.mode); gtk_widget_show (toggle); + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (gimp_toggle_button_update), + &cvals.mode); + table = gtk_table_new (1, 3, FALSE); gtk_table_set_col_spacings (GTK_TABLE (table), 4); gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 0); @@ -396,9 +397,9 @@ check_dialog (void) cvals.size, 1, 400, 1, 10, 0, TRUE, 0, 0, NULL, NULL); - gtk_signal_connect (GTK_OBJECT (size_data), "value_changed", - GTK_SIGNAL_FUNC (gimp_int_adjustment_update), - &cvals.size); + g_signal_connect (G_OBJECT (size_data), "value_changed", + G_CALLBACK (gimp_int_adjustment_update), + &cvals.size); gtk_widget_show (vbox); gtk_widget_show (frame); diff --git a/plug-ins/common/colorify.c b/plug-ins/common/colorify.c index 915b9b5109..e280c18479 100644 --- a/plug-ins/common/colorify.c +++ b/plug-ins/common/colorify.c @@ -315,9 +315,9 @@ colorify_dialog (GimpRGB *color) NULL); - gtk_signal_connect (GTK_OBJECT (dialog), "destroy", - GTK_SIGNAL_FUNC (gtk_main_quit), - NULL); + g_signal_connect (G_OBJECT (dialog), "destroy", + G_CALLBACK (gtk_main_quit), + NULL); frame = gtk_frame_new (_("Color")); gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_ETCHED_IN); @@ -341,9 +341,9 @@ colorify_dialog (GimpRGB *color) COLOR_SIZE, COLOR_SIZE, color, GIMP_COLOR_AREA_FLAT); - gtk_signal_connect (GTK_OBJECT (custum_color_button), "color_changed", - GTK_SIGNAL_FUNC (gimp_color_button_get_color), - color); + g_signal_connect (G_OBJECT (custum_color_button), "color_changed", + G_CALLBACK (gimp_color_button_get_color), + color); gtk_table_attach (GTK_TABLE (table), custum_color_button, 6, 7, 0, 1, GTK_FILL, GTK_FILL, 0, 0); @@ -358,7 +358,7 @@ colorify_dialog (GimpRGB *color) 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", + g_signal_connect (G_OBJECT (button), "clicked", (GtkSignalFunc) predefined_color_callback, color_area); gtk_widget_show (color_area); diff --git a/plug-ins/common/colortoalpha.c b/plug-ins/common/colortoalpha.c index dccb4c79a3..11e1842906 100644 --- a/plug-ins/common/colortoalpha.c +++ b/plug-ins/common/colortoalpha.c @@ -425,9 +425,9 @@ colortoalpha_dialog (GimpDrawable *drawable) NULL); - gtk_signal_connect (GTK_OBJECT (dlg), "destroy", - GTK_SIGNAL_FUNC (gtk_main_quit), - NULL); + g_signal_connect (G_OBJECT (dlg), "destroy", + G_CALLBACK (gtk_main_quit), + NULL); frame = gtk_frame_new (_("Color")); gtk_container_set_border_width (GTK_CONTAINER (frame), 6); @@ -449,17 +449,18 @@ colortoalpha_dialog (GimpDrawable *drawable) PRV_WIDTH, PRV_HEIGHT, &pvals.color, GIMP_COLOR_AREA_FLAT); - gtk_signal_connect (GTK_OBJECT (button), "color_changed", - GTK_SIGNAL_FUNC (gimp_color_button_get_color), - &pvals.color); gtk_table_attach (GTK_TABLE (table), button, 1, 2, 0, 1, GTK_FILL, GTK_SHRINK, 0, 0) ; gtk_widget_show (button); ppreview.color_button = button; + g_signal_connect (G_OBJECT (button), "color_changed", + G_CALLBACK (gimp_color_button_get_color), + &pvals.color); + label = gtk_label_new (_("to Alpha")); gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); - gtk_table_attach_defaults (GTK_TABLE(table), label, 2, 3, 0, 1); + gtk_table_attach_defaults (GTK_TABLE (table), label, 2, 3, 0, 1); gtk_widget_show (label); gtk_widget_show (dlg); diff --git a/plug-ins/common/compose.c b/plug-ins/common/compose.c index 1d17046716..546b9c891d 100644 --- a/plug-ins/common/compose.c +++ b/plug-ins/common/compose.c @@ -58,23 +58,23 @@ static char ident[] = "@(#) GIMP Compose plug-in v1.03 17-Mar-99"; /* Declare local functions */ static void query (void); -static void run (gchar *name, - gint nparams, - GimpParam *param, - gint *nreturn_vals, - GimpParam **return_vals); +static void run (gchar *name, + gint nparams, + GimpParam *param, + gint *nreturn_vals, + GimpParam **return_vals); -static gint32 compose (gchar *compose_type, +static gint32 compose (gchar *compose_type, gint32 *compose_ID, - gint compose_by_drawable); + gint compose_by_drawable); static gint32 create_new_image (gchar *filename, guint width, guint height, GimpImageType gdtype, gint32 *layer_ID, - GimpDrawable **drawable, - GimpPixelRgn *pixel_rgn); + GimpDrawable **drawable, + GimpPixelRgn *pixel_rgn); static void compose_rgb (guchar **src, gint *incr, gint numpix, guchar *dst); static void compose_rgba (guchar **src, gint *incr, gint numpix, guchar *dst); @@ -82,12 +82,12 @@ static void compose_hsv (guchar **src, gint *incr, gint numpix, guchar *dst); static void compose_cmy (guchar **src, gint *incr, gint numpix, guchar *dst); static void compose_cmyk (guchar **src, gint *incr, gint numpix, guchar *dst); -static gint compose_dialog (gchar *compose_type, - gint32 drawable_ID); +static gint compose_dialog (gchar *compose_type, + gint32 drawable_ID); -static gint check_gray (gint32 image_id, - gint32 drawable_id, - gpointer data); +static gint check_gray (gint32 image_id, + gint32 drawable_id, + gpointer data); static void image_menu_callback (gint32 id, gpointer data); @@ -121,22 +121,22 @@ static COMPOSE_DSC compose_dsc[] = N_("Green:"), N_("Blue:"), CHNL_NA }, N_("rgb-compose"), compose_rgb }, - { N_("RGBA"), 4, { N_("Red:"), - N_("Green:"), - N_("Blue:"), - N_("Alpha:") }, N_("rgba-compose"), compose_rgba }, - { N_("HSV"), 3, { N_("Hue:"), - N_("Saturation:"), - N_("Value:"), - CHNL_NA }, N_("hsv-compose"), compose_hsv }, - { N_("CMY"), 3, { N_("Cyan:"), - N_("Magenta:"), - N_("Yellow:"), - CHNL_NA }, N_("cmy-compose"), compose_cmy }, - { N_("CMYK"), 4, { N_("Cyan:"), - N_("Magenta:"), - N_("Yellow:"), - N_("Black:") }, N_("cmyk-compose"), compose_cmyk } + { N_("RGBA"), 4, { N_("Red:"), + N_("Green:"), + N_("Blue:"), + N_("Alpha:") }, N_("rgba-compose"), compose_rgba }, + { N_("HSV"), 3, { N_("Hue:"), + N_("Saturation:"), + N_("Value:"), + CHNL_NA }, N_("hsv-compose"), compose_hsv }, + { N_("CMY"), 3, { N_("Cyan:"), + N_("Magenta:"), + N_("Yellow:"), + CHNL_NA }, N_("cmy-compose"), compose_cmy }, + { N_("CMYK"), 4, { N_("Cyan:"), + N_("Magenta:"), + N_("Yellow:"), + N_("Black:") }, N_("cmyk-compose"), compose_cmyk } }; #define MAX_COMPOSE_TYPES (G_N_ELEMENTS (compose_dsc)) @@ -254,16 +254,16 @@ query (void) static void -run (gchar *name, - gint nparams, +run (gchar *name, + gint nparams, GimpParam *param, - gint *nreturn_vals, + gint *nreturn_vals, GimpParam **return_vals) { - static GimpParam values[2]; + static GimpParam values[2]; GimpPDBStatusType status = GIMP_PDB_SUCCESS; - gint32 image_ID, drawable_ID; - gint compose_by_drawable; + gint32 image_ID, drawable_ID; + gint compose_by_drawable; INIT_I18N_UI (); @@ -271,12 +271,12 @@ run (gchar *name, compose_by_drawable = (strcmp (name, "plug_in_drawable_compose") == 0); *nreturn_vals = 2; - *return_vals = values; + *return_vals = values; - values[0].type = GIMP_PDB_STATUS; + values[0].type = GIMP_PDB_STATUS; values[0].data.d_status = status; - values[1].type = GIMP_PDB_IMAGE; - values[1].data.d_int32 = -1; + values[1].type = GIMP_PDB_IMAGE; + values[1].data.d_int32 = -1; switch (run_mode) { @@ -286,21 +286,24 @@ run (gchar *name, /* The dialog is now drawable based. Get a drawable-ID of the image */ if (strcmp (name, "plug_in_compose") == 0) - {gint32 *layer_list; - gint nlayers; - - layer_list = gimp_image_get_layers (param[1].data.d_int32, &nlayers); - if ((layer_list == NULL) || (nlayers <= 0)) { - g_message (_("compose: Could not get layers for image %d"), - (gint) param[1].data.d_int32); - return; + gint32 *layer_list; + gint nlayers; + + layer_list = gimp_image_get_layers (param[1].data.d_int32, &nlayers); + if ((layer_list == NULL) || (nlayers <= 0)) + { + g_message (_("compose: Could not get layers for image %d"), + (gint) param[1].data.d_int32); + return; + } + drawable_ID = layer_list[0]; + g_free (layer_list); } - drawable_ID = layer_list[0]; - g_free (layer_list); - } else - drawable_ID = param[2].data.d_int32; + { + drawable_ID = param[2].data.d_int32; + } compose_by_drawable = 1; @@ -778,9 +781,9 @@ compose_dialog (gchar *compose_type, NULL); - gtk_signal_connect (GTK_OBJECT (dlg), "destroy", - GTK_SIGNAL_FUNC (gtk_main_quit), - NULL); + g_signal_connect (G_OBJECT (dlg), "destroy", + G_CALLBACK (gtk_main_quit), + NULL); /* parameter settings */ hbox = gtk_hbox_new (FALSE, 6); @@ -853,15 +856,17 @@ compose_dialog (gchar *compose_type, { toggle = gtk_radio_button_new_with_label (group, gettext(compose_dsc[j].compose_type)); - 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 (left_vbox), toggle, TRUE, TRUE, 0); composeint.compose_flag[j] = (j == compose_idx); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - (GtkSignalFunc) compose_type_toggle_update, - &(composeint.compose_flag[j])); + gtk_widget_show (toggle); + + g_signal_connect (G_OBJECT (toggle), "toggled", + GTK_SIGNAL_FUNC (compose_type_toggle_update), + &(composeint.compose_flag[j])); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), composeint.compose_flag[j]); - gtk_widget_show (toggle); } gtk_widget_show (left_vbox); diff --git a/plug-ins/common/convmatrix.c b/plug-ins/common/convmatrix.c index 1ff614a16c..ef52f4e51f 100644 --- a/plug-ins/common/convmatrix.c +++ b/plug-ins/common/convmatrix.c @@ -861,9 +861,9 @@ dialog (void) NULL); - gtk_signal_connect (GTK_OBJECT (dlg), "destroy", - GTK_SIGNAL_FUNC (gtk_main_quit), - NULL); + g_signal_connect (G_OBJECT (dlg), "destroy", + G_CALLBACK (gtk_main_quit), + NULL); main_hbox = gtk_hbox_new (FALSE, 4); gtk_container_set_border_width (GTK_CONTAINER (main_hbox), 6); @@ -894,10 +894,11 @@ dialog (void) 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); - gtk_signal_connect (GTK_OBJECT (entry), "changed", - GTK_SIGNAL_FUNC (entry_callback), - &my_config.matrix[x][y]); gtk_widget_show (entry); + + g_signal_connect (G_OBJECT (entry), "changed", + G_CALLBACK (entry_callback), + &my_config.matrix[x][y]); } gtk_widget_show (table); @@ -917,11 +918,12 @@ dialog (void) my_widgets.divisor = entry = gtk_entry_new (); 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), - &my_config.divisor); gtk_widget_show (entry); + g_signal_connect (G_OBJECT (entry), "changed", + G_CALLBACK (entry_callback), + &my_config.divisor); + gtk_widget_show (table); table = gtk_table_new (1, 2, FALSE); @@ -936,11 +938,12 @@ dialog (void) my_widgets.offset = entry = gtk_entry_new (); 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, - &my_config.offset); gtk_widget_show (entry); + g_signal_connect (G_OBJECT (entry), "changed", + G_CALLBACK (entry_callback), + &my_config.offset); + gtk_widget_show (table); gtk_widget_show (box); @@ -954,21 +957,23 @@ dialog (void) my_widgets.autoset = button = gtk_check_button_new_with_label (_("Automatic")); gtk_box_pack_start (GTK_BOX (box), button, TRUE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (button), "toggled", - (GtkSignalFunc) my_toggle_callback, - &my_config.autoset); gtk_widget_show (button); + g_signal_connect (G_OBJECT (button), "toggled", + G_CALLBACK (my_toggle_callback), + &my_config.autoset); + my_widgets.alpha_alg = button = gtk_check_button_new_with_label (_("Alpha-weighting")); if (my_config.alpha_alg == -1) gtk_widget_set_sensitive (button, FALSE); gtk_box_pack_start (GTK_BOX (box), button, TRUE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (button), "toggled", - (GtkSignalFunc)my_toggle_callback, - &my_config.alpha_alg); gtk_widget_show (button); + g_signal_connect (G_OBJECT (button), "toggled", + G_CALLBACK (my_toggle_callback), + &my_config.alpha_alg); + gtk_widget_show (box); gtk_widget_show (yetanotherbox); @@ -989,12 +994,13 @@ dialog (void) { my_widgets.bmode[i] = button = gtk_radio_button_new_with_label (group, gettext (bmode_labels[i])); - group = gtk_radio_button_group (GTK_RADIO_BUTTON (button)); + group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (button)); gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE, 0); gtk_widget_show (button); - gtk_signal_connect (GTK_OBJECT (button), "toggled", - (GtkSignalFunc) my_bmode_callback, - (gpointer) (i + 1)); + + g_signal_connect (G_OBJECT (button), "toggled", + G_CALLBACK (my_bmode_callback), + (gpointer) (i + 1)); } gtk_widget_show (box); @@ -1012,13 +1018,16 @@ dialog (void) { my_widgets.channels[i] = button = gtk_check_button_new_with_label (gettext (channel_labels[i])); + if (my_config.channels[i] < 0) gtk_widget_set_sensitive (button, FALSE); - gtk_signal_connect (GTK_OBJECT (button), "toggled", - (GtkSignalFunc)my_toggle_callback, - &my_config.channels[i]); + gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE, 0); gtk_widget_show (button); + + g_signal_connect (G_OBJECT (button), "toggled", + G_CALLBACK (my_toggle_callback), + &my_config.channels[i]); } gtk_widget_show(box); diff --git a/plug-ins/common/csource.c b/plug-ins/common/csource.c index bce9244b0a..42249aef63 100644 --- a/plug-ins/common/csource.c +++ b/plug-ins/common/csource.c @@ -49,16 +49,16 @@ typedef struct /* --- prototypes --- */ static void query (void); -static void run (gchar *name, - gint nparams, +static void run (gchar *name, + gint nparams, GimpParam *param, - gint *nreturn_vals, - GimpParam **return_vals); + gint *nreturn_vals, + GimpParam **return_vals); -static gint save_image (Config *config, - gint32 image_ID, - gint32 drawable_ID); -static gboolean run_save_dialog (Config *config); +static gint save_image (Config *config, + gint32 image_ID, + gint32 drawable_ID); +static gboolean run_save_dialog (Config *config); /* --- variables --- */ @@ -117,32 +117,33 @@ query (void) } static void -run (gchar *name, - gint nparams, +run (gchar *name, + gint nparams, GimpParam *param, - gint *nreturn_vals, + gint *nreturn_vals, GimpParam **return_vals) { - static GimpParam values[2]; - GimpRunMode run_mode; - GimpPDBStatusType status = GIMP_PDB_SUCCESS; + static GimpParam values[2]; + GimpRunMode run_mode; + GimpPDBStatusType status = GIMP_PDB_SUCCESS; GimpExportReturnType export = GIMP_EXPORT_CANCEL; run_mode = param[0].data.d_int32; *nreturn_vals = 1; *return_vals = values; + values[0].type = GIMP_PDB_STATUS; values[0].data.d_status = GIMP_PDB_EXECUTION_ERROR; if (run_mode == GIMP_RUN_INTERACTIVE && strcmp (name, "file_csource_save") == 0) { - gint32 image_ID = param[1].data.d_int32; - gint32 drawable_ID = param[2].data.d_int32; - GimpParasite *parasite; - gchar *x; - GimpImageType drawable_type = gimp_drawable_type (drawable_ID); + gint32 image_ID = param[1].data.d_int32; + gint32 drawable_ID = param[2].data.d_int32; + GimpParasite *parasite; + gchar *x; + GimpImageType drawable_type = gimp_drawable_type (drawable_ID); gimp_get_data ("file_csource_save", &config); config.prefixed_name = "gimp_image"; @@ -659,9 +660,9 @@ run_save_dialog (Config *config) NULL); - gtk_signal_connect (GTK_OBJECT (dialog), "destroy", - GTK_SIGNAL_FUNC (gtk_main_quit), - NULL); + g_signal_connect (G_OBJECT (dialog), "destroy", + G_CALLBACK (gtk_main_quit), + NULL); vbox = gtk_vbox_new (FALSE, 2); @@ -699,55 +700,60 @@ run_save_dialog (Config *config) gtk_box_pack_start (GTK_BOX (vbox), toggle, FALSE, FALSE, 0); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), config->use_comment); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - GTK_SIGNAL_FUNC (gimp_toggle_button_update), - &config->use_comment); gtk_widget_show (toggle); + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (gimp_toggle_button_update), + &config->use_comment); + /* GLib types */ toggle = gtk_check_button_new_with_label (_("Use GLib Types (guint8*)")); gtk_box_pack_start (GTK_BOX (vbox), toggle, FALSE, FALSE, 0); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), config->glib_types); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - GTK_SIGNAL_FUNC (gimp_toggle_button_update), - &config->glib_types); gtk_widget_show (toggle); + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (gimp_toggle_button_update), + &config->glib_types); + /* Use Macros */ toggle = gtk_check_button_new_with_label (_("Use Macros instead of Struct")); gtk_box_pack_start (GTK_BOX (vbox), toggle, FALSE, FALSE, 0); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), config->use_macros); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - GTK_SIGNAL_FUNC (gimp_toggle_button_update), - &config->use_macros); gtk_widget_show (toggle); + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (gimp_toggle_button_update), + &config->use_macros); + /* Use RLE */ toggle = gtk_check_button_new_with_label (_("Use 1 Byte Run-Length-Encoding")); gtk_box_pack_start (GTK_BOX (vbox), toggle, FALSE, FALSE, 0); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), config->use_rle); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - GTK_SIGNAL_FUNC (gimp_toggle_button_update), - &config->use_rle); gtk_widget_show (toggle); + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (gimp_toggle_button_update), + &config->use_rle); + /* Alpha */ toggle = gtk_check_button_new_with_label (_("Save Alpha Channel (RGBA/RGB)")); gtk_box_pack_start (GTK_BOX (vbox), toggle, FALSE, FALSE, 0); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), config->alpha); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - GTK_SIGNAL_FUNC (gimp_toggle_button_update), - &config->alpha); gtk_widget_show (toggle); + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (gimp_toggle_button_update), + &config->alpha); + /* Max Alpha Value */ table = gtk_table_new (1, 3, FALSE); @@ -760,9 +766,9 @@ run_save_dialog (Config *config) config->opacity, 0, 100, 1, 10, 1, TRUE, 0, 0, FALSE, FALSE); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &config->opacity); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &config->opacity); gtk_widget_show (dialog); diff --git a/plug-ins/common/cubism.c b/plug-ins/common/cubism.c index 5c2e1df179..f288093b90 100644 --- a/plug-ins/common/cubism.c +++ b/plug-ins/common/cubism.c @@ -324,9 +324,9 @@ cubism_dialog (void) NULL); - gtk_signal_connect (GTK_OBJECT (dlg), "destroy", - GTK_SIGNAL_FUNC (gtk_main_quit), - NULL); + g_signal_connect (G_OBJECT (dlg), "destroy", + G_CALLBACK (gtk_main_quit), + NULL); /* parameter settings */ frame = gtk_frame_new (_("Parameter Settings")); @@ -344,21 +344,23 @@ cubism_dialog (void) toggle = gtk_check_button_new_with_label (_("Use Background Color")); gtk_table_attach (GTK_TABLE (table), toggle, 0, 3, 0, 1, GTK_FILL, GTK_FILL, 0, 0); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - GTK_SIGNAL_FUNC (gimp_toggle_button_update), - &cvals.bg_color); + gtk_widget_show (toggle); + + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (gimp_toggle_button_update), + &cvals.bg_color); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), (cvals.bg_color == BG)); - gtk_widget_show (toggle); scale_data = gimp_scale_entry_new (GTK_TABLE (table), 0, 1, _("Tile Size:"), SCALE_WIDTH, 0, cvals.tile_size, 0.0, 100.0, 1.0, 10.0, 1, TRUE, 0, 0, NULL, NULL); - gtk_signal_connect (GTK_OBJECT (scale_data), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &cvals.tile_size); + g_signal_connect (G_OBJECT (scale_data), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &cvals.tile_size); scale_data = gimp_scale_entry_new (GTK_TABLE (table), 0, 2, @@ -366,9 +368,9 @@ cubism_dialog (void) cvals.tile_saturation, 0.0, 10.0, 0.1, 1, 1, TRUE, 0, 0, NULL, NULL); - gtk_signal_connect (GTK_OBJECT (scale_data), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &cvals.tile_saturation); + g_signal_connect (G_OBJECT (scale_data), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &cvals.tile_saturation); gtk_widget_show (table); gtk_widget_show (frame); diff --git a/plug-ins/common/curve_bend.c b/plug-ins/common/curve_bend.c index c810346be1..8406b0029b 100644 --- a/plug-ins/common/curve_bend.c +++ b/plug-ins/common/curve_bend.c @@ -1382,19 +1382,21 @@ bender_new_dialog (GimpDrawable *drawable) /* The Load button */ button = gtk_button_new_with_label (_("LoadCurve")); gtk_box_pack_start (GTK_BOX (outline_hbox), button, TRUE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (button), "clicked", - GTK_SIGNAL_FUNC (bender_load_callback), - cd); gtk_widget_show (button); + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (bender_load_callback), + cd); + /* The Save button */ button = gtk_button_new_with_label (_("SaveCurve")); gtk_box_pack_start (GTK_BOX (outline_hbox), button, TRUE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (button), "clicked", - GTK_SIGNAL_FUNC (bender_save_callback), - cd); gtk_widget_show (button); + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (bender_save_callback), + cd); + /* Rotate label & spinbutton */ label = gtk_label_new (_("Rotate: ")); gtk_box_pack_start (GTK_BOX (outline_hbox), label, FALSE, FALSE, 0); @@ -1406,13 +1408,11 @@ bender_new_dialog (GimpDrawable *drawable) 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); - - gtk_signal_connect (GTK_OBJECT (cd->rotate_data), "value_changed", - GTK_SIGNAL_FUNC (bender_rotate_adj_callback), - cd); - gtk_widget_show (spinbutton); + g_signal_connect (G_OBJECT (cd->rotate_data), "value_changed", + G_CALLBACK (bender_rotate_adj_callback), + cd); label = gtk_label_new (_("Curve for Border: ")); gtk_box_pack_start (GTK_BOX (outline_hbox), label, FALSE, FALSE, 0); @@ -1450,16 +1450,17 @@ bender_new_dialog (GimpDrawable *drawable) gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_ETCHED_IN); gtk_table_attach (GTK_TABLE (table), frame, 0, 1, 0, 1, GTK_EXPAND, GTK_EXPAND, 0, 0); + gtk_widget_show (frame); cd->pv_widget = gtk_preview_new (GTK_PREVIEW_COLOR); gtk_preview_size (GTK_PREVIEW (cd->pv_widget), PREVIEW_SIZE_X, PREVIEW_SIZE_Y); gtk_widget_set_events (cd->pv_widget, RANGE_MASK); - gtk_signal_connect (GTK_OBJECT (cd->pv_widget), "event", - (GtkSignalFunc) bender_pv_widget_events, - cd); gtk_container_add (GTK_CONTAINER (frame), cd->pv_widget); gtk_widget_show (cd->pv_widget); - gtk_widget_show (frame); + + g_signal_connect (G_OBJECT (cd->pv_widget), "event", + G_CALLBACK (bender_pv_widget_events), + cd); /* The curves graph */ frame = gtk_frame_new (NULL); @@ -1467,18 +1468,19 @@ bender_new_dialog (GimpDrawable *drawable) gtk_table_attach (GTK_TABLE (table), frame, 1, 2, 0, 1, GTK_EXPAND | GTK_SHRINK | GTK_FILL, GTK_FILL, 0, 0); + gtk_widget_show (frame); 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_signal_connect (GTK_OBJECT (cd->graph), "event", - (GtkSignalFunc) bender_graph_events, - cd); gtk_container_add (GTK_CONTAINER (frame), cd->graph); gtk_widget_show (cd->graph); - gtk_widget_show (frame); + + g_signal_connect (G_OBJECT (cd->graph), "event", + G_CALLBACK (bender_graph_events), + cd); gtk_widget_show (table); @@ -1490,52 +1492,52 @@ bender_new_dialog (GimpDrawable *drawable) /* The preview button */ button = gtk_button_new_with_label (_("PreviewOnce")); gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (button), "clicked", - (GtkSignalFunc) bender_preview_update_once, - cd); gtk_widget_show (button); + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (bender_preview_update_once), + cd); /* The preview toggle */ toggle = gtk_check_button_new_with_label (_("Preview")); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), cd->preview); gtk_box_pack_start (GTK_BOX (hbox), toggle, TRUE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - (GtkSignalFunc) bender_preview_update, - cd); - gtk_widget_show (toggle); + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (bender_preview_update), + cd); + /* The smoothing toggle */ toggle = gtk_check_button_new_with_label (_("Smoothing")); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), cd->smoothing); gtk_box_pack_start (GTK_BOX (hbox), toggle, TRUE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - (GtkSignalFunc) bender_smoothing_callback, - cd); - gtk_widget_show (toggle); + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (bender_smoothing_callback), + cd); + /* The antialiasing toggle */ toggle = gtk_check_button_new_with_label (_("Antialiasing")); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), cd->antialias); gtk_box_pack_start (GTK_BOX (hbox), toggle, TRUE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - (GtkSignalFunc) bender_antialias_callback, - cd); - gtk_widget_show (toggle); + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (bender_antialias_callback), + cd); + /* The wor_on_copy toggle */ toggle = gtk_check_button_new_with_label (_("Work on Copy")); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), cd->work_on_copy); gtk_box_pack_start (GTK_BOX (hbox), toggle, TRUE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - (GtkSignalFunc) bender_work_on_copy_callback, - cd); - gtk_widget_show (toggle); + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (bender_work_on_copy_callback), + cd); + gtk_widget_show (hbox); gtk_widget_show (vbox); @@ -1559,7 +1561,7 @@ bender_update (BenderDialog *cd, p_render_preview(cd, cd->preview_layer_id2); if (update & UP_DRAW) - gtk_widget_draw (cd->pv_widget, NULL); + gtk_widget_queue_draw (cd->pv_widget); } if (update & UP_PREVIEW_EXPOSE) { @@ -1571,7 +1573,7 @@ bender_update (BenderDialog *cd, p_render_preview(cd, cd->preview_layer_id2); if (update & UP_DRAW) - gtk_widget_draw (cd->pv_widget, NULL); + gtk_widget_queue_draw (cd->pv_widget); } if ((update & UP_GRAPH) && (update & UP_DRAW) && cd->pixmap != NULL) { @@ -2162,15 +2164,18 @@ bender_load_callback (GtkWidget *w, cd->filesel = filesel; gtk_window_set_position (GTK_WINDOW (filesel), GTK_WIN_POS_MOUSE); - gtk_signal_connect (GTK_OBJECT (GTK_FILE_SELECTION (filesel)->ok_button), - "clicked", (GtkSignalFunc) p_points_load_from_file, - cd); - gtk_signal_connect (GTK_OBJECT (GTK_FILE_SELECTION (filesel)->cancel_button), - "clicked", (GtkSignalFunc) p_filesel_close_cb, - cd); - gtk_signal_connect (GTK_OBJECT (filesel), "destroy", - (GtkSignalFunc) p_filesel_close_cb, - cd); + g_signal_connect (G_OBJECT (GTK_FILE_SELECTION (filesel)->ok_button), + "clicked", + G_CALLBACK (p_points_load_from_file), + cd); + g_signal_connect (G_OBJECT (GTK_FILE_SELECTION (filesel)->cancel_button), + "clicked", + G_CALLBACK (p_filesel_close_cb), + cd); + g_signal_connect (G_OBJECT (filesel), "destroy", + G_CALLBACK (p_filesel_close_cb), + cd); + gtk_file_selection_set_filename (GTK_FILE_SELECTION (filesel), "curve_bend.points"); gtk_widget_show (filesel); @@ -2192,15 +2197,18 @@ bender_save_callback (GtkWidget *w, cd->filesel = filesel; gtk_window_set_position (GTK_WINDOW (filesel), GTK_WIN_POS_MOUSE); - gtk_signal_connect (GTK_OBJECT (GTK_FILE_SELECTION (filesel)->ok_button), - "clicked", (GtkSignalFunc) p_points_save_to_file, - cd); - gtk_signal_connect (GTK_OBJECT (GTK_FILE_SELECTION (filesel)->cancel_button), - "clicked", (GtkSignalFunc) p_filesel_close_cb, - cd); - gtk_signal_connect (GTK_OBJECT (filesel), "destroy", - (GtkSignalFunc) p_filesel_close_cb, - cd); + g_signal_connect (G_OBJECT (GTK_FILE_SELECTION (filesel)->ok_button), + "clicked", + G_CALLBACK (p_points_save_to_file), + cd); + g_signal_connect (G_OBJECT (GTK_FILE_SELECTION (filesel)->cancel_button), + "clicked", + G_CALLBACK (p_filesel_close_cb), + cd); + g_signal_connect (G_OBJECT (filesel), "destroy", + G_CALLBACK (p_filesel_close_cb), + cd); + gtk_file_selection_set_filename (GTK_FILE_SELECTION (filesel), "curve_bend.points"); gtk_widget_show (filesel); @@ -2491,20 +2499,20 @@ p_buildmenu (MenuItem *items) menu = gtk_menu_new (); while (items->label) - { + { menu_item = gtk_menu_item_new_with_label ( gettext(items->label)); gtk_container_add (GTK_CONTAINER (menu), menu_item); if (items->callback) - gtk_signal_connect (GTK_OBJECT (menu_item), "activate", - (GtkSignalFunc) items->callback, - items->user_data); + g_signal_connect (G_OBJECT (menu_item), "activate", + G_CALLBACK (items->callback), + items->user_data); gtk_widget_show (menu_item); items->widget = menu_item; items++; - } + } return menu; } /* end p_buildmenu */ diff --git a/plug-ins/common/decompose.c b/plug-ins/common/decompose.c index 9fe58b5c42..3f24716b93 100644 --- a/plug-ins/common/decompose.c +++ b/plug-ins/common/decompose.c @@ -51,16 +51,16 @@ static char ident[] = "@(#) GIMP Decompose plug-in v1.01 19-Mar-99"; /* Declare local functions */ static void query (void); -static void run (gchar *name, - gint nparams, - GimpParam *param, - gint *nreturn_vals, - GimpParam **return_vals); +static void run (gchar *name, + gint nparams, + GimpParam *param, + gint *nreturn_vals, + GimpParam **return_vals); -static gint32 decompose (gint32 image_id, - gint32 drawable_ID, - gchar *extract_type, - gint32 *drawable_ID_dst); +static gint32 decompose (gint32 image_id, + gint32 drawable_ID, + gchar *extract_type, + gint32 *drawable_ID_dst); static gint32 create_new_image (gchar *filename, guint width, @@ -210,31 +210,31 @@ query (void) } static void -run (gchar *name, - gint nparams, +run (gchar *name, + gint nparams, GimpParam *param, - gint *nreturn_vals, + gint *nreturn_vals, GimpParam **return_vals) { - static GimpParam values[MAX_EXTRACT_IMAGES+1]; + static GimpParam values[MAX_EXTRACT_IMAGES+1]; GimpPDBStatusType status = GIMP_PDB_SUCCESS; - GimpImageType drawable_type; - gint32 num_images; - gint32 image_ID_extract[MAX_EXTRACT_IMAGES]; - gint j; + GimpImageType drawable_type; + gint32 num_images; + gint32 image_ID_extract[MAX_EXTRACT_IMAGES]; + gint j; INIT_I18N_UI(); run_mode = param[0].data.d_int32; *nreturn_vals = MAX_EXTRACT_IMAGES+1; - *return_vals = values; + *return_vals = values; - values[0].type = GIMP_PDB_STATUS; + values[0].type = GIMP_PDB_STATUS; values[0].data.d_status = status; for (j = 0; j < MAX_EXTRACT_IMAGES; j++) { - values[j+1].type = GIMP_PDB_IMAGE; + values[j+1].type = GIMP_PDB_IMAGE; values[j+1].data.d_int32 = -1; } @@ -860,8 +860,8 @@ decompose_dialog (void) GtkWidget *toggle; GtkWidget *frame; GtkWidget *vbox; - GSList *group; - gint j; + GSList *group; + gint j; gimp_ui_init ("decompose", FALSE); @@ -877,9 +877,9 @@ decompose_dialog (void) NULL); - gtk_signal_connect (GTK_OBJECT (dlg), "destroy", - GTK_SIGNAL_FUNC (gtk_main_quit), - NULL); + g_signal_connect (G_OBJECT (dlg), "destroy", + G_CALLBACK (gtk_main_quit), + NULL); /* parameter settings */ frame = gtk_frame_new (_("Extract Channels:")); @@ -897,16 +897,18 @@ decompose_dialog (void) if (!extract[j].dialog) continue; toggle = gtk_radio_button_new_with_label (group, gettext (extract[j].type)); - 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 (vbox), toggle, TRUE, TRUE, 0); decoint.extract_flag[j] = (g_ascii_strcasecmp (decovals.extract_type, extract[j].type) == 0); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - GTK_SIGNAL_FUNC (gimp_toggle_button_update), - &(decoint.extract_flag[j])); + gtk_widget_show (toggle); + + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (gimp_toggle_button_update), + &(decoint.extract_flag[j])); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), decoint.extract_flag[j]); - gtk_widget_show (toggle); } gtk_widget_show (vbox); gtk_widget_show (frame); diff --git a/plug-ins/common/deinterlace.c b/plug-ins/common/deinterlace.c index 3c1abc4150..665c89be23 100644 --- a/plug-ins/common/deinterlace.c +++ b/plug-ins/common/deinterlace.c @@ -45,11 +45,11 @@ enum /* Declare local functions. */ static void query (void); -static void run (gchar *name, - gint nparams, - GimpParam *param, - gint *nreturn_vals, - GimpParam **return_vals); +static void run (gchar *name, + gint nparams, + GimpParam *param, + gint *nreturn_vals, + GimpParam **return_vals); static void deinterlace (GimpDrawable *drawable); @@ -96,16 +96,16 @@ query (void) } static void -run (gchar *name, - gint nparams, +run (gchar *name, + gint nparams, GimpParam *param, - gint *nreturn_vals, + gint *nreturn_vals, GimpParam **return_vals) { - static GimpParam values[1]; - GimpDrawable *drawable; - GimpRunMode run_mode; - GimpPDBStatusType status = GIMP_PDB_SUCCESS; + static GimpParam values[1]; + GimpDrawable *drawable; + GimpRunMode run_mode; + GimpPDBStatusType status = GIMP_PDB_SUCCESS; run_mode = param[0].data.d_int32; @@ -274,24 +274,28 @@ deinterlace_dialog (void) NULL); - gtk_signal_connect (GTK_OBJECT (dlg), "destroy", - GTK_SIGNAL_FUNC (gtk_main_quit), - NULL); + g_signal_connect (G_OBJECT (dlg), "destroy", + G_CALLBACK (gtk_main_quit), + NULL); vbox = gtk_vbox_new (FALSE, 0); gtk_container_set_border_width (GTK_CONTAINER (vbox), 6); gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), vbox, TRUE, TRUE, 0); gtk_widget_show (vbox); - frame = - gimp_radio_group_new2 (TRUE, _("Mode"), - G_CALLBACK (gimp_radio_button_update), - &DeinterlaceValue, (gpointer) DeinterlaceValue, + frame = gimp_radio_group_new2 (TRUE, _("Mode"), + G_CALLBACK (gimp_radio_button_update), + &DeinterlaceValue, + GINT_TO_POINTER (DeinterlaceValue), - _("Keep Odd Fields"), (gpointer) ODD_FIELDS, NULL, - _("Keep Even Fields"), (gpointer) EVEN_FIELDS, NULL, + _("Keep Odd Fields"), + GINT_TO_POINTER (ODD_FIELDS), NULL, + + _("Keep Even Fields"), + GINT_TO_POINTER (EVEN_FIELDS), NULL, + + NULL); - NULL); gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0); gtk_widget_show (frame); diff --git a/plug-ins/common/depthmerge.c b/plug-ins/common/depthmerge.c index fb7fc45a0e..a6e72b47fa 100644 --- a/plug-ins/common/depthmerge.c +++ b/plug-ins/common/depthmerge.c @@ -149,10 +149,10 @@ void util_convertColorspace (guchar *dest, /* ----- plug-in entry points ----- */ static void query (void); -static void run (gchar *name, - gint nparams, +static void run (gchar *name, + gint nparams, GimpParam *param, - gint *nreturn_vals, + gint *nreturn_vals, GimpParam **return_vals); GimpPlugInInfo PLUG_IN_INFO = @@ -202,21 +202,22 @@ query (void) } static void -run (gchar *name, - gint numParams, +run (gchar *name, + gint numParams, GimpParam *param, - gint *numReturnVals, + gint *numReturnVals, GimpParam **returnVals) { - static GimpParam values[1]; - GimpRunMode runMode; - GimpPDBStatusType status; - DepthMerge dm; + static GimpParam values[1]; + GimpRunMode runMode; + GimpPDBStatusType status; + DepthMerge dm; INIT_I18N_UI(); runMode = (GimpRunMode) param[0].data.d_int32; - status = GIMP_PDB_SUCCESS; + status = GIMP_PDB_SUCCESS; + *numReturnVals = 1; *returnVals = values; @@ -646,9 +647,9 @@ DepthMerge_dialog (DepthMerge *dm) NULL); - gtk_signal_connect (GTK_OBJECT (dm->interface->dialog), "destroy", - GTK_SIGNAL_FUNC (gtk_main_quit), - NULL); + g_signal_connect (G_OBJECT (dm->interface->dialog), "destroy", + G_CALLBACK (gtk_main_quit), + NULL); /* topTable */ topTable = gtk_table_new (3, 3, FALSE); @@ -765,40 +766,40 @@ DepthMerge_dialog (DepthMerge *dm) dm->params.overlap, 0, 2, 0.001, 0.01, 3, TRUE, 0, 0, NULL, NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (dialogValueScaleUpdateCallback), - &(dm->params.overlap)); - gtk_object_set_user_data (GTK_OBJECT (adj), dm); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (dialogValueScaleUpdateCallback), + &(dm->params.overlap)); + g_object_set_data (G_OBJECT (adj), "dm", dm); adj = gimp_scale_entry_new (GTK_TABLE (numericParameterTable), 0, 1, _("Offset:"), 0, 0, dm->params.offset, -1, 1, 0.001, 0.01, 3, TRUE, 0, 0, NULL, NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (dialogValueScaleUpdateCallback), - &(dm->params.offset)); - gtk_object_set_user_data (GTK_OBJECT (adj), dm); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (dialogValueScaleUpdateCallback), + &(dm->params.offset)); + g_object_set_data (G_OBJECT (adj), "dm", dm); adj = gimp_scale_entry_new (GTK_TABLE (numericParameterTable), 0, 2, _("Scale 1:"), 0, 0, dm->params.scale1, -1, 1, 0.001, 0.01, 3, TRUE, 0, 0, NULL, NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (dialogValueScaleUpdateCallback), - &(dm->params.scale1)); - gtk_object_set_user_data (GTK_OBJECT (adj), dm); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (dialogValueScaleUpdateCallback), + &(dm->params.scale1)); + g_object_set_data (G_OBJECT (adj), "dm", dm); adj = gimp_scale_entry_new (GTK_TABLE (numericParameterTable), 0, 3, _("Scale 2:"), 0, 0, dm->params.scale2, -1, 1, 0.001, 0.01, 3, TRUE, 0, 0, NULL, NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (dialogValueScaleUpdateCallback), - &(dm->params.scale2)); - gtk_object_set_user_data (GTK_OBJECT (adj), dm); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (dialogValueScaleUpdateCallback), + &(dm->params.scale2)); + g_object_set_data (G_OBJECT (adj), "dm", dm); dm->interface->active = TRUE; @@ -926,8 +927,7 @@ DepthMerge_updatePreview (DepthMerge *dm) g_free(resultRowRGBA); g_free(resultRow); - gtk_widget_draw(dm->interface->preview, NULL); - gdk_flush(); + gtk_widget_queue_draw(dm->interface->preview); } /* ----- Callbacks ----- */ @@ -1078,7 +1078,7 @@ void dialogValueScaleUpdateCallback (GtkAdjustment *adjustment, gpointer data) { - DepthMerge *dm = gtk_object_get_user_data (GTK_OBJECT (adjustment)); + DepthMerge *dm = g_object_get_data (G_OBJECT (adjustment), "dm"); gimp_float_adjustment_update (adjustment, data); diff --git a/plug-ins/common/despeckle.c b/plug-ins/common/despeckle.c index dfab28eead..2d40f206ce 100644 --- a/plug-ins/common/despeckle.c +++ b/plug-ins/common/despeckle.c @@ -627,9 +627,9 @@ despeckle_dialog (void) g_free (plugin_name); - gtk_signal_connect (GTK_OBJECT (dialog), "destroy", - GTK_SIGNAL_FUNC (gtk_main_quit), - NULL); + g_signal_connect (G_OBJECT (dialog), "destroy", + G_CALLBACK (gtk_main_quit), + NULL); main_vbox = gtk_vbox_new (FALSE, 4); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 6); @@ -666,9 +666,9 @@ despeckle_dialog (void) MIN (preview_width, sel_width), MIN (preview_width, sel_width)); - gtk_signal_connect (hscroll_data, "value_changed", - GTK_SIGNAL_FUNC (preview_scroll_callback), - NULL); + g_signal_connect (G_OBJECT (hscroll_data), "value_changed", + G_CALLBACK (preview_scroll_callback), + NULL); scrollbar = gtk_hscrollbar_new (GTK_ADJUSTMENT(hscroll_data)); gtk_range_set_update_policy (GTK_RANGE (scrollbar), GTK_UPDATE_CONTINUOUS); @@ -679,9 +679,9 @@ despeckle_dialog (void) MIN (preview_height, sel_height), MIN (preview_height, sel_height)); - gtk_signal_connect (vscroll_data, "value_changed", - GTK_SIGNAL_FUNC (preview_scroll_callback), - NULL); + g_signal_connect (G_OBJECT (vscroll_data), "value_changed", + G_CALLBACK (preview_scroll_callback), + NULL); scrollbar = gtk_vscrollbar_new (GTK_ADJUSTMENT (vscroll_data)); gtk_range_set_update_policy (GTK_RANGE (scrollbar), GTK_UPDATE_CONTINUOUS); @@ -713,20 +713,22 @@ despeckle_dialog (void) gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), (filter_type & FILTER_ADAPTIVE) ? TRUE : FALSE); - gtk_signal_connect (GTK_OBJECT (button), "toggled", - GTK_SIGNAL_FUNC (dialog_adaptive_callback), - NULL); gtk_widget_show (button); + g_signal_connect (G_OBJECT (button), "toggled", + G_CALLBACK (dialog_adaptive_callback), + NULL); + button = gtk_check_button_new_with_label (_("Recursive")); gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), (filter_type & FILTER_RECURSIVE) ? TRUE : FALSE); - gtk_signal_connect (GTK_OBJECT (button), "toggled", - GTK_SIGNAL_FUNC (dialog_recursive_callback), - NULL); gtk_widget_show (button); + g_signal_connect (G_OBJECT (button), "toggled", + G_CALLBACK (dialog_recursive_callback), + NULL); + frame = gtk_frame_new (_("Parameter Settings")); gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0); gtk_widget_show (frame); @@ -747,9 +749,9 @@ despeckle_dialog (void) despeckle_radius, 1, MAX_RADIUS, 1, 5, 0, TRUE, 0, 0, NULL, NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (dialog_iscale_update), - &despeckle_radius); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (dialog_iscale_update), + &despeckle_radius); /* * Black level control... @@ -760,9 +762,9 @@ despeckle_dialog (void) black_level, -1, 255, 1, 8, 0, TRUE, 0, 0, NULL, NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (dialog_iscale_update), - &black_level); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (dialog_iscale_update), + &black_level); /* * White level control... @@ -773,9 +775,9 @@ despeckle_dialog (void) white_level, 0, 256, 1, 8, 0, TRUE, 0, 0, NULL, NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (dialog_iscale_update), - &white_level); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (dialog_iscale_update), + &white_level); /* * Show it and wait for the user to do something... @@ -1073,8 +1075,7 @@ preview_update (void) y ++, rgb_ptr += preview_width * 3) gtk_preview_draw_row (GTK_PREVIEW (preview), rgb_ptr, 0, y, preview_width); - gtk_widget_draw (preview, NULL); - gdk_flush (); + gtk_widget_queue_draw (preview); } static void diff --git a/plug-ins/common/destripe.c b/plug-ins/common/destripe.c index 487946a4c5..296c65aeec 100644 --- a/plug-ins/common/destripe.c +++ b/plug-ins/common/destripe.c @@ -69,10 +69,10 @@ */ static void query (void); -static void run (gchar *name, - gint nparams, +static void run (gchar *name, + gint nparams, GimpParam *param, - gint *nreturn_vals, + gint *nreturn_vals, GimpParam **return_vals); static void destripe (void); @@ -129,10 +129,10 @@ query (void) { static GimpParamDef args[] = { - { GIMP_PDB_INT32, "run_mode", "Interactive, non-interactive" }, - { GIMP_PDB_IMAGE, "image", "Input image" }, - { GIMP_PDB_DRAWABLE, "drawable", "Input drawable" }, - { GIMP_PDB_INT32, "avg_width", "Averaging filter width (default = 36)" } + { GIMP_PDB_INT32, "run_mode", "Interactive, non-interactive" }, + { GIMP_PDB_IMAGE, "image", "Input image" }, + { GIMP_PDB_DRAWABLE, "drawable", "Input drawable" }, + { GIMP_PDB_INT32, "avg_width", "Averaging filter width (default = 36)" } }; gimp_install_procedure (PLUG_IN_NAME, @@ -151,15 +151,15 @@ query (void) } static void -run (gchar *name, - gint nparams, - GimpParam *param, - gint *nreturn_vals, +run (gchar *name, + gint nparams, + GimpParam *param, + gint *nreturn_vals, GimpParam **return_vals) { - GimpRunMode run_mode; /* Current run mode */ - GimpPDBStatusType status; /* Return status */ - static GimpParam values[1]; /* Return values */ + GimpRunMode run_mode; /* Current run mode */ + GimpPDBStatusType status; /* Return status */ + static GimpParam values[1]; /* Return values */ INIT_I18N_UI(); @@ -503,8 +503,7 @@ destripe_rect (gint sel_x1, if (do_preview) { - gtk_widget_draw (preview, NULL); - gdk_flush (); + gtk_widget_queue_draw (preview); } else { @@ -555,9 +554,9 @@ destripe_dialog (void) NULL); - gtk_signal_connect (GTK_OBJECT (dialog), "destroy", - GTK_SIGNAL_FUNC (gtk_main_quit), - NULL); + g_signal_connect (G_OBJECT (dialog), "destroy", + G_CALLBACK (gtk_main_quit), + NULL); /* * Top-level table for dialog... @@ -604,9 +603,9 @@ destripe_dialog (void) MIN (preview_width, sel_x2 - sel_x1), MIN (preview_width, sel_x2 - sel_x1)); - gtk_signal_connect (hscroll_data, "value_changed", - GTK_SIGNAL_FUNC (preview_scroll_callback), - NULL); + g_signal_connect (G_OBJECT (hscroll_data), "value_changed", + G_CALLBACK (preview_scroll_callback), + NULL); scrollbar = gtk_hscrollbar_new (GTK_ADJUSTMENT (hscroll_data)); gtk_range_set_update_policy (GTK_RANGE (scrollbar), GTK_UPDATE_CONTINUOUS); @@ -618,9 +617,9 @@ destripe_dialog (void) MIN (preview_height, sel_y2 - sel_y1), MIN (preview_height, sel_y2 - sel_y1)); - gtk_signal_connect (vscroll_data, "value_changed", - GTK_SIGNAL_FUNC (preview_scroll_callback), - NULL); + g_signal_connect (G_OBJECT (vscroll_data), "value_changed", + G_CALLBACK (preview_scroll_callback), + NULL); scrollbar = gtk_vscrollbar_new (GTK_ADJUSTMENT (vscroll_data)); gtk_range_set_update_policy (GTK_RANGE (scrollbar), GTK_UPDATE_CONTINUOUS); @@ -649,18 +648,19 @@ destripe_dialog (void) gtk_table_attach_defaults (GTK_TABLE (table), button, 0, 3, 0, 1); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), histogram ? TRUE : FALSE); - gtk_signal_connect (GTK_OBJECT (button), "toggled", - GTK_SIGNAL_FUNC (dialog_histogram_callback), - NULL); gtk_widget_show (button); + g_signal_connect (G_OBJECT (button), "toggled", + G_CALLBACK (dialog_histogram_callback), + NULL); + /* button = gtk_check_button_new_with_label("Recursive"); gtk_table_attach_defaults (GTK_TABLE (table), button, 0, 1, 1, 2); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), (filter_type & FILTER_RECURSIVE) ? TRUE : FALSE); - gtk_signal_connect (GTK_OBJECT (button), "toggled", - GTK_SIGNAL_FUNC (dialog_recursive_callback), - NULL); + g_signal_connect (G_OBJECT (button), "toggled", + G_CALLBACK (dialog_recursive_callback), + NULL); gtk_widget_show (button);*/ /* @@ -672,9 +672,9 @@ destripe_dialog (void) avg_width, 2, MAX_AVG, 1, 10, 0, TRUE, 0, 0, NULL, NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (dialog_iscale_update), - &avg_width); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (dialog_iscale_update), + &avg_width); gtk_widget_show (dialog); diff --git a/plug-ins/common/diffraction.c b/plug-ins/common/diffraction.c index 8cb9ed83e5..8549352755 100644 --- a/plug-ins/common/diffraction.c +++ b/plug-ins/common/diffraction.c @@ -537,9 +537,9 @@ diffraction_dialog (void) NULL); - gtk_signal_connect (GTK_OBJECT (dialog), "destroy", - GTK_SIGNAL_FUNC (gtk_main_quit), - NULL); + g_signal_connect (G_OBJECT (dialog), "destroy", + G_CALLBACK (gtk_main_quit), + NULL); top_table = gtk_table_new (2, 2, FALSE); gtk_container_set_border_width(GTK_CONTAINER (top_table), 6); @@ -572,13 +572,14 @@ diffraction_dialog (void) gtk_widget_show (dint.progress); button = gtk_button_new_with_label (_("Preview!")); - gtk_signal_connect (GTK_OBJECT (button), "clicked", - GTK_SIGNAL_FUNC (dialog_update_callback), - NULL); gtk_table_attach (GTK_TABLE (top_table), button, 0, 1, 1, 2, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0); gtk_widget_show (button); + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (dialog_update_callback), + NULL); + /* Notebook */ notebook = gtk_notebook_new (); @@ -600,27 +601,27 @@ diffraction_dialog (void) dvals.lam_r, 0.0, 20.0, 0.2, 1.0, 3, TRUE, 0, 0, NULL, NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &dvals.lam_r); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &dvals.lam_r); adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 1, _("Green:"), SCALE_WIDTH, 0, dvals.lam_g, 0.0, 20.0, 0.2, 1.0, 3, TRUE, 0, 0, NULL, NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &dvals.lam_g); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &dvals.lam_g); adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 2, _("Blue:"), SCALE_WIDTH, 0, dvals.lam_b, 0.0, 20.0, 0.2, 1.0, 3, TRUE, 0, 0, NULL, NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &dvals.lam_b); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &dvals.lam_b); label = gtk_label_new (_("Frequencies")); gtk_misc_set_alignment (GTK_MISC (label), 0.5, 0.5); @@ -639,27 +640,27 @@ diffraction_dialog (void) dvals.contour_r, 0.0, 10.0, 0.1, 1.0, 3, TRUE, 0, 0, NULL, NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &dvals.contour_r); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &dvals.contour_r); adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 1, _("Green:"), SCALE_WIDTH, 0, dvals.contour_g, 0.0, 10.0, 0.1, 1.0, 3, TRUE, 0, 0, NULL, NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &dvals.contour_g); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &dvals.contour_g); adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 2, _("Blue:"), SCALE_WIDTH, 0, dvals.contour_b, 0.0, 10.0, 0.1, 1.0, 3, TRUE, 0, 0, NULL, NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &dvals.contour_b); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &dvals.contour_b); label = gtk_label_new (_("Contours")); gtk_misc_set_alignment (GTK_MISC (label), 0.5, 0.5); @@ -678,27 +679,27 @@ diffraction_dialog (void) dvals.edges_r, 0.0, 1.0, 0.01, 0.1, 3, TRUE, 0, 0, NULL, NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &dvals.edges_r); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &dvals.edges_r); adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 1, _("Green:"), SCALE_WIDTH, 0, dvals.edges_g, 0.0, 1.0, 0.01, 0.1, 3, TRUE, 0, 0, NULL, NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &dvals.edges_g); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &dvals.edges_g); adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 2, _("Blue:"), SCALE_WIDTH, 0, dvals.edges_b, 0.0, 1.0, 0.01, 0.1, 3, TRUE, 0, 0, NULL, NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &dvals.edges_b); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &dvals.edges_b); label = gtk_label_new (_("Sharp edges")); gtk_misc_set_alignment (GTK_MISC (label), 0.5, 0.5); @@ -717,27 +718,27 @@ diffraction_dialog (void) dvals.brightness, 0.0, 1.0, 0.01, 0.1, 3, TRUE, 0, 0, NULL, NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &dvals.brightness); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &dvals.brightness); adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 1, _("Scattering:"), SCALE_WIDTH, 0, dvals.scattering, 0.0, 100.0, 1.0, 10.0, 3, TRUE, 0, 0, NULL, NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &dvals.scattering); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &dvals.scattering); adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 2, _("Polatization:"), SCALE_WIDTH, 0, dvals.polarization, -1.0, 1.0, 0.02, 0.2, 3, TRUE, 0, 0, NULL, NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &dvals.polarization); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &dvals.polarization); label = gtk_label_new (_("Other options")); gtk_misc_set_alignment (GTK_MISC (label), 0.5, 0.5); @@ -793,17 +794,15 @@ dialog_update_preview (void) gtk_preview_draw_row (GTK_PREVIEW (dint.preview), dint.preview_row, 0, y, PREVIEW_WIDTH); - gtk_progress_bar_update (GTK_PROGRESS_BAR (dint.progress), - (double) y / (double) (PREVIEW_HEIGHT - 1)); - gtk_widget_draw (dint.progress, NULL); - gdk_flush (); + gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (dint.progress), + (double) y / (double) (PREVIEW_HEIGHT - 1)); + gtk_widget_queue_draw (dint.progress); py += dy; } - gtk_widget_draw (dint.preview, NULL); - gtk_progress_bar_update (GTK_PROGRESS_BAR (dint.progress), 0.0); - gdk_flush (); + gtk_widget_queue_draw (dint.preview); + gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (dint.progress), 0.0); } static void diff --git a/plug-ins/common/displace.c b/plug-ins/common/displace.c index 62e4536101..978ad3f2df 100644 --- a/plug-ins/common/displace.c +++ b/plug-ins/common/displace.c @@ -83,30 +83,30 @@ typedef struct */ static void query (void); -static void run (gchar *name, - gint nparams, - GimpParam *param, - gint *nreturn_vals, - GimpParam **return_vals); +static void run (gchar *name, + gint nparams, + GimpParam *param, + gint *nreturn_vals, + GimpParam **return_vals); static void displace (GimpDrawable *drawable); static gint displace_dialog (GimpDrawable *drawable); -static GimpTile * displace_pixel (GimpDrawable * drawable, - GimpTile * tile, - gint width, - gint height, - gint x1, - gint y1, - gint x2, - gint y2, - gint x, - gint y, - gint * row, - gint * col, - guchar * pixel); -static guchar bilinear (gdouble x, - gdouble y, - guchar * v); +static GimpTile *displace_pixel (GimpDrawable *drawable, + GimpTile *tile, + gint width, + gint height, + gint x1, + gint y1, + gint x2, + gint y2, + gint x, + gint y, + gint *row, + gint *col, + guchar *pixel); +static guchar bilinear (gdouble x, + gdouble y, + guchar *v); static gint displace_map_constrain (gint32 image_id, gint32 drawable_id, @@ -117,9 +117,10 @@ static void displace_map_y_callback (gint32 id, gpointer data); static void displace_ok_callback (GtkWidget *widget, gpointer data); -static gdouble displace_map_give_value (guchar* ptr, - gint alpha, - gint bytes); +static gdouble displace_map_give_value (guchar *ptr, + gint alpha, + gint bytes); + /***** Local vars *****/ GimpPlugInInfo PLUG_IN_INFO = @@ -155,16 +156,16 @@ query (void) { static GimpParamDef args[] = { - { GIMP_PDB_INT32, "run_mode", "Interactive, non-interactive" }, - { GIMP_PDB_IMAGE, "image", "Input image (unused)" }, - { GIMP_PDB_DRAWABLE, "drawable", "Input drawable" }, - { GIMP_PDB_FLOAT, "amount_x", "Displace multiplier for X direction" }, - { GIMP_PDB_FLOAT, "amount_y", "Displace multiplier for Y direction" }, - { GIMP_PDB_INT32, "do_x", "Displace in X direction?" }, - { GIMP_PDB_INT32, "do_y", "Displace in Y direction?" }, + { GIMP_PDB_INT32, "run_mode", "Interactive, non-interactive" }, + { GIMP_PDB_IMAGE, "image", "Input image (unused)" }, + { GIMP_PDB_DRAWABLE, "drawable", "Input drawable" }, + { GIMP_PDB_FLOAT, "amount_x", "Displace multiplier for X direction" }, + { GIMP_PDB_FLOAT, "amount_y", "Displace multiplier for Y direction" }, + { GIMP_PDB_INT32, "do_x", "Displace in X direction?" }, + { GIMP_PDB_INT32, "do_y", "Displace in Y direction?" }, { GIMP_PDB_DRAWABLE, "displace_map_x", "Displacement map for X direction" }, { GIMP_PDB_DRAWABLE, "displace_map_y", "Displacement map for Y direction" }, - { GIMP_PDB_INT32, "displace_type", "Edge behavior: { WRAP (0), SMEAR (1), BLACK (2) }" } + { GIMP_PDB_INT32, "displace_type", "Edge behavior: { WRAP (0), SMEAR (1), BLACK (2) }" } }; gimp_install_procedure ("plug_in_displace", @@ -187,16 +188,16 @@ query (void) } static void -run (gchar *name, - gint nparams, +run (gchar *name, + gint nparams, GimpParam *param, - gint *nreturn_vals, + gint *nreturn_vals, GimpParam **return_vals) { - static GimpParam values[1]; - GimpDrawable *drawable; - GimpRunMode run_mode; - GimpPDBStatusType status = GIMP_PDB_SUCCESS; + static GimpParam values[1]; + GimpDrawable *drawable; + GimpRunMode run_mode; + GimpPDBStatusType status = GIMP_PDB_SUCCESS; run_mode = param[0].data.d_int32; @@ -205,6 +206,7 @@ run (gchar *name, *nreturn_vals = 1; *return_vals = values; + values[0].type = GIMP_PDB_STATUS; values[0].data.d_status = status; @@ -301,9 +303,9 @@ displace_dialog (GimpDrawable *drawable) NULL); - gtk_signal_connect (GTK_OBJECT (dlg), "destroy", - GTK_SIGNAL_FUNC (gtk_main_quit), - NULL); + g_signal_connect (G_OBJECT (dlg), "destroy", + G_CALLBACK (gtk_main_quit), + NULL); /* The main table */ frame = gtk_frame_new (_("Displace Options")); @@ -321,24 +323,26 @@ displace_dialog (GimpDrawable *drawable) toggle = gtk_check_button_new_with_label (_("X Displacement:")); gtk_table_attach (GTK_TABLE (table), toggle, 0, 1, 0, 1, GTK_FILL, GTK_FILL, 0, 0); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - GTK_SIGNAL_FUNC (gimp_toggle_button_update), - &dvals.do_x); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), dvals.do_x); gtk_widget_show (toggle); + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (gimp_toggle_button_update), + &dvals.do_x); + spinbutton = gimp_spin_button_new (&adj, dvals.amount_x, (gint) drawable->width * -2, drawable->width * 2, 1, 10, 0, 1, 2); gtk_table_attach (GTK_TABLE (table), spinbutton, 1, 2, 0, 1, GTK_FILL, GTK_FILL, 0, 0); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &dvals.amount_x); + + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &dvals.amount_x); gtk_widget_set_sensitive (spinbutton, dvals.do_x); - gtk_object_set_data (GTK_OBJECT (toggle), "set_sensitive", spinbutton); + g_object_set_data (G_OBJECT (toggle), "set_sensitive", spinbutton); gtk_widget_show (spinbutton); option_menu = gtk_option_menu_new (); @@ -349,31 +353,33 @@ displace_dialog (GimpDrawable *drawable) gtk_option_menu_set_menu (GTK_OPTION_MENU (option_menu), menu); gtk_widget_set_sensitive (option_menu, dvals.do_x); - gtk_object_set_data (GTK_OBJECT (spinbutton), "set_sensitive", option_menu); + g_object_set_data (G_OBJECT (spinbutton), "set_sensitive", option_menu); gtk_widget_show (option_menu); /* Y Options */ toggle = gtk_check_button_new_with_label (_("Y Displacement:")); gtk_table_attach (GTK_TABLE (table), toggle, 0, 1, 1, 2, GTK_FILL, GTK_FILL, 0, 0); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - GTK_SIGNAL_FUNC (gimp_toggle_button_update), - &dvals.do_y); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), dvals.do_y); gtk_widget_show (toggle); + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (gimp_toggle_button_update), + &dvals.do_y); + spinbutton = gimp_spin_button_new (&adj, dvals.amount_y, (gint) drawable->height * -2, drawable->height * 2, 1, 10, 0, 1, 2); gtk_table_attach (GTK_TABLE (table), spinbutton, 1, 2, 1, 2, GTK_FILL, GTK_FILL, 0, 0); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &dvals.amount_y); + + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &dvals.amount_y); gtk_widget_set_sensitive (spinbutton, dvals.do_y); - gtk_object_set_data (GTK_OBJECT (toggle), "set_sensitive", spinbutton); + g_object_set_data (G_OBJECT (toggle), "set_sensitive", spinbutton); gtk_widget_show (spinbutton); option_menu = gtk_option_menu_new (); @@ -384,7 +390,7 @@ displace_dialog (GimpDrawable *drawable) gtk_option_menu_set_menu (GTK_OPTION_MENU (option_menu), menu); gtk_widget_set_sensitive (option_menu, dvals.do_y); - gtk_object_set_data (GTK_OBJECT (spinbutton), "set_sensitive", option_menu); + g_object_set_data (G_OBJECT (spinbutton), "set_sensitive", option_menu); gtk_widget_show (option_menu); /* Displacement Type */ @@ -401,37 +407,46 @@ displace_dialog (GimpDrawable *drawable) gtk_widget_show (label); toggle = gtk_radio_button_new_with_label (group, _("Wrap")); - 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 (toggle_hbox), toggle, FALSE, FALSE, 0); - gtk_object_set_user_data (GTK_OBJECT (toggle), (gpointer) WRAP); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - GTK_SIGNAL_FUNC (gimp_radio_button_update), - &dvals.displace_type); + gtk_widget_show (toggle); + + g_object_set_data (G_OBJECT (toggle), "gimp-item-data", + GINT_TO_POINTER (WRAP)); + + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (gimp_radio_button_update), + &dvals.displace_type); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), dvals.displace_type == WRAP); - gtk_widget_show (toggle); toggle = gtk_radio_button_new_with_label (group, _("Smear")); - 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 (toggle_hbox), toggle, FALSE, FALSE, 0); - gtk_object_set_user_data (GTK_OBJECT (toggle), (gpointer) SMEAR); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - GTK_SIGNAL_FUNC (gimp_radio_button_update), - &dvals.displace_type); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), - dvals.displace_type == SMEAR); gtk_widget_show (toggle); + g_object_set_data (G_OBJECT (toggle), "gimp-item-data", + GINT_TO_POINTER (SMEAR)); + + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (gimp_radio_button_update), + &dvals.displace_type); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), + dvals.displace_type == SMEAR); + toggle = gtk_radio_button_new_with_label (group, _("Black")); - 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 (toggle_hbox), toggle, FALSE, FALSE, 0); - gtk_object_set_user_data (GTK_OBJECT (toggle), (gpointer) BLACK); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - GTK_SIGNAL_FUNC (gimp_radio_button_update), - &dvals.displace_type); + gtk_widget_show (toggle); + + g_object_set_data (G_OBJECT (toggle), "gimp-item-data", + GINT_TO_POINTER (BLACK)); + + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (gimp_radio_button_update), + &dvals.displace_type); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), dvals.displace_type == BLACK); - gtk_widget_show (toggle); gtk_widget_show (toggle_hbox); gtk_widget_show (table); diff --git a/plug-ins/common/edge.c b/plug-ins/common/edge.c index c1a0ea0633..189752248f 100644 --- a/plug-ins/common/edge.c +++ b/plug-ins/common/edge.c @@ -84,11 +84,11 @@ typedef struct typedef struct { GimpTile *tile; - gint row, col; /* tile's row, col */ - gint bpp; - gint tile_width, tile_height; + gint row, col; /* tile's row, col */ + gint bpp; + gint tile_width, tile_height; GimpDrawable *drawable; - gint drawable_width, drawable_height; + gint drawable_width, drawable_height; } TileBuf; /* @@ -96,25 +96,25 @@ typedef struct */ static void query (void); -static void run (gchar *name, - gint nparams, - GimpParam *param, - gint *nreturn_vals, - GimpParam **return_vals); +static void run (gchar *name, + gint nparams, + GimpParam *param, + gint *nreturn_vals, + GimpParam **return_vals); static void edge (GimpDrawable *drawable); static gint edge_dialog (GimpDrawable *drawable); static long long_sqrt (long n); -static void init_tile_buf (TileBuf *buf, +static void init_tile_buf (TileBuf *buf, GimpDrawable *drawable); -static void get_tile_pixel (TileBuf *buf, - gint x, - gint y, - guchar *pixel, - gint wrapmode); -static void end_tile_buf (TileBuf *buf); +static void get_tile_pixel (TileBuf *buf, + gint x, + gint y, + guchar *pixel, + gint wrapmode); +static void end_tile_buf (TileBuf *buf); /***** Local vars *****/ @@ -172,16 +172,16 @@ query (void) } static void -run (gchar *name, - gint nparams, +run (gchar *name, + gint nparams, GimpParam *param, - gint *nreturn_vals, + gint *nreturn_vals, GimpParam **return_vals) { - static GimpParam values[1]; - GimpDrawable *drawable; - GimpRunMode run_mode; - GimpPDBStatusType status = GIMP_PDB_SUCCESS; + static GimpParam values[1]; + GimpDrawable *drawable; + GimpRunMode run_mode; + GimpPDBStatusType status = GIMP_PDB_SUCCESS; run_mode = param[0].data.d_int32; @@ -189,9 +189,9 @@ run (gchar *name, drawable = gimp_drawable_get (param[2].data.d_drawable); *nreturn_vals = 1; - *return_vals = values; + *return_vals = values; - values[0].type = GIMP_PDB_STATUS; + values[0].type = GIMP_PDB_STATUS; values[0].data.d_status = status; switch (run_mode) @@ -266,7 +266,7 @@ run (gchar *name, **********************************************************************/ static void -init_tile_buf (TileBuf *buf, +init_tile_buf (TileBuf *buf, GimpDrawable *drawable) { buf->tile = NULL; @@ -653,9 +653,9 @@ edge_dialog (GimpDrawable *drawable) NULL); - gtk_signal_connect (GTK_OBJECT (dlg), "destroy", - GTK_SIGNAL_FUNC (gtk_main_quit), - NULL); + g_signal_connect (G_OBJECT (dlg), "destroy", + G_CALLBACK (gtk_main_quit), + NULL); /* parameter settings */ frame = gtk_frame_new (_("Parameter Settings")); @@ -676,43 +676,46 @@ edge_dialog (GimpDrawable *drawable) TRUE, 0, 0, NULL, NULL); - gtk_signal_connect (GTK_OBJECT (scale_data), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &evals.amount); + g_signal_connect (G_OBJECT (scale_data), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &evals.amount); /* Radio buttons WRAP, SMEAR, BLACK */ hbox = gtk_hbox_new (FALSE, 4); gtk_table_attach (GTK_TABLE (table), hbox, 0, 3, 1, 2, GTK_FILL, GTK_FILL, 0, 0); + gtk_widget_show (hbox); toggle = gtk_radio_button_new_with_label (group, _("Wrap")); - 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, TRUE, TRUE, 0); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - GTK_SIGNAL_FUNC (gimp_toggle_button_update), - &use_wrap); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), use_wrap); gtk_widget_show (toggle); + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (gimp_toggle_button_update), + &use_wrap); + toggle = gtk_radio_button_new_with_label (group, _("Smear")); - 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, TRUE, TRUE, 0); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - GTK_SIGNAL_FUNC (gimp_toggle_button_update), - &use_smear); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), use_smear); gtk_widget_show (toggle); + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (gimp_toggle_button_update), + &use_smear); + toggle = gtk_radio_button_new_with_label (group, _("Black")); - 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, TRUE, TRUE, 0); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - GTK_SIGNAL_FUNC (gimp_toggle_button_update), - &use_black); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), use_black); gtk_widget_show (toggle); - gtk_widget_show (hbox); + + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (gimp_toggle_button_update), + &use_black); gtk_widget_show (table); gtk_widget_show (frame); diff --git a/plug-ins/common/emboss.c b/plug-ins/common/emboss.c index 9974a8c103..b840b24454 100644 --- a/plug-ins/common/emboss.c +++ b/plug-ins/common/emboss.c @@ -525,9 +525,9 @@ pluginCoreIA (struct piArgs *argp) NULL); - gtk_signal_connect (GTK_OBJECT (dlg), "destroy", - GTK_SIGNAL_FUNC (gtk_main_quit), - NULL); + g_signal_connect (G_OBJECT (dlg), "destroy", + G_CALLBACK (gtk_main_quit), + NULL); main_vbox = gtk_vbox_new (FALSE, 4); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 6); @@ -540,7 +540,7 @@ pluginCoreIA (struct piArgs *argp) gtk_widget_show (hbox); preview = mw_preview_new (hbox, thePreview); - gtk_object_set_data (GTK_OBJECT (preview), "piArgs", argp); + g_object_set_data (G_OBJECT (preview), "piArgs", argp); emboss_do_preview (preview); frame = gimp_radio_group_new2 (TRUE, _("Function"), @@ -571,27 +571,27 @@ pluginCoreIA (struct piArgs *argp) argp->azimuth, 0.0, 360.0, 1.0, 10.0, 2, TRUE, 0, 0, NULL, NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (emboss_float_adjustment_callback), - &argp->azimuth); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (emboss_float_adjustment_callback), + &argp->azimuth); adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 1, _("Elevation:"), 100, 0, argp->elevation, 0.0, 180.0, 1.0, 10.0, 2, TRUE, 0, 0, NULL, NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (emboss_float_adjustment_callback), - &argp->elevation); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (emboss_float_adjustment_callback), + &argp->elevation); adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 2, _("Depth:"), 100, 0, argp->depth, 1.0, 100.0, 1.0, 5.0, 0, TRUE, 0, 0, NULL, NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (emboss_int_adjustment_callback), - &argp->depth); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (emboss_int_adjustment_callback), + &argp->depth); gtk_widget_show (table); @@ -619,7 +619,7 @@ emboss_do_preview (GtkWidget *w) theWidget = w; } - ap = gtk_object_get_data (GTK_OBJECT (theWidget), "piArgs"); + ap = g_object_get_data (G_OBJECT (theWidget), "piArgs"); rowsize = thePreview->width * thePreview->bpp; dst = g_malloc (rowsize); @@ -653,8 +653,8 @@ emboss_do_preview (GtkWidget *w) dst, 0, y, thePreview->width); } - gtk_widget_draw (theWidget, NULL); - gdk_flush (); + gtk_widget_queue_draw (theWidget); + g_free (dst); } @@ -757,11 +757,12 @@ mw_preview_new (GtkWidget *parent, button = gtk_check_button_new_with_label (_("Do Preview")); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), do_preview); - gtk_signal_connect (GTK_OBJECT (button), "toggled", - GTK_SIGNAL_FUNC (mw_preview_toggle_callback), - &do_preview); gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0); gtk_widget_show (button); + g_signal_connect (G_OBJECT (button), "toggled", + G_CALLBACK (mw_preview_toggle_callback), + &do_preview); + return preview; } diff --git a/plug-ins/common/engrave.c b/plug-ins/common/engrave.c index 3ea9dfbebe..6a0754d844 100644 --- a/plug-ins/common/engrave.c +++ b/plug-ins/common/engrave.c @@ -53,10 +53,10 @@ typedef struct } EngraveInterface; static void query (void); -static void run (gchar *name, - gint nparams, +static void run (gchar *name, + gint nparams, GimpParam *param, - gint *nreturn_vals, + gint *nreturn_vals, GimpParam **return_vals); static gint engrave_dialog (void); @@ -65,16 +65,16 @@ static void engrave_ok_callback (GtkWidget *widget, static void engrave (GimpDrawable *drawable); static void engrave_large (GimpDrawable *drawable, - gint height, - gint limit); + gint height, + gint limit); static void engrave_small (GimpDrawable *drawable, - gint height, - gint limit, - gint tile_width); -static void engrave_sub (gint height, - gint limit, - gint bpp, - gint color_n); + gint height, + gint limit, + gint tile_width); +static void engrave_sub (gint height, + gint limit, + gint bpp, + gint color_n); GimpPlugInInfo PLUG_IN_INFO = { @@ -91,7 +91,7 @@ static EngraveValues pvals = static EngraveInterface pint = { - FALSE /* run */ + FALSE /* run */ }; @@ -123,23 +123,23 @@ query (void) } static void -run (gchar *name, - gint nparams, +run (gchar *name, + gint nparams, GimpParam *param, - gint *nreturn_vals, + gint *nreturn_vals, GimpParam **return_vals) { - static GimpParam values[1]; - GimpDrawable *drawable; - GimpRunMode run_mode; - GimpPDBStatusType status = GIMP_PDB_SUCCESS; + static GimpParam values[1]; + GimpDrawable *drawable; + GimpRunMode run_mode; + GimpPDBStatusType status = GIMP_PDB_SUCCESS; run_mode = param[0].data.d_int32; *nreturn_vals = 1; - *return_vals = values; + *return_vals = values; - values[0].type = GIMP_PDB_STATUS; + values[0].type = GIMP_PDB_STATUS; values[0].data.d_status = status; /* Get the specified drawable */ @@ -227,9 +227,9 @@ engrave_dialog (void) NULL); - gtk_signal_connect (GTK_OBJECT (dlg), "destroy", - GTK_SIGNAL_FUNC (gtk_main_quit), - NULL); + g_signal_connect (G_OBJECT (dlg), "destroy", + G_CALLBACK (gtk_main_quit), + NULL); /* parameter settings */ frame = gtk_frame_new (_("Parameter Settings")); @@ -245,20 +245,21 @@ engrave_dialog (void) toggle = gtk_check_button_new_with_label (_("Limit Line Width")); gtk_table_attach (GTK_TABLE (table), toggle, 0, 3, 0, 1, GTK_FILL, 0, 0, 0); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - GTK_SIGNAL_FUNC (gimp_toggle_button_update), - &pvals.limit); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), pvals.limit); gtk_widget_show (toggle); + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (gimp_toggle_button_update), + &pvals.limit); + adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 1, _("Height:"), SCALE_WIDTH, 0, pvals.height, 2.0, 16.0, 1.0, 4.0, 0, TRUE, 0, 0, NULL, NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_int_adjustment_update), - &pvals.height); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_int_adjustment_update), + &pvals.height); gtk_widget_show (frame); gtk_widget_show (table); diff --git a/plug-ins/common/exchange.c b/plug-ins/common/exchange.c index 854b96e13f..bb79d2bc99 100644 --- a/plug-ins/common/exchange.c +++ b/plug-ins/common/exchange.c @@ -325,9 +325,9 @@ exchange_dialog (void) NULL); - gtk_signal_connect (GTK_OBJECT (dialog), "destroy", - GTK_SIGNAL_FUNC (gtk_main_quit), - NULL); + g_signal_connect (G_OBJECT (dialog), "destroy", + G_CALLBACK (gtk_main_quit), + NULL); /* do some boxes here */ mainbox = gtk_vbox_new (FALSE, 4); @@ -355,22 +355,25 @@ exchange_dialog (void) gtk_container_add (GTK_CONTAINER (pframe), preview); gtk_widget_set_events (GTK_WIDGET(preview), GDK_BUTTON_PRESS_MASK | GDK_BUTTON1_MOTION_MASK); - gtk_signal_connect (GTK_OBJECT (preview), "event", - GTK_SIGNAL_FUNC (preview_event_handler), - NULL); - update_preview (); gtk_widget_show (preview); + g_signal_connect (G_OBJECT (preview), "event", + G_CALLBACK (preview_event_handler), + NULL); + + update_preview (); + /* a hidden color_button to handle the threshold more easily */ threshold = gimp_color_button_new (NULL, 1, 1, &xargs.threshold, GIMP_COLOR_AREA_FLAT); - gtk_signal_connect (GTK_OBJECT (threshold), "color_changed", - GTK_SIGNAL_FUNC (gimp_color_button_get_color), - &xargs.threshold); - gtk_signal_connect (GTK_OBJECT (threshold), "color_changed", - GTK_SIGNAL_FUNC (color_button_callback), - &xargs.threshold); + + g_signal_connect (G_OBJECT (threshold), "color_changed", + G_CALLBACK (gimp_color_button_get_color), + &xargs.threshold); + g_signal_connect (G_OBJECT (threshold), "color_changed", + G_CALLBACK (color_button_callback), + &xargs.threshold); /* and our scales */ for (framenumber = 0; framenumber < 2; framenumber++) @@ -393,15 +396,16 @@ exchange_dialog (void) SCALE_WIDTH / 2, 16, framenumber ? &xargs.to : &xargs.from, GIMP_COLOR_AREA_FLAT); - gtk_signal_connect (GTK_OBJECT (colorbutton), "color_changed", - GTK_SIGNAL_FUNC (gimp_color_button_get_color), - framenumber ? &xargs.to : &xargs.from); - gtk_signal_connect (GTK_OBJECT (colorbutton), "color_changed", - GTK_SIGNAL_FUNC (color_button_callback), - framenumber ? &xargs.to : &xargs.from); gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, NULL, 0.0, 0.0, colorbutton, 1, TRUE); + + g_signal_connect (G_OBJECT (colorbutton), "color_changed", + G_CALLBACK (gimp_color_button_get_color), + framenumber ? &xargs.to : &xargs.from); + g_signal_connect (G_OBJECT (colorbutton), "color_changed", + G_CALLBACK (color_button_callback), + framenumber ? &xargs.to : &xargs.from); if (!framenumber) from_colorbutton = colorbutton; @@ -414,15 +418,15 @@ exchange_dialog (void) TRUE, 0, 0, NULL, NULL); - gtk_object_set_user_data (GTK_OBJECT (adj), colorbutton); - gtk_object_set_data (GTK_OBJECT (colorbutton), "red", adj); + g_object_set_data (G_OBJECT (adj), "colorbutton", colorbutton); + g_object_set_data (G_OBJECT (colorbutton), "red", adj); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - framenumber ? &xargs.to.r : &xargs.from.r); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (scale_callback), - framenumber ? &xargs.to : &xargs.from); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + framenumber ? &xargs.to.r : &xargs.from.r); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (scale_callback), + framenumber ? &xargs.to : &xargs.from); scale = GTK_WIDGET (GIMP_SCALE_ENTRY_SCALE (adj)); gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED); @@ -436,14 +440,15 @@ exchange_dialog (void) TRUE, 0, 0, NULL, NULL); - gtk_object_set_user_data (GTK_OBJECT (adj), threshold); - gtk_object_set_data (GTK_OBJECT (threshold), "red", adj); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &xargs.threshold.r); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (scale_callback), - &xargs.threshold); + g_object_set_data (G_OBJECT (adj), "colorbutton", threshold); + g_object_set_data (G_OBJECT (threshold), "red", adj); + + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &xargs.threshold.r); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (scale_callback), + &xargs.threshold); scale = GTK_WIDGET (GIMP_SCALE_ENTRY_SCALE (adj)); gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED); @@ -457,15 +462,15 @@ exchange_dialog (void) TRUE, 0, 0, NULL, NULL); - gtk_object_set_user_data (GTK_OBJECT (adj), colorbutton); - gtk_object_set_data (GTK_OBJECT (colorbutton), "green", adj); + g_object_set_data (G_OBJECT (adj), "colorbutton", colorbutton); + g_object_set_data (G_OBJECT (colorbutton), "green", adj); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - framenumber ? &xargs.to.g : &xargs.from.g); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (scale_callback), - framenumber ? &xargs.to : &xargs.from); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + framenumber ? &xargs.to.g : &xargs.from.g); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (scale_callback), + framenumber ? &xargs.to : &xargs.from); scale = GTK_WIDGET (GIMP_SCALE_ENTRY_SCALE (adj)); gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED); @@ -479,15 +484,15 @@ exchange_dialog (void) TRUE, 0, 0, NULL, NULL); - gtk_object_set_user_data (GTK_OBJECT (adj), threshold); - gtk_object_set_data (GTK_OBJECT (threshold), "green", adj); + g_object_set_data (G_OBJECT (adj), "colorbutton", threshold); + g_object_set_data (G_OBJECT (threshold), "green", adj); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &xargs.threshold.g); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (scale_callback), - &xargs.threshold); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &xargs.threshold.g); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (scale_callback), + &xargs.threshold); scale = GTK_WIDGET (GIMP_SCALE_ENTRY_SCALE (adj)); gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED); @@ -501,15 +506,15 @@ exchange_dialog (void) TRUE, 0, 0, NULL, NULL); - gtk_object_set_user_data (GTK_OBJECT (adj), colorbutton); - gtk_object_set_data (GTK_OBJECT (colorbutton), "blue", adj); + g_object_set_data (G_OBJECT (adj), "colorbutton", colorbutton); + g_object_set_data (G_OBJECT (colorbutton), "blue", adj); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - framenumber ? &xargs.to.b : &xargs.from.b); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (scale_callback), - framenumber ? &xargs.to : &xargs.from); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + framenumber ? &xargs.to.b : &xargs.from.b); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (scale_callback), + framenumber ? &xargs.to : &xargs.from); scale = GTK_WIDGET (GIMP_SCALE_ENTRY_SCALE (adj)); gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED); @@ -523,15 +528,15 @@ exchange_dialog (void) TRUE, 0, 0, NULL, NULL); - gtk_object_set_user_data (GTK_OBJECT (adj), threshold); - gtk_object_set_data (GTK_OBJECT (threshold), "blue", adj); + g_object_set_data (G_OBJECT (adj), "colorbutton", threshold); + g_object_set_data (G_OBJECT (threshold), "blue", adj); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &xargs.threshold.b); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (scale_callback), - &xargs.threshold); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &xargs.threshold.b); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (scale_callback), + &xargs.threshold); scale = GTK_WIDGET (GIMP_SCALE_ENTRY_SCALE (adj)); gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED); @@ -546,10 +551,11 @@ exchange_dialog (void) GTK_FILL, 0, 0, 0); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), lock_threshold); - gtk_signal_connect (GTK_OBJECT (button), "clicked", - GTK_SIGNAL_FUNC (gimp_toggle_button_update), - &lock_threshold); gtk_widget_show (button); + + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (gimp_toggle_button_update), + &lock_threshold); } } @@ -583,9 +589,9 @@ color_button_callback (GtkWidget *widget, color = (GimpRGB *) data; - red_adj = (GtkObject *) gtk_object_get_data (GTK_OBJECT (widget), "red"); - green_adj = (GtkObject *) gtk_object_get_data (GTK_OBJECT (widget), "green"); - blue_adj = (GtkObject *) gtk_object_get_data (GTK_OBJECT (widget), "blue"); + red_adj = (GtkObject *) g_object_get_data (G_OBJECT (widget), "red"); + green_adj = (GtkObject *) g_object_get_data (G_OBJECT (widget), "green"); + blue_adj = (GtkObject *) g_object_get_data (G_OBJECT (widget), "blue"); if (red_adj) gtk_adjustment_set_value (GTK_ADJUSTMENT (red_adj), color->r); @@ -606,9 +612,9 @@ scale_callback (GtkAdjustment *adj, color = (GimpRGB *) data; - object = gtk_object_get_user_data (GTK_OBJECT (adj)); + object = g_object_get_data (G_OBJECT (adj), "colorbutton"); - if (object && GIMP_IS_COLOR_BUTTON (object)) + if (GIMP_IS_COLOR_BUTTON (object)) { if (color == &xargs.threshold && lock_threshold == TRUE) gimp_rgb_set (color, adj->value, adj->value, adj->value); diff --git a/plug-ins/common/film.c b/plug-ins/common/film.c index 248cdb8ece..2f696433af 100644 --- a/plug-ins/common/film.c +++ b/plug-ins/common/film.c @@ -42,6 +42,12 @@ static char ident[] = "@(#) GIMP Film plug-in v1.04 1999-10-08"; #include +#ifdef __GNUC__ +#warning GTK_DISABLE_DEPRECATED +#endif +#undef GTK_DISABLE_DEPRECATED +#include + #include #include @@ -89,11 +95,11 @@ typedef struct /* Declare local functions */ static void query (void); -static void run (gchar *name, - gint nparams, - GimpParam *param, - gint *nreturn_vals, - GimpParam **return_vals); +static void run (gchar *name, + gint nparams, + GimpParam *param, + gint *nreturn_vals, + GimpParam **return_vals); static gint32 create_new_image (gchar *filename, @@ -101,8 +107,8 @@ static gint32 create_new_image (gchar *filename, guint height, GimpImageType gdtype, gint32 *layer_ID, - GimpDrawable **drawable, - GimpPixelRgn *pixel_rgn); + GimpDrawable **drawable, + GimpPixelRgn *pixel_rgn); static gchar * compose_image_name (gint32 image_ID); @@ -110,7 +116,7 @@ static gint32 film (void); static gint check_filmvals (void); -static void convert_to_rgb (GimpDrawable *srcdrawable, +static void convert_to_rgb (GimpDrawable *srcdrawable, gint numpix, guchar *src, guchar *dst); @@ -133,7 +139,7 @@ static gint scale_layer (gint32 src_layer, static guchar * create_hole_rgb (gint width, gint height); -static void draw_hole_rgb (GimpDrawable *drw, +static void draw_hole_rgb (GimpDrawable *drw, gint x, gint y, gint width, @@ -257,28 +263,28 @@ query (void) } static void -run (gchar *name, - gint nparams, +run (gchar *name, + gint nparams, GimpParam *param, - gint *nreturn_vals, + gint *nreturn_vals, GimpParam **return_vals) { - static GimpParam values[2]; + static GimpParam values[2]; GimpPDBStatusType status = GIMP_PDB_SUCCESS; - gint32 image_ID; - gint k; + gint32 image_ID; + gint k; INIT_I18N_UI(); run_mode = param[0].data.d_int32; *nreturn_vals = 2; - *return_vals = values; + *return_vals = values; - values[0].type = GIMP_PDB_STATUS; + values[0].type = GIMP_PDB_STATUS; values[0].data.d_status = status; - values[1].type = GIMP_PDB_IMAGE; - values[1].data.d_int32 = -1; + values[1].type = GIMP_PDB_IMAGE; + values[1].data.d_int32 = -1; switch (run_mode) { @@ -594,9 +600,9 @@ check_filmvals (void) /* Converts numpix pixels from src to RGB at dst */ static void convert_to_rgb (GimpDrawable *srcdrawable, - gint numpix, - guchar *src, - guchar *dst) + gint numpix, + guchar *src, + guchar *dst) { register guchar *from = src, *to = dst; @@ -839,11 +845,11 @@ create_hole_rgb (gint width, /* Draw the hole at the specified position */ static void draw_hole_rgb (GimpDrawable *drw, - gint x, - gint y, - gint width, - gint height, - guchar *hole) + gint x, + gint y, + gint width, + gint height, + guchar *hole) { GimpPixelRgn rgn; guchar *data; @@ -971,8 +977,8 @@ create_new_image (gchar *filename, guint height, GimpImageType gdtype, gint32 *layer_ID, - GimpDrawable **drawable, - GimpPixelRgn *pixel_rgn) + GimpDrawable **drawable, + GimpPixelRgn *pixel_rgn) { gint32 image_ID; GimpImageBaseType gitype; @@ -1043,11 +1049,13 @@ add_list_item_callback (GtkWidget *widget, { if ((label = (GtkWidget *) tmp_list->data) != NULL) { - image_ID = (gint32)gtk_object_get_user_data (GTK_OBJECT (label)); + image_ID = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (label), + "image")); list_item = gtk_list_item_new_with_label (compose_image_name (image_ID)); - gtk_object_set_user_data (GTK_OBJECT (list_item), (gpointer)image_ID); + g_object_set_data (G_OBJECT (list_item), "image", + GINT_TO_POINTER (image_ID)); gtk_container_add (GTK_CONTAINER (filmint.image_list_film), list_item); gtk_widget_show (list_item); } @@ -1122,20 +1130,23 @@ add_image_list (gint add_box_flag, list_item = gtk_list_item_new_with_label (compose_image_name (image_id[i])); - gtk_object_set_user_data (GTK_OBJECT (list_item), (gpointer) image_id[i]); + g_object_set_data (G_OBJECT (list_item), "image", + GINT_TO_POINTER (image_id[i])); gtk_container_add (GTK_CONTAINER (list), list_item); gtk_widget_show (list_item); } button = gtk_button_new_with_label (add_box_flag ? _("Add >>"):_("Remove")); GTK_WIDGET_UNSET_FLAGS (button, GTK_CAN_FOCUS); - gtk_signal_connect (GTK_OBJECT (button), "clicked", - add_box_flag ? (GtkSignalFunc) add_list_item_callback - : (GtkSignalFunc) del_list_item_callback, - list); gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0); gtk_widget_show (button); + g_signal_connect (G_OBJECT (button), "clicked", + add_box_flag ? + G_CALLBACK (add_list_item_callback) : + G_CALLBACK (del_list_item_callback), + list); + return list; } @@ -1174,9 +1185,9 @@ film_dialog (gint32 image_ID) NULL); - gtk_signal_connect (GTK_OBJECT (dlg), "destroy", - GTK_SIGNAL_FUNC (gtk_main_quit), - NULL); + g_signal_connect (G_OBJECT (dlg), "destroy", + G_CALLBACK (gtk_main_quit), + NULL); main_vbox = gtk_vbox_new (FALSE, 4); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 6); @@ -1206,11 +1217,12 @@ film_dialog (gint32 image_ID) /* Keep maximum image height */ toggle = gtk_check_button_new_with_label (_("Fit Height to Images")); gtk_box_pack_start (GTK_BOX (vbox), toggle, FALSE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - GTK_SIGNAL_FUNC (gimp_toggle_button_update), - &filmvals.keep_height); gtk_widget_show (toggle); + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (gimp_toggle_button_update), + &filmvals.keep_height); + table = gtk_table_new (2, 2, FALSE); gtk_table_set_row_spacings (GTK_TABLE (table), 4); gtk_table_set_col_spacings (GTK_TABLE (table), 4); @@ -1220,18 +1232,19 @@ film_dialog (gint32 image_ID) /* Film height */ spinbutton = gimp_spin_button_new (&adj, filmvals.film_height, 10, GIMP_MAX_IMAGE_SIZE, 1, 10, 0, 1, 0); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_int_adjustment_update), - &filmvals.film_height); gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, _("Height:"), 1.0, 0.5, spinbutton, 1, TRUE); - gtk_object_set_data (GTK_OBJECT (toggle), "inverse_sensitive", spinbutton); - gtk_object_set_data - (GTK_OBJECT (spinbutton), "inverse_sensitive", + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_int_adjustment_update), + &filmvals.film_height); + + g_object_set_data (G_OBJECT (toggle), "inverse_sensitive", spinbutton); + g_object_set_data + (G_OBJECT (spinbutton), "inverse_sensitive", /* FIXME: eeeeeek */ - g_list_nth_data (gtk_container_children (GTK_CONTAINER (table)), 1)); + g_list_nth_data (gtk_container_get_children (GTK_CONTAINER (table)), 1)); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), filmvals.keep_height); @@ -1240,14 +1253,14 @@ film_dialog (gint32 image_ID) COLOR_BUTTON_WIDTH, COLOR_BUTTON_HEIGHT, &filmvals.film_color, GIMP_COLOR_AREA_FLAT); - gtk_signal_connect (GTK_OBJECT (button), "color_changed", - GTK_SIGNAL_FUNC (gimp_color_button_get_color), - &filmvals.film_color); - gimp_table_attach_aligned (GTK_TABLE (table), 0, 1, _("Color:"), 1.0, 0.5, button, 1, TRUE); + g_signal_connect (G_OBJECT (button), "color_changed", + G_CALLBACK (gimp_color_button_get_color), + &filmvals.film_color); + gtk_widget_show (vbox); gtk_widget_show (frame); @@ -1269,13 +1282,14 @@ film_dialog (gint32 image_ID) /* Startindex */ spinbutton = gimp_spin_button_new (&adj, filmvals.number_start, 0, G_MAXINT, 1, 10, 0, 1, 0); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_int_adjustment_update), - &filmvals.number_start); gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, _("Start Index:"), 1.0, 0.5, spinbutton, 1, TRUE); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_int_adjustment_update), + &filmvals.number_start); + /* Fontfamily for numbering */ filmint.font_entry = entry = gtk_entry_new (); gtk_widget_set_size_request (entry, 60, -1); @@ -1289,24 +1303,26 @@ film_dialog (gint32 image_ID) COLOR_BUTTON_WIDTH, COLOR_BUTTON_HEIGHT, &filmvals.number_color, GIMP_COLOR_AREA_FLAT); - gtk_signal_connect (GTK_OBJECT (button), "color_changed", - GTK_SIGNAL_FUNC (gimp_color_button_get_color), - &filmvals.number_color); gimp_table_attach_aligned (GTK_TABLE (table), 0, 2, _("Color:"), 1.0, 0.5, button, 1, TRUE); + g_signal_connect (G_OBJECT (button), "color_changed", + G_CALLBACK (gimp_color_button_get_color), + &filmvals.number_color); + for (j = 0; j < 2; j++) { toggle = gtk_check_button_new_with_label (j ? _("At Bottom") : _("At Top")); gtk_box_pack_start (GTK_BOX (vbox), toggle, FALSE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - GTK_SIGNAL_FUNC (gimp_toggle_button_update), - &(filmvals.number_pos[j])); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), filmvals.number_pos[j]); gtk_widget_show (toggle); + + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (gimp_toggle_button_update), + &(filmvals.number_pos[j])); } gtk_widget_show (vbox); @@ -1352,13 +1368,13 @@ film_dialog (gint32 image_ID) 0.0, 1.0, 0.001, 0.01, 3, TRUE, 0, 0, NULL, NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &filmvals.picture_height); - gtk_spin_button_configure (GIMP_SCALE_ENTRY_SPINBUTTON (adj), GIMP_SCALE_ENTRY_SPINBUTTON_ADJ (adj), 0.01, 3); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &filmvals.picture_height); + filmint.advanced_adj[1] = adj = gimp_scale_entry_new (GTK_TABLE (table), 0, row++, _("Image Spacing:"), 1.0, 0.5, @@ -1366,13 +1382,13 @@ film_dialog (gint32 image_ID) 0.0, 1.0, 0.001, 0.01, 3, TRUE, 0, 0, NULL, NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &filmvals.picture_space); - gtk_spin_button_configure (GIMP_SCALE_ENTRY_SPINBUTTON (adj), GIMP_SCALE_ENTRY_SPINBUTTON_ADJ (adj), 0.01, 3); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &filmvals.picture_space); + sep = gtk_hseparator_new (); gtk_table_attach (GTK_TABLE (table), sep, 0, 3, row, row + 1, GTK_FILL, 0, 0, 2); @@ -1387,13 +1403,13 @@ film_dialog (gint32 image_ID) 0.0, 1.0, 0.001, 0.01, 3, TRUE, 0, 0, NULL, NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &filmvals.hole_offset); - gtk_spin_button_configure (GIMP_SCALE_ENTRY_SPINBUTTON (adj), GIMP_SCALE_ENTRY_SPINBUTTON_ADJ (adj), 0.01, 3); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &filmvals.hole_offset); + filmint.advanced_adj[3] = adj = gimp_scale_entry_new (GTK_TABLE (table), 0, row++, _("Hole Width:"), 1.0, 0.5, @@ -1401,13 +1417,13 @@ film_dialog (gint32 image_ID) 0.0, 1.0, 0.001, 0.01, 3, TRUE, 0, 0, NULL, NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &filmvals.hole_width); - gtk_spin_button_configure (GIMP_SCALE_ENTRY_SPINBUTTON (adj), GIMP_SCALE_ENTRY_SPINBUTTON_ADJ (adj), 0.01, 3); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &filmvals.hole_width); + filmint.advanced_adj[4] = adj = gimp_scale_entry_new (GTK_TABLE (table), 0, row++, _("Hole Height:"), 1.0, 0.5, @@ -1415,13 +1431,13 @@ film_dialog (gint32 image_ID) 0.0, 1.0, 0.001, 0.01, 3, TRUE, 0, 0, NULL, NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &filmvals.hole_height); - gtk_spin_button_configure (GIMP_SCALE_ENTRY_SPINBUTTON (adj), GIMP_SCALE_ENTRY_SPINBUTTON_ADJ (adj), 0.01, 3); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &filmvals.hole_height); + filmint.advanced_adj[5] = adj = gimp_scale_entry_new (GTK_TABLE (table), 0, row++, _("Hole Spacing:"), 1.0, 0.5, @@ -1429,13 +1445,13 @@ film_dialog (gint32 image_ID) 0.0, 1.0, 0.001, 0.01, 3, TRUE, 0, 0, NULL, NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &filmvals.hole_space); - gtk_spin_button_configure (GIMP_SCALE_ENTRY_SPINBUTTON (adj), GIMP_SCALE_ENTRY_SPINBUTTON_ADJ (adj), 0.01, 3); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &filmvals.hole_space); + sep = gtk_hseparator_new (); gtk_table_attach (GTK_TABLE (table), sep, 0, 3, row, row + 1, GTK_FILL, 0, 0, 2); @@ -1450,13 +1466,13 @@ film_dialog (gint32 image_ID) 0.0, 1.0, 0.001, 0.01, 3, TRUE, 0, 0, NULL, NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &filmvals.number_height); - gtk_spin_button_configure (GIMP_SCALE_ENTRY_SPINBUTTON (adj), GIMP_SCALE_ENTRY_SPINBUTTON_ADJ (adj), 0.01, 3); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &filmvals.number_height); + sep = gtk_hseparator_new (); gtk_table_attach (GTK_TABLE (table), sep, 0, 3, row, row + 1, GTK_FILL, 0, 0, 2); @@ -1473,11 +1489,12 @@ film_dialog (gint32 image_ID) button = gtk_button_new_with_label (_("Reset to Defaults")); gtk_misc_set_padding (GTK_MISC (GTK_BIN (button)->child), 4, 0); gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (button), "clicked", - GTK_SIGNAL_FUNC (film_reset_callback), - NULL); gtk_widget_show (button); + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (film_reset_callback), + NULL); + gtk_widget_show (dlg); gtk_main (); @@ -1516,7 +1533,8 @@ film_ok_callback (GtkWidget *widget, { if ((label = (GtkWidget *) tmp_list->data) != NULL) { - image_ID = (gint32) gtk_object_get_user_data (GTK_OBJECT (label)); + image_ID = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (label), + "image")); if ((image_ID >= 0) && (num_images < MAX_FILM_PICTURES)) filmvals.image[num_images++] = image_ID; } diff --git a/plug-ins/common/flarefx.c b/plug-ins/common/flarefx.c index cf7216f01e..f9a1208d02 100644 --- a/plug-ins/common/flarefx.c +++ b/plug-ins/common/flarefx.c @@ -121,23 +121,23 @@ typedef struct /* --- Declare local functions --- */ static void query (void); -static void run (gchar *name, - gint nparams, +static void run (gchar *name, + gint nparams, GimpParam *param, - gint *nreturn_vals, + gint *nreturn_vals, GimpParam **return_vals); static void FlareFX (GimpDrawable *drawable, - gint preview_mode); -static void fill_preview_with_thumb (GtkWidget *preview_widget, - gint32 drawable_ID); + gint preview_mode); +static void fill_preview_with_thumb (GtkWidget *preview_widget, + gint32 drawable_ID); static GtkWidget *preview_widget (GimpDrawable *drawable); static gint flare_dialog (GimpDrawable *drawable); -static void flare_ok_callback (GtkWidget *widget, - gpointer data); +static void flare_ok_callback (GtkWidget *widget, + gpointer data); -static GtkWidget * flare_center_create (GimpDrawable *drawable); +static GtkWidget * flare_center_create (GimpDrawable *drawable); static void flare_center_destroy (GtkWidget *widget, gpointer data); static void flare_center_draw (FlareCenter *center, @@ -224,23 +224,23 @@ query (void) } static void -run (gchar *name, - gint nparams, +run (gchar *name, + gint nparams, GimpParam *param, - gint *nreturn_vals, + gint *nreturn_vals, GimpParam **return_vals) { - static GimpParam values[1]; - GimpDrawable *drawable; - GimpRunMode run_mode; - GimpPDBStatusType status = GIMP_PDB_SUCCESS; + static GimpParam values[1]; + GimpDrawable *drawable; + GimpRunMode run_mode; + GimpPDBStatusType status = GIMP_PDB_SUCCESS; run_mode = param[0].data.d_int32; *nreturn_vals = 1; - *return_vals = values; + *return_vals = values; - values[0].type = GIMP_PDB_STATUS; + values[0].type = GIMP_PDB_STATUS; values[0].data.d_status = status; /* Get the specified drawable */ @@ -332,14 +332,15 @@ flare_dialog (GimpDrawable *drawable) GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, + GTK_STOCK_OK, flare_ok_callback, NULL, NULL, NULL, TRUE, FALSE, NULL); - gtk_signal_connect (GTK_OBJECT (dlg), "destroy", - GTK_SIGNAL_FUNC (gtk_main_quit), - NULL); + g_signal_connect (G_OBJECT (dlg), "destroy", + G_CALLBACK (gtk_main_quit), + NULL); /* parameter settings */ main_vbox = gtk_vbox_new (FALSE, 2); @@ -349,7 +350,7 @@ flare_dialog (GimpDrawable *drawable) frame = flare_center_create (drawable); - center = gtk_object_get_user_data (GTK_OBJECT (frame)); + center = g_object_get_data (G_OBJECT (frame), "center"); gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_ETCHED_IN); gtk_container_set_border_width (GTK_CONTAINER (frame), 6); gtk_box_pack_start (GTK_BOX (main_vbox), frame, TRUE, TRUE, 0); @@ -771,12 +772,13 @@ flare_center_create (GimpDrawable *drawable) center->in_call = TRUE; /* to avoid side effects while initialization */ frame = gtk_frame_new (_("Center of FlareFX")); - gtk_signal_connect (GTK_OBJECT (frame), "destroy", - GTK_SIGNAL_FUNC (flare_center_destroy), - center); gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_ETCHED_IN); gtk_container_set_border_width (GTK_CONTAINER (frame), 6); + g_signal_connect (G_OBJECT (frame), "destroy", + G_CALLBACK (flare_center_destroy), + center); + table = gtk_table_new (3, 4, FALSE); gtk_table_set_col_spacings (GTK_TABLE (table), 4); gtk_table_set_row_spacings (GTK_TABLE (table), 4); @@ -794,14 +796,16 @@ flare_center_create (GimpDrawable *drawable) gimp_spin_button_new (¢er->xadj, fvals.posx, G_MININT, G_MAXINT, 1, 10, 10, 0, 0); - gtk_object_set_user_data (GTK_OBJECT (center->xadj), center); - gtk_signal_connect (GTK_OBJECT (center->xadj), "value_changed", - GTK_SIGNAL_FUNC (flare_center_adjustment_update), - &fvals.posx); gtk_table_attach (GTK_TABLE (table), spinbutton, 1, 2, 0, 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0); gtk_widget_show (spinbutton); + g_object_set_data (G_OBJECT (center->xadj), "center", center); + + g_signal_connect (G_OBJECT (center->xadj), "value_changed", + G_CALLBACK (flare_center_adjustment_update), + &fvals.posx); + label = gtk_label_new (_("Y:")); gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5 ); gtk_table_attach (GTK_TABLE (table), label, 2, 3, 0, 1, @@ -812,14 +816,16 @@ flare_center_create (GimpDrawable *drawable) gimp_spin_button_new (¢er->yadj, fvals.posy, G_MININT, G_MAXINT, 1, 10, 10, 0, 0); - gtk_object_set_user_data (GTK_OBJECT (center->yadj), center); - gtk_signal_connect (GTK_OBJECT (center->yadj), "value_changed", - GTK_SIGNAL_FUNC (flare_center_adjustment_update), - &fvals.posy); gtk_table_attach (GTK_TABLE (table), spinbutton, 3, 4, 0, 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0); gtk_widget_show (spinbutton); + g_object_set_data (G_OBJECT (center->yadj), "center", center); + + g_signal_connect (G_OBJECT (center->yadj), "value_changed", + G_CALLBACK (flare_center_adjustment_update), + &fvals.posy); + /* frame (shadow_in) that contains preview */ pframe = gtk_frame_new (NULL); gtk_frame_set_shadow_type (GTK_FRAME (pframe), GTK_SHADOW_IN); @@ -827,20 +833,22 @@ flare_center_create (GimpDrawable *drawable) /* PREVIEW */ preview = preview_widget (drawable); - gtk_object_set_user_data (GTK_OBJECT (preview), center); gtk_widget_set_events (GTK_WIDGET (preview), PREVIEW_MASK); - gtk_signal_connect_after (GTK_OBJECT (preview), "expose_event", - (GtkSignalFunc) flare_center_preview_expose, - center); - gtk_signal_connect (GTK_OBJECT (preview), "event", - (GtkSignalFunc) flare_center_preview_events, - center); - gtk_container_add (GTK_CONTAINER (pframe ), preview); + gtk_container_add (GTK_CONTAINER (pframe), preview); gtk_widget_show (preview); + g_object_set_data (G_OBJECT (preview), "center", center); + + g_signal_connect_after (G_OBJECT (preview), "expose_event", + G_CALLBACK (flare_center_preview_expose), + center); + g_signal_connect (G_OBJECT (preview), "event", + G_CALLBACK (flare_center_preview_events), + center); + gtk_widget_show (pframe); gtk_widget_show (table); - gtk_object_set_user_data (GTK_OBJECT (frame), center); + g_object_set_data (G_OBJECT (frame), "center", center); gtk_widget_show (frame); /* show / hide cursor */ @@ -848,14 +856,15 @@ flare_center_create (GimpDrawable *drawable) gtk_table_attach (GTK_TABLE (table), check, 0, 4, 2, 3, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), show_cursor); - gtk_signal_connect (GTK_OBJECT (check), "toggled", - GTK_SIGNAL_FUNC (gimp_toggle_button_update), - &show_cursor); - gtk_signal_connect_object (GTK_OBJECT (check), "toggled", - GTK_SIGNAL_FUNC (FlareFX), - (gpointer)drawable); gtk_widget_show (check); + g_signal_connect (G_OBJECT (check), "toggled", + G_CALLBACK (gimp_toggle_button_update), + &show_cursor); + g_signal_connect_swapped (G_OBJECT (check), "toggled", + G_CALLBACK (FlareFX), + drawable); + flare_center_cursor_update (center); center->cursor = FALSE; /* Make sure that the cursor has not been drawn */ @@ -1069,7 +1078,7 @@ flare_center_adjustment_update (GtkAdjustment *adjustment, gimp_int_adjustment_update (adjustment, data); - center = gtk_object_get_user_data (GTK_OBJECT (adjustment)); + center = g_object_get_data (G_OBJECT (adjustment), "center"); if (!center->in_call) { @@ -1112,7 +1121,7 @@ flare_center_preview_expose (GtkWidget *widget, { FlareCenter *center; - center = gtk_object_get_user_data (GTK_OBJECT (widget)); + center = g_object_get_data (G_OBJECT (widget), "center"); flare_center_draw (center, ALL); return FALSE; } @@ -1126,11 +1135,11 @@ static gint flare_center_preview_events (GtkWidget *widget, GdkEvent *event) { - FlareCenter *center; + FlareCenter *center; GdkEventButton *bevent; GdkEventMotion *mevent; - center = gtk_object_get_user_data (GTK_OBJECT (widget)); + center = g_object_get_data (G_OBJECT (widget), "center"); switch (event->type) { diff --git a/plug-ins/common/fractaltrace.c b/plug-ins/common/fractaltrace.c index d983c76cdd..e61f272910 100644 --- a/plug-ins/common/fractaltrace.c +++ b/plug-ins/common/fractaltrace.c @@ -41,10 +41,10 @@ /******************************************************************************/ static void query (void); -static void run (gchar *name, - gint nparams, +static void run (gchar *name, + gint nparams, GimpParam *param, - gint *nreturn_vals, + gint *nreturn_vals, GimpParam **return_vals); static void filter (GimpDrawable *drawable); @@ -113,7 +113,7 @@ query (void) { GIMP_PDB_FLOAT, "ymax", "ymax fractal image delimiter" }, { GIMP_PDB_INT32, "depth", "trace depth" }, { GIMP_PDB_INT32, "outside_type", "outside type" - "(0=WRAP/1=TRANS/2=BLACK/3=WHITE)" } + "(0=WRAP/1=TRANS/2=BLACK/3=WHITE)" } }; gimp_install_procedure (PLUG_IN_NAME, @@ -157,16 +157,16 @@ static image_t image; /******************************************************************************/ static void -run (gchar *name, - gint argc, +run (gchar *name, + gint argc, GimpParam *args, - gint *retc, + gint *retc, GimpParam **rets) { - GimpDrawable *drawable; - GimpRunMode run_mode; - GimpPDBStatusType status; - static GimpParam returns[1]; + GimpDrawable *drawable; + GimpRunMode run_mode; + GimpPDBStatusType status; + static GimpParam returns[1]; run_mode = args[0].data.d_int32; status = GIMP_PDB_SUCCESS; @@ -549,8 +549,8 @@ dialog_preview_store (void) gtk_preview_draw_row (GTK_PREVIEW (preview.preview), preview.pixels[y], 0, y, preview.width); } - gtk_widget_draw (preview.preview, NULL); - gdk_flush (); + + gtk_widget_queue_draw (preview.preview); } static void @@ -728,9 +728,9 @@ dialog_show (void) NULL); - gtk_signal_connect (GTK_OBJECT (dialog), "destroy", - GTK_SIGNAL_FUNC (gtk_main_quit), - NULL); + g_signal_connect (G_OBJECT (dialog), "destroy", + G_CALLBACK (gtk_main_quit), + NULL); mainbox = gtk_vbox_new (FALSE, 4); gtk_container_set_border_width (GTK_CONTAINER (mainbox), 6); @@ -795,45 +795,45 @@ dialog_show (void) parameters.x1, -50, 50, 0.1, 0.5, 2, TRUE, 0, 0, NULL, NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (dialog_double_adjustment_update), - ¶meters.x1); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (dialog_double_adjustment_update), + ¶meters.x1); adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 1, _("X2:"), 0, 0, parameters.x2, -50, 50, 0.1, 0.5, 2, TRUE, 0, 0, NULL, NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (dialog_double_adjustment_update), - ¶meters.x2); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (dialog_double_adjustment_update), + ¶meters.x2); adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 2, _("Y1:"), 0, 0, parameters.y1, -50, 50, 0.1, 0.5, 2, TRUE, 0, 0, NULL, NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (dialog_double_adjustment_update), - ¶meters.y1); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (dialog_double_adjustment_update), + ¶meters.y1); adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 3, _("Y2:"), 0, 0, parameters.y2, -50, 50, 0.1, 0.5, 2, TRUE, 0, 0, NULL, NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (dialog_double_adjustment_update), - ¶meters.y2); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (dialog_double_adjustment_update), + ¶meters.y2); adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 4, _("Depth:"), 0, 0, parameters.depth, 1, 50, 1, 5, 0, TRUE, 0, 0, NULL, NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (dialog_int_adjustment_update), - ¶meters.depth); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (dialog_int_adjustment_update), + ¶meters.depth); gtk_widget_show (dialog); dialog_preview_draw (); diff --git a/plug-ins/common/gauss_iir.c b/plug-ins/common/gauss_iir.c index b926b3c419..3f7042f8d9 100644 --- a/plug-ins/common/gauss_iir.c +++ b/plug-ins/common/gauss_iir.c @@ -193,18 +193,18 @@ run (gchar *name, gint *nreturn_vals, GimpParam **return_vals) { - static GimpParam values[1]; - gint32 image_ID; - GimpDrawable *drawable; - GimpRunMode run_mode; - GimpPDBStatusType status = GIMP_PDB_SUCCESS; + static GimpParam values[1]; + gint32 image_ID; + GimpDrawable *drawable; + GimpRunMode run_mode; + GimpPDBStatusType status = GIMP_PDB_SUCCESS; run_mode = param[0].data.d_int32; *nreturn_vals = 1; - *return_vals = values; + *return_vals = values; - values[0].type = GIMP_PDB_STATUS; + values[0].type = GIMP_PDB_STATUS; values[0].data.d_status = status; /* Get the specified image and drawable */ @@ -369,9 +369,9 @@ gauss_iir_dialog (void) NULL); - gtk_signal_connect (GTK_OBJECT (dlg), "destroy", - GTK_SIGNAL_FUNC (gtk_main_quit), - NULL); + g_signal_connect (G_OBJECT (dlg), "destroy", + G_CALLBACK (gtk_main_quit), + NULL); /* parameter settings */ frame = gtk_frame_new (_("Parameter Settings")); @@ -385,20 +385,22 @@ gauss_iir_dialog (void) toggle = gtk_check_button_new_with_label (_("Blur Horizontally")); gtk_box_pack_start (GTK_BOX (vbox), toggle, FALSE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - (GtkSignalFunc) gimp_toggle_button_update, - &bvals.horizontal); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), bvals.horizontal); gtk_widget_show (toggle); + g_signal_connect (G_OBJECT (toggle), "toggled", + (GtkSignalFunc) gimp_toggle_button_update, + &bvals.horizontal); + toggle = gtk_check_button_new_with_label (_("Blur Vertically")); gtk_box_pack_start (GTK_BOX (vbox), toggle, FALSE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - (GtkSignalFunc) gimp_toggle_button_update, - &bvals.vertical); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), bvals.vertical); gtk_widget_show (toggle); + g_signal_connect (G_OBJECT (toggle), "toggled", + (GtkSignalFunc) gimp_toggle_button_update, + &bvals.vertical); + hbox = gtk_hbox_new (FALSE, 4); gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0); @@ -410,11 +412,12 @@ gauss_iir_dialog (void) bvals.radius, 1.0, GIMP_MAX_IMAGE_SIZE, 1.0, 5.0, 0, 1, 2); gtk_box_pack_start (GTK_BOX (hbox), spinbutton, TRUE, TRUE, 0); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &bvals.radius); gtk_widget_show (spinbutton); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &bvals.radius); + gtk_widget_show (hbox); gtk_widget_show (vbox); gtk_widget_show (frame); @@ -453,9 +456,9 @@ gauss_iir2_dialog (gint32 image_ID, NULL); - gtk_signal_connect (GTK_OBJECT (dlg), "destroy", - GTK_SIGNAL_FUNC (gtk_main_quit), - NULL); + g_signal_connect (G_OBJECT (dlg), "destroy", + G_CALLBACK (gtk_main_quit), + NULL); /* parameter settings */ frame = gtk_frame_new (_("Blur Radius")); diff --git a/plug-ins/common/gauss_rle.c b/plug-ins/common/gauss_rle.c index 5424c4b231..1c7dd03c8d 100644 --- a/plug-ins/common/gauss_rle.c +++ b/plug-ins/common/gauss_rle.c @@ -188,18 +188,18 @@ run (gchar *name, gint *nreturn_vals, GimpParam **return_vals) { - static GimpParam values[1]; - gint32 image_ID; - GimpDrawable *drawable; - GimpRunMode run_mode; - GimpPDBStatusType status = GIMP_PDB_SUCCESS; + static GimpParam values[1]; + gint32 image_ID; + GimpDrawable *drawable; + GimpRunMode run_mode; + GimpPDBStatusType status = GIMP_PDB_SUCCESS; run_mode = param[0].data.d_int32; *nreturn_vals = 1; - *return_vals = values; + *return_vals = values; - values[0].type = GIMP_PDB_STATUS; + values[0].type = GIMP_PDB_STATUS; values[0].data.d_status = status; /* Get the specified image and drawable */ @@ -364,9 +364,9 @@ gauss_rle_dialog (void) NULL); - gtk_signal_connect (GTK_OBJECT (dlg), "destroy", - GTK_SIGNAL_FUNC (gtk_main_quit), - NULL); + g_signal_connect (G_OBJECT (dlg), "destroy", + G_CALLBACK (gtk_main_quit), + NULL); /* parameter settings */ frame = gtk_frame_new (_("Parameter Settings")); @@ -380,20 +380,22 @@ gauss_rle_dialog (void) toggle = gtk_check_button_new_with_label (_("Blur Horizontally")); gtk_box_pack_start (GTK_BOX (vbox), toggle, FALSE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - GTK_SIGNAL_FUNC (gimp_toggle_button_update), - &bvals.horizontal); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), bvals.horizontal); gtk_widget_show (toggle); + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (gimp_toggle_button_update), + &bvals.horizontal); + toggle = gtk_check_button_new_with_label (_("Blur Vertically")); gtk_box_pack_start (GTK_BOX (vbox), toggle, FALSE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - GTK_SIGNAL_FUNC (gimp_toggle_button_update), - &bvals.vertical); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), bvals.vertical); gtk_widget_show (toggle); + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (gimp_toggle_button_update), + &bvals.vertical); + hbox = gtk_hbox_new (FALSE, 4); gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); @@ -405,11 +407,12 @@ gauss_rle_dialog (void) bvals.radius, 1.0, GIMP_MAX_IMAGE_SIZE, 1.0, 5.0, 0, 1, 2); gtk_box_pack_start (GTK_BOX (hbox), spinbutton, TRUE, TRUE, 0); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &bvals.radius); gtk_widget_show (spinbutton); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &bvals.radius); + gtk_widget_show (hbox); gtk_widget_show (vbox); gtk_widget_show (frame); @@ -448,9 +451,9 @@ gauss_rle2_dialog (gint32 image_ID, NULL); - gtk_signal_connect (GTK_OBJECT (dlg), "destroy", - GTK_SIGNAL_FUNC (gtk_main_quit), - NULL); + g_signal_connect (G_OBJECT (dlg), "destroy", + G_CALLBACK (gtk_main_quit), + NULL); /* parameter settings */ frame = gtk_frame_new (_("Blur Radius")); diff --git a/plug-ins/common/gbr.c b/plug-ins/common/gbr.c index ac2edf8b9f..4919c2d774 100644 --- a/plug-ins/common/gbr.c +++ b/plug-ins/common/gbr.c @@ -167,7 +167,7 @@ run (gchar *name, GimpParam **return_vals) { static GimpParam values[2]; - GimpRunMode run_mode; + GimpRunMode run_mode; GimpPDBStatusType status = GIMP_PDB_SUCCESS; gint32 image_ID; gint32 drawable_ID; @@ -176,7 +176,8 @@ run (gchar *name, run_mode = param[0].data.d_int32; *nreturn_vals = 1; - *return_vals = values; + *return_vals = values; + values[0].type = GIMP_PDB_STATUS; values[0].data.d_status = GIMP_PDB_EXECUTION_ERROR; @@ -569,9 +570,9 @@ save_dialog (void) NULL); - gtk_signal_connect (GTK_OBJECT(dlg), "destroy", - GTK_SIGNAL_FUNC (gtk_main_quit), - NULL); + g_signal_connect (G_OBJECT(dlg), "destroy", + G_CALLBACK (gtk_main_quit), + NULL); /* The main table */ table = gtk_table_new (2, 2, FALSE); @@ -586,19 +587,21 @@ save_dialog (void) gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, _("Spacing:"), 1.0, 0.5, spinbutton, 1, TRUE); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_int_adjustment_update), - &info.spacing); + + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_int_adjustment_update), + &info.spacing); entry = gtk_entry_new (); 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, entry, 1, FALSE); - gtk_entry_set_text (GTK_ENTRY (entry), info.description); - gtk_signal_connect (GTK_OBJECT (entry), "changed", - GTK_SIGNAL_FUNC (entry_callback), - info.description); + + g_signal_connect (G_OBJECT (entry), "changed", + G_CALLBACK (entry_callback), + info.description); gtk_widget_show (dlg); diff --git a/plug-ins/common/gee.c b/plug-ins/common/gee.c index a8f6cb9ae5..419faae351 100644 --- a/plug-ins/common/gee.c +++ b/plug-ins/common/gee.c @@ -37,19 +37,19 @@ static void run (gchar *name, gint *nreturn_vals, GimpParam **return_vals); -static void do_fun (void); +static void do_fun (void); -static gint window_delete_callback (GtkWidget *widget, - GdkEvent *event, - gpointer data); -static void window_close_callback (GtkWidget *widget, - gpointer data); -static gint iteration_callback (gpointer data); -static void toggle_feedbacktype (GtkWidget *widget, - gpointer data); +static gboolean window_delete_callback (GtkWidget *widget, + GdkEvent *event, + gpointer data); +static void window_close_callback (GtkWidget *widget, + gpointer data); +static gboolean iteration_callback (gpointer data); +static void toggle_feedbacktype (GtkWidget *widget, + gpointer data); -static void render_frame (void); -static void init_preview_misc (void); +static void render_frame (void); +static void init_preview_misc (void); GimpPlugInInfo PLUG_IN_INFO = @@ -181,13 +181,12 @@ build_dialog (GimpImageBaseType basetype, gimp_ui_init ("gee", TRUE); dlg = gtk_dialog_new (); - gtk_window_set_title (GTK_WINDOW (dlg), - _("GEE-SLIME")); - + gtk_window_set_title (GTK_WINDOW (dlg), _("GEE-SLIME")); gtk_window_set_position (GTK_WINDOW (dlg), GTK_WIN_POS_MOUSE); - gtk_signal_connect (GTK_OBJECT (dlg), "delete_event", - (GtkSignalFunc) window_delete_callback, - NULL); + + g_signal_connect (G_OBJECT (dlg), "delete_event", + G_CALLBACK (window_delete_callback), + NULL); gimp_help_connect (dlg, gimp_standard_help_func, "filters/geeslime.html"); @@ -195,17 +194,18 @@ build_dialog (GimpImageBaseType basetype, button = gtk_button_new_with_label (_("** Thank you for choosing GIMP **")); GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT); - gtk_signal_connect_object (GTK_OBJECT (button), "clicked", - (GtkSignalFunc) window_close_callback, - GTK_OBJECT (dlg)); gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->action_area), button, TRUE, TRUE, 0); gtk_widget_grab_default (button); gtk_widget_show (button); - tooltips = gtk_tooltips_new(); - gtk_tooltips_set_tip(GTK_TOOLTIPS(tooltips), button, - _("A less-obsolete creation of Adam D. Moss / adam@gimp.org / adam@foxbox.org / 1998-2000"), + g_signal_connect_swapped (G_OBJECT (button), "clicked", + G_CALLBACK (window_close_callback), + dlg); + + tooltips = gtk_tooltips_new (); + gtk_tooltips_set_tip (GTK_TOOLTIPS (tooltips), button, + _("A less-obsolete creation of Adam D. Moss / adam@gimp.org / adam@foxbox.org / 1998-2000"), NULL); gtk_tooltips_enable (tooltips); @@ -233,7 +233,7 @@ build_dialog (GimpImageBaseType basetype, gtk_frame_set_shadow_type (GTK_FRAME (frame2), GTK_SHADOW_ETCHED_IN); gtk_box_pack_start (GTK_BOX (hbox2), frame2, FALSE, FALSE, 0); - eventbox = gtk_event_box_new(); + eventbox = gtk_event_box_new (); gtk_container_add (GTK_CONTAINER (frame2), GTK_WIDGET (eventbox)); drawing_area = gtk_drawing_area_new (); @@ -257,14 +257,15 @@ build_dialog (GimpImageBaseType basetype, gtk_widget_show (frame); gtk_widget_show (dlg); - - idle_tag = gtk_idle_add_priority (GTK_PRIORITY_LOW, - (GtkFunction) iteration_callback, - NULL); + + idle_tag = g_idle_add_full (G_PRIORITY_LOW, + (GSourceFunc) iteration_callback, + NULL, + NULL); - gtk_signal_connect (GTK_OBJECT (eventbox), "button_release_event", - GTK_SIGNAL_FUNC (toggle_feedbacktype), - NULL); + g_signal_connect (G_OBJECT (eventbox), "button_release_event", + G_CALLBACK (toggle_feedbacktype), + NULL); } @@ -803,12 +804,13 @@ do_iteration (void) /* Callbacks */ -static gint +static gboolean window_delete_callback (GtkWidget *widget, GdkEvent *event, gpointer data) { - gtk_idle_remove (idle_tag); + g_source_remove (idle_tag); + idle_tag = 0; gdk_flush (); gtk_main_quit (); @@ -821,7 +823,7 @@ window_close_callback (GtkWidget *widget, gpointer data) { if (data) - gtk_widget_destroy(GTK_WIDGET(data)); + gtk_widget_destroy (GTK_WIDGET (data)); window_delete_callback (NULL, NULL, NULL); } @@ -833,11 +835,10 @@ toggle_feedbacktype (GtkWidget *widget, } - -static gint -iteration_callback (gpointer data) +static gboolean +iteration_callback (gpointer data) { - do_iteration(); + do_iteration (); return TRUE; } diff --git a/plug-ins/common/gee_zoom.c b/plug-ins/common/gee_zoom.c index f2c4dbfa8d..db29bc8118 100644 --- a/plug-ins/common/gee_zoom.c +++ b/plug-ins/common/gee_zoom.c @@ -57,20 +57,20 @@ static void run (gchar *name, gint *nreturn_vals, GimpParam **return_vals); -static void do_fun (void); +static void do_fun (void); -static gint window_delete_callback (GtkWidget *widget, - GdkEvent *event, - gpointer data); -static void window_close_callback (GtkWidget *widget, - gpointer data); -static gint iteration_callback (gpointer data); -static void toggle_feedbacktype (GtkWidget *widget, - gpointer data); +static gboolean window_delete_callback (GtkWidget *widget, + GdkEvent *event, + gpointer data); +static void window_close_callback (GtkWidget *widget, + gpointer data); +static gboolean iteration_callback (gpointer data); +static void toggle_feedbacktype (GtkWidget *widget, + gpointer data); -static void render_frame (void); -static void show_frame (void); -static void init_preview_misc (void); +static void render_frame (void); +static void show_frame (void); +static void init_preview_misc (void); GimpPlugInInfo PLUG_IN_INFO = @@ -200,11 +200,11 @@ build_dialog (GimpImageBaseType basetype, dlg = gtk_dialog_new (); gtk_window_set_title (GTK_WINDOW (dlg), _("GEE-ZOOM: The Plug-In Formerly Known As \"The GIMP E'er Egg\"")); - gtk_window_set_position (GTK_WINDOW (dlg), GTK_WIN_POS_MOUSE); - gtk_signal_connect (GTK_OBJECT (dlg), "delete_event", - (GtkSignalFunc) window_delete_callback, - NULL); + + g_signal_connect (G_OBJECT (dlg), "delete_event", + G_CALLBACK (window_delete_callback), + NULL); gimp_help_connect (dlg, gimp_standard_help_func, "filters/gee.html"); @@ -212,17 +212,18 @@ build_dialog (GimpImageBaseType basetype, button = gtk_button_new_with_label (_("** Thank you for choosing GIMP **")); GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT); - gtk_signal_connect_object (GTK_OBJECT (button), "clicked", - (GtkSignalFunc) window_close_callback, - GTK_OBJECT (dlg)); gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->action_area), button, TRUE, TRUE, 0); gtk_widget_grab_default (button); gtk_widget_show (button); - tooltips = gtk_tooltips_new(); - gtk_tooltips_set_tip(GTK_TOOLTIPS(tooltips), button, - _("An obsolete creation of Adam D. Moss / adam@gimp.org / adam@foxbox.org / 1998-2000"), + g_signal_connect_swapped (G_OBJECT (button), "clicked", + G_CALLBACK (window_close_callback), + dlg); + + tooltips = gtk_tooltips_new (); + gtk_tooltips_set_tip (GTK_TOOLTIPS (tooltips), button, + _("An obsolete creation of Adam D. Moss / adam@gimp.org / adam@foxbox.org / 1998-2000"), NULL); gtk_tooltips_enable (tooltips); @@ -284,13 +285,14 @@ build_dialog (GimpImageBaseType basetype, gtk_widget_show (dlg); - idle_tag = gtk_idle_add_priority (GTK_PRIORITY_LOW, - (GtkFunction) iteration_callback, - NULL); + idle_tag = g_idle_add_full (G_PRIORITY_LOW, + (GSourceFunc) iteration_callback, + NULL, + NULL); - gtk_signal_connect (GTK_OBJECT (eventbox), "button_release_event", - GTK_SIGNAL_FUNC (toggle_feedbacktype), - NULL); + g_signal_connect (G_OBJECT (eventbox), "button_release_event", + G_CALLBACK (toggle_feedbacktype), + NULL); } @@ -836,12 +838,13 @@ do_iteration (void) /* Callbacks */ -static gint +static gboolean window_delete_callback (GtkWidget *widget, GdkEvent *event, gpointer data) { - gtk_idle_remove (idle_tag); + g_source_remove (idle_tag); + idle_tag = 0; gdk_flush (); gtk_main_quit (); @@ -854,7 +857,7 @@ window_close_callback (GtkWidget *widget, gpointer data) { if (data) - gtk_widget_destroy(GTK_WIDGET(data)); + gtk_widget_destroy (GTK_WIDGET (data)); window_delete_callback (NULL, NULL, NULL); } @@ -893,12 +896,11 @@ toggle_feedbacktype (GtkWidget *widget, } } - -static gint -iteration_callback (gpointer data) +static gboolean +iteration_callback (gpointer data) { - do_iteration(); - show_frame(); + do_iteration (); + show_frame (); return TRUE; } diff --git a/plug-ins/common/gicon.c b/plug-ins/common/gicon.c index c861f50030..5c1c5c468e 100644 --- a/plug-ins/common/gicon.c +++ b/plug-ins/common/gicon.c @@ -54,23 +54,23 @@ typedef struct /* Declare some local functions. */ -static void query (void); -static void run (gchar *name, - gint nparams, - GimpParam *param, - gint *nreturn_vals, - GimpParam **return_vals); -static gint32 load_image (gchar *filename); -static gint save_image (gchar *filename, - gint32 image_ID, - gint32 drawable_ID); +static void query (void); +static void run (gchar *name, + gint nparams, + GimpParam *param, + gint *nreturn_vals, + GimpParam **return_vals); +static gint32 load_image (gchar *filename); +static gint save_image (gchar *filename, + gint32 image_ID, + gint32 drawable_ID); static gint save_dialog (void); -static void ok_callback (GtkWidget *widget, - gpointer data); -static void entry_callback (GtkWidget *widget, - gpointer data); +static void ok_callback (GtkWidget *widget, + gpointer data); +static void entry_callback (GtkWidget *widget, + gpointer data); GimpPlugInInfo PLUG_IN_INFO = { @@ -152,23 +152,24 @@ query (void) } static void -run (gchar *name, - gint nparams, +run (gchar *name, + gint nparams, GimpParam *param, - gint *nreturn_vals, + gint *nreturn_vals, GimpParam **return_vals) { - static GimpParam values[2]; - GimpRunMode run_mode; - GimpPDBStatusType status = GIMP_PDB_SUCCESS; - gint32 image_ID; - gint32 drawable_ID; - GimpExportReturnType export = GIMP_EXPORT_CANCEL; + static GimpParam values[2]; + GimpRunMode run_mode; + GimpPDBStatusType status = GIMP_PDB_SUCCESS; + gint32 image_ID; + gint32 drawable_ID; + GimpExportReturnType export = GIMP_EXPORT_CANCEL; run_mode = param[0].data.d_int32; *nreturn_vals = 1; *return_vals = values; + values[0].type = GIMP_PDB_STATUS; values[0].data.d_status = GIMP_PDB_EXECUTION_ERROR; @@ -437,14 +438,15 @@ save_dialog (void) GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, + GTK_STOCK_OK, ok_callback, NULL, NULL, NULL, TRUE, FALSE, NULL); - gtk_signal_connect (GTK_OBJECT (dlg), "destroy", - GTK_SIGNAL_FUNC (gtk_main_quit), - NULL); + g_signal_connect (G_OBJECT (dlg), "destroy", + G_CALLBACK (gtk_main_quit), + NULL); /* The main table */ table = gtk_table_new (1, 2, FALSE); @@ -454,18 +456,18 @@ save_dialog (void) gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), table, TRUE, TRUE, 0); gtk_widget_show (table); - entry = gtk_entry_new (); 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); gtk_entry_set_text (GTK_ENTRY (entry), givals.icon_name); - gtk_signal_connect (GTK_OBJECT (entry), "changed", - GTK_SIGNAL_FUNC (entry_callback), - givals.icon_name); gtk_widget_show (entry); + g_signal_connect (G_OBJECT (entry), "changed", + G_CALLBACK (entry_callback), + givals.icon_name); + gtk_widget_show (dlg); gtk_main (); diff --git a/plug-ins/common/gif.c b/plug-ins/common/gif.c index 3b183fd524..8bf6b6f719 100644 --- a/plug-ins/common/gif.c +++ b/plug-ins/common/gif.c @@ -270,14 +270,22 @@ #include #include +#ifdef __GNUC__ +#warning GTK_DISABLE_DEPRECATED +#endif +#undef GTK_DISABLE_DEPRECATED + +#ifdef __GNUC__ +#warning GTK_ENABLE_BROKEN +#endif +#define GTK_ENABLE_BROKEN +#include + #include #include #include "libgimp/stdplugins-intl.h" -/* FIXME: remove usage of the 'broken' GtkText */ -#define GTK_ENABLE_BROKEN -#include /* uncomment the line below for a little debugging info */ /* #define GIFDEBUG yesplease */ @@ -1158,9 +1166,9 @@ badbounds_dialog (void) NULL); - gtk_signal_connect (GTK_OBJECT (dlg), "destroy", - GTK_SIGNAL_FUNC (gtk_main_quit), - NULL); + g_signal_connect (G_OBJECT (dlg), "destroy", + G_CALLBACK (gtk_main_quit), + NULL); /* the warning message */ frame = gtk_frame_new (NULL); @@ -1230,9 +1238,9 @@ save_dialog (gint32 image_ID) NULL); - gtk_signal_connect (GTK_OBJECT (dlg), "destroy", - GTK_SIGNAL_FUNC (gtk_main_quit), - NULL); + g_signal_connect (G_OBJECT (dlg), "destroy", + G_CALLBACK (gtk_main_quit), + NULL); main_vbox = gtk_vbox_new (FALSE, 4); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 6); @@ -1250,12 +1258,13 @@ save_dialog (gint32 image_ID) toggle = gtk_check_button_new_with_label (_("Interlace")); gtk_box_pack_start (GTK_BOX (vbox), toggle, FALSE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - GTK_SIGNAL_FUNC (gimp_toggle_button_update), - &gsvals.interlace); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), gsvals.interlace); gtk_widget_show (toggle); + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (gimp_toggle_button_update), + &gsvals.interlace); + hbox = gtk_hbox_new (FALSE, 4); gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0); @@ -1265,12 +1274,13 @@ save_dialog (gint32 image_ID) toggle = gtk_check_button_new_with_label (_("GIF Comment:")); gtk_container_add (GTK_CONTAINER (align), toggle); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - GTK_SIGNAL_FUNC (gimp_toggle_button_update), - &gsvals.save_comment); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), gsvals.save_comment); gtk_widget_show (toggle); + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (gimp_toggle_button_update), + &gsvals.save_comment); + /* the comment text_view in a gtk_scrolled_window */ scrolled_window = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), @@ -1312,6 +1322,7 @@ save_dialog (gint32 image_ID) if (globalcomment) gtk_text_buffer_set_text (text_buffer, globalcomment, -1); + g_signal_connect (G_OBJECT (text_buffer), "changed", G_CALLBACK (comment_entry_callback), NULL); @@ -1332,12 +1343,13 @@ save_dialog (gint32 image_ID) toggle = gtk_check_button_new_with_label (_("Loop forever")); gtk_box_pack_start (GTK_BOX (vbox), toggle, FALSE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - GTK_SIGNAL_FUNC (gimp_toggle_button_update), - &gsvals.loop); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), gsvals.loop); gtk_widget_show (toggle); + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (gimp_toggle_button_update), + &gsvals.loop); + /* default_delay entry field */ hbox = gtk_hbox_new (FALSE, 4); gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); @@ -1349,11 +1361,12 @@ save_dialog (gint32 image_ID) spinbutton = gimp_spin_button_new (&adj, gsvals.default_delay, 0, 65000, 10, 100, 0, 1, 0); gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_int_adjustment_update), - &gsvals.default_delay); gtk_widget_show (spinbutton); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_int_adjustment_update), + &gsvals.default_delay); + label = gtk_label_new (_("Milliseconds")); gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); gtk_widget_show (label); @@ -1371,14 +1384,14 @@ save_dialog (gint32 image_ID) disposal_option_menu = gimp_option_menu_new2 (FALSE, G_CALLBACK (gimp_menu_item_update), &gsvals.default_dispose, - (gpointer) gsvals.default_dispose, + GINT_TO_POINTER (gsvals.default_dispose), _("I don't Care"), - (gpointer) DISPOSE_UNSPECIFIED, NULL, + GINT_TO_POINTER (DISPOSE_UNSPECIFIED), NULL, _("Cumulative Layers (Combine)"), - (gpointer) DISPOSE_COMBINE, NULL, + GINT_TO_POINTER (DISPOSE_COMBINE), NULL, _("One Frame per Layer (Replace)"), - (gpointer) DISPOSE_REPLACE, NULL, + GINT_TO_POINTER (DISPOSE_REPLACE), NULL, NULL); gtk_box_pack_start (GTK_BOX (hbox), disposal_option_menu, FALSE, FALSE, 0); diff --git a/plug-ins/common/gih.c b/plug-ins/common/gih.c index ad8be4022f..0b1cd72225 100644 --- a/plug-ins/common/gih.c +++ b/plug-ins/common/gih.c @@ -54,6 +54,8 @@ #endif #include +#include + #ifdef G_OS_WIN32 #include #endif @@ -227,7 +229,7 @@ run (gchar *name, GimpParam **return_vals) { static GimpParam values[1]; - GimpRunMode run_mode; + GimpRunMode run_mode; GimpPDBStatusType status = GIMP_PDB_SUCCESS; GimpParasite *pipe_parasite; gint32 image_ID; @@ -243,6 +245,7 @@ run (gchar *name, *return_vals = values; *nreturn_vals = 1; + values[0].type = GIMP_PDB_STATUS; values[0].data.d_status = GIMP_PDB_EXECUTION_ERROR; @@ -853,9 +856,9 @@ gih_save_dialog (gint32 image_ID) NULL); - gtk_signal_connect (GTK_OBJECT (dlg), "destroy", - GTK_SIGNAL_FUNC (gtk_main_quit), - NULL); + g_signal_connect (G_OBJECT (dlg), "destroy", + G_CALLBACK (gtk_main_quit), + NULL); /* The main table */ table = gtk_table_new (8, 2, FALSE); @@ -873,9 +876,10 @@ gih_save_dialog (gint32 image_ID) gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, _("Spacing (Percent):"), 1.0, 0.5, spinbutton, 1, TRUE); - gtk_signal_connect (GTK_OBJECT (adjustment), "value_changed", - GTK_SIGNAL_FUNC (gimp_int_adjustment_update), - &info.spacing); + + g_signal_connect (G_OBJECT (adjustment), "value_changed", + G_CALLBACK (gimp_int_adjustment_update), + &info.spacing); /* * Description: ___________ @@ -886,9 +890,10 @@ gih_save_dialog (gint32 image_ID) gimp_table_attach_aligned (GTK_TABLE (table), 0, 1, _("Description:"), 1.0, 0.5, entry, 1, FALSE); - gtk_signal_connect (GTK_OBJECT (entry), "changed", - GTK_SIGNAL_FUNC (entry_callback), - info.description); + + g_signal_connect (G_OBJECT (entry), "changed", + G_CALLBACK (entry_callback), + info.description); /* * Cell size: __ x __ pixels @@ -900,6 +905,7 @@ gih_save_dialog (gint32 image_ID) 2, gimp_image_width (image_ID), 1, 1, 1, 1, 0); gtk_box_pack_start (GTK_BOX (box), spinbutton, FALSE, FALSE, 0); + gtk_widget_show (spinbutton); layer_ID = gimp_image_get_layers (image_ID, &nlayers); cellw_adjust.orientation = GIMP_VERTICAL; @@ -908,10 +914,10 @@ gih_save_dialog (gint32 image_ID) cellw_adjust.nguides = 0; cellw_adjust.guides = NULL; cellw_adjust.value = &gihparams.cellwidth; - gtk_signal_connect (GTK_OBJECT (adjustment), "value_changed", - GTK_SIGNAL_FUNC (size_adjustment_callback), - &cellw_adjust); - gtk_widget_show (spinbutton); + + g_signal_connect (G_OBJECT (adjustment), "value_changed", + G_CALLBACK (size_adjustment_callback), + &cellw_adjust); label = gtk_label_new ("x"); gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0); @@ -922,16 +928,18 @@ gih_save_dialog (gint32 image_ID) 2, gimp_image_height (image_ID), 1, 1, 1, 1, 0); gtk_box_pack_start (GTK_BOX (box), spinbutton, FALSE, FALSE, 0); + gtk_widget_show (spinbutton); + cellh_adjust.orientation = GIMP_HORIZONTAL; cellh_adjust.image = image_ID; cellh_adjust.toplayer = layer_ID[nlayers-1]; cellh_adjust.nguides = 0; cellh_adjust.guides = NULL; cellh_adjust.value = &gihparams.cellheight; - gtk_signal_connect (GTK_OBJECT (adjustment), "value_changed", - GTK_SIGNAL_FUNC (size_adjustment_callback), - &cellh_adjust); - gtk_widget_show (spinbutton); + + g_signal_connect (G_OBJECT (adjustment), "value_changed", + G_CALLBACK (size_adjustment_callback), + &cellh_adjust); label = gtk_label_new ( _("Pixels")); gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0); @@ -952,9 +960,10 @@ gih_save_dialog (gint32 image_ID) gimp_table_attach_aligned (GTK_TABLE (table), 0, 3, _("Number of Cells:"), 1.0, 0.5, spinbutton, 1, TRUE); - gtk_signal_connect (GTK_OBJECT (adjustment), "value_changed", - GTK_SIGNAL_FUNC (gimp_int_adjustment_update), - &gihparams.ncells); + + g_signal_connect (G_OBJECT (adjustment), "value_changed", + G_CALLBACK (gimp_int_adjustment_update), + &gihparams.ncells); if (gihparams.dim == 1) cellw_adjust.ncells = cellh_adjust.ncells = adjustment; @@ -1010,9 +1019,10 @@ gih_save_dialog (gint32 image_ID) gimp_table_attach_aligned (GTK_TABLE (table), 0, 5, _("Dimension:"), 1.0, 0.5, spinbutton, 1, TRUE); - gtk_signal_connect (GTK_OBJECT (adjustment), "value_changed", - GTK_SIGNAL_FUNC (gimp_int_adjustment_update), - &gihparams.dim); + + g_signal_connect (G_OBJECT (adjustment), "value_changed", + G_CALLBACK (gimp_int_adjustment_update), + &gihparams.dim); /* * Ranks: __ __ __ __ __ @@ -1030,10 +1040,12 @@ gih_save_dialog (gint32 image_ID) gihparams.rank[i], 0, 100, 1, 1, 1, 1, 0); gtk_box_pack_start (GTK_BOX (box), spinbutton, FALSE, TRUE, 0); - gtk_signal_connect (GTK_OBJECT (adjustment), "value_changed", - GTK_SIGNAL_FUNC (gimp_int_adjustment_update), - &gihparams.rank[i]); gtk_widget_show (spinbutton); + + g_signal_connect (G_OBJECT (adjustment), "value_changed", + G_CALLBACK (gimp_int_adjustment_update), + &gihparams.rank[i]); + if (i == 0) { if (gihparams.dim == 1) @@ -1058,23 +1070,27 @@ gih_save_dialog (gint32 image_ID) cbitems = g_list_append (cbitems, "ytilt"); box = gtk_hbox_new (TRUE, 4); + for (i = 0; i < GIMP_PIXPIPE_MAXDIM; i++) { cb = gtk_combo_new (); + gtk_editable_set_editable (GTK_EDITABLE (GTK_COMBO (cb)->entry), FALSE); + gtk_combo_set_popdown_strings (GTK_COMBO (cb), cbitems); if (gihparams.selection[i]) - gtk_entry_set_text (GTK_ENTRY (GTK_COMBO (cb)->entry) - , gihparams.selection[i]); + gtk_entry_set_text (GTK_ENTRY (GTK_COMBO (cb)->entry), + gihparams.selection[i]); else gtk_entry_set_text (GTK_ENTRY (GTK_COMBO (cb)->entry), "random"); - gtk_entry_set_editable (GTK_ENTRY (GTK_COMBO (cb)->entry), FALSE); gtk_box_pack_start (GTK_BOX (box), cb, FALSE, TRUE, 0); - gtk_signal_connect (GTK_OBJECT (GTK_COMBO (cb)->entry), "changed", - GTK_SIGNAL_FUNC (cb_callback), - &gihparams.selection[i]); gtk_widget_show (cb); + + g_signal_connect (G_OBJECT (GTK_COMBO (cb)->entry), "changed", + G_CALLBACK (cb_callback), + &gihparams.selection[i]); } + gimp_table_attach_aligned (GTK_TABLE (table), 0, 7, _("Selection:"), 1.0, 0.5, box, 1, FALSE); diff --git a/plug-ins/common/glasstile.c b/plug-ins/common/glasstile.c index ae84f36e52..dbfe28af99 100644 --- a/plug-ins/common/glasstile.c +++ b/plug-ins/common/glasstile.c @@ -67,21 +67,21 @@ typedef struct /* --- Declare local functions --- */ static void query (void); -static void run (gchar *name, - gint nparams, +static void run (gchar *name, + gint nparams, GimpParam *param, - gint *nreturn_vals, + gint *nreturn_vals, GimpParam **return_vals); -static gint glass_dialog (GimpDrawable *drawable); +static gint glass_dialog (GimpDrawable *drawable); static void glass_ok_callback (GtkWidget *widget, gpointer data); static void fill_preview_with_thumb (GtkWidget *preview_widget, gint32 drawable_ID); -static GtkWidget *preview_widget (GimpDrawable *drawable); +static GtkWidget *preview_widget (GimpDrawable *drawable); -static void glasstile (GimpDrawable *drawable, +static void glasstile (GimpDrawable *drawable, gboolean preview_mode); /* --- Variables --- */ @@ -142,23 +142,23 @@ query (void) } static void -run (gchar *name, - gint nparams, +run (gchar *name, + gint nparams, GimpParam *param, - gint *nreturn_vals, + gint *nreturn_vals, GimpParam **return_vals) { - static GimpParam values[1]; - GimpDrawable *drawable; - GimpRunMode run_mode; - GimpPDBStatusType status = GIMP_PDB_SUCCESS; + static GimpParam values[1]; + GimpDrawable *drawable; + GimpRunMode run_mode; + GimpPDBStatusType status = GIMP_PDB_SUCCESS; run_mode = param[0].data.d_int32; *nreturn_vals = 1; - *return_vals = values; + *return_vals = values; - values[0].type = GIMP_PDB_STATUS; + values[0].type = GIMP_PDB_STATUS; values[0].data.d_status = status; /* Get the specified drawable */ @@ -263,9 +263,9 @@ glass_dialog (GimpDrawable *drawable) NULL); - gtk_signal_connect (GTK_OBJECT (dlg), "destroy", - GTK_SIGNAL_FUNC (gtk_main_quit), - NULL); + g_signal_connect (G_OBJECT (dlg), "destroy", + G_CALLBACK (gtk_main_quit), + NULL); main_vbox = gtk_vbox_new (FALSE, 3); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 0); @@ -307,12 +307,13 @@ glass_dialog (GimpDrawable *drawable) gtvals.xblock, 10, 50, 2, 10, 0, TRUE, 0, 0, NULL, NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_int_adjustment_update), - >vals.xblock); - gtk_signal_connect_object (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (glasstile), - (gpointer)drawable); + + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_int_adjustment_update), + >vals.xblock); + g_signal_connect_swapped (G_OBJECT (adj), "value_changed", + G_CALLBACK (glasstile), + drawable); /* Horizontal scale - Height */ adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 1, @@ -320,13 +321,15 @@ glass_dialog (GimpDrawable *drawable) gtvals.yblock, 10, 50, 2, 10, 0, TRUE, 0, 0, NULL, NULL); - gtk_object_set_data (GTK_OBJECT (adj), "drawable", drawable); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_int_adjustment_update), - >vals.yblock); - gtk_signal_connect_object (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (glasstile), - (gpointer)drawable); + + g_object_set_data (G_OBJECT (adj), "drawable", drawable); + + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_int_adjustment_update), + >vals.yblock); + g_signal_connect_swapped (G_OBJECT (adj), "value_changed", + G_CALLBACK (glasstile), + drawable); gtk_widget_show (frame); gtk_widget_show (table); diff --git a/plug-ins/common/gqbist.c b/plug-ins/common/gqbist.c index 32194ebf46..57d59bc2d7 100644 --- a/plug-ins/common/gqbist.c +++ b/plug-ins/common/gqbist.c @@ -606,7 +606,8 @@ dialog_update_previews (GtkWidget *widget, gtk_preview_draw_row (GTK_PREVIEW (preview[j]), buf, 0, i, PREVIEW_SIZE); } - gtk_widget_draw (preview[j], NULL); + + gtk_widget_queue_draw (preview[j]); } } @@ -735,15 +736,17 @@ dialog_load (GtkWidget *widget, gimp_help_connect (file_select, gimp_standard_help_func, "filters/gqbist.html"); - gtk_file_selection_set_filename (GTK_FILE_SELECTION (file_select), qbist_info.path); - gtk_signal_connect (GTK_OBJECT (GTK_FILE_SELECTION (file_select)->ok_button), - "clicked", - GTK_SIGNAL_FUNC (file_selection_load), - (gpointer) file_select); - gtk_signal_connect_object (GTK_OBJECT (GTK_FILE_SELECTION (file_select)->cancel_button), - "clicked", - GTK_SIGNAL_FUNC (gtk_widget_destroy), - GTK_OBJECT (file_select)); + gtk_file_selection_set_filename (GTK_FILE_SELECTION (file_select), + qbist_info.path); + + g_signal_connect (G_OBJECT (GTK_FILE_SELECTION (file_select)->ok_button), + "clicked", + G_CALLBACK (file_selection_load), + file_select); + g_signal_connect_swapped (G_OBJECT (GTK_FILE_SELECTION (file_select)->cancel_button), + "clicked", + G_CALLBACK (gtk_widget_destroy), + file_select); gtk_widget_show (file_select); } @@ -762,14 +765,15 @@ dialog_save (GtkWidget *widget, gtk_file_selection_set_filename (GTK_FILE_SELECTION (file_select), qbist_info.path); - gtk_signal_connect (GTK_OBJECT (GTK_FILE_SELECTION (file_select)->ok_button), - "clicked", - GTK_SIGNAL_FUNC (file_selection_save), - (gpointer) file_select); - gtk_signal_connect_object (GTK_OBJECT (GTK_FILE_SELECTION (file_select)->cancel_button), - "clicked", - GTK_SIGNAL_FUNC (gtk_widget_destroy), - GTK_OBJECT (file_select)); + + g_signal_connect (G_OBJECT (GTK_FILE_SELECTION (file_select)->ok_button), + "clicked", + G_CALLBACK (file_selection_save), + file_select); + g_signal_connect_swapped (G_OBJECT (GTK_FILE_SELECTION (file_select)->cancel_button), + "clicked", + G_CALLBACK (gtk_widget_destroy), + file_select); gtk_widget_show (file_select); } @@ -808,9 +812,9 @@ dialog_create (void) NULL); - gtk_signal_connect (GTK_OBJECT (dialog), "destroy", - GTK_SIGNAL_FUNC (gtk_main_quit), - NULL); + g_signal_connect (G_OBJECT (dialog), "destroy", + G_CALLBACK (gtk_main_quit), + NULL); vbox = gtk_vbox_new (FALSE, 6); gtk_container_set_border_width (GTK_CONTAINER (vbox), 6); @@ -830,14 +834,15 @@ dialog_create (void) for (i = 0; i < 9; i++) { button = gtk_button_new (); - gtk_signal_connect (GTK_OBJECT (button), "clicked", - GTK_SIGNAL_FUNC (dialog_select_preview), - (gpointer) & (info[(i + 5) % 9])); gtk_table_attach (GTK_TABLE (table), button, i % 3, (i % 3) + 1, i / 3, (i / 3) + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); gtk_widget_show (button); + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (dialog_select_preview), + (gpointer) & (info[(i + 5) % 9])); + preview[i] = gtk_preview_new (GTK_PREVIEW_COLOR); gtk_preview_size (GTK_PREVIEW (preview[i]), PREVIEW_SIZE, PREVIEW_SIZE); gtk_container_add (GTK_CONTAINER (button), preview[i]); @@ -848,11 +853,12 @@ dialog_create (void) gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), qbist_info.oversampling > 1); gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (button), "toggled", - GTK_SIGNAL_FUNC (dialog_toggle_antialaising), - NULL); gtk_widget_show (button); + g_signal_connect (G_OBJECT (button), "toggled", + G_CALLBACK (dialog_toggle_antialaising), + NULL); + bbox = gtk_hbutton_box_new (); gtk_box_pack_start (GTK_BOX (vbox), bbox, FALSE, FALSE, 0); gtk_widget_show (bbox); @@ -860,19 +866,21 @@ dialog_create (void) button = gtk_button_new_from_stock (GTK_STOCK_OPEN); GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT); gtk_container_add (GTK_CONTAINER (bbox), button); - gtk_signal_connect (GTK_OBJECT (button), "clicked", - GTK_SIGNAL_FUNC (dialog_load), - NULL); gtk_widget_show (button); + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (dialog_load), + NULL); + button = gtk_button_new_from_stock (GTK_STOCK_SAVE); GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT); gtk_container_add (GTK_CONTAINER (bbox), button); - gtk_signal_connect (GTK_OBJECT (button), "clicked", - GTK_SIGNAL_FUNC (dialog_save), - NULL); gtk_widget_show (button); + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (dialog_save), + NULL); + dialog_update_previews (NULL, NULL); gtk_widget_show (dialog); diff --git a/plug-ins/common/grid.c b/plug-ins/common/grid.c index dacdc5d2e8..cde68629c2 100644 --- a/plug-ins/common/grid.c +++ b/plug-ins/common/grid.c @@ -170,14 +170,14 @@ run (gchar *name, gint *nreturn_vals, GimpParam **return_vals) { - static GimpParam values[1]; - GimpDrawable *drawable; - gint32 image_ID; - GimpRunMode run_mode; - GimpPDBStatusType status = GIMP_PDB_SUCCESS; + static GimpParam values[1]; + GimpDrawable *drawable; + gint32 image_ID; + GimpRunMode run_mode; + GimpPDBStatusType status = GIMP_PDB_SUCCESS; *nreturn_vals = 1; - *return_vals = values; + *return_vals = values; INIT_I18N_UI(); @@ -521,17 +521,20 @@ ok_callback (GtkWidget *widget, run_flag = TRUE; - entry = gtk_object_get_data (GTK_OBJECT (data), "width"); + entry = g_object_get_data (G_OBJECT (data), "width"); + grid_cfg.hwidth = RINT (gimp_size_entry_get_refval (GIMP_SIZE_ENTRY (entry), 0)); grid_cfg.vwidth = RINT (gimp_size_entry_get_refval (GIMP_SIZE_ENTRY (entry), 1)); grid_cfg.iwidth = RINT (gimp_size_entry_get_refval (GIMP_SIZE_ENTRY (entry), 2)); - entry = gtk_object_get_data (GTK_OBJECT (data), "space"); + entry = g_object_get_data (G_OBJECT (data), "space"); + grid_cfg.hspace = RINT (gimp_size_entry_get_refval (GIMP_SIZE_ENTRY (entry), 0)); grid_cfg.vspace = RINT (gimp_size_entry_get_refval (GIMP_SIZE_ENTRY (entry), 1)); grid_cfg.ispace = RINT (gimp_size_entry_get_refval (GIMP_SIZE_ENTRY (entry), 2)); - entry = gtk_object_get_data (GTK_OBJECT (data), "offset"); + entry = g_object_get_data (G_OBJECT (data), "offset"); + grid_cfg.hoffset = RINT (gimp_size_entry_get_refval (GIMP_SIZE_ENTRY (entry), 0)); grid_cfg.voffset = RINT (gimp_size_entry_get_refval (GIMP_SIZE_ENTRY (entry), 1)); grid_cfg.ioffset = RINT (gimp_size_entry_get_refval (GIMP_SIZE_ENTRY (entry), 2)); @@ -602,19 +605,22 @@ update_preview_callback (GtkWidget *widget, GimpDrawable *drawable; GtkWidget *entry; - drawable = gtk_object_get_data (GTK_OBJECT (widget), "drawable"); + drawable = g_object_get_data (G_OBJECT (widget), "drawable"); + + entry = g_object_get_data (G_OBJECT (widget), "width"); - entry = gtk_object_get_data (GTK_OBJECT (widget), "width"); grid_cfg.hwidth = RINT (gimp_size_entry_get_refval (GIMP_SIZE_ENTRY (entry), 0)); grid_cfg.vwidth = RINT (gimp_size_entry_get_refval (GIMP_SIZE_ENTRY (entry), 1)); grid_cfg.iwidth = RINT (gimp_size_entry_get_refval (GIMP_SIZE_ENTRY (entry), 2)); - entry = gtk_object_get_data (GTK_OBJECT (widget), "space"); + entry = g_object_get_data (G_OBJECT (widget), "space"); + grid_cfg.hspace = RINT (gimp_size_entry_get_refval (GIMP_SIZE_ENTRY (entry), 0)); grid_cfg.vspace = RINT (gimp_size_entry_get_refval (GIMP_SIZE_ENTRY (entry), 1)); grid_cfg.ispace = RINT (gimp_size_entry_get_refval (GIMP_SIZE_ENTRY (entry), 2)); - entry = gtk_object_get_data (GTK_OBJECT (widget), "offset"); + entry = g_object_get_data (G_OBJECT (widget), "offset"); + grid_cfg.hoffset = RINT (gimp_size_entry_get_refval (GIMP_SIZE_ENTRY (entry), 0)); grid_cfg.voffset = RINT (gimp_size_entry_get_refval (GIMP_SIZE_ENTRY (entry), 1)); grid_cfg.ioffset = RINT (gimp_size_entry_get_refval (GIMP_SIZE_ENTRY (entry), 2)); @@ -658,9 +664,9 @@ dialog (gint32 image_ID, NULL); - gtk_signal_connect (GTK_OBJECT (dlg), "destroy", - GTK_SIGNAL_FUNC (gtk_main_quit), - NULL); + g_signal_connect (G_OBJECT (dlg), "destroy", + G_CALLBACK (gtk_main_quit), + NULL); /* Get the image resolution and unit */ gimp_image_get_resolution (image_ID, &xres, &yres); @@ -703,12 +709,15 @@ dialog (gint32 image_ID, gtk_widget_show (abox); button = gtk_button_new_with_label (_("Update Preview")); gtk_misc_set_padding (GTK_MISC (GTK_BIN (button)->child), 2, 0); - gtk_object_set_data (GTK_OBJECT (button), "drawable", drawable); - gtk_signal_connect (GTK_OBJECT (button), "clicked", - GTK_SIGNAL_FUNC (update_preview_callback), - NULL); gtk_container_add (GTK_CONTAINER (abox), button); gtk_widget_show (button); + + g_object_set_data (G_OBJECT (button), "drawable", drawable); + + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (update_preview_callback), + NULL); + /* left side of the UI is done */ /* right side */ @@ -731,7 +740,7 @@ dialog (gint32 image_ID, FALSE, /* show_refval */ SPIN_BUTTON_WIDTH, /* spinbutton_usize */ GIMP_SIZE_ENTRY_UPDATE_SIZE); /* update_policy */ - gtk_object_set_data (GTK_OBJECT (button), "width", width); + g_object_set_data (G_OBJECT (button), "width", width); /* set the unit back to pixels, since most times we will want pixels */ gimp_size_entry_set_unit (GIMP_SIZE_ENTRY (width), GIMP_UNIT_PIXEL); @@ -774,10 +783,12 @@ dialog (gint32 image_ID, gtk_table_attach_defaults (GTK_TABLE (width), chain_button, 1, 3, 2, 3); gtk_widget_show (chain_button); - /* connect to the 'value_changed' signal because we have to take care - of keeping the entries in sync when the chainbutton is active */ - gtk_signal_connect (GTK_OBJECT (width), "value_changed", - (GtkSignalFunc) entry_callback, chain_button); + /* connect to the 'value_changed' signal because we have to take care + * of keeping the entries in sync when the chainbutton is active + */ + g_signal_connect (G_OBJECT (width), "value_changed", + G_CALLBACK (entry_callback), + chain_button); abox = gtk_alignment_new (1.0, 0.5, 0.0, 0.0); gtk_container_add (GTK_CONTAINER (abox), width); @@ -794,7 +805,7 @@ dialog (gint32 image_ID, FALSE, /* show_refval */ SPIN_BUTTON_WIDTH, /* spinbutton_usize */ GIMP_SIZE_ENTRY_UPDATE_SIZE); /* update_policy */ - gtk_object_set_data (GTK_OBJECT (button), "space", space); + g_object_set_data (G_OBJECT (button), "space", space); gimp_size_entry_set_unit (GIMP_SIZE_ENTRY (space), GIMP_UNIT_PIXEL); /* set the resolution to the image resolution */ @@ -831,12 +842,16 @@ dialog (gint32 image_ID, gtk_table_attach_defaults (GTK_TABLE (space), chain_button, 1, 3, 2, 3); gtk_widget_show (chain_button); - /* connect to the 'value_changed' and "unit_changed" signals because we have to - take care of keeping the entries in sync when the chainbutton is active */ - gtk_signal_connect (GTK_OBJECT (space), "value_changed", - (GtkSignalFunc) entry_callback, chain_button); - gtk_signal_connect (GTK_OBJECT (space), "unit_changed", - (GtkSignalFunc) entry_callback, chain_button); + /* connect to the 'value_changed' and "unit_changed" signals because + * we have to take care of keeping the entries in sync when the + * chainbutton is active + */ + g_signal_connect (G_OBJECT (space), "value_changed", + G_CALLBACK (entry_callback), + chain_button); + g_signal_connect (G_OBJECT (space), "unit_changed", + G_CALLBACK (entry_callback), + chain_button); abox = gtk_alignment_new (1.0, 0.5, 0.0, 0.0); gtk_container_add (GTK_CONTAINER (abox), space); @@ -853,7 +868,7 @@ dialog (gint32 image_ID, FALSE, /* show_refval */ SPIN_BUTTON_WIDTH, /* spinbutton_usize */ GIMP_SIZE_ENTRY_UPDATE_SIZE); /* update_policy */ - gtk_object_set_data (GTK_OBJECT (button), "offset", offset); + g_object_set_data (G_OBJECT (button), "offset", offset); gimp_size_entry_set_unit (GIMP_SIZE_ENTRY (offset), GIMP_UNIT_PIXEL); /* set the resolution to the image resolution */ @@ -897,13 +912,16 @@ dialog (gint32 image_ID, gtk_table_attach_defaults (GTK_TABLE (table), chain_button, 0, 2, 0, 1); gtk_widget_show (chain_button); - /* connect to the 'value_changed' and "unit_changed" signals because we - have to take care of keeping the entries in sync when the chainbutton - is active */ - gtk_signal_connect (GTK_OBJECT (offset), "value_changed", - (GtkSignalFunc) entry_callback, chain_button); - gtk_signal_connect (GTK_OBJECT (offset), "unit_changed", - (GtkSignalFunc) entry_callback, chain_button); + /* connect to the 'value_changed' and "unit_changed" signals because + * we have to take care of keeping the entries in sync when the + * chainbutton is active + */ + g_signal_connect (G_OBJECT (offset), "value_changed", + G_CALLBACK (entry_callback), + chain_button); + g_signal_connect (G_OBJECT (offset), "unit_changed", + G_CALLBACK (entry_callback), + chain_button); /* put a chain_button under the color_buttons */ chain_button = gimp_chain_button_new (GIMP_CHAIN_BOTTOM); @@ -913,50 +931,58 @@ dialog (gint32 image_ID, gtk_widget_show (chain_button); /* attach color selectors */ + align = gtk_alignment_new (0.0, 0.5, 0, 0); + gtk_table_attach_defaults (GTK_TABLE (table), align, 0, 1, 1, 2); + gtk_widget_show (align); + hcolor_button = gimp_color_button_new (_("Horizontal Color"), COLOR_BUTTON_WIDTH, 16, &grid_cfg.hcolor, GIMP_COLOR_AREA_SMALL_CHECKS); - gtk_signal_connect (GTK_OBJECT (hcolor_button), "color_changed", - GTK_SIGNAL_FUNC (gimp_color_button_get_color), - &grid_cfg.hcolor); - gtk_signal_connect (GTK_OBJECT (hcolor_button), "color_changed", - GTK_SIGNAL_FUNC (color_callback), - chain_button); - align = gtk_alignment_new (0.0, 0.5, 0, 0); gtk_container_add (GTK_CONTAINER (align), hcolor_button); - gtk_table_attach_defaults (GTK_TABLE (table), align, 0, 1, 1, 2); gtk_widget_show (hcolor_button); + + g_signal_connect (G_OBJECT (hcolor_button), "color_changed", + G_CALLBACK (gimp_color_button_get_color), + &grid_cfg.hcolor); + g_signal_connect (G_OBJECT (hcolor_button), "color_changed", + G_CALLBACK (color_callback), + chain_button); + + + align = gtk_alignment_new (0.0, 0.5, 0, 0); + gtk_table_attach_defaults (GTK_TABLE (table), align, 1, 2, 1, 2); gtk_widget_show (align); vcolor_button = gimp_color_button_new (_("Vertical Color"), COLOR_BUTTON_WIDTH, 16, &grid_cfg.vcolor, GIMP_COLOR_AREA_SMALL_CHECKS); - gtk_signal_connect (GTK_OBJECT (vcolor_button), "color_changed", - GTK_SIGNAL_FUNC (gimp_color_button_get_color), - &grid_cfg.vcolor); - gtk_signal_connect (GTK_OBJECT (vcolor_button), "color_changed", - GTK_SIGNAL_FUNC (color_callback), - chain_button); - align = gtk_alignment_new (0.0, 0.5, 0, 0); gtk_container_add (GTK_CONTAINER (align), vcolor_button); - gtk_table_attach_defaults (GTK_TABLE (table), align, 1, 2, 1, 2); gtk_widget_show (vcolor_button); + + g_signal_connect (G_OBJECT (vcolor_button), "color_changed", + G_CALLBACK (gimp_color_button_get_color), + &grid_cfg.vcolor); + g_signal_connect (G_OBJECT (vcolor_button), "color_changed", + G_CALLBACK (color_callback), + chain_button); + + align = gtk_alignment_new (0.0, 0.5, 0, 0); + gtk_table_attach_defaults (GTK_TABLE (table), align, 2, 3, 1, 2); gtk_widget_show (align); button = gimp_color_button_new (_("Intersection Color"), COLOR_BUTTON_WIDTH, 16, &grid_cfg.icolor, GIMP_COLOR_AREA_SMALL_CHECKS); - gtk_signal_connect (GTK_OBJECT (button), "color_changed", - GTK_SIGNAL_FUNC (gimp_color_button_get_color), - &grid_cfg.icolor); - align = gtk_alignment_new (0.0, 0.5, 0, 0); gtk_container_add (GTK_CONTAINER (align), button); - gtk_table_attach_defaults (GTK_TABLE (table), align, 2, 3, 1, 2); gtk_widget_show (button); - gtk_widget_show (align); + + g_signal_connect (G_OBJECT (button), "color_changed", + G_CALLBACK (gimp_color_button_get_color), + &grid_cfg.icolor); + gtk_widget_show (table); abox = gtk_alignment_new (1.0, 0.5, 0.0, 0.0); @@ -968,9 +994,9 @@ dialog (gint32 image_ID, gtk_widget_show (main_hbox); gtk_widget_show (dlg); - gtk_object_set_data (GTK_OBJECT (dlg), "width", width); - gtk_object_set_data (GTK_OBJECT (dlg), "space", space); - gtk_object_set_data (GTK_OBJECT (dlg), "offset", offset); + g_object_set_data (G_OBJECT (dlg), "width", width); + g_object_set_data (G_OBJECT (dlg), "space", space); + g_object_set_data (G_OBJECT (dlg), "offset", offset); gtk_main (); gdk_flush (); diff --git a/plug-ins/common/gtm.c b/plug-ins/common/gtm.c index c23b596da5..2f8e9974b7 100644 --- a/plug-ins/common/gtm.c +++ b/plug-ins/common/gtm.c @@ -111,15 +111,15 @@ static GTMValues gtmvals = /* Declare some local functions */ static void query (void); -static void run (gchar *name, - gint nparams, +static void run (gchar *name, + gint nparams, GimpParam *param, - gint *nreturn_vals, + gint *nreturn_vals, GimpParam **return_vals); -static gint save_image (gchar *filename, +static gint save_image (gchar *filename, GimpDrawable *drawable); -static gint save_dialog (gint32 image_ID); +static gint save_dialog (gint32 image_ID); static gint color_comp (guchar *buffer, guchar *buf2); @@ -175,15 +175,15 @@ query (void) } static void -run (gchar *name, - gint nparams, +run (gchar *name, + gint nparams, GimpParam *param, - gint *nreturn_vals, + gint *nreturn_vals, GimpParam **return_vals) { - static GimpParam values[2]; - GimpPDBStatusType status = GIMP_PDB_SUCCESS; - GimpDrawable *drawable; + static GimpParam values[2]; + GimpPDBStatusType status = GIMP_PDB_SUCCESS; + GimpDrawable *drawable; INIT_I18N_UI(); @@ -191,6 +191,7 @@ run (gchar *name, *nreturn_vals = 1; *return_vals = values; + values[0].type = GIMP_PDB_STATUS; values[0].data.d_status = GIMP_PDB_EXECUTION_ERROR; @@ -378,9 +379,9 @@ save_dialog (image_ID) NULL); - gtk_signal_connect (GTK_OBJECT (dlg), "destroy", - GTK_SIGNAL_FUNC (gtk_main_quit), - NULL); + g_signal_connect (G_OBJECT (dlg), "destroy", + G_CALLBACK (gtk_main_quit), + NULL); /* Initialize Tooltips */ gimp_help_init (); @@ -428,17 +429,19 @@ save_dialog (image_ID) toggle = gtk_check_button_new_with_label (_("Generate Full HTML Document")); gtk_box_pack_start (GTK_BOX (vbox), toggle, FALSE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - GTK_SIGNAL_FUNC (gimp_toggle_button_update), - >mvals.fulldoc); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), gtmvals.fulldoc); gtk_widget_show (toggle); + gimp_help_set_help_data (toggle, _("If checked GTM will output a full HTML document " "with , , etc. tags instead of just " "the table html."), NULL); + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (gimp_toggle_button_update), + >mvals.fulldoc); + gtk_widget_show (main_vbox); gtk_widget_show (frame); @@ -455,24 +458,24 @@ save_dialog (image_ID) toggle = gtk_check_button_new_with_label (_("Use Cellspan")); gtk_table_attach (GTK_TABLE (table), toggle, 0, 2, 0, 1, GTK_FILL, 0, 0, 0); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - GTK_SIGNAL_FUNC (gimp_toggle_button_update), - >mvals.spantags); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), gtmvals.spantags); gtk_widget_show (toggle); + gimp_help_set_help_data (toggle, _("If checked GTM will replace any rectangular " "sections of identically colored blocks with one " "large cell with ROWSPAN and COLSPAN values."), NULL); + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (gimp_toggle_button_update), + >mvals.spantags); + toggle = gtk_check_button_new_with_label (_("Compress TD tags")); gtk_table_attach (GTK_TABLE (table), toggle, 0, 2, 1, 2, GTK_FILL, 0, 0, 0); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - GTK_SIGNAL_FUNC (gimp_toggle_button_update), - >mvals.tdcomp); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), gtmvals.tdcomp); gtk_widget_show (toggle); + gimp_help_set_help_data (toggle, _("Checking this tag will cause GTM to leave no " "whitespace between the TD tags and the " @@ -480,44 +483,54 @@ save_dialog (image_ID) "level positioning control."), NULL); + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (gimp_toggle_button_update), + >mvals.tdcomp); + toggle = gtk_check_button_new_with_label (_("Caption")); gtk_table_attach (GTK_TABLE (table), toggle, 0, 1, 2, 3, GTK_FILL, 0, 0, 0); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - GTK_SIGNAL_FUNC (gimp_toggle_button_update), - >mvals.caption); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), gtmvals.caption); gtk_widget_show (toggle); + gimp_help_set_help_data (toggle, _("Check if you would like to have the table " "captioned."), NULL); + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (gimp_toggle_button_update), + >mvals.caption); + entry = gtk_entry_new (); + gtk_widget_set_size_request (entry, 200, -1); + gtk_entry_set_text (GTK_ENTRY (entry), gtmvals.captiontxt); gtk_table_attach (GTK_TABLE (table), entry, 1, 2, 2, 3, GTK_FILL | GTK_EXPAND, 0, 0, 0); - gtk_widget_set_size_request (entry, 200, -1); - gtk_signal_connect (GTK_OBJECT (entry), "changed", - GTK_SIGNAL_FUNC (gtm_caption_callback), - NULL); - gtk_entry_set_text (GTK_ENTRY (entry), gtmvals.captiontxt); gtk_widget_show (entry); + gimp_help_set_help_data (entry, _("The text for the table caption."), NULL); - gtk_object_set_data (GTK_OBJECT (toggle), "set_sensitive", entry); + g_signal_connect (G_OBJECT (entry), "changed", + G_CALLBACK (gtm_caption_callback), + NULL); + + g_object_set_data (G_OBJECT (toggle), "set_sensitive", entry); gtk_widget_set_sensitive (entry, gtmvals.caption); entry = gtk_entry_new (); gtk_widget_set_size_request (entry, 200, -1); + gtk_entry_set_text (GTK_ENTRY (entry), gtmvals.cellcontent); gimp_table_attach_aligned (GTK_TABLE (table), 0, 3, _("Cell Content:"), 1.0, 0.5, entry, 1, FALSE); - gtk_signal_connect (GTK_OBJECT (entry), "changed", - GTK_SIGNAL_FUNC (gtm_cellcontent_callback), - NULL); - gtk_entry_set_text (GTK_ENTRY (entry), gtmvals.cellcontent); gtk_widget_show (entry); + gimp_help_set_help_data (entry, _("The text to go into each cell."), NULL); + g_signal_connect (G_OBJECT (entry), "changed", + G_CALLBACK (gtm_cellcontent_callback), + NULL); + gtk_widget_show (table); gtk_widget_show (frame); @@ -537,63 +550,73 @@ save_dialog (image_ID) gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, _("Border:"), 1.0, 0.5, spinbutton, 1, TRUE); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_int_adjustment_update), - >mvals.border); + gimp_help_set_help_data (spinbutton, _("The number of pixels in the table border."), NULL); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_int_adjustment_update), + >mvals.border); + entry = gtk_entry_new (); gtk_widget_set_size_request (entry, 60, -1); + gtk_entry_set_text (GTK_ENTRY (entry), gtmvals.clwidth); gimp_table_attach_aligned (GTK_TABLE (table), 0, 1, _("Width:"), 1.0, 0.5, entry, 1, TRUE); - gtk_signal_connect (GTK_OBJECT (entry), "changed", - GTK_SIGNAL_FUNC (gtm_clwidth_callback), - NULL); - gtk_entry_set_text (GTK_ENTRY (entry), gtmvals.clwidth); + gimp_help_set_help_data (entry, _("The width for each table cell. " "Can be a number or a percent."), NULL); + g_signal_connect (G_OBJECT (entry), "changed", + G_CALLBACK (gtm_clwidth_callback), + NULL); + entry = gtk_entry_new (); gtk_widget_set_size_request (entry, 60, -1); + gtk_entry_set_text (GTK_ENTRY (entry), gtmvals.clheight); gimp_table_attach_aligned (GTK_TABLE (table), 0, 2, _("Height:"), 1.0, 0.5, entry, 1, TRUE); - gtk_signal_connect (GTK_OBJECT (entry), "changed", - GTK_SIGNAL_FUNC (gtm_clheight_callback), - NULL); - gtk_entry_set_text (GTK_ENTRY (entry), gtmvals.clheight); + gimp_help_set_help_data (entry, _("The height for each table cell. " "Can be a number or a percent."), NULL); + g_signal_connect (G_OBJECT (entry), "changed", + G_CALLBACK (gtm_clheight_callback), + NULL); + spinbutton = gimp_spin_button_new (&adj, gtmvals.cellpadding, 0, 1000, 1, 10, 0, 1, 0); gimp_table_attach_aligned (GTK_TABLE (table), 0, 3, _("Cell-Padding:"), 1.0, 0.5, spinbutton, 1, TRUE); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_int_adjustment_update), - >mvals.cellpadding); + gimp_help_set_help_data (spinbutton, _("The amount of cellpadding."), NULL); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_int_adjustment_update), + >mvals.cellpadding); + spinbutton = gimp_spin_button_new (&adj, gtmvals.cellspacing, 0, 1000, 1, 10, 0, 1, 0); gimp_table_attach_aligned (GTK_TABLE (table), 0, 4, _("Cell-Spacing:"), 1.0, 0.5, spinbutton, 1, TRUE); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_int_adjustment_update), - >mvals.cellspacing); + gimp_help_set_help_data (spinbutton, _("The amount of cellspacing."), NULL); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_int_adjustment_update), + >mvals.cellspacing); + gtk_widget_show (table); gtk_widget_show (frame); diff --git a/plug-ins/common/hot.c b/plug-ins/common/hot.c index 17718484b4..090996e9c4 100644 --- a/plug-ins/common/hot.c +++ b/plug-ins/common/hot.c @@ -104,15 +104,15 @@ struct piArgs typedef enum { - act_lredux = 0, - act_sredux = 1, - act_flag = 2 + ACT_LREDUX, + ACT_SREDUX, + ACT_FLAG } hotAction; typedef enum { - mode_ntsc = 0, - mode_pal = 1 + MODE_NTSC, + MODE_PAL } hotModes; #define CHROMA_LIM 50.0 /* chroma amplitude limit */ @@ -159,18 +159,18 @@ static glong ichroma_lim2; /* chroma limit squared (scaled integer) */ static gint icompos_lim; /* composite amplitude limit (scaled integer) */ static void query (void); -static void run (gchar *name, - gint nparam, +static void run (gchar *name, + gint nparam, GimpParam *param, - gint *nretvals, + gint *nretvals, GimpParam **retvals); -static gint pluginCore (struct piArgs *argp); -static gint pluginCoreIA (struct piArgs *argp); -static gint hotp (register guint8 r, - register guint8 g, - register guint8 b); -static void build_tab (int m); +static gint pluginCore (struct piArgs *argp); +static gint pluginCoreIA (struct piArgs *argp); +static gint hotp (register guint8 r, + register guint8 g, + register guint8 b); +static void build_tab (gint m); /* * gc: apply the gamma correction specified for this video standard. @@ -238,29 +238,29 @@ query (void) } static void -run (gchar *name, - gint nparam, +run (gchar *name, + gint nparam, GimpParam *param, - gint *nretvals, + gint *nretvals, GimpParam **retvals) { static GimpParam rvals[1]; - - struct piArgs args; + struct piArgs args; *nretvals = 1; - *retvals = rvals; + *retvals = rvals; memset (&args, (int) 0, sizeof (struct piArgs)); args.mode = -1; gimp_get_data ("plug_in_hot", &args); - args.image = param[1].data.d_image; + args.image = param[1].data.d_image; args.drawable = param[2].data.d_drawable; - rvals[0].type = GIMP_PDB_STATUS; + rvals[0].type = GIMP_PDB_STATUS; rvals[0].data.d_status = GIMP_PDB_SUCCESS; + switch (param[0].data.d_int32) { case GIMP_RUN_INTERACTIVE: @@ -268,8 +268,8 @@ run (gchar *name, /* XXX: add code here for interactive running */ if (args.mode == -1) { - args.mode = mode_ntsc; - args.action = act_lredux; + args.mode = MODE_NTSC; + args.action = ACT_LREDUX; args.new_layerp = 1; } @@ -391,7 +391,7 @@ pluginCore (struct piArgs *argp) { if (hotp (r = *(s + 0), g = *(s + 1), b = *(s + 2))) { - if (argp->action == act_flag) + if (argp->action == ACT_FLAG) { for (i = 0; i < 3; i++) *d++ = 0; @@ -455,7 +455,7 @@ pluginCore (struct piArgs *argp) * pixel with the same luminance (R=G=B=Y), we * change saturation without affecting luminance. */ - if (argp->action == act_lredux) + if (argp->action == ACT_LREDUX) { /* * Calculate a scale factor that will bring the pixel @@ -480,7 +480,7 @@ pluginCore (struct piArgs *argp) b = (guint8) pix_encode (scale * pb); } else - { /* act_sredux hopefully */ + { /* ACT_SREDUX hopefully */ /* * Calculate a scale factor that will bring the * pixel within both chroma and composite @@ -593,9 +593,9 @@ pluginCoreIA (struct piArgs *argp) NULL); - gtk_signal_connect (GTK_OBJECT (dlg), "destroy", - GTK_SIGNAL_FUNC (gtk_main_quit), - NULL); + g_signal_connect (G_OBJECT (dlg), "destroy", + G_CALLBACK (gtk_main_quit), + NULL); hbox = gtk_hbox_new (FALSE, 5); gtk_container_set_border_width (GTK_CONTAINER (hbox), 5); @@ -609,33 +609,40 @@ pluginCoreIA (struct piArgs *argp) toggle = gtk_check_button_new_with_label (_("Create New Layer")); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), argp->new_layerp); gtk_box_pack_start (GTK_BOX (vbox), toggle, FALSE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - GTK_SIGNAL_FUNC (gimp_toggle_button_update), - &argp->new_layerp); gtk_widget_show (toggle); + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (gimp_toggle_button_update), + &argp->new_layerp); + frame = gimp_radio_group_new2 (TRUE, _("Mode"), G_CALLBACK (gimp_radio_button_update), - &argp->mode, (gpointer) argp->mode, + &argp->mode, + GINT_TO_POINTER (argp->mode), - "NTSC", (gpointer) mode_ntsc, NULL, - "PAL", (gpointer) mode_pal, NULL, + "NTSC", GINT_TO_POINTER (MODE_NTSC), NULL, + "PAL", GINT_TO_POINTER (MODE_PAL), NULL, NULL); gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0); gtk_widget_show (frame); - frame = - gimp_radio_group_new2 (TRUE, _("Action"), - G_CALLBACK (gimp_radio_button_update), - &argp->action, (gpointer) argp->action, + frame = gimp_radio_group_new2 (TRUE, _("Action"), + G_CALLBACK (gimp_radio_button_update), + &argp->action, + GINT_TO_POINTER (argp->action), - _("Reduce Luminance"), (gpointer) act_lredux, NULL, - _("Reduce Saturation"), (gpointer) act_sredux, NULL, - _("Blacken"), (gpointer) act_flag, NULL, + _("Reduce Luminance"), + GINT_TO_POINTER (ACT_LREDUX), NULL, - NULL); + _("Reduce Saturation"), + GINT_TO_POINTER (ACT_SREDUX), NULL, + + _("Blacken"), + GINT_TO_POINTER (ACT_FLAG), NULL, + + NULL); gtk_box_pack_start (GTK_BOX (hbox), frame, FALSE, FALSE, 0); gtk_widget_show (frame); diff --git a/plug-ins/common/illusion.c b/plug-ins/common/illusion.c index eb36cb4fc3..8efaa3189d 100644 --- a/plug-ins/common/illusion.c +++ b/plug-ins/common/illusion.c @@ -46,16 +46,16 @@ /******************************************************************************/ static void query (void); -static void run (gchar *name, - gint nparam, +static void run (gchar *name, + gint nparam, GimpParam *param, - gint *nreturn_vals, + gint *nreturn_vals, GimpParam **return_vals); static void filter (GimpDrawable *drawable); static void filter_preview (void); -static void fill_preview_with_thumb (GtkWidget *preview_widget, - gint32 drawable_ID); +static void fill_preview_with_thumb (GtkWidget *preview_widget, + gint32 drawable_ID); static gboolean dialog (GimpDrawable *drawable); /******************************************************************************/ @@ -124,19 +124,20 @@ query (void) /******************************************************************************/ static void -run (gchar *name, - gint nparams, +run (gchar *name, + gint nparams, GimpParam *params, - gint *nreturn_vals, + gint *nreturn_vals, GimpParam **return_vals) { - GimpDrawable *drawable; - GimpRunMode run_mode; - static GimpParam returnv[1]; - GimpPDBStatusType status = GIMP_PDB_SUCCESS; + GimpDrawable *drawable; + GimpRunMode run_mode; + static GimpParam returnv[1]; + GimpPDBStatusType status = GIMP_PDB_SUCCESS; run_mode = params[0].data.d_int32; drawable = gimp_drawable_get (params[2].data.d_drawable); + *nreturn_vals = 1; *return_vals = returnv; @@ -568,35 +569,40 @@ dialog (GimpDrawable *mangle) GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, + GTK_STOCK_OK, dialog_ok_handler, NULL, NULL, NULL, TRUE, FALSE, NULL); - gtk_signal_connect (GTK_OBJECT (dlg), "destroy", - GTK_SIGNAL_FUNC (gtk_main_quit), - NULL); + g_signal_connect (G_OBJECT (dlg), "destroy", + G_CALLBACK (gtk_main_quit), + NULL); /* Initialize Tooltips */ gimp_help_init (); main_vbox = gtk_vbox_new (FALSE, 3); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 0); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), main_vbox, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), main_vbox, + TRUE, TRUE, 0); gtk_widget_show (main_vbox); frame = gtk_frame_new (_("Preview")); gtk_container_set_border_width (GTK_CONTAINER (frame), 6); gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0); gtk_widget_show (frame); + abox = gtk_alignment_new (0.5, 0.5, 0.0, 0.0); gtk_container_set_border_width (GTK_CONTAINER (abox), 4); gtk_container_add (GTK_CONTAINER (frame), abox); gtk_widget_show (abox); + frame = gtk_frame_new (NULL); gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN); gtk_container_add (GTK_CONTAINER (abox), frame); gtk_widget_show (frame); + preview = preview_widget (mangle); gtk_container_add (GTK_CONTAINER (frame), preview); filter_preview(); @@ -619,37 +625,44 @@ dialog (GimpDrawable *mangle) gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, _("Division:"), 1.0, 0.5, spinbutton, 1, TRUE); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_int_adjustment_update), - ¶meters.division); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (filter_preview), - NULL); + + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_int_adjustment_update), + ¶meters.division); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (filter_preview), + NULL); radio = gtk_radio_button_new_with_label (group, _("Mode 1")); - group = gtk_radio_button_group (GTK_RADIO_BUTTON (radio)); - gtk_signal_connect (GTK_OBJECT (radio), "toggled", - GTK_SIGNAL_FUNC (gimp_toggle_button_update), - ¶meters.type1); - gtk_signal_connect (GTK_OBJECT (radio), "toggled", - GTK_SIGNAL_FUNC (filter_preview), - NULL); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio), parameters.type1); - gtk_table_attach (GTK_TABLE (table), radio, 0, 2, 1, 2, GTK_FILL, GTK_FILL, 0, 0); + group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio)); + gtk_table_attach (GTK_TABLE (table), radio, 0, 2, 1, 2, + GTK_FILL, GTK_FILL, 0, 0); gtk_widget_show (radio); + g_signal_connect (G_OBJECT (radio), "toggled", + G_CALLBACK (gimp_toggle_button_update), + ¶meters.type1); + g_signal_connect (G_OBJECT (radio), "toggled", + G_CALLBACK (filter_preview), + NULL); + + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio), parameters.type1); + radio = gtk_radio_button_new_with_label (group, _("Mode 2")); - group = gtk_radio_button_group (GTK_RADIO_BUTTON (radio)); - gtk_signal_connect (GTK_OBJECT (radio), "toggled", - GTK_SIGNAL_FUNC (gimp_toggle_button_update), - ¶meters.type2); - gtk_signal_connect (GTK_OBJECT (radio), "toggled", - GTK_SIGNAL_FUNC (filter_preview), - NULL); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio), parameters.type2); - gtk_table_attach (GTK_TABLE (table), radio, 0, 2, 2, 3, GTK_FILL, GTK_FILL, 0, 0); + group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio)); + gtk_table_attach (GTK_TABLE (table), radio, 0, 2, 2, 3, + GTK_FILL, GTK_FILL, 0, 0); gtk_widget_show (radio); + g_signal_connect (G_OBJECT (radio), "toggled", + G_CALLBACK (gimp_toggle_button_update), + ¶meters.type2); + g_signal_connect (G_OBJECT (radio), "toggled", + G_CALLBACK (filter_preview), + NULL); + + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio), parameters.type2); + gtk_widget_show (dlg); gtk_main (); diff --git a/plug-ins/common/iwarp.c b/plug-ins/common/iwarp.c index 23d0b4c94b..01a58e1307 100644 --- a/plug-ins/common/iwarp.c +++ b/plug-ins/common/iwarp.c @@ -927,16 +927,17 @@ iwarp_animate_dialog (GtkWidget *dlg, button = gtk_check_button_new_with_label (_("Animate")); gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), do_animate); - gtk_signal_connect (GTK_OBJECT (button), "toggled", - GTK_SIGNAL_FUNC (gimp_toggle_button_update), - &do_animate); gtk_widget_show (button); + g_signal_connect (G_OBJECT (button), "toggled", + G_CALLBACK (gimp_toggle_button_update), + &do_animate); + frame = gtk_frame_new (NULL); gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0); gtk_widget_show (frame); - gtk_object_set_data (GTK_OBJECT (button), "set_sensitive", frame); + g_object_set_data (G_OBJECT (button), "set_sensitive", frame); gtk_widget_set_sensitive (frame, do_animate); table = gtk_table_new (3, 3, FALSE); @@ -952,26 +953,28 @@ iwarp_animate_dialog (GtkWidget *dlg, 2, MAX_NUM_FRAMES, 1.0, 10.0, 1, TRUE, 0, 0, NULL, NULL); - gtk_signal_connect (GTK_OBJECT (scale_data), "value_changed", - GTK_SIGNAL_FUNC (gimp_int_adjustment_update), - &animate_num_frames); + g_signal_connect (G_OBJECT (scale_data), "value_changed", + G_CALLBACK (gimp_int_adjustment_update), + &animate_num_frames); button = gtk_check_button_new_with_label (_("Reverse")); gtk_table_attach (GTK_TABLE (table), button, 0, 3, 1, 2, GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND, 0, 0); - gtk_signal_connect (GTK_OBJECT (button), "clicked", - GTK_SIGNAL_FUNC (gimp_toggle_button_update), - &do_animate_reverse); gtk_widget_show (button); + + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (gimp_toggle_button_update), + &do_animate_reverse); button = gtk_check_button_new_with_label (_("Ping Pong")); gtk_table_attach (GTK_TABLE (table), button, 0, 3, 2, 3, GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND, 0, 0); - gtk_signal_connect (GTK_OBJECT (button), "clicked", - GTK_SIGNAL_FUNC (gimp_toggle_button_update), - &do_animate_ping_pong); gtk_widget_show (button); + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (gimp_toggle_button_update), + &do_animate_ping_pong); + gtk_widget_show (vbox); gtk_notebook_append_page (GTK_NOTEBOOK (notebook), @@ -1009,9 +1012,9 @@ iwarp_settings_dialog (GtkWidget *dlg, 5.0, MAX_DEFORM_AREA_RADIUS, 1.0, 10.0, 0, TRUE, 0, 0, NULL, NULL); - gtk_signal_connect (GTK_OBJECT (scale_data), "value_changed", - GTK_SIGNAL_FUNC (gimp_int_adjustment_update), - &iwarp_vals.deform_area_radius); + g_signal_connect (G_OBJECT (scale_data), "value_changed", + G_CALLBACK (gimp_int_adjustment_update), + &iwarp_vals.deform_area_radius); scale_data = gimp_scale_entry_new (GTK_TABLE (table), 0, 1, _("Deform Amount:"), SCALE_WIDTH, 0, @@ -1019,9 +1022,9 @@ iwarp_settings_dialog (GtkWidget *dlg, 0.0, 1.0, 0.01, 0.1, 2, TRUE, 0, 0, NULL, NULL); - gtk_signal_connect (GTK_OBJECT (scale_data), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &iwarp_vals.deform_amount); + g_signal_connect (G_OBJECT (scale_data), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &iwarp_vals.deform_amount); frame = gtk_frame_new (_("Deform Mode")); gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0); @@ -1035,16 +1038,28 @@ iwarp_settings_dialog (GtkWidget *dlg, vbox2 = gimp_radio_group_new2 (FALSE, NULL, G_CALLBACK (gimp_radio_button_update), &iwarp_vals.deform_mode, - (gpointer) iwarp_vals.deform_mode, + GINT_TO_POINTER (iwarp_vals.deform_mode), - _("Move"), (gpointer) MOVE, NULL, - _("Grow"), (gpointer) GROW, NULL, - _("Swirl CCW"), (gpointer) SWIRL_CCW, NULL, - _("Remove"), (gpointer) REMOVE, &widget[0], - _("Shrink"), (gpointer) SHRINK, &widget[1], - _("Swirl CW"), (gpointer) SWIRL_CW, &widget[2], + _("Move"), + GINT_TO_POINTER (MOVE), NULL, + + _("Grow"), + GINT_TO_POINTER (GROW), NULL, + + _("Swirl CCW"), + GINT_TO_POINTER (SWIRL_CCW), NULL, + + _("Remove"), + GINT_TO_POINTER (REMOVE), &widget[0], + + _("Shrink"), + GINT_TO_POINTER (SHRINK), &widget[1], + + _("Swirl CW"), + GINT_TO_POINTER (SWIRL_CW), &widget[2], NULL); + gtk_container_add (GTK_CONTAINER (hbox), vbox2); gtk_widget_show (vbox2); @@ -1054,23 +1069,24 @@ iwarp_settings_dialog (GtkWidget *dlg, for (i = 0; i < 3; i++) { - gtk_object_ref (GTK_OBJECT (widget[i])); + g_object_ref (G_OBJECT (widget[i])); gtk_widget_hide (widget[i]); gtk_container_remove (GTK_CONTAINER (vbox2), widget[i]); gtk_box_pack_start (GTK_BOX (vbox3), widget[i], FALSE, FALSE, 0); gtk_widget_show (widget[i]); - gtk_object_unref (GTK_OBJECT (widget[i])); + g_object_unref (G_OBJECT (widget[i])); } button = gtk_check_button_new_with_label (_("Bilinear")); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), iwarp_vals.do_bilinear); gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (button), "toggled", - GTK_SIGNAL_FUNC (gimp_toggle_button_update), - &iwarp_vals.do_bilinear); - gtk_widget_show(button); + gtk_widget_show (button); + + g_signal_connect (G_OBJECT (button), "toggled", + G_CALLBACK (gimp_toggle_button_update), + &iwarp_vals.do_bilinear); frame = gtk_frame_new (NULL); gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0); @@ -1085,18 +1101,19 @@ iwarp_settings_dialog (GtkWidget *dlg, gtk_box_pack_start (GTK_BOX (vbox2), button, FALSE, FALSE, 0); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), iwarp_vals.do_supersample); - gtk_signal_connect (GTK_OBJECT (button), "toggled", - GTK_SIGNAL_FUNC (gimp_toggle_button_update), - &iwarp_vals.do_supersample); gtk_widget_show (button); + g_signal_connect (G_OBJECT (button), "toggled", + G_CALLBACK (gimp_toggle_button_update), + &iwarp_vals.do_supersample); + table = gtk_table_new (2, 3, FALSE); gtk_table_set_row_spacings (GTK_TABLE (table), 2); gtk_table_set_col_spacings (GTK_TABLE (table), 4); gtk_box_pack_start (GTK_BOX (vbox2), table, FALSE, FALSE, 0); gtk_widget_show (table); - gtk_object_set_data (GTK_OBJECT (button), "set_sensitive", table); + g_object_set_data (G_OBJECT (button), "set_sensitive", table); gtk_widget_set_sensitive (table, iwarp_vals.do_supersample); scale_data = gimp_scale_entry_new (GTK_TABLE (table), 0, 0, @@ -1105,9 +1122,9 @@ iwarp_settings_dialog (GtkWidget *dlg, 1.0, 5.0, 1.1, 1.0, 0, TRUE, 0, 0, NULL, NULL); - gtk_signal_connect (GTK_OBJECT (scale_data), "value_changed", - GTK_SIGNAL_FUNC (gimp_int_adjustment_update), - &iwarp_vals.max_supersample_depth); + g_signal_connect (G_OBJECT (scale_data), "value_changed", + G_CALLBACK (gimp_int_adjustment_update), + &iwarp_vals.max_supersample_depth); scale_data = gimp_scale_entry_new (GTK_TABLE (table), 0, 1, _("Threshold:"), SCALE_WIDTH, 0, @@ -1115,9 +1132,9 @@ iwarp_settings_dialog (GtkWidget *dlg, 1.0, 10.0, 0.01, 0.1, 2, TRUE, 0, 0, NULL, NULL); - gtk_signal_connect (GTK_OBJECT (scale_data), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &iwarp_vals.supersample_threshold); + g_signal_connect (G_OBJECT (scale_data), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &iwarp_vals.supersample_threshold); gtk_widget_show (vbox); @@ -1154,9 +1171,9 @@ iwarp_dialog (void) NULL); - gtk_signal_connect (GTK_OBJECT (dlg), "destroy", - GTK_SIGNAL_FUNC (gtk_main_quit), - NULL); + g_signal_connect (G_OBJECT (dlg), "destroy", + G_CALLBACK (gtk_main_quit), + NULL); main_hbox = gtk_hbox_new (FALSE, 6); gtk_container_set_border_width (GTK_CONTAINER (main_hbox), 6); @@ -1191,9 +1208,9 @@ iwarp_dialog (void) GDK_BUTTON_RELEASE_MASK | GDK_BUTTON1_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK); - gtk_signal_connect (GTK_OBJECT(preview), "event", - GTK_SIGNAL_FUNC (iwarp_motion_callback), - NULL); + g_signal_connect (G_OBJECT(preview), "event", + G_CALLBACK (iwarp_motion_callback), + NULL); notebook = gtk_notebook_new (); gtk_notebook_set_tab_pos (GTK_NOTEBOOK (notebook), GTK_POS_TOP); @@ -1220,23 +1237,18 @@ iwarp_update_preview (gint x0, gint y1) { gint i; - GdkRectangle rect; - x0 = MAX(x0, 0); - y0 = MAX(y0, 0); - x1 = MIN(x1, preview_width); - y1 = MIN(y1, preview_height); + x0 = MAX (x0, 0); + y0 = MAX (y0, 0); + x1 = MIN (x1, preview_width); + y1 = MIN (y1, preview_height); for (i = y0; i < y1; i++) gtk_preview_draw_row (GTK_PREVIEW (preview), dstimage + (i * preview_width + x0) * preview_bpp, x0, i,x1-x0); - rect.x = x0; - rect.y = y0; - rect.width = x1 - x0; - rect.height = y1 - y0; - gtk_widget_draw (preview, &rect); - gdk_flush (); + + gtk_widget_queue_draw_area (preview, x0, y0, x1 - x0, y1 - y0); } static void diff --git a/plug-ins/common/jigsaw.c b/plug-ins/common/jigsaw.c index 3de18bf155..6aaf9f9000 100644 --- a/plug-ins/common/jigsaw.c +++ b/plug-ins/common/jigsaw.c @@ -66,10 +66,10 @@ typedef enum static void query (void); -static void run (gchar *name, - gint nparams, +static void run (gchar *name, + gint nparams, GimpParam *param, - gint *nreturn_vals, + gint *nreturn_vals, GimpParam **return_vals); static gint jigsaw (gboolean preview_mode); @@ -398,21 +398,21 @@ query (void) } static void -run (gchar *name, - gint nparams, +run (gchar *name, + gint nparams, GimpParam *param, - gint *nreturn_vals, + gint *nreturn_vals, GimpParam **return_vals) { - static GimpParam values[1]; - GimpDrawable *drawable; - GimpRunMode run_mode; - GimpPDBStatusType status = GIMP_PDB_SUCCESS; + static GimpParam values[1]; + GimpDrawable *drawable; + GimpRunMode run_mode; + GimpPDBStatusType status = GIMP_PDB_SUCCESS; run_mode = param[0].data.d_int32; drawable = gimp_drawable_get(param[2].data.d_drawable); globals.drawable = drawable; - gimp_tile_cache_ntiles(drawable->width / gimp_tile_width() + 1); + gimp_tile_cache_ntiles (drawable->width / gimp_tile_width () + 1); switch (run_mode) { @@ -2489,9 +2489,9 @@ dialog_box (void) NULL); - gtk_signal_connect (GTK_OBJECT (dlg), "destroy", - GTK_SIGNAL_FUNC (gtk_main_quit), - NULL); + g_signal_connect (G_OBJECT (dlg), "destroy", + G_CALLBACK (gtk_main_quit), + NULL); /* init tooltips */ gimp_help_init (); @@ -2545,12 +2545,12 @@ dialog_box (void) config.x, MIN_XTILES, MAX_XTILES, 1.0, 4.0, 0, TRUE, 0, 0, _("Number of pieces going across"), NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_int_adjustment_update), - &config.x); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (jigsaw), - NULL); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_int_adjustment_update), + &config.x); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (jigsaw), + NULL); /* ytiles */ adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 1, @@ -2558,12 +2558,12 @@ dialog_box (void) config.y, MIN_YTILES, MAX_YTILES, 1.0, 4.0, 0, TRUE, 0, 0, _("Number of pieces going down"), NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_int_adjustment_update), - &config.y); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (jigsaw), - NULL); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_int_adjustment_update), + &config.y); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (jigsaw), + NULL); gtk_widget_show (table); gtk_widget_show (frame); @@ -2585,12 +2585,12 @@ dialog_box (void) MIN_BLEND_LINES, MAX_BLEND_LINES, 1.0, 2.0, 0, TRUE, 0, 0, _("Degree of slope of each piece's edge"), NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_int_adjustment_update), - &config.blend_lines); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (jigsaw), - NULL); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_int_adjustment_update), + &config.blend_lines); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (jigsaw), + NULL); /* blending amount */ adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 1, @@ -2600,12 +2600,12 @@ dialog_box (void) TRUE, 0, 0, _("The amount of highlighting on the edges " "of each piece"), NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &config.blend_amount); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (jigsaw), - NULL); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &config.blend_amount); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (jigsaw), + NULL); gtk_widget_show (table); gtk_widget_show (frame); @@ -2617,10 +2617,14 @@ dialog_box (void) frame = gimp_radio_group_new2 (TRUE, _("Jigsaw Style"), G_CALLBACK (jigsaw_radio_button_update), - &config.style, (gpointer) config.style, + &config.style, + GINT_TO_POINTER (config.style), - _("Square"), (gpointer) BEZIER_1, &rbutton1, - _("Curved"), (gpointer) BEZIER_2, &rbutton2, + _("Square"), + GINT_TO_POINTER (BEZIER_1), &rbutton1, + + _("Curved"), + GINT_TO_POINTER (BEZIER_2), &rbutton2, NULL); @@ -2636,13 +2640,15 @@ dialog_box (void) cbutton = gtk_check_button_new_with_label (_("Disable Tooltips")); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (cbutton), globals.tooltips ? FALSE : TRUE); - gtk_signal_connect (GTK_OBJECT (cbutton), "toggled", - GTK_SIGNAL_FUNC (check_button_callback), - NULL); gtk_table_attach (GTK_TABLE (table), cbutton, 0, 1, 1, 2, 0, 0, 0, 20); gtk_widget_show (cbutton); + gimp_help_set_help_data (cbutton, _("Toggle Tooltips on/off"), NULL); + g_signal_connect (G_OBJECT (cbutton), "toggled", + G_CALLBACK (check_button_callback), + NULL); + gtk_widget_show (table); gtk_widget_show (hbox); gtk_widget_show (dlg); diff --git a/plug-ins/common/jpeg.c b/plug-ins/common/jpeg.c index 536c12825e..3e8e2f5d5c 100644 --- a/plug-ins/common/jpeg.c +++ b/plug-ins/common/jpeg.c @@ -222,7 +222,7 @@ static void run (gchar *name, gint *nreturn_vals, GimpParam **return_vals); static gint32 load_image (gchar *filename, - GimpRunMode runmode, + GimpRunMode runmode, gboolean preview); static gboolean save_image (gchar *filename, gint32 image_ID, @@ -356,7 +356,7 @@ run (gchar *name, GimpParam **return_vals) { static GimpParam values[2]; - GimpRunMode run_mode; + GimpRunMode run_mode; GimpPDBStatusType status = GIMP_PDB_SUCCESS; gint32 image_ID; gint32 drawable_ID; @@ -1507,10 +1507,9 @@ make_preview (void) else { gtk_label_set_text (GTK_LABEL (preview_size), _("Size: unknown")); - gtk_widget_draw (preview_size, NULL); - + gtk_widget_queue_draw (preview_size); + gimp_displays_flush (); - gdk_flush(); } } @@ -1582,9 +1581,9 @@ save_dialog (void) NULL); - gtk_signal_connect (GTK_OBJECT (dlg), "destroy", - GTK_SIGNAL_FUNC (save_close_callback), - NULL); + g_signal_connect (G_OBJECT (dlg), "destroy", + G_CALLBACK (save_close_callback), + NULL); main_vbox = gtk_vbox_new (FALSE, 4); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 6); @@ -1604,15 +1603,17 @@ save_dialog (void) preview = gtk_check_button_new_with_label (_("Preview (in image window)")); gtk_box_pack_start (GTK_BOX (vbox), preview, FALSE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (preview), "toggled", - GTK_SIGNAL_FUNC (gimp_toggle_button_update), - &jsvals.preview); - gtk_signal_connect (GTK_OBJECT (preview), "toggled", - GTK_SIGNAL_FUNC (make_preview), - NULL); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (preview), jsvals.preview); gtk_widget_show (preview); + g_signal_connect (G_OBJECT (preview), "toggled", + G_CALLBACK (gimp_toggle_button_update), + &jsvals.preview); + g_signal_connect (G_OBJECT (preview), "toggled", + G_CALLBACK (make_preview), + NULL); + + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (preview), jsvals.preview); + preview_size = gtk_label_new (_("Size: unknown")); gtk_misc_set_alignment (GTK_MISC (preview_size), 0.0, 0.5); gtk_box_pack_start (GTK_BOX (vbox), preview_size, FALSE, FALSE, 0); @@ -1647,14 +1648,15 @@ save_dialog (void) gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP); gtk_scale_set_digits (GTK_SCALE (scale), 2); gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED); - gtk_signal_connect (GTK_OBJECT (scale_data), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &jsvals.quality); - gtk_signal_connect (GTK_OBJECT (scale_data), "value_changed", - GTK_SIGNAL_FUNC (make_preview), - NULL); gtk_widget_show (scale); + g_signal_connect (G_OBJECT (scale_data), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &jsvals.quality); + g_signal_connect (G_OBJECT (scale_data), "value_changed", + G_CALLBACK (make_preview), + NULL); + label = gtk_label_new (_("Smoothing:")); gtk_misc_set_alignment (GTK_MISC (label), 1.0, 1.0); gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2, @@ -1669,14 +1671,15 @@ save_dialog (void) gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP); gtk_scale_set_digits (GTK_SCALE (scale), 2); gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED); - gtk_signal_connect (GTK_OBJECT (scale_data), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &jsvals.smoothing); - gtk_signal_connect (GTK_OBJECT (scale_data), "value_changed", - GTK_SIGNAL_FUNC (make_preview), - NULL); gtk_widget_show (scale); + g_signal_connect (G_OBJECT (scale_data), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &jsvals.smoothing); + g_signal_connect (G_OBJECT (scale_data), "value_changed", + G_CALLBACK (make_preview), + NULL); + /* sg - have to init scale here */ scale_data = gtk_adjustment_new ((jsvals.restart == 0) ? 1 : jsvals.restart, 1, 64, 1, 1, 0.0); @@ -1685,11 +1688,12 @@ save_dialog (void) restart = gtk_check_button_new_with_label (_("Restart markers")); gtk_table_attach (GTK_TABLE (table), restart, 0, 1, 2, 3, GTK_FILL, 0, 0, 0); - gtk_signal_connect (GTK_OBJECT (restart), "toggled", - GTK_SIGNAL_FUNC (save_restart_toggle_update), - scale_data); gtk_widget_show (restart); + g_signal_connect (G_OBJECT (restart), "toggled", + G_CALLBACK (save_restart_toggle_update), + scale_data); + restart_markers_label = gtk_label_new (_("Restart frequency (rows):")); gtk_misc_set_alignment (GTK_MISC (restart_markers_label), 1.0, 1.0); gtk_table_attach (GTK_TABLE (table), restart_markers_label, 0, 1, 3, 4, @@ -1708,9 +1712,9 @@ save_dialog (void) gtk_range_set_update_policy (GTK_RANGE (restart_markers_scale), GTK_UPDATE_DELAYED); - gtk_signal_connect (GTK_OBJECT (scale_data), "value_changed", - GTK_SIGNAL_FUNC (save_restart_update), - restart); + g_signal_connect (G_OBJECT (scale_data), "value_changed", + G_CALLBACK (save_restart_update), + restart); gtk_widget_set_sensitive (restart_markers_label, (jsvals.restart ? TRUE : FALSE)); @@ -1722,27 +1726,31 @@ save_dialog (void) toggle = gtk_check_button_new_with_label (_("Optimize")); gtk_table_attach (GTK_TABLE (table), toggle, 0, 3, 4, 5, GTK_FILL, 0, 0, 0); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - GTK_SIGNAL_FUNC (gimp_toggle_button_update), - &jsvals.optimize); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - GTK_SIGNAL_FUNC (make_preview), - NULL); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), jsvals.optimize); gtk_widget_show (toggle); + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (gimp_toggle_button_update), + &jsvals.optimize); + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (make_preview), + NULL); + + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), jsvals.optimize); + progressive = gtk_check_button_new_with_label (_("Progressive")); gtk_table_attach (GTK_TABLE (table), progressive, 0, 3, 5, 6, GTK_FILL, 0, 0, 0); - gtk_signal_connect (GTK_OBJECT (progressive), "toggled", - GTK_SIGNAL_FUNC (gimp_toggle_button_update), - &jsvals.progressive); - gtk_signal_connect (GTK_OBJECT (progressive), "toggled", - GTK_SIGNAL_FUNC (make_preview), - NULL); + gtk_widget_show (progressive); + + g_signal_connect (G_OBJECT (progressive), "toggled", + G_CALLBACK (gimp_toggle_button_update), + &jsvals.progressive); + g_signal_connect (G_OBJECT (progressive), "toggled", + G_CALLBACK (make_preview), + NULL); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (progressive), jsvals.progressive); - gtk_widget_show (progressive); #ifndef HAVE_PROGRESSIVE_JPEG gtk_widget_set_sensitive (progressive, FALSE); @@ -1751,15 +1759,17 @@ save_dialog (void) baseline = gtk_check_button_new_with_label (_("Force baseline JPEG (Readable by all decoders)")); gtk_table_attach (GTK_TABLE (table), baseline, 0, 3, 6, 7, GTK_FILL, 0, 0, 0); - gtk_signal_connect (GTK_OBJECT (baseline), "toggled", - GTK_SIGNAL_FUNC (gimp_toggle_button_update), - &jsvals.baseline); - gtk_signal_connect (GTK_OBJECT (baseline), "toggled", - GTK_SIGNAL_FUNC (make_preview), - NULL); + gtk_widget_show (baseline); + + g_signal_connect (G_OBJECT (baseline), "toggled", + G_CALLBACK (gimp_toggle_button_update), + &jsvals.baseline); + g_signal_connect (G_OBJECT (baseline), "toggled", + G_CALLBACK (make_preview), + NULL); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (baseline), jsvals.baseline); - gtk_widget_show (baseline); /* Subsampling */ menu = @@ -1828,7 +1838,7 @@ save_dialog (void) * [DindinX 2001-09-04]: this comment is still true with the text_buffer... */ - gtk_object_set_data (GTK_OBJECT (dlg), "text_buffer", text_buffer); + g_object_set_data (G_OBJECT (dlg), "text_buffer", text_buffer); gtk_widget_show (com_frame); @@ -1864,7 +1874,7 @@ save_ok_callback (GtkWidget *widget, jsint.run = TRUE; /* pw - get the comment text_buffer object and grab it's data */ - text_buffer = gtk_object_get_data (GTK_OBJECT (data), "text_buffer"); + text_buffer = g_object_get_data (G_OBJECT (data), "text_buffer"); gtk_text_buffer_get_bounds (text_buffer, &start_iter, &end_iter); image_comment = gtk_text_buffer_get_text (text_buffer, diff --git a/plug-ins/common/laplace.c b/plug-ins/common/laplace.c index 8d9c288550..85a78804cb 100644 --- a/plug-ins/common/laplace.c +++ b/plug-ins/common/laplace.c @@ -41,18 +41,18 @@ /* Declare local functions. */ static void query (void); -static void run (gchar *name, - gint nparams, - GimpParam *param, - gint *nreturn_vals, - GimpParam **return_vals); +static void run (gchar *name, + gint nparams, + GimpParam *param, + gint *nreturn_vals, + GimpParam **return_vals); -static void laplace (GimpDrawable *drawable); -static void laplace_prepare_row (GimpPixelRgn *pixel_rgn, - guchar *data, - gint x, - gint y, - gint w); +static void laplace (GimpDrawable *drawable); +static void laplace_prepare_row (GimpPixelRgn *pixel_rgn, + guchar *data, + gint x, + gint y, + gint w); GimpPlugInInfo PLUG_IN_INFO = @@ -95,16 +95,16 @@ query (void) } static void -run (gchar *name, - gint nparams, +run (gchar *name, + gint nparams, GimpParam *param, - gint *nreturn_vals, + gint *nreturn_vals, GimpParam **return_vals) { - static GimpParam values[1]; - GimpDrawable *drawable; - GimpRunMode run_mode; - GimpPDBStatusType status = GIMP_PDB_SUCCESS; + static GimpParam values[1]; + GimpDrawable *drawable; + GimpRunMode run_mode; + GimpPDBStatusType status = GIMP_PDB_SUCCESS; run_mode = param[0].data.d_int32; @@ -130,9 +130,9 @@ run (gchar *name, } *nreturn_vals = 1; - *return_vals = values; + *return_vals = values; - values[0].type = GIMP_PDB_STATUS; + values[0].type = GIMP_PDB_STATUS; values[0].data.d_status = status; gimp_drawable_detach (drawable); @@ -140,10 +140,10 @@ run (gchar *name, static void laplace_prepare_row (GimpPixelRgn *pixel_rgn, - guchar *data, - gint x, - gint y, - gint w) + guchar *data, + gint x, + gint y, + gint w) { gint b; diff --git a/plug-ins/common/lic.c b/plug-ins/common/lic.c index 8ecab3bd6b..409be40d1a 100644 --- a/plug-ins/common/lic.c +++ b/plug-ins/common/lic.c @@ -40,7 +40,6 @@ #include #include -#include #include #include @@ -1129,45 +1128,45 @@ create_main_dialog (void) licvals.filtlen, 0, 64, 1.0, 8.0, 1, TRUE, 0, 0, NULL, NULL); - gtk_signal_connect (GTK_OBJECT(scale_data), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &licvals.filtlen); + g_signal_connect (G_OBJECT(scale_data), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &licvals.filtlen); scale_data = gimp_scale_entry_new (GTK_TABLE (table), 0, row++, _("Noise Magnitude:"), 0, 0, licvals.noisemag, 1, 5, 0.1, 1.0, 1, TRUE, 0, 0, NULL, NULL); - gtk_signal_connect (GTK_OBJECT(scale_data), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &licvals.noisemag); + g_signal_connect (G_OBJECT(scale_data), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &licvals.noisemag); scale_data = gimp_scale_entry_new (GTK_TABLE (table), 0, row++, _("Integration Steps:"), 0, 0, licvals.intsteps, 1, 40, 1.0, 5.0, 1, TRUE, 0, 0, NULL, NULL); - gtk_signal_connect (GTK_OBJECT(scale_data), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &licvals.intsteps); + g_signal_connect (G_OBJECT(scale_data), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &licvals.intsteps); scale_data = gimp_scale_entry_new (GTK_TABLE (table), 0, row++, _("Minimum Value:"), 0, 0, licvals.minv, -100, 0, 1, 10, 1, TRUE, 0, 0, NULL, NULL); - gtk_signal_connect (GTK_OBJECT(scale_data), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &licvals.minv); + g_signal_connect (G_OBJECT(scale_data), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &licvals.minv); scale_data = gimp_scale_entry_new (GTK_TABLE (table), 0, row++, _("Maximum Value:"), 0, 0, licvals.maxv, 0, 100, 1, 10, 1, TRUE, 0, 0, NULL, NULL); - gtk_signal_connect (GTK_OBJECT(scale_data), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &licvals.maxv); + g_signal_connect (G_OBJECT(scale_data), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &licvals.maxv); gtk_widget_show (dialog); } @@ -1224,16 +1223,16 @@ query (void) } static void -run (gchar *name, - gint nparams, +run (gchar *name, + gint nparams, GimpParam *param, - gint *nreturn_vals, + gint *nreturn_vals, GimpParam **return_vals) { - static GimpParam values[1]; - GimpDrawable *drawable; - GimpRunMode run_mode; - GimpPDBStatusType status = GIMP_PDB_SUCCESS; + static GimpParam values[1]; + GimpDrawable *drawable; + GimpRunMode run_mode; + GimpPDBStatusType status = GIMP_PDB_SUCCESS; run_mode = param[0].data.d_int32; @@ -1247,9 +1246,9 @@ run (gchar *name, } *nreturn_vals = 1; - *return_vals = values; + *return_vals = values; - values[0].type = GIMP_PDB_STATUS; + values[0].type = GIMP_PDB_STATUS; values[0].data.d_status = status; /* Set default values */ diff --git a/plug-ins/common/mail.c b/plug-ins/common/mail.c index 974ddf1564..044b1857cd 100644 --- a/plug-ins/common/mail.c +++ b/plug-ins/common/mail.c @@ -231,10 +231,10 @@ run (gchar *name, GimpParam **return_vals) { static GimpParam values[2]; - GimpRunMode run_mode; + GimpRunMode run_mode; GimpPDBStatusType status = GIMP_PDB_SUCCESS; - gint32 image_ID; - gint32 drawable_ID; + gint32 image_ID; + gint32 drawable_ID; INIT_I18N_UI(); @@ -244,6 +244,7 @@ run (gchar *name, *nreturn_vals = 1; *return_vals = values; + values[0].type = GIMP_PDB_STATUS; values[0].data.d_status = GIMP_PDB_EXECUTION_ERROR; @@ -470,9 +471,9 @@ save_dialog (void) NULL); - gtk_signal_connect (GTK_OBJECT (dlg), "destroy", - GTK_SIGNAL_FUNC (gtk_main_quit), - NULL); + g_signal_connect (G_OBJECT (dlg), "destroy", + G_CALLBACK (gtk_main_quit), + NULL); /* table */ table = gtk_table_new (7, 2, FALSE); @@ -491,9 +492,9 @@ save_dialog (void) gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, _("Recipient:"), 1.0, 0.5, entry, 1, FALSE); - gtk_signal_connect (GTK_OBJECT (entry), "changed", - GTK_SIGNAL_FUNC (mail_entry_callback), - &mail_info.receipt); + g_signal_connect (G_OBJECT (entry), "changed", + G_CALLBACK (mail_entry_callback), + &mail_info.receipt); /* From entry */ entry = gtk_entry_new (); @@ -503,9 +504,9 @@ save_dialog (void) gimp_table_attach_aligned (GTK_TABLE (table), 0, 1, _("Sender:"), 1.0, 0.5, entry, 1, FALSE); - gtk_signal_connect (GTK_OBJECT (entry), "changed", - GTK_SIGNAL_FUNC (mail_entry_callback), - &mail_info.from); + g_signal_connect (G_OBJECT (entry), "changed", + G_CALLBACK (mail_entry_callback), + &mail_info.from); /* Subject entry */ entry = gtk_entry_new (); @@ -515,9 +516,9 @@ save_dialog (void) gimp_table_attach_aligned (GTK_TABLE (table), 0, 2, _("Subject:"), 1.0, 0.5, entry, 1, FALSE); - gtk_signal_connect (GTK_OBJECT (entry), "changed", - GTK_SIGNAL_FUNC (mail_entry_callback), - &mail_info.subject); + g_signal_connect (G_OBJECT (entry), "changed", + G_CALLBACK (mail_entry_callback), + &mail_info.subject); /* Comment entry */ entry = gtk_entry_new (); @@ -527,9 +528,9 @@ save_dialog (void) gimp_table_attach_aligned (GTK_TABLE (table), 0, 3, _("Comment:"), 1.0, 0.5, entry, 1, FALSE); - gtk_signal_connect (GTK_OBJECT (entry), "changed", - GTK_SIGNAL_FUNC (mail_entry_callback), - &mail_info.comment); + g_signal_connect (G_OBJECT (entry), "changed", + G_CALLBACK (mail_entry_callback), + &mail_info.comment); /* Filename entry */ entry = gtk_entry_new (); @@ -539,9 +540,9 @@ save_dialog (void) gimp_table_attach_aligned (GTK_TABLE (table), 0, 4, _("Filename:"), 1.0, 0.5, entry, 1, FALSE); - gtk_signal_connect (GTK_OBJECT (entry), "changed", - GTK_SIGNAL_FUNC (mail_entry_callback), - &mail_info.filename); + g_signal_connect (G_OBJECT (entry), "changed", + G_CALLBACK (mail_entry_callback), + &mail_info.filename); /* comment */ scrolled_window = gtk_scrolled_window_new (NULL, NULL); diff --git a/plug-ins/common/mapcolor.c b/plug-ins/common/mapcolor.c index b102a488d4..bc68db8fb5 100644 --- a/plug-ins/common/mapcolor.c +++ b/plug-ins/common/mapcolor.c @@ -93,10 +93,10 @@ static gboolean run_flag = FALSE; /* Declare some local functions. */ static void query (void); -static void run (gchar *name, - gint nparams, +static void run (gchar *name, + gint nparams, GimpParam *param, - gint *nreturn_vals, + gint *nreturn_vals, GimpParam **return_vals); GimpPlugInInfo PLUG_IN_INFO = @@ -378,22 +378,22 @@ run (gchar *name, { static GimpParam values[1]; - GimpRunMode run_mode; + GimpRunMode run_mode; GimpDrawable *drawable = NULL; GimpPDBStatusType status = GIMP_PDB_SUCCESS; - guchar *c; - gint j; + guchar *c; + gint j; - c = (guchar *)ident; + c = (guchar *) ident; INIT_I18N_UI(); l_run_mode = run_mode = param[0].data.d_int32; *nreturn_vals = 1; - *return_vals = values; + *return_vals = values; - values[0].type = GIMP_PDB_STATUS; + values[0].type = GIMP_PDB_STATUS; values[0].data.d_status = status; while (status == GIMP_PDB_SUCCESS) @@ -559,9 +559,9 @@ dialog (gint32 drawable_ID) NULL); - gtk_signal_connect (GTK_OBJECT (dlg), "destroy", - GTK_SIGNAL_FUNC (gtk_main_quit), - NULL); + g_signal_connect (G_OBJECT (dlg), "destroy", + G_CALLBACK (gtk_main_quit), + NULL); /* Preview */ ip = img_preview_create_from_drawable (IMG_PRV_SIZE, drawable_ID); @@ -648,15 +648,16 @@ add_color_button (gint csel_index, PRV_WIDTH, PRV_HEIGHT, &plvals.colors[csel_index], GIMP_COLOR_AREA_FLAT); - gtk_signal_connect (GTK_OBJECT (button), "color_changed", - GTK_SIGNAL_FUNC (gimp_color_button_get_color), - &plvals.colors[csel_index]); - gtk_signal_connect (GTK_OBJECT (button), "color_changed", - GTK_SIGNAL_FUNC (update_img_preview), - NULL); gtk_table_attach (GTK_TABLE (table), button, left+1, left+2, top, top+1, GTK_FILL, GTK_FILL, 0, 0); gtk_widget_show (button); + + g_signal_connect (G_OBJECT (button), "color_changed", + G_CALLBACK (gimp_color_button_get_color), + &plvals.colors[csel_index]); + g_signal_connect (G_OBJECT (button), "color_changed", + G_CALLBACK (update_img_preview), + NULL); } diff --git a/plug-ins/common/max_rgb.c b/plug-ins/common/max_rgb.c index 0f24ae261b..1684e48446 100644 --- a/plug-ins/common/max_rgb.c +++ b/plug-ins/common/max_rgb.c @@ -139,18 +139,18 @@ run (gchar *name, gint *nreturn_vals, GimpParam **return_vals) { - GimpDrawable *drawable; - static GimpParam values[1]; - GimpPDBStatusType status = GIMP_PDB_EXECUTION_ERROR; - GimpRunMode run_mode; + GimpDrawable *drawable; + static GimpParam values[1]; + GimpPDBStatusType status = GIMP_PDB_EXECUTION_ERROR; + GimpRunMode run_mode; run_mode = param[0].data.d_int32; drawable = gimp_drawable_get (param[2].data.d_drawable); *nreturn_vals = 1; - *return_vals = values; + *return_vals = values; - values[0].type = GIMP_PDB_STATUS; + values[0].type = GIMP_PDB_STATUS; values[0].data.d_status = status; switch (run_mode) @@ -185,7 +185,6 @@ run (gchar *name, gimp_set_data (PLUG_IN_NAME, &pvals, sizeof (ValueType)); g_free(preview_bits); - values[0].type = GIMP_PDB_STATUS; values[0].data.d_status = status; } @@ -352,9 +351,9 @@ dialog (GimpDrawable *drawable) NULL); - gtk_signal_connect (GTK_OBJECT (dlg), "destroy", - GTK_SIGNAL_FUNC (gtk_main_quit), - NULL); + g_signal_connect (G_OBJECT (dlg), "destroy", + G_CALLBACK (gtk_main_quit), + NULL); main_vbox = gtk_vbox_new (FALSE, 2); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 0); @@ -380,16 +379,19 @@ dialog (GimpDrawable *drawable) frame = gimp_radio_group_new2 (TRUE, _("Parameter Settings"), G_CALLBACK (radio_callback), - &pvals.max_p, (gpointer) pvals.max_p, + &pvals.max_p, + GINT_TO_POINTER (pvals.max_p), _("Hold the Maximal Channels"), - (gpointer) MAX_CHANNELS, &max, + GINT_TO_POINTER (MAX_CHANNELS), &max, + _("Hold the Minimal Channels"), - (gpointer) MIN_CHANNELS, &min, + GINT_TO_POINTER (MIN_CHANNELS), &min, NULL); - gtk_object_set_data (GTK_OBJECT (max), "drawable", drawable); - gtk_object_set_data (GTK_OBJECT (min), "drawable", drawable); + + g_object_set_data (G_OBJECT (max), "drawable", drawable); + g_object_set_data (G_OBJECT (min), "drawable", drawable); gtk_container_set_border_width (GTK_CONTAINER (frame), 6); gtk_container_add (GTK_CONTAINER (main_vbox), frame); @@ -413,7 +415,7 @@ radio_callback (GtkWidget *widget, if (GTK_TOGGLE_BUTTON (widget)->active) { - drawable = gtk_object_get_data (GTK_OBJECT (widget), "drawable"); + drawable = g_object_get_data (G_OBJECT (widget), "drawable"); main_function (drawable, TRUE); } } diff --git a/plug-ins/common/mblur.c b/plug-ins/common/mblur.c index 5f9bcd7ccd..ac5f90cc7b 100644 --- a/plug-ins/common/mblur.c +++ b/plug-ins/common/mblur.c @@ -176,18 +176,18 @@ run (gchar *name, GimpParam **return_vals) { static GimpParam values[1]; - GimpRunMode run_mode; + GimpRunMode run_mode; GimpPDBStatusType status; status = GIMP_PDB_SUCCESS; run_mode = param[0].data.d_int32; - values[0].type = GIMP_PDB_STATUS; - values[0].data.d_status = status; - *nreturn_vals = 1; *return_vals = values; + values[0].type = GIMP_PDB_STATUS; + values[0].data.d_status = status; + /* Get the active drawable info */ drawable = gimp_drawable_get (param[2].data.d_drawable); @@ -766,25 +766,31 @@ mblur_dialog (void) NULL); - gtk_signal_connect (GTK_OBJECT (dialog), "destroy", - GTK_SIGNAL_FUNC (gtk_main_quit), - NULL); + g_signal_connect (G_OBJECT (dialog), "destroy", + G_CALLBACK (gtk_main_quit), + NULL); main_vbox = gtk_vbox_new (FALSE, 4); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 6); gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); gtk_widget_show (main_vbox); - frame = - gimp_radio_group_new2 (TRUE, _("Blur Type"), - G_CALLBACK (gimp_radio_button_update), - &mbvals.mblur_type, (gpointer) mbvals.mblur_type, + frame = gimp_radio_group_new2 (TRUE, _("Blur Type"), + G_CALLBACK (gimp_radio_button_update), + &mbvals.mblur_type, + GINT_TO_POINTER (mbvals.mblur_type), - _("Linear"), (gpointer) MBLUR_LINEAR, NULL, - _("Radial"), (gpointer) MBLUR_RADIAL, NULL, - _("Zoom"), (gpointer) MBLUR_ZOOM, NULL, + _("Linear"), + GINT_TO_POINTER (MBLUR_LINEAR), NULL, + + _("Radial"), + GINT_TO_POINTER (MBLUR_RADIAL), NULL, + + _("Zoom"), + GINT_TO_POINTER (MBLUR_ZOOM), NULL, + + NULL); - NULL); gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0); gtk_widget_show (frame); @@ -804,18 +810,18 @@ mblur_dialog (void) mbvals.length, 0.0, 256.0, 1.0, 8.0, 0, TRUE, 0, 0, NULL, NULL); - gtk_signal_connect (adjustment, "value_changed", - GTK_SIGNAL_FUNC (gimp_int_adjustment_update), - &mbvals.length); + g_signal_connect (G_OBJECT (adjustment), "value_changed", + G_CALLBACK (gimp_int_adjustment_update), + &mbvals.length); adjustment = gimp_scale_entry_new (GTK_TABLE (table), 0, 1, _("Angle:"), 150, 0, mbvals.angle, 0.0, 360.0, 1.0, 15.0, 0, TRUE, 0, 0, NULL, NULL); - gtk_signal_connect (adjustment, "value_changed", - GTK_SIGNAL_FUNC (gimp_int_adjustment_update), - &mbvals.angle); + g_signal_connect (G_OBJECT (adjustment), "value_changed", + G_CALLBACK (gimp_int_adjustment_update), + &mbvals.angle); gtk_widget_show (dialog); diff --git a/plug-ins/common/mosaic.c b/plug-ins/common/mosaic.c index 64aacda62a..eb0deba8e2 100644 --- a/plug-ins/common/mosaic.c +++ b/plug-ins/common/mosaic.c @@ -22,6 +22,7 @@ * Copyright (C) 1996 Spencer Kimball * Speedups by Elliot Lee */ + #include "config.h" #include @@ -553,9 +554,9 @@ mosaic_dialog (void) NULL); - gtk_signal_connect (GTK_OBJECT (dlg), "destroy", - GTK_SIGNAL_FUNC (gtk_main_quit), - NULL); + g_signal_connect (G_OBJECT (dlg), "destroy", + G_CALLBACK (gtk_main_quit), + NULL); /* The main hbox -- splits the scripts and the info vbox */ main_hbox = gtk_hbox_new (FALSE, 6); @@ -602,48 +603,53 @@ mosaic_dialog (void) toggle = gtk_check_button_new_with_label (_("Antialiasing")); gtk_box_pack_start (GTK_BOX (toggle_vbox), toggle, FALSE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - GTK_SIGNAL_FUNC (gimp_toggle_button_update), - &mvals.antialiasing); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), mvals.antialiasing); gtk_widget_show (toggle); + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (gimp_toggle_button_update), + &mvals.antialiasing); + toggle = gtk_check_button_new_with_label ( _("Color Averaging")); gtk_box_pack_start (GTK_BOX (toggle_vbox), toggle, FALSE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - GTK_SIGNAL_FUNC (gimp_toggle_button_update), - &mvals.color_averaging); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), mvals.color_averaging); gtk_widget_show (toggle); + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (gimp_toggle_button_update), + &mvals.color_averaging); + toggle = gtk_check_button_new_with_label ( _("Allow Tile splitting")); gtk_box_pack_start (GTK_BOX (toggle_vbox), toggle, FALSE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - GTK_SIGNAL_FUNC (gimp_toggle_button_update), - &mvals.tile_allow_split); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), mvals.tile_allow_split); gtk_widget_show (toggle); + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (gimp_toggle_button_update), + &mvals.tile_allow_split); + toggle = gtk_check_button_new_with_label ( _("Pitted Surfaces")); gtk_box_pack_start (GTK_BOX (toggle_vbox), toggle, FALSE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - GTK_SIGNAL_FUNC (gimp_toggle_button_update), - &mvals.tile_surface); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), (mvals.tile_surface == ROUGH)); gtk_widget_show (toggle); + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (gimp_toggle_button_update), + &mvals.tile_surface); + toggle = gtk_check_button_new_with_label ( _("FG/BG Lighting")); gtk_box_pack_start (GTK_BOX (toggle_vbox), toggle, FALSE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - GTK_SIGNAL_FUNC (gimp_toggle_button_update), - &mvals.grout_color); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), (mvals.grout_color == FG_BG)); gtk_widget_show (toggle); + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (gimp_toggle_button_update), + &mvals.grout_color); + gtk_widget_show (toggle_vbox); gtk_widget_show (frame); gtk_widget_show (hbox); @@ -682,27 +688,27 @@ mosaic_dialog (void) mvals.tile_size, 5.0, 100.0, 1.0, 10.0, 1, TRUE, 0, 0, NULL, NULL); - gtk_signal_connect (GTK_OBJECT (scale_data), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &mvals.tile_size); + g_signal_connect (G_OBJECT (scale_data), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &mvals.tile_size); scale_data = gimp_scale_entry_new (GTK_TABLE (table), 0, 1, _("Tile Height:"), SCALE_WIDTH, 0, mvals.tile_height, 1.0, 50.0, 1.0, 10.0, 1, TRUE, 0, 0, NULL, NULL); - gtk_signal_connect (GTK_OBJECT (scale_data), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &mvals.tile_height); + g_signal_connect (G_OBJECT (scale_data), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &mvals.tile_height); scale_data = gimp_scale_entry_new (GTK_TABLE (table), 0, 2, _("Tile Spacing:"), SCALE_WIDTH, 0, mvals.tile_spacing, 1.0, 50.0, 1.0, 10.0, 1, TRUE, 0, 0, NULL, NULL); - gtk_signal_connect (GTK_OBJECT (scale_data), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &mvals.tile_spacing); + g_signal_connect (G_OBJECT (scale_data), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &mvals.tile_spacing); scale_data = gimp_scale_entry_new (GTK_TABLE (table), 0, 3, _("Tile Neatness:"), SCALE_WIDTH, 0, @@ -710,18 +716,18 @@ mosaic_dialog (void) 0.0, 1.0, 0.10, 0.1, 2, TRUE, 0, 0, NULL, NULL); - gtk_signal_connect (GTK_OBJECT (scale_data), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &mvals.tile_neatness); + g_signal_connect (G_OBJECT (scale_data), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &mvals.tile_neatness); scale_data = gimp_scale_entry_new (GTK_TABLE (table), 0, 4, _("Light Direction:"), SCALE_WIDTH, 0, mvals.light_dir, 0.0, 360.0, 1.0, 15.0, 1, TRUE, 0, 0, NULL, NULL); - gtk_signal_connect (GTK_OBJECT (scale_data), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &mvals.light_dir); + g_signal_connect (G_OBJECT (scale_data), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &mvals.light_dir); scale_data = gimp_scale_entry_new (GTK_TABLE (table), 0, 5, _("Color Variation:"), SCALE_WIDTH, 0, @@ -729,9 +735,9 @@ mosaic_dialog (void) 0.0, 1.0, 0.01, 0.1, 2, TRUE, 0, 0, NULL, NULL); - gtk_signal_connect (GTK_OBJECT (scale_data), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &mvals.color_variation); + g_signal_connect (G_OBJECT (scale_data), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &mvals.color_variation); gtk_widget_show (frame); gtk_widget_show (table); diff --git a/plug-ins/common/newsprint.c b/plug-ins/common/newsprint.c index 8ac86b9621..714bad91e6 100644 --- a/plug-ins/common/newsprint.c +++ b/plug-ins/common/newsprint.c @@ -500,21 +500,34 @@ static const gint cspace_nchans[] = /* Declare local functions. */ static void query (void); -static void run (gchar *name, - gint nparams, - GimpParam *param, - gint *nreturn_vals, - GimpParam **return_vals); +static void run (gchar *name, + gint nparams, + GimpParam *param, + gint *nreturn_vals, + GimpParam **return_vals); -static gint newsprint_dialog (GimpDrawable *drawable); -static void newsprint_ok_callback (GtkWidget *widget, - gpointer data); -static void newsprint_cspace_update (GtkWidget *widget, - gpointer data); +static gint newsprint_dialog (GimpDrawable *drawable); +static void newsprint_ok_callback (GtkWidget *widget, + gpointer data); +static void newsprint_cspace_update (GtkWidget *widget, + gpointer data); -static void newsprint (GimpDrawable *drawable); -static guchar * spot2thresh (gint type, - gint width); +static void newsprint_menu_callback (GtkWidget *widget, + gpointer data); +static void angle_callback (GtkAdjustment *adjustment, + gpointer data); +static void lpi_callback (GtkAdjustment *adjustment, + gpointer data); +static void spi_callback (GtkAdjustment *adjustment, + gpointer data); +static void cellsize_callback (GtkAdjustment *adjustment, + gpointer data); +static void newsprint_defaults_callback (GtkWidget *widget, + gpointer data); + +static void newsprint (GimpDrawable *drawable); +static guchar * spot2thresh (gint type, + gint width); GimpPlugInInfo PLUG_IN_INFO = @@ -575,23 +588,23 @@ query (void) } static void -run (gchar *name, - gint nparams, +run (gchar *name, + gint nparams, GimpParam *param, - gint *nreturn_vals, - GimpParam **return_vals) + gint *nreturn_vals, + GimpParam **return_vals) { - static GimpParam values[1]; - GimpDrawable *drawable; - GimpRunMode run_mode; - GimpPDBStatusType status = GIMP_PDB_SUCCESS; + static GimpParam values[1]; + GimpDrawable *drawable; + GimpRunMode run_mode; + GimpPDBStatusType status = GIMP_PDB_SUCCESS; run_mode = param[0].data.d_int32; *nreturn_vals = 1; - *return_vals = values; + *return_vals = values; - values[0].type = GIMP_PDB_STATUS; + values[0].type = GIMP_PDB_STATUS; values[0].data.d_status = status; /* basic defaults */ @@ -814,23 +827,20 @@ preview_update (channel_st *st) } /* redraw preview widget */ - gtk_widget_draw (prev->widget, NULL); + gtk_widget_queue_draw (prev->widget); g_snprintf (pct, sizeof (pct), "%2d%%", (int) RINT (spotfn_list[sfn].prev_lvl[i] * 100)); gtk_label_set_text (GTK_LABEL(prev->label), pct); } - - gdk_flush (); } - + static void newsprint_menu_callback (GtkWidget *widget, gpointer data) { channel_st *st = data; - gpointer ud; gint menufn; static gint in_progress = FALSE; @@ -845,8 +855,8 @@ newsprint_menu_callback (GtkWidget *widget, in_progress = TRUE; - ud = gtk_object_get_user_data (GTK_OBJECT (widget)); - menufn = GPOINTER_TO_INT (ud); + menufn = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (widget), + "gimp-item-data")); *(st->spotfn_num) = menufn; @@ -884,7 +894,7 @@ angle_callback (GtkAdjustment *adjustment, gdouble *angle_ptr; static gint in_progress = FALSE; - angle_ptr = gtk_object_get_user_data (GTK_OBJECT (adjustment)); + angle_ptr = g_object_get_data (G_OBJECT (adjustment), "angle"); gimp_double_adjustment_update (adjustment, angle_ptr); @@ -904,22 +914,6 @@ angle_callback (GtkAdjustment *adjustment, } } -static void -spi_callback (GtkAdjustment *adjustment, - gpointer data) -{ - NewsprintDialog_st *st = data; - - gimp_double_adjustment_update (adjustment, &pvals_ui.input_spi); - - gtk_signal_handler_block_by_data (GTK_OBJECT (st->output_lpi), data); - - gtk_adjustment_set_value (GTK_ADJUSTMENT (st->output_lpi), - pvals_ui.input_spi / pvals.cell_width); - - gtk_signal_handler_unblock_by_data (GTK_OBJECT (st->output_lpi), data); -} - static void lpi_callback (GtkAdjustment *adjustment, gpointer data) @@ -928,12 +922,36 @@ lpi_callback (GtkAdjustment *adjustment, gimp_double_adjustment_update (adjustment, &pvals_ui.output_lpi); - gtk_signal_handler_block_by_data (GTK_OBJECT (st->cellsize), data); + g_signal_handlers_block_by_func (G_OBJECT (st->cellsize), + cellsize_callback, + data); gtk_adjustment_set_value (GTK_ADJUSTMENT (st->cellsize), pvals_ui.input_spi / pvals_ui.output_lpi); - gtk_signal_handler_unblock_by_data (GTK_OBJECT (st->cellsize), data); + g_signal_handlers_unblock_by_func (G_OBJECT (st->cellsize), + cellsize_callback, + data); +} + +static void +spi_callback (GtkAdjustment *adjustment, + gpointer data) +{ + NewsprintDialog_st *st = data; + + gimp_double_adjustment_update (adjustment, &pvals_ui.input_spi); + + g_signal_handlers_block_by_func (G_OBJECT (st->output_lpi), + lpi_callback, + data); + + gtk_adjustment_set_value (GTK_ADJUSTMENT (st->output_lpi), + pvals_ui.input_spi / pvals.cell_width); + + g_signal_handlers_unblock_by_func (G_OBJECT (st->output_lpi), + lpi_callback, + data); } static void @@ -944,12 +962,16 @@ cellsize_callback (GtkAdjustment *adjustment, gimp_int_adjustment_update (adjustment, &pvals.cell_width); - gtk_signal_handler_block_by_data (GTK_OBJECT (st->output_lpi), data); + g_signal_handlers_block_by_func (G_OBJECT (st->output_lpi), + lpi_callback, + data); gtk_adjustment_set_value (GTK_ADJUSTMENT (st->output_lpi), pvals_ui.input_spi / pvals.cell_width); - gtk_signal_handler_unblock_by_data (GTK_OBJECT (st->output_lpi), data); + g_signal_handlers_unblock_by_func (G_OBJECT (st->output_lpi), + lpi_callback, + data); } static void @@ -1034,10 +1056,11 @@ new_channel (const chan_tmpl *ct) -90, 90, 1, 15, 1, TRUE, 0, 0, NULL, NULL); - gtk_object_set_user_data (chst->angle_adj, ct->angle); - gtk_signal_connect (GTK_OBJECT (chst->angle_adj), "value_changed", - GTK_SIGNAL_FUNC (angle_callback), - chst); + g_object_set_data (G_OBJECT (chst->angle_adj), "angle", ct->angle); + + g_signal_connect (G_OBJECT (chst->angle_adj), "value_changed", + G_CALLBACK (angle_callback), + chst); /* spot function popup */ hbox = gtk_hbox_new (FALSE, 6); @@ -1068,14 +1091,17 @@ new_channel (const chan_tmpl *ct) while (sf->name) { chst->menuitem[i] = gtk_menu_item_new_with_label( gettext(sf->name)); - gtk_signal_connect (GTK_OBJECT (chst->menuitem[i]), "activate", - GTK_SIGNAL_FUNC (newsprint_menu_callback), - chst); - gtk_object_set_user_data (GTK_OBJECT (chst->menuitem[i]), - GINT_TO_POINTER (i)); - gtk_widget_show (chst->menuitem[i]); gtk_menu_shell_append (GTK_MENU_SHELL (menu), GTK_WIDGET (chst->menuitem[i])); + gtk_widget_show (chst->menuitem[i]); + + g_signal_connect (G_OBJECT (chst->menuitem[i]), "activate", + G_CALLBACK (newsprint_menu_callback), + chst); + + g_object_set_data (G_OBJECT (chst->menuitem[i]), "gimp-item-data", + GINT_TO_POINTER (i)); + sf++; i++; } @@ -1116,7 +1142,6 @@ new_channel (const chan_tmpl *ct) /* create the menuitem used to select this channel for editing */ chst->ch_menuitem = gtk_menu_item_new_with_label (gettext (ct->name)); - gtk_object_set_user_data (GTK_OBJECT (chst->ch_menuitem), chst); /* signal attachment and showing left to caller */ /* deliberately don't show the chst->frame, leave that up to @@ -1221,9 +1246,9 @@ newsprint_dialog (GimpDrawable *drawable) NULL); - gtk_signal_connect (GTK_OBJECT (st.dlg), "destroy", - GTK_SIGNAL_FUNC (gtk_main_quit), - NULL); + g_signal_connect (G_OBJECT (st.dlg), "destroy", + G_CALLBACK (gtk_main_quit), + NULL); main_vbox = gtk_vbox_new (FALSE, 4); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 6); @@ -1256,9 +1281,9 @@ newsprint_dialog (GimpDrawable *drawable) 1.0, 1200.0, 1.0, 10.0, 0, FALSE, GIMP_MIN_RESOLUTION, GIMP_MAX_RESOLUTION, NULL, NULL); - gtk_signal_connect (GTK_OBJECT (st.input_spi), "value_changed", - GTK_SIGNAL_FUNC (spi_callback), - &st); + g_signal_connect (G_OBJECT (st.input_spi), "value_changed", + G_CALLBACK (spi_callback), + &st); st.output_lpi = gimp_scale_entry_new (GTK_TABLE (table), 0, 1, @@ -1267,9 +1292,9 @@ newsprint_dialog (GimpDrawable *drawable) 1.0, 1200.0, 1.0, 10.0, 1, FALSE, GIMP_MIN_RESOLUTION, GIMP_MAX_RESOLUTION, NULL, NULL); - gtk_signal_connect (GTK_OBJECT (st.output_lpi), "value_changed", - GTK_SIGNAL_FUNC (lpi_callback), - &st); + g_signal_connect (G_OBJECT (st.output_lpi), "value_changed", + G_CALLBACK (lpi_callback), + &st); st.cellsize = gimp_scale_entry_new (GTK_TABLE (table), 0, 2, _("Cell Size:"), SCALE_WIDTH, 0, @@ -1277,9 +1302,9 @@ newsprint_dialog (GimpDrawable *drawable) 3.0, 100.0, 1.0, 5.0, 0, FALSE, 3.0, GIMP_MAX_IMAGE_SIZE, NULL, NULL); - gtk_signal_connect (GTK_OBJECT (st.cellsize), "value_changed", - GTK_SIGNAL_FUNC (cellsize_callback), - &st); + g_signal_connect (G_OBJECT (st.cellsize), "value_changed", + G_CALLBACK (cellsize_callback), + &st); gtk_widget_show (table); gtk_widget_show (frame); @@ -1313,13 +1338,13 @@ newsprint_dialog (GimpDrawable *drawable) 0, 100, 1, 10, 0, TRUE, 0, 0, NULL, NULL); - gtk_signal_connect (GTK_OBJECT (st.pull), "value_changed", - GTK_SIGNAL_FUNC (gimp_int_adjustment_update), - &pvals.k_pullout); gtk_widget_set_sensitive (st.pull_table, (pvals.colourspace == CS_CMYK)); - gtk_widget_show (st.pull_table); + g_signal_connect (G_OBJECT (st.pull), "value_changed", + G_CALLBACK (gimp_int_adjustment_update), + &pvals.k_pullout); + /* RGB / CMYK / Intensity select */ hbox = gtk_hbox_new (FALSE, 6); gtk_box_pack_start (GTK_BOX (st.vbox), hbox, FALSE, FALSE, 0); @@ -1336,62 +1361,69 @@ newsprint_dialog (GimpDrawable *drawable) gtk_widget_show(label); toggle = gtk_radio_button_new_with_label(group, _("RGB")); - 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, TRUE, TRUE, 0); - gtk_object_set_user_data(GTK_OBJECT(toggle), &st); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), (pvals.colourspace == CS_RGB)); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - (GtkSignalFunc) newsprint_cspace_update, - GINT_TO_POINTER(CS_RGB)); gtk_widget_show (toggle); + g_object_set_data (G_OBJECT (toggle), "dialog", &st); + + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (newsprint_cspace_update), + GINT_TO_POINTER (CS_RGB)); + toggle = gtk_radio_button_new_with_label (group, _("CMYK")); - 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, TRUE, TRUE, 0); - gtk_object_set_user_data(GTK_OBJECT(toggle), &st); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), (pvals.colourspace == CS_CMYK)); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - (GtkSignalFunc) newsprint_cspace_update, - GINT_TO_POINTER(CS_CMYK)); gtk_widget_show (toggle); + g_object_set_data (G_OBJECT (toggle), "dialog", &st); + + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (newsprint_cspace_update), + GINT_TO_POINTER (CS_CMYK)); + toggle = gtk_radio_button_new_with_label (group, _("Intensity")); - 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, TRUE, TRUE, 0); - gtk_object_set_user_data(GTK_OBJECT(toggle), &st); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), (pvals.colourspace == CS_INTENSITY)); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - (GtkSignalFunc) newsprint_cspace_update, - GINT_TO_POINTER(CS_INTENSITY)); gtk_widget_show (toggle); + g_object_set_data (G_OBJECT (toggle), "dialog", &st); + + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (newsprint_cspace_update), + GINT_TO_POINTER (CS_INTENSITY)); + gtk_widget_show (hbox); /* channel lock & factory defaults button */ hbox = gtk_hbutton_box_new (); - gtk_button_box_set_spacing (GTK_BUTTON_BOX (hbox), 10); + gtk_box_set_spacing (GTK_BOX (hbox), 10); gtk_box_pack_start (GTK_BOX (st.vbox), hbox, FALSE, FALSE, 0); gtk_widget_show (hbox); toggle = gtk_check_button_new_with_label (_("Lock Channels")); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - GTK_SIGNAL_FUNC (gimp_toggle_button_update), - &pvals_ui.lock_channels); - gtk_object_set_user_data (GTK_OBJECT (toggle), NULL); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), pvals_ui.lock_channels); gtk_box_pack_start (GTK_BOX (hbox), toggle, FALSE, FALSE, 0); gtk_widget_show (toggle); + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (gimp_toggle_button_update), + &pvals_ui.lock_channels); + button = gtk_button_new_with_label (_("Factory Defaults")); - gtk_signal_connect(GTK_OBJECT (button), "clicked", - GTK_SIGNAL_FUNC (newsprint_defaults_callback), - &st); gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE, 0); gtk_widget_show (button); + + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (newsprint_defaults_callback), + &st); } /* Make the channels appropriate for this colourspace and @@ -1423,9 +1455,9 @@ newsprint_dialog (GimpDrawable *drawable) 1.0, 15.0, 1.0, 5.0, 0, TRUE, 0, 0, NULL, NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_int_adjustment_update), - &pvals.oversample); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_int_adjustment_update), + &pvals.oversample); gtk_widget_show (table); gtk_widget_show (frame); @@ -1457,7 +1489,7 @@ newsprint_cspace_update (GtkWidget *widget, gint new_cs = GPOINTER_TO_INT (data); gint old_cs = pvals.colourspace; - st = gtk_object_get_user_data (GTK_OBJECT (widget)); + st = g_object_get_data (G_OBJECT (widget), "dialog"); if (!st) printf ("newsprint: cspace_update: no state, can't happen!\n"); diff --git a/plug-ins/dbbrowser/dbbrowser_utils.c b/plug-ins/dbbrowser/dbbrowser_utils.c index 17ac50517a..9a7eb9309e 100644 --- a/plug-ins/dbbrowser/dbbrowser_utils.c +++ b/plug-ins/dbbrowser/dbbrowser_utils.c @@ -26,6 +26,12 @@ #include "config.h" #include + +#ifdef __GNUC__ +#warning GTK_DISABLE_DEPRECATED +#endif +#undef GTK_DISABLE_DEPRECATED + #include #include @@ -35,17 +41,18 @@ #include "libgimp/stdplugins-intl.h" -/* FIXME: remove usage of the 'broken' GtkText */ +#ifdef __GNUC__ +#warning GTK_ENABLE_BROKEN +#endif #define GTK_ENABLE_BROKEN + #include -/* configuration */ #define DBL_LIST_WIDTH 220 -#define DBL_WIDTH DBL_LIST_WIDTH+400 -#define DBL_HEIGHT 250 +#define DBL_WIDTH DBL_LIST_WIDTH+400 +#define DBL_HEIGHT 250 -/* end of configuration */ typedef struct { diff --git a/plug-ins/dbbrowser/gimpprocbrowser.c b/plug-ins/dbbrowser/gimpprocbrowser.c index 17ac50517a..9a7eb9309e 100644 --- a/plug-ins/dbbrowser/gimpprocbrowser.c +++ b/plug-ins/dbbrowser/gimpprocbrowser.c @@ -26,6 +26,12 @@ #include "config.h" #include + +#ifdef __GNUC__ +#warning GTK_DISABLE_DEPRECATED +#endif +#undef GTK_DISABLE_DEPRECATED + #include #include @@ -35,17 +41,18 @@ #include "libgimp/stdplugins-intl.h" -/* FIXME: remove usage of the 'broken' GtkText */ +#ifdef __GNUC__ +#warning GTK_ENABLE_BROKEN +#endif #define GTK_ENABLE_BROKEN + #include -/* configuration */ #define DBL_LIST_WIDTH 220 -#define DBL_WIDTH DBL_LIST_WIDTH+400 -#define DBL_HEIGHT 250 +#define DBL_WIDTH DBL_LIST_WIDTH+400 +#define DBL_HEIGHT 250 -/* end of configuration */ typedef struct { diff --git a/plug-ins/dbbrowser/gimpprocview.c b/plug-ins/dbbrowser/gimpprocview.c index 17ac50517a..9a7eb9309e 100644 --- a/plug-ins/dbbrowser/gimpprocview.c +++ b/plug-ins/dbbrowser/gimpprocview.c @@ -26,6 +26,12 @@ #include "config.h" #include + +#ifdef __GNUC__ +#warning GTK_DISABLE_DEPRECATED +#endif +#undef GTK_DISABLE_DEPRECATED + #include #include @@ -35,17 +41,18 @@ #include "libgimp/stdplugins-intl.h" -/* FIXME: remove usage of the 'broken' GtkText */ +#ifdef __GNUC__ +#warning GTK_ENABLE_BROKEN +#endif #define GTK_ENABLE_BROKEN + #include -/* configuration */ #define DBL_LIST_WIDTH 220 -#define DBL_WIDTH DBL_LIST_WIDTH+400 -#define DBL_HEIGHT 250 +#define DBL_WIDTH DBL_LIST_WIDTH+400 +#define DBL_HEIGHT 250 -/* end of configuration */ typedef struct { diff --git a/plug-ins/fits/fits.c b/plug-ins/fits/fits.c index 642fa1948d..dac0101956 100644 --- a/plug-ins/fits/fits.c +++ b/plug-ins/fits/fits.c @@ -66,10 +66,10 @@ typedef struct /* Declare some local functions. */ static void query (void); -static void run (gchar *name, - gint nparams, +static void run (gchar *name, + gint nparams, GimpParam *param, - gint *nreturn_vals, + gint *nreturn_vals, GimpParam **return_vals); static gint32 load_image (gchar *filename); @@ -981,16 +981,17 @@ load_dialog (void) GTK_WIN_POS_MOUSE, FALSE, FALSE, FALSE, - GTK_STOCK_OK, load_ok_callback, - NULL, NULL, NULL, TRUE, FALSE, GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, + GTK_STOCK_OK, load_ok_callback, + NULL, NULL, NULL, TRUE, FALSE, + NULL); - gtk_signal_connect (GTK_OBJECT (dialog), "destroy", - GTK_SIGNAL_FUNC (gtk_main_quit), - NULL); + g_signal_connect (G_OBJECT (dialog), "destroy", + G_CALLBACK (gtk_main_quit), + NULL); vbox = gtk_vbox_new (FALSE, 4); gtk_container_set_border_width (GTK_CONTAINER (vbox), 6); diff --git a/plug-ins/flame/flame.c b/plug-ins/flame/flame.c index 2439f589e5..0f77d0c09f 100644 --- a/plug-ins/flame/flame.c +++ b/plug-ins/flame/flame.c @@ -383,7 +383,7 @@ ok_callback (GtkWidget *widget, gtk_widget_destroy (GTK_WIDGET (data)); } -static void +static gboolean file_cancel_callback (GtkWidget *widget, gpointer data) { @@ -394,6 +394,8 @@ file_cancel_callback (GtkWidget *widget, if (! GTK_WIDGET_SENSITIVE (save_button)) gtk_widget_set_sensitive (save_button, TRUE); + + return TRUE; } static void @@ -476,18 +478,18 @@ make_file_dlg (void) gtk_quit_add_destroy (1, GTK_OBJECT (file_dlg)); gtk_window_set_position (GTK_WINDOW (file_dlg), GTK_WIN_POS_MOUSE); - gtk_signal_connect_object (GTK_OBJECT (file_dlg), "delete_event", - GTK_SIGNAL_FUNC (file_cancel_callback), - GTK_OBJECT (file_dlg)); - gtk_signal_connect (GTK_OBJECT (GTK_FILE_SELECTION (file_dlg)->ok_button), - "clicked", - GTK_SIGNAL_FUNC (file_ok_callback), + g_signal_connect_swapped (G_OBJECT (file_dlg), "delete_event", + G_CALLBACK (file_cancel_callback), + file_dlg); + g_signal_connect (G_OBJECT (GTK_FILE_SELECTION (file_dlg)->ok_button), + "clicked", + G_CALLBACK (file_ok_callback), file_dlg); - gtk_signal_connect_object - (GTK_OBJECT (GTK_FILE_SELECTION (file_dlg)->cancel_button), + g_signal_connect_swapped + (G_OBJECT (GTK_FILE_SELECTION (file_dlg)->cancel_button), "clicked", - GTK_SIGNAL_FUNC (file_cancel_callback), - GTK_OBJECT (file_dlg)); + G_CALLBACK (file_cancel_callback), + file_dlg); gimp_help_connect (file_dlg, gimp_standard_help_func, "filters/flame.html"); } @@ -576,7 +578,7 @@ set_edit_preview (void) gtk_preview_draw_row (GTK_PREVIEW (edit_previews[mut]), b + y * EDIT_PREVIEW_SIZE * 3, 0, y, EDIT_PREVIEW_SIZE); - gtk_widget_draw (edit_previews[mut], NULL); + gtk_widget_queue_draw (edit_previews[mut]); } g_free (b); } @@ -664,13 +666,14 @@ edit_callback (GtkWidget *widget, EDIT_PREVIEW_SIZE, EDIT_PREVIEW_SIZE); button = gtk_button_new (); gtk_container_add (GTK_CONTAINER(button), edit_previews[mut]); - gtk_signal_connect (GTK_OBJECT (button), "clicked", - GTK_SIGNAL_FUNC (preview_clicked), - (gpointer) mut); gtk_table_attach (GTK_TABLE (table), button, i, i+1, j, j+1, GTK_EXPAND, GTK_EXPAND, 0, 0); gtk_widget_show (edit_previews[mut]); gtk_widget_show (button); + + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (preview_clicked), + GINT_TO_POINTER (mut)); } frame = gtk_frame_new( _("Controls")); @@ -693,12 +696,13 @@ edit_callback (GtkWidget *widget, 0.05, 0.5, 0.01, 0.1, 2, TRUE, 0, 0, NULL, NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &pick_speed); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (set_edit_preview), - NULL); + + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &pick_speed); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (set_edit_preview), + NULL); hbox = gtk_hbox_new (FALSE, 4); gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); @@ -707,11 +711,12 @@ edit_callback (GtkWidget *widget, button = gtk_button_new_with_label( _("Randomize")); gtk_misc_set_padding (GTK_MISC (GTK_BIN (button)->child), 2, 0); gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0); - gtk_signal_connect_object (GTK_OBJECT (button), "clicked", - GTK_SIGNAL_FUNC (randomize_callback), - NULL); gtk_widget_show (button); + g_signal_connect_swapped (G_OBJECT (button), "clicked", + G_CALLBACK (randomize_callback), + NULL); + optionmenu = gimp_option_menu_new2 (FALSE, G_CALLBACK (menu_cb), &config.variation, @@ -837,7 +842,7 @@ set_flame_preview (void) b+y*preview_width*3, 0, y, preview_width); g_free (b); - gtk_widget_draw (flame_preview, NULL); + gtk_widget_queue_draw (flame_preview); } static void @@ -867,7 +872,7 @@ set_cmap_preview (void) gtk_preview_draw_row (GTK_PREVIEW (cmap_preview), b, 0, y+3, 32); } - gtk_widget_draw (cmap_preview, NULL); + gtk_widget_queue_draw (cmap_preview); } static void @@ -918,15 +923,17 @@ dialog (void) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - GTK_STOCK_OK, ok_callback, - NULL, NULL, NULL, TRUE, FALSE, GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, + GTK_STOCK_OK, ok_callback, + NULL, NULL, NULL, TRUE, FALSE, + NULL); - gtk_signal_connect (GTK_OBJECT (dlg), "destroy", - GTK_SIGNAL_FUNC (gtk_main_quit), - NULL); + + g_signal_connect (G_OBJECT (dlg), "destroy", + G_CALLBACK (gtk_main_quit), + NULL); main_vbox = gtk_vbox_new (FALSE, 4); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 6); @@ -966,30 +973,33 @@ dialog (void) vbbox= gtk_vbutton_box_new (); gtk_box_set_homogeneous (GTK_BOX (vbbox), FALSE); - gtk_button_box_set_spacing (GTK_BUTTON_BOX (vbbox), 4); + gtk_box_set_spacing (GTK_BOX (vbbox), 4); gtk_box_pack_start (GTK_BOX (box), vbbox, FALSE, FALSE, 0); gtk_widget_show (vbbox); button = gtk_button_new_with_label (_("Edit Flame")); - gtk_signal_connect (GTK_OBJECT (button), "clicked", - GTK_SIGNAL_FUNC (edit_callback), - NULL); gtk_box_pack_start (GTK_BOX (vbbox), button, FALSE, FALSE, 0); gtk_widget_show (button); + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (edit_callback), + NULL); + load_button = button = gtk_button_new_with_label (_("Load Flame")); - gtk_signal_connect (GTK_OBJECT (button), "clicked", - GTK_SIGNAL_FUNC (load_callback), - NULL); gtk_box_pack_start (GTK_BOX (vbbox), button, FALSE, FALSE, 0); gtk_widget_show (button); + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (load_callback), + NULL); + save_button = button = gtk_button_new_with_label (_("Save Flame")); - gtk_signal_connect (GTK_OBJECT (button), "clicked", - GTK_SIGNAL_FUNC (save_callback), - NULL); gtk_box_pack_start (GTK_BOX (vbbox), button, FALSE, FALSE, 0); gtk_widget_show (button); + + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (save_callback), + NULL); } frame = gtk_frame_new (_("Rendering")); @@ -1014,12 +1024,13 @@ dialog (void) 0, 5, 0.1, 1, 2, TRUE, 0, 0, NULL, NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &config.cp.brightness); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (set_flame_preview), - NULL); + + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &config.cp.brightness); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (set_flame_preview), + NULL); adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 1, _("Contrast:"), SCALE_WIDTH, 0, @@ -1027,12 +1038,13 @@ dialog (void) 0, 5, 0.1, 1, 2, TRUE, 0, 0, NULL, NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &config.cp.contrast); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (set_flame_preview), - NULL); + + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &config.cp.contrast); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (set_flame_preview), + NULL); adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 2, _("Gamma:"), SCALE_WIDTH, 0, @@ -1040,12 +1052,13 @@ dialog (void) 1, 5, 0.1, 1, 2, TRUE, 0, 0, NULL, NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &config.cp.gamma); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (set_flame_preview), - NULL); + + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &config.cp.gamma); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (set_flame_preview), + NULL); adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 3, _("Sample Density:"), SCALE_WIDTH, 0, @@ -1053,9 +1066,10 @@ dialog (void) 0.1, 20, 1, 5, 2, TRUE, 0, 0, NULL, NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &config.cp.sample_density); + + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &config.cp.sample_density); adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 4, _("Spatial Oversample:"), SCALE_WIDTH, 0, @@ -1063,9 +1077,10 @@ dialog (void) 0, 1, 0.01, 0.1, 0, TRUE, 0, 0, NULL, NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_int_adjustment_update), - &config.cp.spatial_oversample); + + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_int_adjustment_update), + &config.cp.spatial_oversample); adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 5, _("Spatial Filter Radius:"), SCALE_WIDTH, 0, @@ -1073,9 +1088,10 @@ dialog (void) 0, 4, 0.2, 1, 2, TRUE, 0, 0, NULL, NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &config.cp.spatial_filter_radius); + + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &config.cp.spatial_filter_radius); { GtkWidget *sep; @@ -1106,9 +1122,9 @@ dialog (void) config.cmap_drawable = save_drawable; #if 0 menuitem = gtk_menu_item_new_with_label (_("Black")); - gtk_signal_connect (GTK_OBJECT (menuitem), "activate", - GTK_SIGNAL_FUNC (gradient_cb), - (gpointer) BLACK_DRAWABLE); + g_signal_connect (G_OBJECT (menuitem), "activate", + G_CALLBACK (gradient_cb), + (gpointer) BLACK_DRAWABLE); gtk_menu_prepend (GTK_MENU (menu), menuitem); if (BLACK_DRAWABLE == save_drawable) gtk_menu_set_active (GTK_MENU (menu), 0); @@ -1132,9 +1148,9 @@ dialog (void) gint d = TABLE_DRAWABLE - good[i]; menuitem = gtk_menu_item_new_with_label (names[i]); - gtk_signal_connect (GTK_OBJECT (menuitem), "activate", - GTK_SIGNAL_FUNC (gradient_cb), - (gpointer) d); + g_signal_connect (G_OBJECT (menuitem), "activate", + G_CALLBACK (gradient_cb), + (gpointer) d); gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), menuitem); if (d == save_drawable) gtk_menu_set_active (GTK_MENU (menu), 0); @@ -1143,9 +1159,9 @@ dialog (void) } menuitem = gtk_menu_item_new_with_label (_("Custom Gradient")); - gtk_signal_connect (GTK_OBJECT (menuitem), "activate", - GTK_SIGNAL_FUNC (gradient_cb), - (gpointer) GRADIENT_DRAWABLE); + g_signal_connect (G_OBJECT (menuitem), "activate", + G_CALLBACK (gradient_cb), + (gpointer) GRADIENT_DRAWABLE); gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), menuitem); if (GRADIENT_DRAWABLE == save_drawable) gtk_menu_set_active (GTK_MENU (menu), 0); @@ -1179,12 +1195,13 @@ dialog (void) -4, 4, 0.5, 1, 2, TRUE, 0, 0, NULL, NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &config.cp.zoom); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (set_flame_preview), - NULL); + + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &config.cp.zoom); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (set_flame_preview), + NULL); adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 1, _("X:"), SCALE_WIDTH, 0, @@ -1192,12 +1209,13 @@ dialog (void) -2, 2, 0.5, 1, 2, TRUE, 0, 0, NULL, NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &config.cp.center[0]); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (set_flame_preview), - NULL); + + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &config.cp.center[0]); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (set_flame_preview), + NULL); adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 2, _("Y:"), SCALE_WIDTH, 0, @@ -1205,12 +1223,13 @@ dialog (void) -2, 2, 0.5, 1, 2, TRUE, 0, 0, NULL, NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &config.cp.center[1]); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (set_flame_preview), - NULL); + + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &config.cp.center[1]); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (set_flame_preview), + NULL); flame_preview = gtk_preview_new (GTK_PREVIEW_COLOR); { diff --git a/plug-ins/fp/fp_gtk.c b/plug-ins/fp/fp_gtk.c index 4b5aa49344..0b28032a7c 100644 --- a/plug-ins/fp/fp_gtk.c +++ b/plug-ins/fp/fp_gtk.c @@ -122,15 +122,17 @@ fp_create_bna (void) } /* close a sub dialog (from window manager) by simulating toggle click */ -void +gboolean sub_dialog_destroy (GtkWidget *dialog, GdkEvent *ev, gpointer dummy) { GtkWidget *button = - GTK_WIDGET (gtk_object_get_data (GTK_OBJECT (dialog), "ctrlButton")); + GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), "ctrlButton")); - gtk_signal_emit_by_name (GTK_OBJECT (button), "clicked", dialog); + gtk_button_clicked (GTK_BUTTON (button)); + + return TRUE; } GtkWidget * @@ -196,9 +198,10 @@ fp_create_circle_palette (void) gtk_window_set_title (GTK_WINDOW (win), _("Hue Variations")); gtk_container_add (GTK_CONTAINER (win), frame); - gtk_signal_connect (GTK_OBJECT (win), "delete_event", - GTK_SIGNAL_FUNC (sub_dialog_destroy), - NULL); + + g_signal_connect (G_OBJECT (win), "delete_event", + G_CALLBACK (sub_dialog_destroy), + NULL); return win; } @@ -216,14 +219,15 @@ fp_create_rough (void) data = gtk_adjustment_new (Current.Rough, 0, 1.0, 0.05, 0.01, 0.0); Current.roughnessScale = scale = gtk_hscale_new (GTK_ADJUSTMENT (data)); - gtk_widget_set_usize (scale, 60, 0); + gtk_widget_set_size_request (scale, 60, -1); gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP); gtk_scale_set_digits (GTK_SCALE (scale), 2); - gtk_signal_connect (GTK_OBJECT (data), "value_changed", - GTK_SIGNAL_FUNC (fp_scale_update), - &Current.Rough); gtk_widget_show (scale); + g_signal_connect (G_OBJECT (data), "value_changed", + G_CALLBACK (fp_scale_update), + &Current.Rough); + vbox = gtk_vbox_new (FALSE, 2); gtk_container_set_border_width (GTK_CONTAINER (vbox), 4); gtk_widget_show (vbox); @@ -342,9 +346,10 @@ fp_create_lnd (void) gtk_window_set_title (GTK_WINDOW (win), _("Value Variations")); gtk_container_add (GTK_CONTAINER (win), frame); - gtk_signal_connect (GTK_OBJECT (win), "delete_event", - GTK_SIGNAL_FUNC (sub_dialog_destroy), - NULL); + + g_signal_connect (G_OBJECT (win), "delete_event", + G_CALLBACK (sub_dialog_destroy), + NULL); return win; } @@ -390,9 +395,10 @@ fp_create_msnls (void) gtk_window_set_title (GTK_WINDOW (win), _("Saturation Variations")); gtk_container_add (GTK_CONTAINER (win), frame); - gtk_signal_connect (GTK_OBJECT (win), "delete_event", - GTK_SIGNAL_FUNC (sub_dialog_destroy), - NULL); + + g_signal_connect (G_OBJECT (win), "delete_event", + G_CALLBACK (sub_dialog_destroy), + NULL); return win; } @@ -515,15 +521,17 @@ Button_In_A_Box (GtkWidget *vbox, GtkWidget *button; button = gtk_radio_button_new_with_label (group, label); - gtk_signal_connect (GTK_OBJECT (button), "clicked", - GTK_SIGNAL_FUNC (function), - data); gtk_widget_show (button); gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0); + + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (function), + data); + if (clicked) gtk_button_clicked (GTK_BUTTON (button)); - return gtk_radio_button_group (GTK_RADIO_BUTTON (button)); + return gtk_radio_button_get_group (GTK_RADIO_BUTTON (button)); } void @@ -536,13 +544,14 @@ Check_Button_In_A_Box (GtkWidget *vbox, GtkWidget *button; button = gtk_check_button_new_with_label (label); - gtk_signal_connect (GTK_OBJECT (button), "clicked", - GTK_SIGNAL_FUNC (function), - data); gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), clicked); - gtk_widget_show (button); + + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (function), + data); + + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), clicked); } void @@ -555,14 +564,15 @@ Frames_Check_Button_In_A_Box (GtkWidget *vbox, GtkWidget *button; button = gtk_check_button_new_with_label (label); - gtk_signal_connect (GTK_OBJECT (button), "clicked", - GTK_SIGNAL_FUNC (function), - frame); gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), clicked); - gtk_object_set_data (GTK_OBJECT (frame), "ctrlButton", (gpointer) button); - + g_object_set_data (G_OBJECT (frame), "ctrlButton", (gpointer) button); gtk_widget_show (button); + + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (function), + frame); +# + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), clicked); } void @@ -593,14 +603,15 @@ Create_A_Table_Entry (GtkWidget **box, if (description != current_val) { button = gtk_button_new (); - gtk_signal_connect (GTK_OBJECT (button), "clicked", - GTK_SIGNAL_FUNC (selectionMade), - (gchar *) description); - - gtk_container_add (GTK_CONTAINER (button), SmallerFrame); - gtk_widget_show (button); gtk_table_attach (GTK_TABLE (table), button, 0, 1, 1, 2, 0, 0, 0, 4); + gtk_widget_show (button); + + gtk_container_add (GTK_CONTAINER (button), SmallerFrame); + + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (selectionMade), + (gchar *) description); } else { @@ -618,16 +629,16 @@ fp_redraw_all_windows (void) Adjust_Preview_Sizes (reduced->width, reduced->height); /*gtk_container_check_resize(GTK_CONTAINER(fpFrames.palette), NULL);*/ - gtk_widget_draw (fpFrames.palette, NULL); + gtk_widget_queue_draw (fpFrames.palette); /*gtk_container_check_resize(GTK_CONTAINER(fpFrames.satur), NULL);*/ - gtk_widget_draw (fpFrames.satur, NULL); + gtk_widget_queue_draw (fpFrames.satur); /*gtk_container_check_resize(GTK_CONTAINER(fpFrames.lnd), NULL);*/ - gtk_widget_draw (fpFrames.lnd, NULL); + gtk_widget_queue_draw (fpFrames.lnd); /*gtk_container_check_resize(GTK_CONTAINER(dlg), NULL);*/ - gtk_widget_draw (dlg, NULL); + gtk_widget_queue_draw (dlg); refreshPreviews (Current.VisibleFrames); } @@ -910,9 +921,9 @@ fp_dialog (void) NULL); - gtk_signal_connect (GTK_OBJECT (dlg), "destroy", - GTK_SIGNAL_FUNC (gtk_main_quit), - NULL); + g_signal_connect (G_OBJECT (dlg), "destroy", + G_CALLBACK (gtk_main_quit), + NULL); /********************************************************************/ @@ -1032,9 +1043,10 @@ fp_advanced_dialog (void) gtk_window_set_title (GTK_WINDOW (AW.window), _("Advanced Filter Pack Options")); - gtk_signal_connect (GTK_OBJECT (AW.window), "delete_event", - GTK_SIGNAL_FUNC (sub_dialog_destroy), - NULL); + + g_signal_connect (G_OBJECT (AW.window), "delete_event", + G_CALLBACK (sub_dialog_destroy), + NULL); mainvbox = gtk_hbox_new (FALSE, 4); gtk_container_set_border_width (GTK_CONTAINER (mainvbox), 6); @@ -1099,15 +1111,16 @@ fp_advanced_dialog (void) /************************************************************/ AW.aliasingGraph = gtk_drawing_area_new (); - gtk_drawing_area_size (GTK_DRAWING_AREA (AW.aliasingGraph), - 2 * MARGIN + 256, - RANGE_HEIGHT); + gtk_widget_set_size_request (AW.aliasingGraph, + 2 * MARGIN + 256, + RANGE_HEIGHT); gtk_box_pack_start (GTK_BOX (vbox), AW.aliasingGraph, TRUE, TRUE, 0); gtk_widget_show (AW.aliasingGraph); gtk_widget_set_events (AW.aliasingGraph, RANGE_ADJUST_MASK); - gtk_signal_connect (GTK_OBJECT (AW.aliasingGraph),"event", - GTK_SIGNAL_FUNC (FP_Range_Change_Events), - &Current); + + g_signal_connect (G_OBJECT (AW.aliasingGraph),"event", + G_CALLBACK (FP_Range_Change_Events), + &Current); /************************************************************/ @@ -1115,16 +1128,17 @@ fp_advanced_dialog (void) Current.aliasingScale = scale = gtk_hscale_new (GTK_ADJUSTMENT (smoothnessData)); - gtk_widget_set_usize (scale, 200, 0); + gtk_widget_set_size_request (scale, 200, -1); gtk_scale_set_digits (GTK_SCALE (scale), 2); gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP); gtk_range_set_update_policy (GTK_RANGE (scale), 0); - gtk_signal_connect (GTK_OBJECT (smoothnessData), "value_changed", - GTK_SIGNAL_FUNC (fp_scale_update), - &Current.Alias); - gtk_widget_show (scale); gtk_table_attach (GTK_TABLE (table), scale, 0, 1, 2, 3, 0, 0, 0, 0); + gtk_widget_show (scale); + + g_signal_connect (G_OBJECT (smoothnessData), "value_changed", + G_CALLBACK (fp_scale_update), + &Current.Alias); /******************* MISC OPTIONS ***************************/ @@ -1153,15 +1167,16 @@ fp_advanced_dialog (void) Current.previewSizeScale = scale = gtk_hscale_new (GTK_ADJUSTMENT (smoothnessData)); gtk_container_add (GTK_CONTAINER (frame),scale); - gtk_widget_set_usize (scale, 100, 0); + gtk_widget_set_size_request (scale, 100, -1); gtk_scale_set_digits (GTK_SCALE (scale), 0); gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP); gtk_range_set_update_policy (GTK_RANGE (scale), 0); - gtk_signal_connect (GTK_OBJECT (smoothnessData), "value_changed", - GTK_SIGNAL_FUNC (preview_size_scale_update), - &Current.PreviewSize); gtk_widget_show (scale); + g_signal_connect (G_OBJECT (smoothnessData), "value_changed", + G_CALLBACK (preview_size_scale_update), + &Current.PreviewSize); + gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0); return 1; diff --git a/plug-ins/fp/fp_misc.c b/plug-ins/fp/fp_misc.c index 61db67feb0..7957dbe620 100644 --- a/plug-ins/fp/fp_misc.c +++ b/plug-ins/fp/fp_misc.c @@ -7,6 +7,12 @@ #include "fp.h" +#ifdef __GNUC__ +#warning GTK_DISABLE_DEPRECATED +#endif +#undef GTK_DISABLE_DEPRECATED +#include + extern FP_Params Current; extern GimpDrawable *drawable, *mask; @@ -241,8 +247,7 @@ fp_render_preview(GtkWidget *preview, } free(a); - gtk_widget_draw(preview,NULL); - gdk_flush(); + gtk_widget_queue_draw (preview); } void @@ -329,8 +334,7 @@ fp_create_smoothness_graph (GtkWidget *preview) } gtk_preview_draw_row( GTK_PREVIEW(preview),data,0,i,256); } - gtk_widget_draw(preview,NULL); - gdk_flush(); + gtk_widget_queue_draw (preview); } void @@ -375,8 +379,7 @@ fp_range_preview_spill(GtkWidget *preview, int type) } gtk_preview_draw_row( GTK_PREVIEW(preview),data,0,i,256); } - gtk_widget_draw(preview,NULL); - gdk_flush(); + gtk_widget_queue_draw (preview); } diff --git a/plug-ins/gfig/gfig.c b/plug-ins/gfig/gfig.c index f2ce1df1af..06efeec04b 100644 --- a/plug-ins/gfig/gfig.c +++ b/plug-ins/gfig/gfig.c @@ -62,6 +62,12 @@ #include #endif #include + +#ifdef __GNUC__ +#warning GTK_DISABLE_DEPRECATED +#endif +#undef GTK_DISABLE_DEPRECATED + #include #ifdef G_OS_WIN32 diff --git a/plug-ins/gflare/gflare.c b/plug-ins/gflare/gflare.c index 8ff78a4139..9c94a93489 100644 --- a/plug-ins/gflare/gflare.c +++ b/plug-ins/gflare/gflare.c @@ -51,6 +51,11 @@ static char rcsid[] = "$Id$"; #include #endif +#ifdef __GNUC__ +#warning GTK_DISABLE_DEPRECATED +#endif +#undef GTK_DISABLE_DEPRECATED + #include #ifdef G_OS_WIN32 diff --git a/plug-ins/gfli/gfli.c b/plug-ins/gfli/gfli.c index c7081139c4..d5791bdb2d 100644 --- a/plug-ins/gfli/gfli.c +++ b/plug-ins/gfli/gfli.c @@ -67,10 +67,10 @@ static void query (void); -static void run (gchar *name, - gint nparams, +static void run (gchar *name, + gint nparams, GimpParam *param, - gint *nreturn_vals, + gint *nreturn_vals, GimpParam **return_vals); /* return the image-ID of the new image, or -1 in case of an error */ @@ -823,9 +823,9 @@ load_dialog (gchar *name) NULL); - gtk_signal_connect (GTK_OBJECT (dialog), "destroy", - GTK_SIGNAL_FUNC (gtk_main_quit), - NULL); + g_signal_connect (G_OBJECT (dialog), "destroy", + G_CALLBACK (gtk_main_quit), + NULL); table = gtk_table_new (2, 2, FALSE); gtk_container_set_border_width (GTK_CONTAINER (table), 6); @@ -844,18 +844,18 @@ load_dialog (gchar *name) gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, _("From:"), 1.0, 0.5, spinbutton, 1, TRUE); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_int_adjustment_update), - &from_frame); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_int_adjustment_update), + &from_frame); spinbutton = gimp_spin_button_new (&adj, to_frame, 1, nframes, 1, 10, 0, 1, 0); gimp_table_attach_aligned (GTK_TABLE (table), 0, 1, _("To:"), 1.0, 0.5, spinbutton, 1, TRUE); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_int_adjustment_update), - &to_frame); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_int_adjustment_update), + &to_frame); gtk_widget_show (dialog); @@ -892,9 +892,9 @@ save_dialog (gint32 image_id) NULL); - gtk_signal_connect (GTK_OBJECT (dialog), "destroy", - GTK_SIGNAL_FUNC (gtk_main_quit), - NULL); + g_signal_connect (G_OBJECT (dialog), "destroy", + G_CALLBACK (gtk_main_quit), + NULL); table = gtk_table_new (2, 2, FALSE); gtk_container_set_border_width (GTK_CONTAINER (table), 6); @@ -913,18 +913,18 @@ save_dialog (gint32 image_id) gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, _("From:"), 1.0, 0.5, spinbutton, 1, TRUE); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_int_adjustment_update), - &from_frame); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_int_adjustment_update), + &from_frame); spinbutton = gimp_spin_button_new (&adj, to_frame, 1, nframes, 1, 10, 0, 1, 0); gimp_table_attach_aligned (GTK_TABLE (table), 0, 1, _("To:"), 1.0, 0.5, spinbutton, 1, TRUE); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_int_adjustment_update), - &to_frame); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_int_adjustment_update), + &to_frame); gtk_widget_show (dialog); diff --git a/plug-ins/gimpressionist/brush.c b/plug-ins/gimpressionist/brush.c index 22bac9c9b4..ca2874bbed 100644 --- a/plug-ins/gimpressionist/brush.c +++ b/plug-ins/gimpressionist/brush.c @@ -18,6 +18,11 @@ #include "gimpressionist.h" #include "ppmtool.h" +#ifdef __GNUC__ +#warning GTK_DISABLE_DEPRECATED +#endif +#undef GTK_DISABLE_DEPRECATED +#include GtkWidget *brushlist = NULL; GtkWidget *brushprev = NULL; @@ -192,15 +197,19 @@ void savebrush(GtkWidget *wg, gpointer data) gtk_file_selection_set_filename(GTK_FILE_SELECTION(window), path); - gtk_signal_connect (GTK_OBJECT(window), "destroy", - (GtkSignalFunc) destroy_window, &window); + g_signal_connect (G_OBJECT(window), "destroy", + G_CALLBACK (destroy_window), + &window); - gtk_signal_connect (GTK_OBJECT(GTK_FILE_SELECTION(window)->ok_button), - "clicked", (GtkSignalFunc)savebrush_ok,(gpointer)window); + g_signal_connect (G_OBJECT(GTK_FILE_SELECTION(window)->ok_button), + "clicked", + G_CALLBACK (savebrush_ok), + window); - gtk_signal_connect_object(GTK_OBJECT(GTK_FILE_SELECTION(window)->cancel_button), - "clicked", (GtkSignalFunc) gtk_widget_destroy, - GTK_OBJECT(window)); + g_signal_connect_swapped (G_OBJECT(GTK_FILE_SELECTION(window)->cancel_button), + "clicked", + G_CALLBACK (gtk_widget_destroy), + window); gtk_widget_show(window); return; @@ -284,7 +293,7 @@ void updatebrushprev(char *fn) } killppm(&p); } - gtk_widget_draw (brushprev, NULL); + gtk_widget_queue_draw (brushprev); } int brushdontupdate = 0; @@ -317,7 +326,7 @@ void selectbrush(GtkWidget *wg, GtkWidget *p) if(!h) return; tmpw = h->data; if(!tmpw) return; - gtk_label_get(GTK_LABEL(GTK_BIN(tmpw)->child), &l); + l = (gchar *) gtk_label_get_text(GTK_LABEL(GTK_BIN(tmpw)->child)); if(oldl) if(strcmp(oldl, l)) { brushdontupdate = 1; @@ -373,7 +382,7 @@ void create_brushpage(GtkNotebook *notebook) GTK_POLICY_AUTOMATIC); gtk_box_pack_start (GTK_BOX (box1), scrolled_win, FALSE, FALSE, 0); gtk_widget_show (scrolled_win); - gtk_widget_set_usize(scrolled_win, 150,-1); + gtk_widget_set_size_request(scrolled_win, 150,-1); brushlist = list = gtk_list_new (); gtk_list_set_selection_mode (GTK_LIST (list), GTK_SELECTION_BROWSE); @@ -406,13 +415,14 @@ void create_brushpage(GtkNotebook *notebook) brushgammaadjust = gtk_adjustment_new(pcvals.brushgamma, 0.5, 3.0, 0.1, 0.1, 1.0); tmpw = gtk_hscale_new(GTK_ADJUSTMENT(brushgammaadjust)); - gtk_widget_set_usize (GTK_WIDGET(tmpw), 100, 30); + gtk_widget_set_size_request (GTK_WIDGET(tmpw), 100, 30); gtk_scale_set_draw_value (GTK_SCALE (tmpw), FALSE); gtk_scale_set_digits(GTK_SCALE (tmpw), 2); gtk_box_pack_start (GTK_BOX (box2), tmpw, FALSE, FALSE, 0); gtk_widget_show (tmpw); - gtk_signal_connect(GTK_OBJECT(brushgammaadjust), "value_changed", - (GtkSignalFunc)selectbrush, list); + g_signal_connect(G_OBJECT(brushgammaadjust), "value_changed", + G_CALLBACK(selectbrush), + list); gtk_tooltips_set_tip(GTK_TOOLTIPS(tooltips), tmpw, _("Changes the gamma (brightness) of the selected brush"), NULL); box1 = gtk_hbox_new (FALSE, 0); @@ -450,8 +460,9 @@ void create_brushpage(GtkNotebook *notebook) gtk_widget_show(box3); brushemptyitem = emptyitem = gtk_menu_item_new_with_label( _("(None)")); - gtk_signal_connect (GTK_OBJECT(emptyitem), "activate", - (GtkSignalFunc)dummybrushdmenuselect, NULL); + g_signal_connect (G_OBJECT(emptyitem), "activate", + G_CALLBACK(dummybrushdmenuselect), + NULL); gtk_widget_show(emptyitem); tmpw = gtk_option_menu_new(); @@ -459,39 +470,41 @@ void create_brushpage(GtkNotebook *notebook) gtk_widget_show(tmpw); brushdrawablemenu = dmenu = gimp_drawable_menu_new(validdrawable, brushdmenuselect, NULL, -1); - gtk_menu_prepend(GTK_MENU(dmenu), emptyitem); + gtk_menu_shell_prepend (GTK_MENU_SHELL (dmenu), emptyitem); gtk_option_menu_set_menu(GTK_OPTION_MENU(tmpw), dmenu); tmpw = gtk_button_new_with_label( _("Save...")); gtk_box_pack_start(GTK_BOX(box3),tmpw, FALSE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT(tmpw), "clicked", - GTK_SIGNAL_FUNC(savebrush), NULL); + g_signal_connect (G_OBJECT(tmpw), "clicked", + G_CALLBACK(savebrush), + NULL); gtk_widget_show(tmpw); } brushaspectadjust = gtk_adjustment_new(pcvals.brushaspect, -1.0, 2.0, 0.1, 0.1, 1.0); tmpw = gtk_hscale_new(GTK_ADJUSTMENT(brushaspectadjust)); - gtk_widget_set_usize (GTK_WIDGET(tmpw), 150, 30); + gtk_widget_set_size_request (GTK_WIDGET(tmpw), 150, 30); gtk_scale_set_draw_value (GTK_SCALE (tmpw), TRUE); gtk_scale_set_digits(GTK_SCALE (tmpw), 2); gtk_box_pack_start (GTK_BOX (box2), tmpw, FALSE, FALSE, 0); gtk_widget_show (tmpw); gtk_tooltips_set_tip(GTK_TOOLTIPS(tooltips), tmpw, _("Specifies the aspect ratio of the brush"), NULL); - gtk_signal_connect(GTK_OBJECT(brushaspectadjust), "value_changed", - (GtkSignalFunc)selectbrush, list); + g_signal_connect(G_OBJECT(brushaspectadjust), "value_changed", + G_CALLBACK (selectbrush), + list); brushreliefadjust = gtk_adjustment_new(pcvals.brushrelief, 0.0, 101.0, 1.0, 1.0, 1.0); tmpw = gtk_hscale_new(GTK_ADJUSTMENT(brushreliefadjust)); - gtk_widget_set_usize (GTK_WIDGET(tmpw), 150, 30); + gtk_widget_set_size_request (GTK_WIDGET(tmpw), 150, 30); gtk_scale_set_draw_value (GTK_SCALE (tmpw), TRUE); gtk_scale_set_digits(GTK_SCALE (tmpw), 2); gtk_box_pack_start (GTK_BOX (box2), tmpw, FALSE, FALSE, 0); gtk_widget_show (tmpw); gtk_tooltips_set_tip(GTK_TOOLTIPS(tooltips), tmpw, _("Specifies the amount of embossing to apply to each brush stroke"), NULL); - gtk_signal_connect (GTK_OBJECT(list), "selection_changed", - GTK_SIGNAL_FUNC(selectbrushfile), - list); + g_signal_connect (G_OBJECT(list), "selection_changed", + G_CALLBACK(selectbrushfile), + list); if(!GTK_LIST(list)->selection) gtk_list_select_item(GTK_LIST(list), 0); selectbrush(NULL, list); diff --git a/plug-ins/gimpressionist/color.c b/plug-ins/gimpressionist/color.c index 228dcb63c6..fddd4d5af8 100644 --- a/plug-ins/gimpressionist/color.c +++ b/plug-ins/gimpressionist/color.c @@ -1,21 +1,24 @@ -#ifdef HAVE_CONFIG_H #include "config.h" -#else -#define HAVE_DIRENT_H -#define HAVE_UNISTD_H -#endif #include #include -#include #include #ifdef HAVE_UNISTD_H #include #endif -#include + +#ifdef __GNUC__ +#warning GTK_DISABLE_DEPRECATED +#endif +#undef GTK_DISABLE_DEPRECATED + +#include + #include "gimpressionist.h" #include "ppmtool.h" +#include "libgimp/stdplugins-intl.h" + #define NUMCOLORRADIO 2 diff --git a/plug-ins/gimpressionist/general.c b/plug-ins/gimpressionist/general.c index 742e3fc580..eadc5f123e 100644 --- a/plug-ins/gimpressionist/general.c +++ b/plug-ins/gimpressionist/general.c @@ -1,21 +1,25 @@ -#ifdef HAVE_CONFIG_H #include "config.h" -#else -#define HAVE_DIRENT_H -#define HAVE_UNISTD_H -#endif #include #include -#include #include #ifdef HAVE_UNISTD_H #include #endif -#include + +#ifdef __GNUC__ +#warning GTK_DISABLE_DEPRECATED +#endif +#undef GTK_DISABLE_DEPRECATED + +#include + #include "gimpressionist.h" #include "ppmtool.h" +#include "libgimp/stdplugins-intl.h" + + #define COLORBUTTONWIDTH 30 #define COLORBUTTONHEIGHT 20 diff --git a/plug-ins/gimpressionist/gimpressionist.c b/plug-ins/gimpressionist/gimpressionist.c index 1e889e648f..cda4750391 100644 --- a/plug-ins/gimpressionist/gimpressionist.c +++ b/plug-ins/gimpressionist/gimpressionist.c @@ -8,8 +8,6 @@ #include #include #include -#include -#include #include #ifdef HAVE_DIRENT_H #include @@ -19,6 +17,11 @@ #include #endif +#ifdef __GNUC__ +#warning GTK_DISABLE_DEPRECATED +#endif +#undef GTK_DISABLE_DEPRECATED + #include #include diff --git a/plug-ins/gimpressionist/orientation.c b/plug-ins/gimpressionist/orientation.c index 2b995d102d..feaf24921e 100644 --- a/plug-ins/gimpressionist/orientation.c +++ b/plug-ins/gimpressionist/orientation.c @@ -7,14 +7,22 @@ #include #include -#include #include #ifdef HAVE_UNISTD_H #include #endif + +#ifdef __GNUC__ +#warning GTK_DISABLE_DEPRECATED +#endif +#undef GTK_DISABLE_DEPRECATED + +#include + #include "gimpressionist.h" #include "ppmtool.h" -#include + +#include "libgimp/stdplugins-intl.h" GtkObject *orientnumadjust = NULL; diff --git a/plug-ins/gimpressionist/orientmap.c b/plug-ins/gimpressionist/orientmap.c index dc1c7fa71f..210ae574bf 100644 --- a/plug-ins/gimpressionist/orientmap.c +++ b/plug-ins/gimpressionist/orientmap.c @@ -1,12 +1,21 @@ +#include "config.h" + #include #include #include #include + +#ifdef __GNUC__ +#warning GTK_DISABLE_DEPRECATED +#endif +#undef GTK_DISABLE_DEPRECATED + #include + #include "gimpressionist.h" #include "ppmtool.h" -#include "config.h" -#include + +#include "libgimp/stdplugins-intl.h" #define MAPFILE "data.out" diff --git a/plug-ins/gimpressionist/paper.c b/plug-ins/gimpressionist/paper.c index f5452def4d..5ed492c884 100644 --- a/plug-ins/gimpressionist/paper.c +++ b/plug-ins/gimpressionist/paper.c @@ -1,19 +1,23 @@ -#ifdef HAVE_CONFIG_H #include "config.h" -#else -#define HAVE_DIRENT_H -#define HAVE_UNISTD_H -#endif + #include #include #include -#include #ifdef HAVE_UNISTD_H #include #endif + +#ifdef __GNUC__ +#warning GTK_DISABLE_DEPRECATED +#endif +#undef GTK_DISABLE_DEPRECATED + +#include + #include "gimpressionist.h" #include "ppmtool.h" -#include + +#include "libgimp/stdplugins-intl.h" GtkWidget *paperlist = NULL; diff --git a/plug-ins/gimpressionist/placement.c b/plug-ins/gimpressionist/placement.c index b8417d5b52..07a7104d24 100644 --- a/plug-ins/gimpressionist/placement.c +++ b/plug-ins/gimpressionist/placement.c @@ -1,20 +1,23 @@ -#ifdef HAVE_CONFIG_H #include "config.h" -#else -#define HAVE_DIRENT_H -#define HAVE_UNISTD_H -#endif #include #include -#include #include #ifdef HAVE_UNISTD_H #include #endif + +#ifdef __GNUC__ +#warning GTK_DISABLE_DEPRECATED +#endif +#undef GTK_DISABLE_DEPRECATED + +#include + #include "gimpressionist.h" #include "ppmtool.h" -#include + +#include "libgimp/stdplugins-intl.h" #define NUMPLACERADIO 2 diff --git a/plug-ins/gimpressionist/presets.c b/plug-ins/gimpressionist/presets.c index 85739866e2..6b831c2ac8 100644 --- a/plug-ins/gimpressionist/presets.c +++ b/plug-ins/gimpressionist/presets.c @@ -1,20 +1,24 @@ -#ifdef HAVE_CONFIG_H #include "config.h" -#else -#define HAVE_DIRENT_H -#define HAVE_UNISTD_H -#endif + +#include #include #include #include -#include #ifdef HAVE_UNISTD_H #include #endif -#include + +#ifdef __GNUC__ +#warning GTK_DISABLE_DEPRECATED +#endif +#undef GTK_DISABLE_DEPRECATED + +#include + #include "gimpressionist.h" #include "ppmtool.h" -#include + +#include "libgimp/stdplugins-intl.h" /* FIXME: remove usage of the 'broken' GtkText */ #define GTK_ENABLE_BROKEN diff --git a/plug-ins/gimpressionist/preview.c b/plug-ins/gimpressionist/preview.c index 522ca5af2b..f42c01f254 100644 --- a/plug-ins/gimpressionist/preview.c +++ b/plug-ins/gimpressionist/preview.c @@ -1,17 +1,22 @@ -#ifdef HAVE_CONFIG_H #include "config.h" -#else -#define HAVE_DIRENT_H -#define HAVE_UNISTD_H -#endif + #include -#include #ifdef HAVE_UNISTD_H #include #endif + +#ifdef __GNUC__ +#warning GTK_DISABLE_DEPRECATED +#endif +#undef GTK_DISABLE_DEPRECATED + +#include + #include "gimpressionist.h" #include "ppmtool.h" -#include + +#include "libgimp/stdplugins-intl.h" + GtkWidget *previewprev = NULL; GtkWidget *previewbutton = NULL; diff --git a/plug-ins/gimpressionist/size.c b/plug-ins/gimpressionist/size.c index 42cbe11d61..282fffb229 100644 --- a/plug-ins/gimpressionist/size.c +++ b/plug-ins/gimpressionist/size.c @@ -1,20 +1,24 @@ -#ifdef HAVE_CONFIG_H #include "config.h" -#else -#define HAVE_DIRENT_H -#define HAVE_UNISTD_H -#endif #include #include -#include #include #ifdef HAVE_UNISTD_H #include #endif + +#ifdef __GNUC__ +#warning GTK_DISABLE_DEPRECATED +#endif +#undef GTK_DISABLE_DEPRECATED + +#include + #include "gimpressionist.h" #include "ppmtool.h" -#include + +#include "libgimp/stdplugins-intl.h" + GtkObject *sizenumadjust = NULL; GtkObject *sizefirstadjust = NULL; diff --git a/plug-ins/gimpressionist/sizemap.c b/plug-ins/gimpressionist/sizemap.c index 0db939843e..8b7ad18bf0 100644 --- a/plug-ins/gimpressionist/sizemap.c +++ b/plug-ins/gimpressionist/sizemap.c @@ -1,12 +1,22 @@ +#include "config.h" + #include #include #include #include + +#ifdef __GNUC__ +#warning GTK_DISABLE_DEPRECATED +#endif +#undef GTK_DISABLE_DEPRECATED + #include + #include "gimpressionist.h" #include "ppmtool.h" -#include "config.h" -#include + +#include "libgimp/stdplugins-intl.h" + #define MAPFILE "data.out" diff --git a/plug-ins/ifscompose/ifscompose.c b/plug-ins/ifscompose/ifscompose.c index 1adc0ebcce..62aff92d3b 100644 --- a/plug-ins/ifscompose/ifscompose.c +++ b/plug-ins/ifscompose/ifscompose.c @@ -39,14 +39,20 @@ #include #include +#ifdef __GNUC__ +#warning GTK_DISABLE_DEPRECATED +#endif +#undef GTK_DISABLE_DEPRECATED + #include #include #include +#include "ifscompose.h" + #include "libgimp/stdplugins-intl.h" -#include "ifscompose.h" #define SCALE_WIDTH 150 #define ENTRY_WIDTH 60 diff --git a/plug-ins/imagemap/imap_about.c b/plug-ins/imagemap/imap_about.c index d911ab40d6..a8b5aaf1b9 100644 --- a/plug-ins/imagemap/imap_about.c +++ b/plug-ins/imagemap/imap_about.c @@ -23,6 +23,13 @@ #include "config.h" +#ifdef __GNUC__ +#warning GTK_DISABLE_DEPRECATED +#endif +#undef GTK_DISABLE_DEPRECATED + +#include + #include "imap_about.h" #include "imap_default_dialog.h" diff --git a/plug-ins/imagemap/imap_browse.c b/plug-ins/imagemap/imap_browse.c index 4e8fc6db77..89497516f5 100644 --- a/plug-ins/imagemap/imap_browse.c +++ b/plug-ins/imagemap/imap_browse.c @@ -21,6 +21,13 @@ * */ +#ifdef __GNUC__ +#warning GTK_DISABLE_DEPRECATED +#endif +#undef GTK_DISABLE_DEPRECATED + +#include + #include "imap_browse.h" #include "open.xpm" diff --git a/plug-ins/imagemap/imap_browse.h b/plug-ins/imagemap/imap_browse.h index f3e19a20da..fa21589d0e 100644 --- a/plug-ins/imagemap/imap_browse.h +++ b/plug-ins/imagemap/imap_browse.h @@ -24,8 +24,6 @@ #ifndef _IMAP_BROWSE_H #define _IMAP_BROWSE_H -#include "gtk/gtk.h" - typedef gchar* (*BrowseFilter_t)(const gchar*, gpointer data); typedef struct { diff --git a/plug-ins/imagemap/imap_circle.c b/plug-ins/imagemap/imap_circle.c index 1cdeee6e1c..92697ee8dd 100644 --- a/plug-ins/imagemap/imap_circle.c +++ b/plug-ins/imagemap/imap_circle.c @@ -21,16 +21,25 @@ * */ +#include "config.h" + #include -#include "config.h" +#ifdef __GNUC__ +#warning GTK_DISABLE_DEPRECATED +#endif +#undef GTK_DISABLE_DEPRECATED + +#include + #include "imap_circle.h" -#include "libgimp/stdplugins-intl.h" #include "imap_main.h" #include "imap_misc.h" #include "imap_object_popup.h" #include "imap_table.h" +#include "libgimp/stdplugins-intl.h" + #include "circle.xpm" static gboolean circle_is_valid(Object_t *obj); @@ -260,20 +269,20 @@ circle_create_info_widget(GtkWidget *frame) create_label_in_table(table, 0, 0, _("Center x:")); props->x = create_spin_button_in_table(table, 0, 1, 1, 0, max_width - 1); - gtk_signal_connect(GTK_OBJECT(props->x), "changed", - (GtkSignalFunc) x_changed_cb, (gpointer) props); + g_signal_connect(G_OBJECT(props->x), "changed", + G_CALLBACK (x_changed_cb), (gpointer) props); create_label_in_table(table, 0, 2, _("pixels")); create_label_in_table(table, 1, 0, _("Center y:")); props->y = create_spin_button_in_table(table, 1, 1, 1, 0, max_height - 1); - gtk_signal_connect(GTK_OBJECT(props->y), "changed", - (GtkSignalFunc) y_changed_cb, (gpointer) props); + g_signal_connect(G_OBJECT(props->y), "changed", + G_CALLBACK (y_changed_cb), (gpointer) props); create_label_in_table(table, 1, 2, _("pixels")); create_label_in_table(table, 2, 0, _("Radius:")); props->r = create_spin_button_in_table(table, 2, 1, 1, 1, G_MAXINT); - gtk_signal_connect(GTK_OBJECT(props->r), "changed", - (GtkSignalFunc) r_changed_cb, (gpointer) props); + g_signal_connect(G_OBJECT(props->r), "changed", + G_CALLBACK (r_changed_cb), (gpointer) props); create_label_in_table(table, 2, 2, _("pixels")); return props; diff --git a/plug-ins/imagemap/imap_cmd_clear.c b/plug-ins/imagemap/imap_cmd_clear.c index 6fe27d4772..f78119a964 100644 --- a/plug-ins/imagemap/imap_cmd_clear.c +++ b/plug-ins/imagemap/imap_cmd_clear.c @@ -23,6 +23,8 @@ #include "config.h" +#include + #include "imap_cmd_clear.h" #include "imap_cmd_delete.h" #include "imap_main.h" diff --git a/plug-ins/imagemap/imap_cmd_copy.c b/plug-ins/imagemap/imap_cmd_copy.c index 6aecea196b..1fdb86d4de 100644 --- a/plug-ins/imagemap/imap_cmd_copy.c +++ b/plug-ins/imagemap/imap_cmd_copy.c @@ -23,6 +23,13 @@ #include "config.h" +#ifdef __GNUC__ +#warning GTK_DISABLE_DEPRECATED +#endif +#undef GTK_DISABLE_DEPRECATED + +#include + #include "imap_cmd_copy.h" #include "libgimp/stdplugins-intl.h" diff --git a/plug-ins/imagemap/imap_cmd_copy_object.c b/plug-ins/imagemap/imap_cmd_copy_object.c index ae89cd0651..07be3c6469 100644 --- a/plug-ins/imagemap/imap_cmd_copy_object.c +++ b/plug-ins/imagemap/imap_cmd_copy_object.c @@ -23,6 +23,8 @@ #include "config.h" +#include + #include "imap_cmd_copy_object.h" #include "libgimp/stdplugins-intl.h" diff --git a/plug-ins/imagemap/imap_cmd_create.c b/plug-ins/imagemap/imap_cmd_create.c index 29c270e2d0..98551a0273 100644 --- a/plug-ins/imagemap/imap_cmd_create.c +++ b/plug-ins/imagemap/imap_cmd_create.c @@ -23,11 +23,14 @@ #include "config.h" +#include + #include "imap_cmd_create.h" -#include "libgimp/stdplugins-intl.h" #include "imap_main.h" +#include "libgimp/stdplugins-intl.h" + static CmdExecuteValue_t create_command_execute(Command_t *parent); static void create_command_destruct(Command_t *parent); static void create_command_undo(Command_t *parent); diff --git a/plug-ins/imagemap/imap_cmd_cut.c b/plug-ins/imagemap/imap_cmd_cut.c index 76019db882..867a2b63ea 100644 --- a/plug-ins/imagemap/imap_cmd_cut.c +++ b/plug-ins/imagemap/imap_cmd_cut.c @@ -23,6 +23,8 @@ #include "config.h" +#include + #include "imap_cmd_delete.h" #include "imap_cmd_cut.h" #include "imap_main.h" diff --git a/plug-ins/imagemap/imap_cmd_cut_object.c b/plug-ins/imagemap/imap_cmd_cut_object.c index dc2df90f52..8fcc811d65 100644 --- a/plug-ins/imagemap/imap_cmd_cut_object.c +++ b/plug-ins/imagemap/imap_cmd_cut_object.c @@ -23,6 +23,8 @@ #include "config.h" +#include + #include "imap_cmd_copy_object.h" #include "imap_cmd_cut_object.h" #include "imap_cmd_delete.h" diff --git a/plug-ins/imagemap/imap_cmd_delete.c b/plug-ins/imagemap/imap_cmd_delete.c index 870758bd8c..5e4ac9fe17 100644 --- a/plug-ins/imagemap/imap_cmd_delete.c +++ b/plug-ins/imagemap/imap_cmd_delete.c @@ -23,6 +23,8 @@ #include "config.h" +#include + #include "imap_cmd_delete.h" #include "imap_main.h" diff --git a/plug-ins/imagemap/imap_cmd_delete_point.c b/plug-ins/imagemap/imap_cmd_delete_point.c index fc787e31f8..3838dc1b31 100644 --- a/plug-ins/imagemap/imap_cmd_delete_point.c +++ b/plug-ins/imagemap/imap_cmd_delete_point.c @@ -23,6 +23,8 @@ #include "config.h" +#include + #include "imap_cmd_delete_point.h" #include "imap_main.h" #include "imap_polygon.h" diff --git a/plug-ins/imagemap/imap_cmd_edit_object.c b/plug-ins/imagemap/imap_cmd_edit_object.c index eadc2eeb14..d09186e2fd 100644 --- a/plug-ins/imagemap/imap_cmd_edit_object.c +++ b/plug-ins/imagemap/imap_cmd_edit_object.c @@ -23,6 +23,8 @@ #include "config.h" +#include + #include "imap_cmd_edit_object.h" #include "imap_main.h" diff --git a/plug-ins/imagemap/imap_cmd_guides.c b/plug-ins/imagemap/imap_cmd_guides.c index 40891af3ef..17a12db3ae 100644 --- a/plug-ins/imagemap/imap_cmd_guides.c +++ b/plug-ins/imagemap/imap_cmd_guides.c @@ -25,6 +25,8 @@ #include +#include + #include "imap_cmd_create.h" #include "imap_default_dialog.h" #include "imap_cmd_guides.h" @@ -165,43 +167,43 @@ make_guides_dialog() create_label_in_table(table, 0, 0, _("Width")); data->width = create_spin_button_in_table(table, 0, 1, 32, 1, 100); - gtk_signal_connect(GTK_OBJECT(data->width), "changed", - GTK_SIGNAL_FUNC(recalc_bounds), (gpointer) data); + g_signal_connect(G_OBJECT(data->width), "changed", + G_CALLBACK(recalc_bounds), (gpointer) data); create_label_in_table(table, 0, 2, _("Left Start at")); data->left = create_spin_button_in_table(table, 0, 3, 0, 0, 100); - gtk_signal_connect(GTK_OBJECT(data->left), "changed", - GTK_SIGNAL_FUNC(recalc_bounds), (gpointer) data); + g_signal_connect(G_OBJECT(data->left), "changed", + G_CALLBACK(recalc_bounds), (gpointer) data); create_label_in_table(table, 1, 0, _("Height")); data->height = create_spin_button_in_table(table, 1, 1, 32, 1, 100); - gtk_signal_connect(GTK_OBJECT(data->height), "changed", - GTK_SIGNAL_FUNC(recalc_bounds), (gpointer) data); + g_signal_connect(G_OBJECT(data->height), "changed", + G_CALLBACK(recalc_bounds), (gpointer) data); create_label_in_table(table, 1, 2, _("Top Start at")); data->top = create_spin_button_in_table(table, 1, 3, 0, 0, 100); - gtk_signal_connect(GTK_OBJECT(data->top), "changed", - GTK_SIGNAL_FUNC(recalc_bounds), (gpointer) data); + g_signal_connect(G_OBJECT(data->top), "changed", + G_CALLBACK(recalc_bounds), (gpointer) data); create_label_in_table(table, 2, 0, _("Horz. Spacing")); data->horz_spacing = create_spin_button_in_table(table, 2, 1, 0, 0, 100); - gtk_signal_connect(GTK_OBJECT(data->horz_spacing), "changed", - GTK_SIGNAL_FUNC(recalc_bounds), (gpointer) data); + g_signal_connect(G_OBJECT(data->horz_spacing), "changed", + G_CALLBACK(recalc_bounds), (gpointer) data); create_label_in_table(table, 2, 2, _("No. Across")); data->no_across = create_spin_button_in_table(table, 2, 3, 0, 0, 100); - gtk_signal_connect(GTK_OBJECT(data->no_across), "changed", - GTK_SIGNAL_FUNC(recalc_bounds), (gpointer) data); + g_signal_connect(G_OBJECT(data->no_across), "changed", + G_CALLBACK(recalc_bounds), (gpointer) data); create_label_in_table(table, 3, 0, _("Vert. Spacing")); data->vert_spacing = create_spin_button_in_table(table, 3, 1, 0, 0, 100); - gtk_signal_connect(GTK_OBJECT(data->vert_spacing), "changed", - GTK_SIGNAL_FUNC(recalc_bounds), (gpointer) data); + g_signal_connect(G_OBJECT(data->vert_spacing), "changed", + G_CALLBACK(recalc_bounds), (gpointer) data); create_label_in_table(table, 3, 2, _("No. Down")); data->no_down = create_spin_button_in_table(table, 3, 3, 0, 0, 100); - gtk_signal_connect(GTK_OBJECT(data->no_down), "changed", - GTK_SIGNAL_FUNC(recalc_bounds), (gpointer) data); + g_signal_connect(G_OBJECT(data->no_down), "changed", + G_CALLBACK(recalc_bounds), (gpointer) data); hbox = gtk_hbox_new(FALSE, 1); gtk_container_set_border_width(GTK_CONTAINER(hbox), 10); diff --git a/plug-ins/imagemap/imap_cmd_insert_point.c b/plug-ins/imagemap/imap_cmd_insert_point.c index 41e871ad76..548d1e7c21 100644 --- a/plug-ins/imagemap/imap_cmd_insert_point.c +++ b/plug-ins/imagemap/imap_cmd_insert_point.c @@ -23,6 +23,8 @@ #include "config.h" +#include + #include "imap_cmd_insert_point.h" #include "imap_main.h" #include "imap_polygon.h" diff --git a/plug-ins/imagemap/imap_cmd_move.c b/plug-ins/imagemap/imap_cmd_move.c index 057d061579..8c2ab972e8 100644 --- a/plug-ins/imagemap/imap_cmd_move.c +++ b/plug-ins/imagemap/imap_cmd_move.c @@ -23,6 +23,10 @@ #include "config.h" +#include + +#include "libgimp/gimp.h" + #include "imap_cmd_move.h" #include "imap_cmd_object_move.h" #include "imap_main.h" @@ -132,10 +136,10 @@ button_release(GtkWidget *widget, GdkEventButton *event, gpointer data) { MoveCommand_t *command = (MoveCommand_t*) data; - gtk_signal_disconnect_by_func(GTK_OBJECT(widget), - (GtkSignalFunc) button_motion, data); - gtk_signal_disconnect_by_func(GTK_OBJECT(widget), - (GtkSignalFunc) button_release, data); + g_signal_handlers_disconnect_by_func (G_OBJECT(widget), + button_motion, data); + g_signal_handlers_disconnect_by_func (G_OBJECT(widget), + button_release, data); if (!command->moved_first_time) { preview_set_cursor(command->preview, command->cursor); @@ -159,9 +163,9 @@ move_command_execute(Command_t *parent) GtkWidget *widget = command->preview->preview; preview_freeze(); - gtk_signal_connect(GTK_OBJECT(widget), "button_release_event", - (GtkSignalFunc) button_release, command); - gtk_signal_connect(GTK_OBJECT(widget), "motion_notify_event", - (GtkSignalFunc) button_motion, command); + g_signal_connect(G_OBJECT(widget), "button_release_event", + G_CALLBACK (button_release), command); + g_signal_connect(G_OBJECT(widget), "motion_notify_event", + G_CALLBACK (button_motion), command); return CMD_DESTRUCT; } diff --git a/plug-ins/imagemap/imap_cmd_move_down.c b/plug-ins/imagemap/imap_cmd_move_down.c index b0c884277a..063d050717 100644 --- a/plug-ins/imagemap/imap_cmd_move_down.c +++ b/plug-ins/imagemap/imap_cmd_move_down.c @@ -23,6 +23,8 @@ #include "config.h" +#include + #include "imap_cmd_copy.h" #include "imap_cmd_object_down.h" #include "imap_main.h" diff --git a/plug-ins/imagemap/imap_cmd_move_sash.c b/plug-ins/imagemap/imap_cmd_move_sash.c index e538f20a60..6ffe3ed7ee 100644 --- a/plug-ins/imagemap/imap_cmd_move_sash.c +++ b/plug-ins/imagemap/imap_cmd_move_sash.c @@ -23,6 +23,8 @@ #include "config.h" +#include + #include "imap_cmd_copy.h" #include "imap_cmd_edit_object.h" #include "imap_main.h" @@ -119,10 +121,10 @@ sash_end(GtkWidget *widget, GdkEventButton *event, gpointer data) MoveSashCommand_t *command = (MoveSashCommand_t*) data; Object_t *obj = command->obj; - gtk_signal_disconnect_by_func(GTK_OBJECT(widget), - (GtkSignalFunc) sash_move, data); - gtk_signal_disconnect_by_func(GTK_OBJECT(widget), - (GtkSignalFunc) sash_end, data); + g_signal_handlers_disconnect_by_func(G_OBJECT(widget), + sash_move, data); + g_signal_handlers_disconnect_by_func(G_OBJECT(widget), + sash_end, data); if (obj->class->normalize) object_normalize(obj); gdk_gc_set_function(get_preferences()->selected_gc, GDK_COPY); @@ -138,10 +140,10 @@ move_sash_command_execute(Command_t *parent) hide_url(); preview_freeze(); - gtk_signal_connect(GTK_OBJECT(command->widget), "button_release_event", - (GtkSignalFunc) sash_end, command); - gtk_signal_connect(GTK_OBJECT(command->widget), "motion_notify_event", - (GtkSignalFunc) sash_move, command); + g_signal_connect(G_OBJECT(command->widget), "button_release_event", + G_CALLBACK (sash_end), command); + g_signal_connect(G_OBJECT(command->widget), "motion_notify_event", + G_CALLBACK (sash_move), command); gdk_gc_set_function(get_preferences()->selected_gc, GDK_EQUIV); return CMD_APPEND; diff --git a/plug-ins/imagemap/imap_cmd_move_selected.c b/plug-ins/imagemap/imap_cmd_move_selected.c index 4225be4280..3412a9ea71 100644 --- a/plug-ins/imagemap/imap_cmd_move_selected.c +++ b/plug-ins/imagemap/imap_cmd_move_selected.c @@ -23,6 +23,8 @@ #include "config.h" +#include + #include "imap_cmd_move_selected.h" #include "imap_main.h" diff --git a/plug-ins/imagemap/imap_cmd_move_to_front.c b/plug-ins/imagemap/imap_cmd_move_to_front.c index bda5c45ab2..98ba72590b 100644 --- a/plug-ins/imagemap/imap_cmd_move_to_front.c +++ b/plug-ins/imagemap/imap_cmd_move_to_front.c @@ -23,6 +23,8 @@ #include "config.h" +#include + #include "imap_cmd_create.h" #include "imap_cmd_delete.h" #include "imap_cmd_move_to_front.h" diff --git a/plug-ins/imagemap/imap_cmd_move_up.c b/plug-ins/imagemap/imap_cmd_move_up.c index 828d1a0f33..f2c45b094a 100644 --- a/plug-ins/imagemap/imap_cmd_move_up.c +++ b/plug-ins/imagemap/imap_cmd_move_up.c @@ -23,6 +23,8 @@ #include "config.h" +#include + #include "imap_cmd_move_up.h" #include "imap_cmd_object_up.h" #include "imap_main.h" diff --git a/plug-ins/imagemap/imap_cmd_object_down.c b/plug-ins/imagemap/imap_cmd_object_down.c index 88dbbffe8c..ed86ca1aa7 100644 --- a/plug-ins/imagemap/imap_cmd_object_down.c +++ b/plug-ins/imagemap/imap_cmd_object_down.c @@ -23,6 +23,8 @@ #include "config.h" +#include + #include "imap_cmd_copy.h" #include "imap_main.h" diff --git a/plug-ins/imagemap/imap_cmd_object_move.c b/plug-ins/imagemap/imap_cmd_object_move.c index 474934b4a8..06f501a059 100644 --- a/plug-ins/imagemap/imap_cmd_object_move.c +++ b/plug-ins/imagemap/imap_cmd_object_move.c @@ -23,6 +23,8 @@ #include "config.h" +#include + #include "imap_cmd_object_move.h" #include "imap_main.h" diff --git a/plug-ins/imagemap/imap_cmd_object_up.c b/plug-ins/imagemap/imap_cmd_object_up.c index 98792b508a..19fbc86db1 100644 --- a/plug-ins/imagemap/imap_cmd_object_up.c +++ b/plug-ins/imagemap/imap_cmd_object_up.c @@ -23,6 +23,8 @@ #include "config.h" +#include + #include "imap_cmd_copy.h" #include "imap_main.h" diff --git a/plug-ins/imagemap/imap_cmd_paste.c b/plug-ins/imagemap/imap_cmd_paste.c index cb53fda06a..05e72dbcea 100644 --- a/plug-ins/imagemap/imap_cmd_paste.c +++ b/plug-ins/imagemap/imap_cmd_paste.c @@ -23,6 +23,8 @@ #include "config.h" +#include + #include "imap_cmd_create.h" #include "imap_cmd_paste.h" #include "imap_main.h" diff --git a/plug-ins/imagemap/imap_cmd_select.c b/plug-ins/imagemap/imap_cmd_select.c index e696a37b34..ca947574e2 100644 --- a/plug-ins/imagemap/imap_cmd_select.c +++ b/plug-ins/imagemap/imap_cmd_select.c @@ -23,6 +23,8 @@ #include "config.h" +#include + #include "imap_cmd_select.h" #include "imap_main.h" diff --git a/plug-ins/imagemap/imap_cmd_select_all.c b/plug-ins/imagemap/imap_cmd_select_all.c index 964752b80a..321dc21887 100644 --- a/plug-ins/imagemap/imap_cmd_select_all.c +++ b/plug-ins/imagemap/imap_cmd_select_all.c @@ -23,6 +23,8 @@ #include "config.h" +#include + #include "imap_cmd_select.h" #include "imap_cmd_select_all.h" #include "imap_main.h" diff --git a/plug-ins/imagemap/imap_cmd_select_next.c b/plug-ins/imagemap/imap_cmd_select_next.c index 3026830ab5..cc633b984c 100644 --- a/plug-ins/imagemap/imap_cmd_select_next.c +++ b/plug-ins/imagemap/imap_cmd_select_next.c @@ -23,6 +23,8 @@ #include "config.h" +#include + #include "imap_cmd_select.h" #include "imap_cmd_select_next.h" #include "imap_cmd_unselect.h" diff --git a/plug-ins/imagemap/imap_cmd_select_prev.c b/plug-ins/imagemap/imap_cmd_select_prev.c index 5e1733adc9..8984cdb53f 100644 --- a/plug-ins/imagemap/imap_cmd_select_prev.c +++ b/plug-ins/imagemap/imap_cmd_select_prev.c @@ -23,6 +23,8 @@ #include "config.h" +#include + #include "imap_cmd_select.h" #include "imap_cmd_select_prev.h" #include "imap_cmd_unselect.h" diff --git a/plug-ins/imagemap/imap_cmd_select_region.c b/plug-ins/imagemap/imap_cmd_select_region.c index 7a0d8f7a42..76e72934c3 100644 --- a/plug-ins/imagemap/imap_cmd_select_region.c +++ b/plug-ins/imagemap/imap_cmd_select_region.c @@ -23,6 +23,8 @@ #include "config.h" +#include + #include "imap_rectangle.h" #include "imap_cmd_select.h" #include "imap_cmd_select_region.h" @@ -104,10 +106,10 @@ select_release(GtkWidget *widget, GdkEventButton *event, gpointer data) gpointer id; gint count; - gtk_signal_disconnect_by_func(GTK_OBJECT(widget), - (GtkSignalFunc) select_motion, data); - gtk_signal_disconnect_by_func(GTK_OBJECT(widget), - (GtkSignalFunc) select_release, data); + g_signal_handlers_disconnect_by_func(G_OBJECT(widget), + select_motion, data); + g_signal_handlers_disconnect_by_func(G_OBJECT(widget), + select_release, data); object_draw(obj, widget->window); object_normalize(obj); @@ -134,10 +136,10 @@ select_region_command_execute(Command_t *parent) SelectRegionCommand_t *command = (SelectRegionCommand_t*) parent; command->obj = create_rectangle(command->x, command->y, 0, 0); - gtk_signal_connect(GTK_OBJECT(command->widget), "button_release_event", - (GtkSignalFunc) select_release, command); - gtk_signal_connect(GTK_OBJECT(command->widget), "motion_notify_event", - (GtkSignalFunc) select_motion, command); + g_signal_connect(G_OBJECT(command->widget), "button_release_event", + G_CALLBACK (select_release), command); + g_signal_connect(G_OBJECT(command->widget), "motion_notify_event", + G_CALLBACK (select_motion), command); gdk_gc_set_function(get_preferences()->normal_gc, GDK_EQUIV); diff --git a/plug-ins/imagemap/imap_cmd_send_to_back.c b/plug-ins/imagemap/imap_cmd_send_to_back.c index 617ecff9dc..97126d7fbd 100644 --- a/plug-ins/imagemap/imap_cmd_send_to_back.c +++ b/plug-ins/imagemap/imap_cmd_send_to_back.c @@ -23,6 +23,8 @@ #include "config.h" +#include + #include "imap_cmd_create.h" #include "imap_cmd_delete.h" #include "imap_cmd_send_to_back.h" diff --git a/plug-ins/imagemap/imap_cmd_unselect.c b/plug-ins/imagemap/imap_cmd_unselect.c index 40e7ad6d83..1cc6aaf057 100644 --- a/plug-ins/imagemap/imap_cmd_unselect.c +++ b/plug-ins/imagemap/imap_cmd_unselect.c @@ -23,6 +23,8 @@ #include "config.h" +#include + #include "imap_cmd_unselect.h" #include "imap_main.h" diff --git a/plug-ins/imagemap/imap_cmd_unselect_all.c b/plug-ins/imagemap/imap_cmd_unselect_all.c index cbff8dbd16..5cac7a28fb 100644 --- a/plug-ins/imagemap/imap_cmd_unselect_all.c +++ b/plug-ins/imagemap/imap_cmd_unselect_all.c @@ -21,11 +21,16 @@ * */ +#include "config.h" + +#include + #include "imap_cmd_unselect.h" #include "imap_cmd_unselect_all.h" -#include "libgimp/stdplugins-intl.h" #include "imap_main.h" +#include "libgimp/stdplugins-intl.h" + COMMAND_PROTO(unselect_all_command); static CommandClass_t unselect_all_command_class = { diff --git a/plug-ins/imagemap/imap_command.c b/plug-ins/imagemap/imap_command.c index 72297b9681..d32ed4e916 100755 --- a/plug-ins/imagemap/imap_command.c +++ b/plug-ins/imagemap/imap_command.c @@ -21,7 +21,12 @@ * */ +#include "config.h" + #include + +#include + #include "imap_command.h" #define INFINITE_UNDO_LEVELS -1 diff --git a/plug-ins/imagemap/imap_default_dialog.c b/plug-ins/imagemap/imap_default_dialog.c index 8c02de4aeb..d1aaca5a33 100644 --- a/plug-ins/imagemap/imap_default_dialog.c +++ b/plug-ins/imagemap/imap_default_dialog.c @@ -40,10 +40,12 @@ dialog_cancel(GtkWidget *widget, gpointer data) dialog->cancel_cb(dialog->cancel_cb_data); } -static void +static gboolean dialog_destroy(GtkWidget *widget, GdkEvent *event, gpointer data) { dialog_cancel(widget, data); + + return TRUE; } static void @@ -103,38 +105,38 @@ make_default_dialog(const gchar *title) data->dialog = dialog = gtk_dialog_new(); gtk_window_set_title(GTK_WINDOW(dialog), title); - gtk_signal_connect(GTK_OBJECT(dialog), "delete_event", - GTK_SIGNAL_FUNC(dialog_destroy), (gpointer) data); + g_signal_connect(G_OBJECT(dialog), "delete_event", + G_CALLBACK(dialog_destroy), (gpointer) data); /* Action area */ gtk_container_set_border_width(GTK_CONTAINER( GTK_DIALOG(dialog)->action_area), 2); gtk_box_set_homogeneous(GTK_BOX(GTK_DIALOG(dialog)->action_area), FALSE); hbbox = gtk_hbutton_box_new(); - gtk_button_box_set_spacing(GTK_BUTTON_BOX(hbbox), 4); + gtk_box_set_spacing(GTK_BOX(hbbox), 4); gtk_box_pack_end(GTK_BOX(GTK_DIALOG(dialog)->action_area), hbbox, FALSE, FALSE, 0); gtk_widget_show (hbbox); data->ok = gtk_button_new_from_stock(GTK_STOCK_OK); GTK_WIDGET_SET_FLAGS(data->ok, GTK_CAN_DEFAULT); - gtk_signal_connect(GTK_OBJECT(data->ok), "clicked", - GTK_SIGNAL_FUNC(dialog_ok), (gpointer) data); + g_signal_connect(G_OBJECT(data->ok), "clicked", + G_CALLBACK(dialog_ok), (gpointer) data); gtk_box_pack_start(GTK_BOX(hbbox), data->ok, FALSE, FALSE, 0); gtk_widget_grab_default(data->ok); gtk_widget_show(data->ok); data->apply = gtk_button_new_with_label(_("Apply")); GTK_WIDGET_SET_FLAGS(data->apply, GTK_CAN_DEFAULT); - gtk_signal_connect(GTK_OBJECT(data->apply), "clicked", - GTK_SIGNAL_FUNC(dialog_apply), (gpointer) data); + g_signal_connect(G_OBJECT(data->apply), "clicked", + G_CALLBACK(dialog_apply), (gpointer) data); gtk_box_pack_start(GTK_BOX(hbbox), data->apply, FALSE, FALSE, 0); gtk_widget_show(data->apply); data->cancel = gtk_button_new_from_stock(GTK_STOCK_CANCEL); GTK_WIDGET_SET_FLAGS(data->cancel, GTK_CAN_DEFAULT); - gtk_signal_connect(GTK_OBJECT(data->cancel), "clicked", - GTK_SIGNAL_FUNC(dialog_cancel), (gpointer) data); + g_signal_connect(G_OBJECT(data->cancel), "clicked", + G_CALLBACK(dialog_cancel), (gpointer) data); gtk_box_pack_start(GTK_BOX(hbbox), data->cancel, FALSE, FALSE, 0); gtk_widget_show(data->cancel); diff --git a/plug-ins/imagemap/imap_default_dialog.h b/plug-ins/imagemap/imap_default_dialog.h index 99776e281f..ae3d24dd8b 100644 --- a/plug-ins/imagemap/imap_default_dialog.h +++ b/plug-ins/imagemap/imap_default_dialog.h @@ -24,8 +24,6 @@ #ifndef _IMAP_DEFAULT_DIALOG_H #define _IMAP_DEFAULT_DIALOG_H -#include "gtk/gtk.h" - typedef struct { GtkWidget *dialog; GtkWidget *ok; diff --git a/plug-ins/imagemap/imap_edit_area_info.c b/plug-ins/imagemap/imap_edit_area_info.c index cdc8543a1f..eb1189d66f 100644 --- a/plug-ins/imagemap/imap_edit_area_info.c +++ b/plug-ins/imagemap/imap_edit_area_info.c @@ -21,18 +21,27 @@ * */ +#include "config.h" + #include #include -#include "config.h" +#ifdef __GNUC__ +#warning GTK_DISABLE_DEPRECATED +#endif +#undef GTK_DISABLE_DEPRECATED + +#include + #include "imap_browse.h" #include "imap_cmd_edit_object.h" #include "imap_default_dialog.h" #include "imap_edit_area_info.h" #include "imap_main.h" -#include "libgimp/stdplugins-intl.h" #include "imap_table.h" +#include "libgimp/stdplugins-intl.h" + static gint callback_lock; @@ -175,50 +184,50 @@ create_link_tab(AreaInfoDialog_t *dialog, GtkWidget *notebook) dialog->web_site = create_radio_button_in_table(subtable, NULL, 0, 0, _("Web Site")); - gtk_signal_connect(GTK_OBJECT(dialog->web_site), "toggled", - (GtkSignalFunc) select_web_cb, (gpointer) dialog); - group = gtk_radio_button_group(GTK_RADIO_BUTTON(dialog->web_site)); + g_signal_connect(G_OBJECT(dialog->web_site), "toggled", + G_CALLBACK (select_web_cb), (gpointer) dialog); + group = gtk_radio_button_get_group(GTK_RADIO_BUTTON(dialog->web_site)); dialog->ftp_site = create_radio_button_in_table(subtable, group, 0, 1, _("Ftp Site")); - gtk_signal_connect(GTK_OBJECT(dialog->ftp_site), "toggled", - (GtkSignalFunc) select_ftp_cb, (gpointer) dialog); - group = gtk_radio_button_group(GTK_RADIO_BUTTON(dialog->ftp_site)); + g_signal_connect(G_OBJECT(dialog->ftp_site), "toggled", + G_CALLBACK (select_ftp_cb), (gpointer) dialog); + group = gtk_radio_button_get_group(GTK_RADIO_BUTTON(dialog->ftp_site)); dialog->gopher = create_radio_button_in_table(subtable, group, 0, 2, _("Gopher")); - gtk_signal_connect(GTK_OBJECT(dialog->gopher), "toggled", - (GtkSignalFunc) select_gopher_cb, (gpointer) dialog); - group = gtk_radio_button_group(GTK_RADIO_BUTTON(dialog->gopher)); + g_signal_connect(G_OBJECT(dialog->gopher), "toggled", + G_CALLBACK (select_gopher_cb), (gpointer) dialog); + group = gtk_radio_button_get_group(GTK_RADIO_BUTTON(dialog->gopher)); dialog->other = create_radio_button_in_table(subtable, group, 0, 3, _("Other")); - gtk_signal_connect(GTK_OBJECT(dialog->other), "toggled", - (GtkSignalFunc) select_other_cb, (gpointer) dialog); - group = gtk_radio_button_group(GTK_RADIO_BUTTON(dialog->other)); + g_signal_connect(G_OBJECT(dialog->other), "toggled", + G_CALLBACK (select_other_cb), (gpointer) dialog); + group = gtk_radio_button_get_group(GTK_RADIO_BUTTON(dialog->other)); dialog->file = create_radio_button_in_table(subtable, group, 1, 0, _("File")); - gtk_signal_connect(GTK_OBJECT(dialog->file), "toggled", - (GtkSignalFunc) select_file_cb, (gpointer) dialog); - group = gtk_radio_button_group(GTK_RADIO_BUTTON(dialog->file)); + g_signal_connect(G_OBJECT(dialog->file), "toggled", + G_CALLBACK (select_file_cb), (gpointer) dialog); + group = gtk_radio_button_get_group(GTK_RADIO_BUTTON(dialog->file)); dialog->wais = create_radio_button_in_table(subtable, group, 1, 1, _("WAIS")); - gtk_signal_connect(GTK_OBJECT(dialog->wais), "toggled", - (GtkSignalFunc) select_wais_cb, (gpointer) dialog); - group = gtk_radio_button_group(GTK_RADIO_BUTTON(dialog->wais)); + g_signal_connect(G_OBJECT(dialog->wais), "toggled", + G_CALLBACK (select_wais_cb), (gpointer) dialog); + group = gtk_radio_button_get_group(GTK_RADIO_BUTTON(dialog->wais)); dialog->telnet = create_radio_button_in_table(subtable, group, 1, 2, _("Telnet")); - gtk_signal_connect(GTK_OBJECT(dialog->telnet), "toggled", - (GtkSignalFunc) select_telnet_cb, (gpointer) dialog); - group = gtk_radio_button_group(GTK_RADIO_BUTTON(dialog->telnet)); + g_signal_connect(G_OBJECT(dialog->telnet), "toggled", + G_CALLBACK (select_telnet_cb), (gpointer) dialog); + group = gtk_radio_button_get_group(GTK_RADIO_BUTTON(dialog->telnet)); dialog->email = create_radio_button_in_table(subtable, group, 1, 3, _("e-mail")); - gtk_signal_connect(GTK_OBJECT(dialog->email), "toggled", - (GtkSignalFunc) select_email_cb, (gpointer) dialog); + g_signal_connect(G_OBJECT(dialog->email), "toggled", + G_CALLBACK (select_email_cb), (gpointer) dialog); create_label_in_table( table, 2, 0, @@ -228,8 +237,8 @@ create_link_tab(AreaInfoDialog_t *dialog, GtkWidget *notebook) browse_widget_set_filter(browse, relative_filter, (gpointer) dialog); gtk_table_attach_defaults(GTK_TABLE(table), browse->hbox, 0, 1, 3, 4); dialog->url = browse->file; - gtk_signal_connect(GTK_OBJECT(dialog->url), "changed", - GTK_SIGNAL_FUNC(url_changed), dialog); + g_signal_connect(G_OBJECT(dialog->url), "changed", + G_CALLBACK(url_changed), dialog); dialog->relative_link = create_check_button_in_table(table, 4, 0, _("Relative link")); @@ -285,8 +294,8 @@ create_info_tab(AreaInfoDialog_t *dialog, GtkWidget *notebook) gtk_widget_show(frame); preview = gtk_check_button_new_with_label(_("Preview")); - gtk_signal_connect(GTK_OBJECT(preview), "toggled", - (GtkSignalFunc) toggle_preview_cb, (gpointer) dialog); + g_signal_connect(G_OBJECT(preview), "toggled", + G_CALLBACK (toggle_preview_cb), (gpointer) dialog); gtk_box_pack_start(GTK_BOX(vbox), preview, FALSE, FALSE, 0); gtk_widget_show(preview); @@ -429,8 +438,8 @@ create_edit_area_info_dialog(Object_t *obj) data->notebook = notebook = gtk_notebook_new(); gtk_container_set_border_width(GTK_CONTAINER(notebook), 10); - gtk_signal_connect_after(GTK_OBJECT(notebook), "switch_page", - GTK_SIGNAL_FUNC(switch_page), (gpointer) data); + g_signal_connect_after(G_OBJECT(notebook), "switch_page", + G_CALLBACK(switch_page), (gpointer) data); gtk_box_pack_start(GTK_BOX(GTK_DIALOG(data->dialog->dialog)->vbox), notebook, TRUE, TRUE, 10); diff --git a/plug-ins/imagemap/imap_edit_area_info.h b/plug-ins/imagemap/imap_edit_area_info.h index a8e49d5428..f1b488c362 100644 --- a/plug-ins/imagemap/imap_edit_area_info.h +++ b/plug-ins/imagemap/imap_edit_area_info.h @@ -26,8 +26,6 @@ typedef struct AreaInfoDialog_t AreaInfoDialog_t; -#include "gtk/gtk.h" - #include "imap_default_dialog.h" #include "imap_object.h" diff --git a/plug-ins/imagemap/imap_file.c b/plug-ins/imagemap/imap_file.c index f6af9b2d8e..e6bf8fd5ad 100644 --- a/plug-ins/imagemap/imap_file.c +++ b/plug-ins/imagemap/imap_file.c @@ -60,11 +60,11 @@ do_file_open_dialog(void) static GtkWidget *dialog; if (!dialog) { dialog = gtk_file_selection_new(_("Load Imagemap")); - gtk_signal_connect_object( - GTK_OBJECT(GTK_FILE_SELECTION(dialog)->cancel_button), - "clicked", GTK_SIGNAL_FUNC(gtk_widget_hide), GTK_OBJECT(dialog)); - gtk_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(dialog)->ok_button), - "clicked", GTK_SIGNAL_FUNC(open_cb), dialog); + g_signal_connect_swapped( + G_OBJECT(GTK_FILE_SELECTION(dialog)->cancel_button), + "clicked", G_CALLBACK(gtk_widget_hide), dialog); + g_signal_connect(G_OBJECT(GTK_FILE_SELECTION(dialog)->ok_button), + "clicked", G_CALLBACK(open_cb), dialog); } gtk_widget_show(dialog); } @@ -120,11 +120,11 @@ do_file_save_as_dialog(void) static GtkWidget *dialog; if (!dialog) { dialog = gtk_file_selection_new(_("Save Imagemap")); - gtk_signal_connect_object( - GTK_OBJECT(GTK_FILE_SELECTION(dialog)->cancel_button), - "clicked", GTK_SIGNAL_FUNC(gtk_widget_hide), GTK_OBJECT(dialog)); - gtk_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(dialog)->ok_button), - "clicked", GTK_SIGNAL_FUNC(save_cb), dialog); + g_signal_connect_swapped( + G_OBJECT(GTK_FILE_SELECTION(dialog)->cancel_button), + "clicked", G_CALLBACK(gtk_widget_hide), dialog); + g_signal_connect(G_OBJECT(GTK_FILE_SELECTION(dialog)->ok_button), + "clicked", G_CALLBACK(save_cb), dialog); } gtk_widget_show(dialog); } diff --git a/plug-ins/imagemap/imap_file.h b/plug-ins/imagemap/imap_file.h index 235538cda4..fcfdfe060c 100644 --- a/plug-ins/imagemap/imap_file.h +++ b/plug-ins/imagemap/imap_file.h @@ -24,8 +24,6 @@ #ifndef _IMAP_FILE_H #define _IMAP_FILE_H -#include "gtk/gtk.h" - void do_file_open_dialog(void); void do_file_save_as_dialog(void); void do_file_error_dialog(const char *error, const char *filename); diff --git a/plug-ins/imagemap/imap_grid.c b/plug-ins/imagemap/imap_grid.c index ca8b5604fc..09595db1b0 100644 --- a/plug-ins/imagemap/imap_grid.c +++ b/plug-ins/imagemap/imap_grid.c @@ -22,8 +22,12 @@ */ #include "config.h" + +#include + +#include "libgimp/gimp.h" + #include "imap_grid.h" -#include "libgimp/stdplugins-intl.h" #include "imap_main.h" #include "imap_menu.h" #include "imap_popup.h" @@ -31,6 +35,8 @@ #include "imap_table.h" #include "imap_toolbar.h" +#include "libgimp/stdplugins-intl.h" + typedef enum {GRID_HIDDEN, GRID_LINES, GRID_CROSSES} GridType_t; static GdkGC *grid_gc; @@ -152,8 +158,8 @@ create_grid_settings_dialog() gtk_widget_show(main_table); data->snap = gtk_check_button_new_with_label(_("Snap-To Grid Enabled")); - gtk_signal_connect(GTK_OBJECT(data->snap), "toggled", - (GtkSignalFunc) snap_toggled_cb, data); + g_signal_connect(G_OBJECT(data->snap), "toggled", + G_CALLBACK (snap_toggled_cb), data); gtk_table_attach_defaults(GTK_TABLE(main_table), data->snap, 0, 1, 0, 1); gtk_widget_show(data->snap); @@ -165,25 +171,25 @@ create_grid_settings_dialog() gtk_widget_show(hbox); data->hidden = button = gtk_radio_button_new_with_label(NULL, _("Hidden")); - gtk_signal_connect(GTK_OBJECT(button), "toggled", - (GtkSignalFunc) type_toggled_cb, (gpointer) GRID_HIDDEN); + g_signal_connect(G_OBJECT(button), "toggled", + G_CALLBACK (type_toggled_cb), (gpointer) GRID_HIDDEN); gtk_box_pack_start(GTK_BOX(hbox), button, TRUE, TRUE, 10); gtk_widget_show(button); - group = gtk_radio_button_group(GTK_RADIO_BUTTON(button)); + group = gtk_radio_button_get_group(GTK_RADIO_BUTTON(button)); data->lines = button = gtk_radio_button_new_with_label(group, _("Lines")); - gtk_signal_connect(GTK_OBJECT(button), "toggled", - (GtkSignalFunc) type_toggled_cb, (gpointer) GRID_LINES); + g_signal_connect(G_OBJECT(button), "toggled", + G_CALLBACK (type_toggled_cb), (gpointer) GRID_LINES); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), TRUE); gtk_box_pack_start(GTK_BOX(hbox), button, TRUE, TRUE, 10); gtk_widget_show(button); - group = gtk_radio_button_group(GTK_RADIO_BUTTON(button)); + group = gtk_radio_button_get_group(GTK_RADIO_BUTTON(button)); data->crosses = button = gtk_radio_button_new_with_label(group, _("Crosses")); - gtk_signal_connect(GTK_OBJECT(button), "toggled", - (GtkSignalFunc) type_toggled_cb, - (gpointer) GRID_CROSSES); + g_signal_connect(G_OBJECT(button), "toggled", + G_CALLBACK (type_toggled_cb), + (gpointer) GRID_CROSSES); gtk_box_pack_start(GTK_BOX(hbox), button, TRUE, TRUE, 10); gtk_widget_show(button); @@ -197,14 +203,14 @@ create_grid_settings_dialog() create_label_in_table(table, 0, 0, _("Width")); data->width = create_spin_button_in_table(table, 0, 1, 15, 1, 100); - gtk_signal_connect(GTK_OBJECT(data->width), "changed", - (GtkSignalFunc) width_changed_cb, (gpointer) data); + g_signal_connect(G_OBJECT(data->width), "changed", + G_CALLBACK (width_changed_cb), (gpointer) data); create_label_in_table(table, 0, 2, _("pixels")); create_label_in_table(table, 1, 0, _("Height")); data->height = create_spin_button_in_table(table, 1, 1, 15, 1, 100); - gtk_signal_connect(GTK_OBJECT(data->height), "changed", - (GtkSignalFunc) height_changed_cb, (gpointer) data); + g_signal_connect(G_OBJECT(data->height), "changed", + G_CALLBACK (height_changed_cb), (gpointer) data); create_label_in_table(table, 1, 2, _("pixels")); gtk_widget_show(table); @@ -219,19 +225,19 @@ create_grid_settings_dialog() gtk_container_add(GTK_CONTAINER(frame), table); data->left = create_spin_button_in_table(table, 0, 0, 0, 0, 100); - gtk_signal_connect(GTK_OBJECT(data->left), "changed", - (GtkSignalFunc) left_changed_cb, (gpointer) data); + g_signal_connect(G_OBJECT(data->left), "changed", + G_CALLBACK (left_changed_cb), (gpointer) data); create_label_in_table(table, 0, 1, _("pixels from left")); data->top = create_spin_button_in_table(table, 1, 0, 0, 0, 100); - gtk_signal_connect(GTK_OBJECT(data->top), "changed", - (GtkSignalFunc) top_changed_cb, (gpointer) data); + g_signal_connect(G_OBJECT(data->top), "changed", + G_CALLBACK (top_changed_cb), (gpointer) data); create_label_in_table(table, 1, 1, _("pixels from top")); data->preview = create_check_button_in_table(main_table, 3, 0, _("Preview")); - gtk_signal_connect(GTK_OBJECT(data->preview), "toggled", - (GtkSignalFunc) toggle_preview_cb, (gpointer) data); + g_signal_connect(G_OBJECT(data->preview), "toggled", + G_CALLBACK (toggle_preview_cb), (gpointer) data); gtk_widget_show(data->preview); snap_toggled_cb(data->snap, data); diff --git a/plug-ins/imagemap/imap_main.c b/plug-ins/imagemap/imap_main.c index d6e0b12d12..cfd52485a0 100644 --- a/plug-ins/imagemap/imap_main.c +++ b/plug-ins/imagemap/imap_main.c @@ -28,6 +28,11 @@ #include #include +#ifdef __GNUC__ +#warning GTK_DISABLE_DEPRECATED +#endif +#undef GTK_DISABLE_DEPRECATED + #include #include /* for keyboard values */ diff --git a/plug-ins/imagemap/imap_menu.c b/plug-ins/imagemap/imap_menu.c index c5b4ab0891..bf8f416c4e 100644 --- a/plug-ins/imagemap/imap_menu.c +++ b/plug-ins/imagemap/imap_menu.c @@ -26,6 +26,13 @@ #include #include +#ifdef __GNUC__ +#warning GTK_DISABLE_DEPRECATED +#endif +#undef GTK_DISABLE_DEPRECATED + +#include + #include "imap_circle.h" #include "imap_file.h" #include "imap_grid.h" @@ -447,7 +454,7 @@ menu_build_mru_items(MRU_t *mru) int i; if (_menu.nr_off_mru_items) { - GList *children = gtk_container_children(GTK_CONTAINER(_menu.file_menu)); + GList *children = gtk_container_get_children(GTK_CONTAINER(_menu.file_menu)); p = g_list_nth(children, position); for (i = 0; i < _menu.nr_off_mru_items; i++, p = p->next) { diff --git a/plug-ins/imagemap/imap_menu_funcs.c b/plug-ins/imagemap/imap_menu_funcs.c index 8c0d24d9c2..569fcab245 100644 --- a/plug-ins/imagemap/imap_menu_funcs.c +++ b/plug-ins/imagemap/imap_menu_funcs.c @@ -21,6 +21,15 @@ * */ +#include "config.h" + +#ifdef __GNUC__ +#warning GTK_DISABLE_DEPRECATED +#endif +#undef GTK_DISABLE_DEPRECATED + +#include + #include "imap_command.h" #include "imap_menu_funcs.h" diff --git a/plug-ins/imagemap/imap_menu_funcs.h b/plug-ins/imagemap/imap_menu_funcs.h index d44fd396b4..aee06eb60d 100644 --- a/plug-ins/imagemap/imap_menu_funcs.h +++ b/plug-ins/imagemap/imap_menu_funcs.h @@ -24,8 +24,6 @@ #ifndef _IMAP_MENU_FUNCS_H #define _IMAP_MENU_FUNCS_H -#include "gtk/gtk.h" - typedef void (*MenuCallback)(GtkWidget *widget, gpointer data); void init_accel_group(GtkWidget *window); diff --git a/plug-ins/imagemap/imap_misc.c b/plug-ins/imagemap/imap_misc.c index 3675fc8fa2..1700fcb789 100644 --- a/plug-ins/imagemap/imap_misc.c +++ b/plug-ins/imagemap/imap_misc.c @@ -21,6 +21,15 @@ * */ +#include "config.h" + +#ifdef __GNUC__ +#warning GTK_DISABLE_DEPRECATED +#endif +#undef GTK_DISABLE_DEPRECATED + +#include + #include "imap_main.h" #include "imap_misc.h" diff --git a/plug-ins/imagemap/imap_misc.h b/plug-ins/imagemap/imap_misc.h index 0d0db12511..ecb359c638 100644 --- a/plug-ins/imagemap/imap_misc.h +++ b/plug-ins/imagemap/imap_misc.h @@ -24,8 +24,6 @@ #ifndef _IMAP_MISC_H #define _IMAP_MISC_H -#include "gtk/gtk.h" - GtkWidget *make_toolbar_icon(GtkWidget *toolbar, GtkWidget *window, char **data, const char *identifier, const char *tooltip, diff --git a/plug-ins/imagemap/imap_mru.c b/plug-ins/imagemap/imap_mru.c index bf912a6bd9..e7c0630c1f 100644 --- a/plug-ins/imagemap/imap_mru.c +++ b/plug-ins/imagemap/imap_mru.c @@ -21,8 +21,12 @@ * */ +#include "config.h" + #include +#include + #include "imap_mru.h" MRU_t* diff --git a/plug-ins/imagemap/imap_mru.h b/plug-ins/imagemap/imap_mru.h index d9a3f90000..f91e42d74f 100644 --- a/plug-ins/imagemap/imap_mru.h +++ b/plug-ins/imagemap/imap_mru.h @@ -26,8 +26,6 @@ #include -#include "gtk/gtk.h" - #define DEFAULT_MRU_SIZE 4 typedef struct { diff --git a/plug-ins/imagemap/imap_object.c b/plug-ins/imagemap/imap_object.c index 390b7405d7..30b1bb9325 100644 --- a/plug-ins/imagemap/imap_object.c +++ b/plug-ins/imagemap/imap_object.c @@ -21,6 +21,10 @@ * */ +#include "config.h" + +#include + #include "imap_cmd_create.h" #include "imap_command.h" #include "imap_default_dialog.h" @@ -436,9 +440,9 @@ object_on_button_press(GtkWidget *widget, GdkEventButton *event, gpointer data) if (obj) { if (event->button == 1) { if (!factory->finish || factory->finish(obj, x, y)) { - gtk_signal_disconnect_by_func(GTK_OBJECT(widget), - (GtkSignalFunc) button_motion, - factory); + g_signal_handlers_disconnect_by_func(G_OBJECT(widget), + button_motion, + factory); if (object_is_valid(obj)) { Command_t *command = create_command_new(get_shapes(), obj); @@ -457,9 +461,9 @@ object_on_button_press(GtkWidget *widget, GdkEventButton *event, gpointer data) } else if (event->button == 3) { object_draw(obj, widget->window); if (!factory->cancel || factory->cancel(event, obj)) { - gtk_signal_disconnect_by_func(GTK_OBJECT(widget), - (GtkSignalFunc) button_motion, - factory); + g_signal_handlers_disconnect_by_func(G_OBJECT(widget), + button_motion, + factory); object_unref(obj); gdk_gc_set_function(preferences->normal_gc, GDK_COPY); obj = NULL; @@ -475,8 +479,9 @@ object_on_button_press(GtkWidget *widget, GdkEventButton *event, gpointer data) gdk_gc_set_function(preferences->normal_gc, GDK_EQUIV); - gtk_signal_connect(GTK_OBJECT(widget), "motion_notify_event", - (GtkSignalFunc) button_motion, factory); + g_signal_connect(G_OBJECT(widget), "motion_notify_event", + G_CALLBACK (button_motion), + factory); } } } diff --git a/plug-ins/imagemap/imap_object.h b/plug-ins/imagemap/imap_object.h index 7606c78ff3..2d3afe1e0b 100644 --- a/plug-ins/imagemap/imap_object.h +++ b/plug-ins/imagemap/imap_object.h @@ -28,8 +28,6 @@ typedef struct Object_t Object_t; typedef struct ObjectClass_t ObjectClass_t; typedef struct ObjectList_t ObjectList_t; -#include "gtk/gtk.h" - #include "imap_edit_area_info.h" #include "imap_menu_funcs.h" diff --git a/plug-ins/imagemap/imap_object_popup.c b/plug-ins/imagemap/imap_object_popup.c index 75ac32a865..5147de9adf 100644 --- a/plug-ins/imagemap/imap_object_popup.c +++ b/plug-ins/imagemap/imap_object_popup.c @@ -21,6 +21,10 @@ * */ +#include "config.h" + +#include + #include "imap_cmd_copy_object.h" #include "imap_cmd_cut_object.h" #include "imap_cmd_object_down.h" diff --git a/plug-ins/imagemap/imap_polygon.c b/plug-ins/imagemap/imap_polygon.c index a3b3299cf2..d37fffee67 100644 --- a/plug-ins/imagemap/imap_polygon.c +++ b/plug-ins/imagemap/imap_polygon.c @@ -26,6 +26,13 @@ #include #include +#ifdef __GNUC__ +#warning GTK_DISABLE_DEPRECATED +#endif +#undef GTK_DISABLE_DEPRECATED + +#include + #include "imap_cmd_delete_point.h" #include "imap_cmd_insert_point.h" #include "imap_main.h" diff --git a/plug-ins/imagemap/imap_popup.c b/plug-ins/imagemap/imap_popup.c index a9554d62c0..fe53d9a578 100644 --- a/plug-ins/imagemap/imap_popup.c +++ b/plug-ins/imagemap/imap_popup.c @@ -22,7 +22,8 @@ */ #include "config.h" -#include "libgimp/stdplugins-intl.h" + +#include #include "imap_edit_area_info.h" #include "imap_grid.h" @@ -32,6 +33,8 @@ #include "imap_popup.h" #include "imap_tools.h" +#include "libgimp/stdplugins-intl.h" + static gint _popup_callback_lock; static PopupMenu_t _popup; diff --git a/plug-ins/imagemap/imap_preferences.c b/plug-ins/imagemap/imap_preferences.c index 85182d1930..98054f9113 100644 --- a/plug-ins/imagemap/imap_preferences.c +++ b/plug-ins/imagemap/imap_preferences.c @@ -27,6 +27,15 @@ #include #include +#ifdef __GNUC__ +#warning GTK_DISABLE_DEPRECATED +#endif +#undef GTK_DISABLE_DEPRECATED + +#include + +#include "libgimp/gimp.h" + #include "imap_command.h" #include "imap_file.h" #include "imap_main.h" @@ -36,7 +45,6 @@ #include "imap_preferences.h" #include "imap_table.h" -#include "libgimp/gimp.h" #include "libgimp/stdplugins-intl.h" static gint diff --git a/plug-ins/imagemap/imap_preview.c b/plug-ins/imagemap/imap_preview.c index e7d9cb3bd9..00026936a0 100644 --- a/plug-ins/imagemap/imap_preview.c +++ b/plug-ins/imagemap/imap_preview.c @@ -21,6 +21,15 @@ * */ +#include "config.h" + +#ifdef __GNUC__ +#warning GTK_DISABLE_DEPRECATED +#endif +#undef GTK_DISABLE_DEPRECATED + +#include + #include "libgimp/gimp.h" #include "imap_cmd_edit_object.h" diff --git a/plug-ins/imagemap/imap_preview.h b/plug-ins/imagemap/imap_preview.h index c26e4b107e..69bdc274b0 100644 --- a/plug-ins/imagemap/imap_preview.h +++ b/plug-ins/imagemap/imap_preview.h @@ -24,9 +24,6 @@ #ifndef _IMAP_PREVIEW_H #define _IMAP_PREVIEW_H -#include "libgimp/gimp.h" -#include "gtk/gtk.h" - typedef struct { GimpDrawable *drawable; GtkWidget *window; diff --git a/plug-ins/imagemap/imap_rectangle.c b/plug-ins/imagemap/imap_rectangle.c index 00634a281a..e0dcf89cfe 100644 --- a/plug-ins/imagemap/imap_rectangle.c +++ b/plug-ins/imagemap/imap_rectangle.c @@ -25,6 +25,13 @@ #include /* abs */ +#ifdef __GNUC__ +#warning GTK_DISABLE_DEPRECATED +#endif +#undef GTK_DISABLE_DEPRECATED + +#include + #include "libgimp/stdplugins-intl.h" #include "imap_main.h" #include "imap_misc.h" diff --git a/plug-ins/imagemap/imap_selection.c b/plug-ins/imagemap/imap_selection.c index 0722213396..92a7463d35 100644 --- a/plug-ins/imagemap/imap_selection.c +++ b/plug-ins/imagemap/imap_selection.c @@ -25,6 +25,13 @@ #include +#ifdef __GNUC__ +#warning GTK_DISABLE_DEPRECATED +#endif +#undef GTK_DISABLE_DEPRECATED + +#include + #include "imap_cmd_edit_object.h" #include "imap_cmd_select.h" #include "imap_cmd_unselect.h" diff --git a/plug-ins/imagemap/imap_settings.c b/plug-ins/imagemap/imap_settings.c index 7ce82d27bd..a957ee940f 100644 --- a/plug-ins/imagemap/imap_settings.c +++ b/plug-ins/imagemap/imap_settings.c @@ -23,13 +23,22 @@ #include "config.h" +#ifdef __GNUC__ +#warning GTK_DISABLE_DEPRECATED +#endif +#undef GTK_DISABLE_DEPRECATED + +#include + #include "imap_browse.h" #include "imap_main.h" #include "imap_settings.h" #include "imap_string.h" #include "imap_table.h" -/* FIXME: remove usage of the 'broken' GtkText */ +#ifdef __GNUC__ +#warning GTK_ENABLE_BROKEN +#endif #define GTK_ENABLE_BROKEN #include diff --git a/plug-ins/imagemap/imap_source.c b/plug-ins/imagemap/imap_source.c index a68f620b28..5d23441f2d 100644 --- a/plug-ins/imagemap/imap_source.c +++ b/plug-ins/imagemap/imap_source.c @@ -26,13 +26,22 @@ #include #include +#ifdef __GNUC__ +#warning GTK_DISABLE_DEPRECATED +#endif +#undef GTK_DISABLE_DEPRECATED + +#include + #include "imap_default_dialog.h" #include "imap_main.h" #include "imap_source.h" #include "libgimp/stdplugins-intl.h" -/* FIXME: remove usage of the 'broken' GtkText */ +#ifdef __GNUC__ +#warning GTK_ENABLE_BROKEN +#endif #define GTK_ENABLE_BROKEN #include diff --git a/plug-ins/imagemap/imap_statusbar.c b/plug-ins/imagemap/imap_statusbar.c index 93ad0dfd96..823a783a4e 100644 --- a/plug-ins/imagemap/imap_statusbar.c +++ b/plug-ins/imagemap/imap_statusbar.c @@ -21,14 +21,23 @@ * */ +#include "config.h" + #include #include -#include "coord.xpm" -#include "dimension.xpm" +#ifdef __GNUC__ +#warning GTK_DISABLE_DEPRECATED +#endif +#undef GTK_DISABLE_DEPRECATED + +#include #include "imap_statusbar.h" +#include "coord.xpm" +#include "dimension.xpm" + StatusBar_t* make_statusbar(GtkWidget *main_vbox, GtkWidget *window) { diff --git a/plug-ins/imagemap/imap_statusbar.h b/plug-ins/imagemap/imap_statusbar.h index 318e463528..9d0d116d43 100644 --- a/plug-ins/imagemap/imap_statusbar.h +++ b/plug-ins/imagemap/imap_statusbar.h @@ -24,8 +24,6 @@ #ifndef _IMAP_STATUSBAR_H #define _IMAP_STATUSBAR_H -#include "gtk/gtk.h" - typedef struct { GtkWidget *status; GtkWidget *xy; diff --git a/plug-ins/imagemap/imap_string.c b/plug-ins/imagemap/imap_string.c index 3778b72c95..ca99044abc 100644 --- a/plug-ins/imagemap/imap_string.c +++ b/plug-ins/imagemap/imap_string.c @@ -21,6 +21,10 @@ * */ +#include "config.h" + +#include + #include "imap_string.h" gchar* diff --git a/plug-ins/imagemap/imap_string.h b/plug-ins/imagemap/imap_string.h index 30bfe7a1bb..2bd4a7d1f4 100644 --- a/plug-ins/imagemap/imap_string.h +++ b/plug-ins/imagemap/imap_string.h @@ -24,8 +24,6 @@ #ifndef _IMAP_STRING_H #define _IMAP_STRING_H -#include "gtk/gtk.h" - gchar *g_strreplace(gchar **old_str, const gchar *new_str); #endif /* _IMAP_STRING_H */ diff --git a/plug-ins/imagemap/imap_table.c b/plug-ins/imagemap/imap_table.c index a0fd8e67f4..98b8272190 100644 --- a/plug-ins/imagemap/imap_table.c +++ b/plug-ins/imagemap/imap_table.c @@ -21,6 +21,10 @@ * */ +#include "config.h" + +#include + #include "imap_table.h" GtkWidget* diff --git a/plug-ins/imagemap/imap_table.h b/plug-ins/imagemap/imap_table.h index 959b5ae14b..a159151a15 100644 --- a/plug-ins/imagemap/imap_table.h +++ b/plug-ins/imagemap/imap_table.h @@ -24,8 +24,6 @@ #ifndef _IMAP_TABLE_H #define _IMAP_TABLE_H -#include "gtk/gtk.h" - GtkWidget *create_spin_button_in_table(GtkWidget *table, int row, int col, int value, int min, int max); GtkWidget *create_check_button_in_table(GtkWidget *table, int row, int col, diff --git a/plug-ins/imagemap/imap_taglist.c b/plug-ins/imagemap/imap_taglist.c index e9aa1da7ce..aa5a2f7ade 100644 --- a/plug-ins/imagemap/imap_taglist.c +++ b/plug-ins/imagemap/imap_taglist.c @@ -21,7 +21,12 @@ * */ +#include "config.h" + #include + +#include + #include "imap_string.h" #include "imap_taglist.h" diff --git a/plug-ins/imagemap/imap_toolbar.c b/plug-ins/imagemap/imap_toolbar.c index c15b2e3327..2a44cc6a00 100644 --- a/plug-ins/imagemap/imap_toolbar.c +++ b/plug-ins/imagemap/imap_toolbar.c @@ -23,6 +23,8 @@ #include "config.h" +#include + #include "imap_main.h" #include "imap_misc.h" #include "imap_toolbar.h" diff --git a/plug-ins/imagemap/imap_toolbar.h b/plug-ins/imagemap/imap_toolbar.h index d0b3119aed..ec66c240c1 100644 --- a/plug-ins/imagemap/imap_toolbar.h +++ b/plug-ins/imagemap/imap_toolbar.h @@ -24,8 +24,6 @@ #ifndef _IMAP_TOOLBAR_H #define _IMAP_TOOLBAR_H -#include "gtk/gtk.h" - #include "imap_command.h" typedef struct { diff --git a/plug-ins/imagemap/imap_tools.c b/plug-ins/imagemap/imap_tools.c index e0cf507d40..2810c0b36f 100644 --- a/plug-ins/imagemap/imap_tools.c +++ b/plug-ins/imagemap/imap_tools.c @@ -23,6 +23,8 @@ #include "config.h" +#include + #include "imap_circle.h" #include "imap_edit_area_info.h" #include "imap_main.h" diff --git a/plug-ins/jpeg/jpeg-load.c b/plug-ins/jpeg/jpeg-load.c index 536c12825e..3e8e2f5d5c 100644 --- a/plug-ins/jpeg/jpeg-load.c +++ b/plug-ins/jpeg/jpeg-load.c @@ -222,7 +222,7 @@ static void run (gchar *name, gint *nreturn_vals, GimpParam **return_vals); static gint32 load_image (gchar *filename, - GimpRunMode runmode, + GimpRunMode runmode, gboolean preview); static gboolean save_image (gchar *filename, gint32 image_ID, @@ -356,7 +356,7 @@ run (gchar *name, GimpParam **return_vals) { static GimpParam values[2]; - GimpRunMode run_mode; + GimpRunMode run_mode; GimpPDBStatusType status = GIMP_PDB_SUCCESS; gint32 image_ID; gint32 drawable_ID; @@ -1507,10 +1507,9 @@ make_preview (void) else { gtk_label_set_text (GTK_LABEL (preview_size), _("Size: unknown")); - gtk_widget_draw (preview_size, NULL); - + gtk_widget_queue_draw (preview_size); + gimp_displays_flush (); - gdk_flush(); } } @@ -1582,9 +1581,9 @@ save_dialog (void) NULL); - gtk_signal_connect (GTK_OBJECT (dlg), "destroy", - GTK_SIGNAL_FUNC (save_close_callback), - NULL); + g_signal_connect (G_OBJECT (dlg), "destroy", + G_CALLBACK (save_close_callback), + NULL); main_vbox = gtk_vbox_new (FALSE, 4); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 6); @@ -1604,15 +1603,17 @@ save_dialog (void) preview = gtk_check_button_new_with_label (_("Preview (in image window)")); gtk_box_pack_start (GTK_BOX (vbox), preview, FALSE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (preview), "toggled", - GTK_SIGNAL_FUNC (gimp_toggle_button_update), - &jsvals.preview); - gtk_signal_connect (GTK_OBJECT (preview), "toggled", - GTK_SIGNAL_FUNC (make_preview), - NULL); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (preview), jsvals.preview); gtk_widget_show (preview); + g_signal_connect (G_OBJECT (preview), "toggled", + G_CALLBACK (gimp_toggle_button_update), + &jsvals.preview); + g_signal_connect (G_OBJECT (preview), "toggled", + G_CALLBACK (make_preview), + NULL); + + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (preview), jsvals.preview); + preview_size = gtk_label_new (_("Size: unknown")); gtk_misc_set_alignment (GTK_MISC (preview_size), 0.0, 0.5); gtk_box_pack_start (GTK_BOX (vbox), preview_size, FALSE, FALSE, 0); @@ -1647,14 +1648,15 @@ save_dialog (void) gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP); gtk_scale_set_digits (GTK_SCALE (scale), 2); gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED); - gtk_signal_connect (GTK_OBJECT (scale_data), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &jsvals.quality); - gtk_signal_connect (GTK_OBJECT (scale_data), "value_changed", - GTK_SIGNAL_FUNC (make_preview), - NULL); gtk_widget_show (scale); + g_signal_connect (G_OBJECT (scale_data), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &jsvals.quality); + g_signal_connect (G_OBJECT (scale_data), "value_changed", + G_CALLBACK (make_preview), + NULL); + label = gtk_label_new (_("Smoothing:")); gtk_misc_set_alignment (GTK_MISC (label), 1.0, 1.0); gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2, @@ -1669,14 +1671,15 @@ save_dialog (void) gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP); gtk_scale_set_digits (GTK_SCALE (scale), 2); gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED); - gtk_signal_connect (GTK_OBJECT (scale_data), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &jsvals.smoothing); - gtk_signal_connect (GTK_OBJECT (scale_data), "value_changed", - GTK_SIGNAL_FUNC (make_preview), - NULL); gtk_widget_show (scale); + g_signal_connect (G_OBJECT (scale_data), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &jsvals.smoothing); + g_signal_connect (G_OBJECT (scale_data), "value_changed", + G_CALLBACK (make_preview), + NULL); + /* sg - have to init scale here */ scale_data = gtk_adjustment_new ((jsvals.restart == 0) ? 1 : jsvals.restart, 1, 64, 1, 1, 0.0); @@ -1685,11 +1688,12 @@ save_dialog (void) restart = gtk_check_button_new_with_label (_("Restart markers")); gtk_table_attach (GTK_TABLE (table), restart, 0, 1, 2, 3, GTK_FILL, 0, 0, 0); - gtk_signal_connect (GTK_OBJECT (restart), "toggled", - GTK_SIGNAL_FUNC (save_restart_toggle_update), - scale_data); gtk_widget_show (restart); + g_signal_connect (G_OBJECT (restart), "toggled", + G_CALLBACK (save_restart_toggle_update), + scale_data); + restart_markers_label = gtk_label_new (_("Restart frequency (rows):")); gtk_misc_set_alignment (GTK_MISC (restart_markers_label), 1.0, 1.0); gtk_table_attach (GTK_TABLE (table), restart_markers_label, 0, 1, 3, 4, @@ -1708,9 +1712,9 @@ save_dialog (void) gtk_range_set_update_policy (GTK_RANGE (restart_markers_scale), GTK_UPDATE_DELAYED); - gtk_signal_connect (GTK_OBJECT (scale_data), "value_changed", - GTK_SIGNAL_FUNC (save_restart_update), - restart); + g_signal_connect (G_OBJECT (scale_data), "value_changed", + G_CALLBACK (save_restart_update), + restart); gtk_widget_set_sensitive (restart_markers_label, (jsvals.restart ? TRUE : FALSE)); @@ -1722,27 +1726,31 @@ save_dialog (void) toggle = gtk_check_button_new_with_label (_("Optimize")); gtk_table_attach (GTK_TABLE (table), toggle, 0, 3, 4, 5, GTK_FILL, 0, 0, 0); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - GTK_SIGNAL_FUNC (gimp_toggle_button_update), - &jsvals.optimize); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - GTK_SIGNAL_FUNC (make_preview), - NULL); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), jsvals.optimize); gtk_widget_show (toggle); + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (gimp_toggle_button_update), + &jsvals.optimize); + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (make_preview), + NULL); + + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), jsvals.optimize); + progressive = gtk_check_button_new_with_label (_("Progressive")); gtk_table_attach (GTK_TABLE (table), progressive, 0, 3, 5, 6, GTK_FILL, 0, 0, 0); - gtk_signal_connect (GTK_OBJECT (progressive), "toggled", - GTK_SIGNAL_FUNC (gimp_toggle_button_update), - &jsvals.progressive); - gtk_signal_connect (GTK_OBJECT (progressive), "toggled", - GTK_SIGNAL_FUNC (make_preview), - NULL); + gtk_widget_show (progressive); + + g_signal_connect (G_OBJECT (progressive), "toggled", + G_CALLBACK (gimp_toggle_button_update), + &jsvals.progressive); + g_signal_connect (G_OBJECT (progressive), "toggled", + G_CALLBACK (make_preview), + NULL); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (progressive), jsvals.progressive); - gtk_widget_show (progressive); #ifndef HAVE_PROGRESSIVE_JPEG gtk_widget_set_sensitive (progressive, FALSE); @@ -1751,15 +1759,17 @@ save_dialog (void) baseline = gtk_check_button_new_with_label (_("Force baseline JPEG (Readable by all decoders)")); gtk_table_attach (GTK_TABLE (table), baseline, 0, 3, 6, 7, GTK_FILL, 0, 0, 0); - gtk_signal_connect (GTK_OBJECT (baseline), "toggled", - GTK_SIGNAL_FUNC (gimp_toggle_button_update), - &jsvals.baseline); - gtk_signal_connect (GTK_OBJECT (baseline), "toggled", - GTK_SIGNAL_FUNC (make_preview), - NULL); + gtk_widget_show (baseline); + + g_signal_connect (G_OBJECT (baseline), "toggled", + G_CALLBACK (gimp_toggle_button_update), + &jsvals.baseline); + g_signal_connect (G_OBJECT (baseline), "toggled", + G_CALLBACK (make_preview), + NULL); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (baseline), jsvals.baseline); - gtk_widget_show (baseline); /* Subsampling */ menu = @@ -1828,7 +1838,7 @@ save_dialog (void) * [DindinX 2001-09-04]: this comment is still true with the text_buffer... */ - gtk_object_set_data (GTK_OBJECT (dlg), "text_buffer", text_buffer); + g_object_set_data (G_OBJECT (dlg), "text_buffer", text_buffer); gtk_widget_show (com_frame); @@ -1864,7 +1874,7 @@ save_ok_callback (GtkWidget *widget, jsint.run = TRUE; /* pw - get the comment text_buffer object and grab it's data */ - text_buffer = gtk_object_get_data (GTK_OBJECT (data), "text_buffer"); + text_buffer = g_object_get_data (G_OBJECT (data), "text_buffer"); gtk_text_buffer_get_bounds (text_buffer, &start_iter, &end_iter); image_comment = gtk_text_buffer_get_text (text_buffer, diff --git a/plug-ins/jpeg/jpeg-load.h b/plug-ins/jpeg/jpeg-load.h index 536c12825e..3e8e2f5d5c 100644 --- a/plug-ins/jpeg/jpeg-load.h +++ b/plug-ins/jpeg/jpeg-load.h @@ -222,7 +222,7 @@ static void run (gchar *name, gint *nreturn_vals, GimpParam **return_vals); static gint32 load_image (gchar *filename, - GimpRunMode runmode, + GimpRunMode runmode, gboolean preview); static gboolean save_image (gchar *filename, gint32 image_ID, @@ -356,7 +356,7 @@ run (gchar *name, GimpParam **return_vals) { static GimpParam values[2]; - GimpRunMode run_mode; + GimpRunMode run_mode; GimpPDBStatusType status = GIMP_PDB_SUCCESS; gint32 image_ID; gint32 drawable_ID; @@ -1507,10 +1507,9 @@ make_preview (void) else { gtk_label_set_text (GTK_LABEL (preview_size), _("Size: unknown")); - gtk_widget_draw (preview_size, NULL); - + gtk_widget_queue_draw (preview_size); + gimp_displays_flush (); - gdk_flush(); } } @@ -1582,9 +1581,9 @@ save_dialog (void) NULL); - gtk_signal_connect (GTK_OBJECT (dlg), "destroy", - GTK_SIGNAL_FUNC (save_close_callback), - NULL); + g_signal_connect (G_OBJECT (dlg), "destroy", + G_CALLBACK (save_close_callback), + NULL); main_vbox = gtk_vbox_new (FALSE, 4); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 6); @@ -1604,15 +1603,17 @@ save_dialog (void) preview = gtk_check_button_new_with_label (_("Preview (in image window)")); gtk_box_pack_start (GTK_BOX (vbox), preview, FALSE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (preview), "toggled", - GTK_SIGNAL_FUNC (gimp_toggle_button_update), - &jsvals.preview); - gtk_signal_connect (GTK_OBJECT (preview), "toggled", - GTK_SIGNAL_FUNC (make_preview), - NULL); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (preview), jsvals.preview); gtk_widget_show (preview); + g_signal_connect (G_OBJECT (preview), "toggled", + G_CALLBACK (gimp_toggle_button_update), + &jsvals.preview); + g_signal_connect (G_OBJECT (preview), "toggled", + G_CALLBACK (make_preview), + NULL); + + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (preview), jsvals.preview); + preview_size = gtk_label_new (_("Size: unknown")); gtk_misc_set_alignment (GTK_MISC (preview_size), 0.0, 0.5); gtk_box_pack_start (GTK_BOX (vbox), preview_size, FALSE, FALSE, 0); @@ -1647,14 +1648,15 @@ save_dialog (void) gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP); gtk_scale_set_digits (GTK_SCALE (scale), 2); gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED); - gtk_signal_connect (GTK_OBJECT (scale_data), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &jsvals.quality); - gtk_signal_connect (GTK_OBJECT (scale_data), "value_changed", - GTK_SIGNAL_FUNC (make_preview), - NULL); gtk_widget_show (scale); + g_signal_connect (G_OBJECT (scale_data), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &jsvals.quality); + g_signal_connect (G_OBJECT (scale_data), "value_changed", + G_CALLBACK (make_preview), + NULL); + label = gtk_label_new (_("Smoothing:")); gtk_misc_set_alignment (GTK_MISC (label), 1.0, 1.0); gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2, @@ -1669,14 +1671,15 @@ save_dialog (void) gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP); gtk_scale_set_digits (GTK_SCALE (scale), 2); gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED); - gtk_signal_connect (GTK_OBJECT (scale_data), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &jsvals.smoothing); - gtk_signal_connect (GTK_OBJECT (scale_data), "value_changed", - GTK_SIGNAL_FUNC (make_preview), - NULL); gtk_widget_show (scale); + g_signal_connect (G_OBJECT (scale_data), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &jsvals.smoothing); + g_signal_connect (G_OBJECT (scale_data), "value_changed", + G_CALLBACK (make_preview), + NULL); + /* sg - have to init scale here */ scale_data = gtk_adjustment_new ((jsvals.restart == 0) ? 1 : jsvals.restart, 1, 64, 1, 1, 0.0); @@ -1685,11 +1688,12 @@ save_dialog (void) restart = gtk_check_button_new_with_label (_("Restart markers")); gtk_table_attach (GTK_TABLE (table), restart, 0, 1, 2, 3, GTK_FILL, 0, 0, 0); - gtk_signal_connect (GTK_OBJECT (restart), "toggled", - GTK_SIGNAL_FUNC (save_restart_toggle_update), - scale_data); gtk_widget_show (restart); + g_signal_connect (G_OBJECT (restart), "toggled", + G_CALLBACK (save_restart_toggle_update), + scale_data); + restart_markers_label = gtk_label_new (_("Restart frequency (rows):")); gtk_misc_set_alignment (GTK_MISC (restart_markers_label), 1.0, 1.0); gtk_table_attach (GTK_TABLE (table), restart_markers_label, 0, 1, 3, 4, @@ -1708,9 +1712,9 @@ save_dialog (void) gtk_range_set_update_policy (GTK_RANGE (restart_markers_scale), GTK_UPDATE_DELAYED); - gtk_signal_connect (GTK_OBJECT (scale_data), "value_changed", - GTK_SIGNAL_FUNC (save_restart_update), - restart); + g_signal_connect (G_OBJECT (scale_data), "value_changed", + G_CALLBACK (save_restart_update), + restart); gtk_widget_set_sensitive (restart_markers_label, (jsvals.restart ? TRUE : FALSE)); @@ -1722,27 +1726,31 @@ save_dialog (void) toggle = gtk_check_button_new_with_label (_("Optimize")); gtk_table_attach (GTK_TABLE (table), toggle, 0, 3, 4, 5, GTK_FILL, 0, 0, 0); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - GTK_SIGNAL_FUNC (gimp_toggle_button_update), - &jsvals.optimize); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - GTK_SIGNAL_FUNC (make_preview), - NULL); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), jsvals.optimize); gtk_widget_show (toggle); + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (gimp_toggle_button_update), + &jsvals.optimize); + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (make_preview), + NULL); + + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), jsvals.optimize); + progressive = gtk_check_button_new_with_label (_("Progressive")); gtk_table_attach (GTK_TABLE (table), progressive, 0, 3, 5, 6, GTK_FILL, 0, 0, 0); - gtk_signal_connect (GTK_OBJECT (progressive), "toggled", - GTK_SIGNAL_FUNC (gimp_toggle_button_update), - &jsvals.progressive); - gtk_signal_connect (GTK_OBJECT (progressive), "toggled", - GTK_SIGNAL_FUNC (make_preview), - NULL); + gtk_widget_show (progressive); + + g_signal_connect (G_OBJECT (progressive), "toggled", + G_CALLBACK (gimp_toggle_button_update), + &jsvals.progressive); + g_signal_connect (G_OBJECT (progressive), "toggled", + G_CALLBACK (make_preview), + NULL); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (progressive), jsvals.progressive); - gtk_widget_show (progressive); #ifndef HAVE_PROGRESSIVE_JPEG gtk_widget_set_sensitive (progressive, FALSE); @@ -1751,15 +1759,17 @@ save_dialog (void) baseline = gtk_check_button_new_with_label (_("Force baseline JPEG (Readable by all decoders)")); gtk_table_attach (GTK_TABLE (table), baseline, 0, 3, 6, 7, GTK_FILL, 0, 0, 0); - gtk_signal_connect (GTK_OBJECT (baseline), "toggled", - GTK_SIGNAL_FUNC (gimp_toggle_button_update), - &jsvals.baseline); - gtk_signal_connect (GTK_OBJECT (baseline), "toggled", - GTK_SIGNAL_FUNC (make_preview), - NULL); + gtk_widget_show (baseline); + + g_signal_connect (G_OBJECT (baseline), "toggled", + G_CALLBACK (gimp_toggle_button_update), + &jsvals.baseline); + g_signal_connect (G_OBJECT (baseline), "toggled", + G_CALLBACK (make_preview), + NULL); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (baseline), jsvals.baseline); - gtk_widget_show (baseline); /* Subsampling */ menu = @@ -1828,7 +1838,7 @@ save_dialog (void) * [DindinX 2001-09-04]: this comment is still true with the text_buffer... */ - gtk_object_set_data (GTK_OBJECT (dlg), "text_buffer", text_buffer); + g_object_set_data (G_OBJECT (dlg), "text_buffer", text_buffer); gtk_widget_show (com_frame); @@ -1864,7 +1874,7 @@ save_ok_callback (GtkWidget *widget, jsint.run = TRUE; /* pw - get the comment text_buffer object and grab it's data */ - text_buffer = gtk_object_get_data (GTK_OBJECT (data), "text_buffer"); + text_buffer = g_object_get_data (G_OBJECT (data), "text_buffer"); gtk_text_buffer_get_bounds (text_buffer, &start_iter, &end_iter); image_comment = gtk_text_buffer_get_text (text_buffer, diff --git a/plug-ins/jpeg/jpeg-save.c b/plug-ins/jpeg/jpeg-save.c index 536c12825e..3e8e2f5d5c 100644 --- a/plug-ins/jpeg/jpeg-save.c +++ b/plug-ins/jpeg/jpeg-save.c @@ -222,7 +222,7 @@ static void run (gchar *name, gint *nreturn_vals, GimpParam **return_vals); static gint32 load_image (gchar *filename, - GimpRunMode runmode, + GimpRunMode runmode, gboolean preview); static gboolean save_image (gchar *filename, gint32 image_ID, @@ -356,7 +356,7 @@ run (gchar *name, GimpParam **return_vals) { static GimpParam values[2]; - GimpRunMode run_mode; + GimpRunMode run_mode; GimpPDBStatusType status = GIMP_PDB_SUCCESS; gint32 image_ID; gint32 drawable_ID; @@ -1507,10 +1507,9 @@ make_preview (void) else { gtk_label_set_text (GTK_LABEL (preview_size), _("Size: unknown")); - gtk_widget_draw (preview_size, NULL); - + gtk_widget_queue_draw (preview_size); + gimp_displays_flush (); - gdk_flush(); } } @@ -1582,9 +1581,9 @@ save_dialog (void) NULL); - gtk_signal_connect (GTK_OBJECT (dlg), "destroy", - GTK_SIGNAL_FUNC (save_close_callback), - NULL); + g_signal_connect (G_OBJECT (dlg), "destroy", + G_CALLBACK (save_close_callback), + NULL); main_vbox = gtk_vbox_new (FALSE, 4); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 6); @@ -1604,15 +1603,17 @@ save_dialog (void) preview = gtk_check_button_new_with_label (_("Preview (in image window)")); gtk_box_pack_start (GTK_BOX (vbox), preview, FALSE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (preview), "toggled", - GTK_SIGNAL_FUNC (gimp_toggle_button_update), - &jsvals.preview); - gtk_signal_connect (GTK_OBJECT (preview), "toggled", - GTK_SIGNAL_FUNC (make_preview), - NULL); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (preview), jsvals.preview); gtk_widget_show (preview); + g_signal_connect (G_OBJECT (preview), "toggled", + G_CALLBACK (gimp_toggle_button_update), + &jsvals.preview); + g_signal_connect (G_OBJECT (preview), "toggled", + G_CALLBACK (make_preview), + NULL); + + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (preview), jsvals.preview); + preview_size = gtk_label_new (_("Size: unknown")); gtk_misc_set_alignment (GTK_MISC (preview_size), 0.0, 0.5); gtk_box_pack_start (GTK_BOX (vbox), preview_size, FALSE, FALSE, 0); @@ -1647,14 +1648,15 @@ save_dialog (void) gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP); gtk_scale_set_digits (GTK_SCALE (scale), 2); gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED); - gtk_signal_connect (GTK_OBJECT (scale_data), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &jsvals.quality); - gtk_signal_connect (GTK_OBJECT (scale_data), "value_changed", - GTK_SIGNAL_FUNC (make_preview), - NULL); gtk_widget_show (scale); + g_signal_connect (G_OBJECT (scale_data), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &jsvals.quality); + g_signal_connect (G_OBJECT (scale_data), "value_changed", + G_CALLBACK (make_preview), + NULL); + label = gtk_label_new (_("Smoothing:")); gtk_misc_set_alignment (GTK_MISC (label), 1.0, 1.0); gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2, @@ -1669,14 +1671,15 @@ save_dialog (void) gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP); gtk_scale_set_digits (GTK_SCALE (scale), 2); gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED); - gtk_signal_connect (GTK_OBJECT (scale_data), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &jsvals.smoothing); - gtk_signal_connect (GTK_OBJECT (scale_data), "value_changed", - GTK_SIGNAL_FUNC (make_preview), - NULL); gtk_widget_show (scale); + g_signal_connect (G_OBJECT (scale_data), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &jsvals.smoothing); + g_signal_connect (G_OBJECT (scale_data), "value_changed", + G_CALLBACK (make_preview), + NULL); + /* sg - have to init scale here */ scale_data = gtk_adjustment_new ((jsvals.restart == 0) ? 1 : jsvals.restart, 1, 64, 1, 1, 0.0); @@ -1685,11 +1688,12 @@ save_dialog (void) restart = gtk_check_button_new_with_label (_("Restart markers")); gtk_table_attach (GTK_TABLE (table), restart, 0, 1, 2, 3, GTK_FILL, 0, 0, 0); - gtk_signal_connect (GTK_OBJECT (restart), "toggled", - GTK_SIGNAL_FUNC (save_restart_toggle_update), - scale_data); gtk_widget_show (restart); + g_signal_connect (G_OBJECT (restart), "toggled", + G_CALLBACK (save_restart_toggle_update), + scale_data); + restart_markers_label = gtk_label_new (_("Restart frequency (rows):")); gtk_misc_set_alignment (GTK_MISC (restart_markers_label), 1.0, 1.0); gtk_table_attach (GTK_TABLE (table), restart_markers_label, 0, 1, 3, 4, @@ -1708,9 +1712,9 @@ save_dialog (void) gtk_range_set_update_policy (GTK_RANGE (restart_markers_scale), GTK_UPDATE_DELAYED); - gtk_signal_connect (GTK_OBJECT (scale_data), "value_changed", - GTK_SIGNAL_FUNC (save_restart_update), - restart); + g_signal_connect (G_OBJECT (scale_data), "value_changed", + G_CALLBACK (save_restart_update), + restart); gtk_widget_set_sensitive (restart_markers_label, (jsvals.restart ? TRUE : FALSE)); @@ -1722,27 +1726,31 @@ save_dialog (void) toggle = gtk_check_button_new_with_label (_("Optimize")); gtk_table_attach (GTK_TABLE (table), toggle, 0, 3, 4, 5, GTK_FILL, 0, 0, 0); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - GTK_SIGNAL_FUNC (gimp_toggle_button_update), - &jsvals.optimize); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - GTK_SIGNAL_FUNC (make_preview), - NULL); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), jsvals.optimize); gtk_widget_show (toggle); + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (gimp_toggle_button_update), + &jsvals.optimize); + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (make_preview), + NULL); + + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), jsvals.optimize); + progressive = gtk_check_button_new_with_label (_("Progressive")); gtk_table_attach (GTK_TABLE (table), progressive, 0, 3, 5, 6, GTK_FILL, 0, 0, 0); - gtk_signal_connect (GTK_OBJECT (progressive), "toggled", - GTK_SIGNAL_FUNC (gimp_toggle_button_update), - &jsvals.progressive); - gtk_signal_connect (GTK_OBJECT (progressive), "toggled", - GTK_SIGNAL_FUNC (make_preview), - NULL); + gtk_widget_show (progressive); + + g_signal_connect (G_OBJECT (progressive), "toggled", + G_CALLBACK (gimp_toggle_button_update), + &jsvals.progressive); + g_signal_connect (G_OBJECT (progressive), "toggled", + G_CALLBACK (make_preview), + NULL); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (progressive), jsvals.progressive); - gtk_widget_show (progressive); #ifndef HAVE_PROGRESSIVE_JPEG gtk_widget_set_sensitive (progressive, FALSE); @@ -1751,15 +1759,17 @@ save_dialog (void) baseline = gtk_check_button_new_with_label (_("Force baseline JPEG (Readable by all decoders)")); gtk_table_attach (GTK_TABLE (table), baseline, 0, 3, 6, 7, GTK_FILL, 0, 0, 0); - gtk_signal_connect (GTK_OBJECT (baseline), "toggled", - GTK_SIGNAL_FUNC (gimp_toggle_button_update), - &jsvals.baseline); - gtk_signal_connect (GTK_OBJECT (baseline), "toggled", - GTK_SIGNAL_FUNC (make_preview), - NULL); + gtk_widget_show (baseline); + + g_signal_connect (G_OBJECT (baseline), "toggled", + G_CALLBACK (gimp_toggle_button_update), + &jsvals.baseline); + g_signal_connect (G_OBJECT (baseline), "toggled", + G_CALLBACK (make_preview), + NULL); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (baseline), jsvals.baseline); - gtk_widget_show (baseline); /* Subsampling */ menu = @@ -1828,7 +1838,7 @@ save_dialog (void) * [DindinX 2001-09-04]: this comment is still true with the text_buffer... */ - gtk_object_set_data (GTK_OBJECT (dlg), "text_buffer", text_buffer); + g_object_set_data (G_OBJECT (dlg), "text_buffer", text_buffer); gtk_widget_show (com_frame); @@ -1864,7 +1874,7 @@ save_ok_callback (GtkWidget *widget, jsint.run = TRUE; /* pw - get the comment text_buffer object and grab it's data */ - text_buffer = gtk_object_get_data (GTK_OBJECT (data), "text_buffer"); + text_buffer = g_object_get_data (G_OBJECT (data), "text_buffer"); gtk_text_buffer_get_bounds (text_buffer, &start_iter, &end_iter); image_comment = gtk_text_buffer_get_text (text_buffer, diff --git a/plug-ins/jpeg/jpeg-save.h b/plug-ins/jpeg/jpeg-save.h index 536c12825e..3e8e2f5d5c 100644 --- a/plug-ins/jpeg/jpeg-save.h +++ b/plug-ins/jpeg/jpeg-save.h @@ -222,7 +222,7 @@ static void run (gchar *name, gint *nreturn_vals, GimpParam **return_vals); static gint32 load_image (gchar *filename, - GimpRunMode runmode, + GimpRunMode runmode, gboolean preview); static gboolean save_image (gchar *filename, gint32 image_ID, @@ -356,7 +356,7 @@ run (gchar *name, GimpParam **return_vals) { static GimpParam values[2]; - GimpRunMode run_mode; + GimpRunMode run_mode; GimpPDBStatusType status = GIMP_PDB_SUCCESS; gint32 image_ID; gint32 drawable_ID; @@ -1507,10 +1507,9 @@ make_preview (void) else { gtk_label_set_text (GTK_LABEL (preview_size), _("Size: unknown")); - gtk_widget_draw (preview_size, NULL); - + gtk_widget_queue_draw (preview_size); + gimp_displays_flush (); - gdk_flush(); } } @@ -1582,9 +1581,9 @@ save_dialog (void) NULL); - gtk_signal_connect (GTK_OBJECT (dlg), "destroy", - GTK_SIGNAL_FUNC (save_close_callback), - NULL); + g_signal_connect (G_OBJECT (dlg), "destroy", + G_CALLBACK (save_close_callback), + NULL); main_vbox = gtk_vbox_new (FALSE, 4); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 6); @@ -1604,15 +1603,17 @@ save_dialog (void) preview = gtk_check_button_new_with_label (_("Preview (in image window)")); gtk_box_pack_start (GTK_BOX (vbox), preview, FALSE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (preview), "toggled", - GTK_SIGNAL_FUNC (gimp_toggle_button_update), - &jsvals.preview); - gtk_signal_connect (GTK_OBJECT (preview), "toggled", - GTK_SIGNAL_FUNC (make_preview), - NULL); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (preview), jsvals.preview); gtk_widget_show (preview); + g_signal_connect (G_OBJECT (preview), "toggled", + G_CALLBACK (gimp_toggle_button_update), + &jsvals.preview); + g_signal_connect (G_OBJECT (preview), "toggled", + G_CALLBACK (make_preview), + NULL); + + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (preview), jsvals.preview); + preview_size = gtk_label_new (_("Size: unknown")); gtk_misc_set_alignment (GTK_MISC (preview_size), 0.0, 0.5); gtk_box_pack_start (GTK_BOX (vbox), preview_size, FALSE, FALSE, 0); @@ -1647,14 +1648,15 @@ save_dialog (void) gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP); gtk_scale_set_digits (GTK_SCALE (scale), 2); gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED); - gtk_signal_connect (GTK_OBJECT (scale_data), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &jsvals.quality); - gtk_signal_connect (GTK_OBJECT (scale_data), "value_changed", - GTK_SIGNAL_FUNC (make_preview), - NULL); gtk_widget_show (scale); + g_signal_connect (G_OBJECT (scale_data), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &jsvals.quality); + g_signal_connect (G_OBJECT (scale_data), "value_changed", + G_CALLBACK (make_preview), + NULL); + label = gtk_label_new (_("Smoothing:")); gtk_misc_set_alignment (GTK_MISC (label), 1.0, 1.0); gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2, @@ -1669,14 +1671,15 @@ save_dialog (void) gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP); gtk_scale_set_digits (GTK_SCALE (scale), 2); gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED); - gtk_signal_connect (GTK_OBJECT (scale_data), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &jsvals.smoothing); - gtk_signal_connect (GTK_OBJECT (scale_data), "value_changed", - GTK_SIGNAL_FUNC (make_preview), - NULL); gtk_widget_show (scale); + g_signal_connect (G_OBJECT (scale_data), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &jsvals.smoothing); + g_signal_connect (G_OBJECT (scale_data), "value_changed", + G_CALLBACK (make_preview), + NULL); + /* sg - have to init scale here */ scale_data = gtk_adjustment_new ((jsvals.restart == 0) ? 1 : jsvals.restart, 1, 64, 1, 1, 0.0); @@ -1685,11 +1688,12 @@ save_dialog (void) restart = gtk_check_button_new_with_label (_("Restart markers")); gtk_table_attach (GTK_TABLE (table), restart, 0, 1, 2, 3, GTK_FILL, 0, 0, 0); - gtk_signal_connect (GTK_OBJECT (restart), "toggled", - GTK_SIGNAL_FUNC (save_restart_toggle_update), - scale_data); gtk_widget_show (restart); + g_signal_connect (G_OBJECT (restart), "toggled", + G_CALLBACK (save_restart_toggle_update), + scale_data); + restart_markers_label = gtk_label_new (_("Restart frequency (rows):")); gtk_misc_set_alignment (GTK_MISC (restart_markers_label), 1.0, 1.0); gtk_table_attach (GTK_TABLE (table), restart_markers_label, 0, 1, 3, 4, @@ -1708,9 +1712,9 @@ save_dialog (void) gtk_range_set_update_policy (GTK_RANGE (restart_markers_scale), GTK_UPDATE_DELAYED); - gtk_signal_connect (GTK_OBJECT (scale_data), "value_changed", - GTK_SIGNAL_FUNC (save_restart_update), - restart); + g_signal_connect (G_OBJECT (scale_data), "value_changed", + G_CALLBACK (save_restart_update), + restart); gtk_widget_set_sensitive (restart_markers_label, (jsvals.restart ? TRUE : FALSE)); @@ -1722,27 +1726,31 @@ save_dialog (void) toggle = gtk_check_button_new_with_label (_("Optimize")); gtk_table_attach (GTK_TABLE (table), toggle, 0, 3, 4, 5, GTK_FILL, 0, 0, 0); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - GTK_SIGNAL_FUNC (gimp_toggle_button_update), - &jsvals.optimize); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - GTK_SIGNAL_FUNC (make_preview), - NULL); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), jsvals.optimize); gtk_widget_show (toggle); + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (gimp_toggle_button_update), + &jsvals.optimize); + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (make_preview), + NULL); + + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), jsvals.optimize); + progressive = gtk_check_button_new_with_label (_("Progressive")); gtk_table_attach (GTK_TABLE (table), progressive, 0, 3, 5, 6, GTK_FILL, 0, 0, 0); - gtk_signal_connect (GTK_OBJECT (progressive), "toggled", - GTK_SIGNAL_FUNC (gimp_toggle_button_update), - &jsvals.progressive); - gtk_signal_connect (GTK_OBJECT (progressive), "toggled", - GTK_SIGNAL_FUNC (make_preview), - NULL); + gtk_widget_show (progressive); + + g_signal_connect (G_OBJECT (progressive), "toggled", + G_CALLBACK (gimp_toggle_button_update), + &jsvals.progressive); + g_signal_connect (G_OBJECT (progressive), "toggled", + G_CALLBACK (make_preview), + NULL); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (progressive), jsvals.progressive); - gtk_widget_show (progressive); #ifndef HAVE_PROGRESSIVE_JPEG gtk_widget_set_sensitive (progressive, FALSE); @@ -1751,15 +1759,17 @@ save_dialog (void) baseline = gtk_check_button_new_with_label (_("Force baseline JPEG (Readable by all decoders)")); gtk_table_attach (GTK_TABLE (table), baseline, 0, 3, 6, 7, GTK_FILL, 0, 0, 0); - gtk_signal_connect (GTK_OBJECT (baseline), "toggled", - GTK_SIGNAL_FUNC (gimp_toggle_button_update), - &jsvals.baseline); - gtk_signal_connect (GTK_OBJECT (baseline), "toggled", - GTK_SIGNAL_FUNC (make_preview), - NULL); + gtk_widget_show (baseline); + + g_signal_connect (G_OBJECT (baseline), "toggled", + G_CALLBACK (gimp_toggle_button_update), + &jsvals.baseline); + g_signal_connect (G_OBJECT (baseline), "toggled", + G_CALLBACK (make_preview), + NULL); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (baseline), jsvals.baseline); - gtk_widget_show (baseline); /* Subsampling */ menu = @@ -1828,7 +1838,7 @@ save_dialog (void) * [DindinX 2001-09-04]: this comment is still true with the text_buffer... */ - gtk_object_set_data (GTK_OBJECT (dlg), "text_buffer", text_buffer); + g_object_set_data (G_OBJECT (dlg), "text_buffer", text_buffer); gtk_widget_show (com_frame); @@ -1864,7 +1874,7 @@ save_ok_callback (GtkWidget *widget, jsint.run = TRUE; /* pw - get the comment text_buffer object and grab it's data */ - text_buffer = gtk_object_get_data (GTK_OBJECT (data), "text_buffer"); + text_buffer = g_object_get_data (G_OBJECT (data), "text_buffer"); gtk_text_buffer_get_bounds (text_buffer, &start_iter, &end_iter); image_comment = gtk_text_buffer_get_text (text_buffer, diff --git a/plug-ins/jpeg/jpeg.c b/plug-ins/jpeg/jpeg.c index 536c12825e..3e8e2f5d5c 100644 --- a/plug-ins/jpeg/jpeg.c +++ b/plug-ins/jpeg/jpeg.c @@ -222,7 +222,7 @@ static void run (gchar *name, gint *nreturn_vals, GimpParam **return_vals); static gint32 load_image (gchar *filename, - GimpRunMode runmode, + GimpRunMode runmode, gboolean preview); static gboolean save_image (gchar *filename, gint32 image_ID, @@ -356,7 +356,7 @@ run (gchar *name, GimpParam **return_vals) { static GimpParam values[2]; - GimpRunMode run_mode; + GimpRunMode run_mode; GimpPDBStatusType status = GIMP_PDB_SUCCESS; gint32 image_ID; gint32 drawable_ID; @@ -1507,10 +1507,9 @@ make_preview (void) else { gtk_label_set_text (GTK_LABEL (preview_size), _("Size: unknown")); - gtk_widget_draw (preview_size, NULL); - + gtk_widget_queue_draw (preview_size); + gimp_displays_flush (); - gdk_flush(); } } @@ -1582,9 +1581,9 @@ save_dialog (void) NULL); - gtk_signal_connect (GTK_OBJECT (dlg), "destroy", - GTK_SIGNAL_FUNC (save_close_callback), - NULL); + g_signal_connect (G_OBJECT (dlg), "destroy", + G_CALLBACK (save_close_callback), + NULL); main_vbox = gtk_vbox_new (FALSE, 4); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 6); @@ -1604,15 +1603,17 @@ save_dialog (void) preview = gtk_check_button_new_with_label (_("Preview (in image window)")); gtk_box_pack_start (GTK_BOX (vbox), preview, FALSE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (preview), "toggled", - GTK_SIGNAL_FUNC (gimp_toggle_button_update), - &jsvals.preview); - gtk_signal_connect (GTK_OBJECT (preview), "toggled", - GTK_SIGNAL_FUNC (make_preview), - NULL); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (preview), jsvals.preview); gtk_widget_show (preview); + g_signal_connect (G_OBJECT (preview), "toggled", + G_CALLBACK (gimp_toggle_button_update), + &jsvals.preview); + g_signal_connect (G_OBJECT (preview), "toggled", + G_CALLBACK (make_preview), + NULL); + + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (preview), jsvals.preview); + preview_size = gtk_label_new (_("Size: unknown")); gtk_misc_set_alignment (GTK_MISC (preview_size), 0.0, 0.5); gtk_box_pack_start (GTK_BOX (vbox), preview_size, FALSE, FALSE, 0); @@ -1647,14 +1648,15 @@ save_dialog (void) gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP); gtk_scale_set_digits (GTK_SCALE (scale), 2); gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED); - gtk_signal_connect (GTK_OBJECT (scale_data), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &jsvals.quality); - gtk_signal_connect (GTK_OBJECT (scale_data), "value_changed", - GTK_SIGNAL_FUNC (make_preview), - NULL); gtk_widget_show (scale); + g_signal_connect (G_OBJECT (scale_data), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &jsvals.quality); + g_signal_connect (G_OBJECT (scale_data), "value_changed", + G_CALLBACK (make_preview), + NULL); + label = gtk_label_new (_("Smoothing:")); gtk_misc_set_alignment (GTK_MISC (label), 1.0, 1.0); gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2, @@ -1669,14 +1671,15 @@ save_dialog (void) gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP); gtk_scale_set_digits (GTK_SCALE (scale), 2); gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED); - gtk_signal_connect (GTK_OBJECT (scale_data), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &jsvals.smoothing); - gtk_signal_connect (GTK_OBJECT (scale_data), "value_changed", - GTK_SIGNAL_FUNC (make_preview), - NULL); gtk_widget_show (scale); + g_signal_connect (G_OBJECT (scale_data), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &jsvals.smoothing); + g_signal_connect (G_OBJECT (scale_data), "value_changed", + G_CALLBACK (make_preview), + NULL); + /* sg - have to init scale here */ scale_data = gtk_adjustment_new ((jsvals.restart == 0) ? 1 : jsvals.restart, 1, 64, 1, 1, 0.0); @@ -1685,11 +1688,12 @@ save_dialog (void) restart = gtk_check_button_new_with_label (_("Restart markers")); gtk_table_attach (GTK_TABLE (table), restart, 0, 1, 2, 3, GTK_FILL, 0, 0, 0); - gtk_signal_connect (GTK_OBJECT (restart), "toggled", - GTK_SIGNAL_FUNC (save_restart_toggle_update), - scale_data); gtk_widget_show (restart); + g_signal_connect (G_OBJECT (restart), "toggled", + G_CALLBACK (save_restart_toggle_update), + scale_data); + restart_markers_label = gtk_label_new (_("Restart frequency (rows):")); gtk_misc_set_alignment (GTK_MISC (restart_markers_label), 1.0, 1.0); gtk_table_attach (GTK_TABLE (table), restart_markers_label, 0, 1, 3, 4, @@ -1708,9 +1712,9 @@ save_dialog (void) gtk_range_set_update_policy (GTK_RANGE (restart_markers_scale), GTK_UPDATE_DELAYED); - gtk_signal_connect (GTK_OBJECT (scale_data), "value_changed", - GTK_SIGNAL_FUNC (save_restart_update), - restart); + g_signal_connect (G_OBJECT (scale_data), "value_changed", + G_CALLBACK (save_restart_update), + restart); gtk_widget_set_sensitive (restart_markers_label, (jsvals.restart ? TRUE : FALSE)); @@ -1722,27 +1726,31 @@ save_dialog (void) toggle = gtk_check_button_new_with_label (_("Optimize")); gtk_table_attach (GTK_TABLE (table), toggle, 0, 3, 4, 5, GTK_FILL, 0, 0, 0); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - GTK_SIGNAL_FUNC (gimp_toggle_button_update), - &jsvals.optimize); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - GTK_SIGNAL_FUNC (make_preview), - NULL); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), jsvals.optimize); gtk_widget_show (toggle); + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (gimp_toggle_button_update), + &jsvals.optimize); + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (make_preview), + NULL); + + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), jsvals.optimize); + progressive = gtk_check_button_new_with_label (_("Progressive")); gtk_table_attach (GTK_TABLE (table), progressive, 0, 3, 5, 6, GTK_FILL, 0, 0, 0); - gtk_signal_connect (GTK_OBJECT (progressive), "toggled", - GTK_SIGNAL_FUNC (gimp_toggle_button_update), - &jsvals.progressive); - gtk_signal_connect (GTK_OBJECT (progressive), "toggled", - GTK_SIGNAL_FUNC (make_preview), - NULL); + gtk_widget_show (progressive); + + g_signal_connect (G_OBJECT (progressive), "toggled", + G_CALLBACK (gimp_toggle_button_update), + &jsvals.progressive); + g_signal_connect (G_OBJECT (progressive), "toggled", + G_CALLBACK (make_preview), + NULL); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (progressive), jsvals.progressive); - gtk_widget_show (progressive); #ifndef HAVE_PROGRESSIVE_JPEG gtk_widget_set_sensitive (progressive, FALSE); @@ -1751,15 +1759,17 @@ save_dialog (void) baseline = gtk_check_button_new_with_label (_("Force baseline JPEG (Readable by all decoders)")); gtk_table_attach (GTK_TABLE (table), baseline, 0, 3, 6, 7, GTK_FILL, 0, 0, 0); - gtk_signal_connect (GTK_OBJECT (baseline), "toggled", - GTK_SIGNAL_FUNC (gimp_toggle_button_update), - &jsvals.baseline); - gtk_signal_connect (GTK_OBJECT (baseline), "toggled", - GTK_SIGNAL_FUNC (make_preview), - NULL); + gtk_widget_show (baseline); + + g_signal_connect (G_OBJECT (baseline), "toggled", + G_CALLBACK (gimp_toggle_button_update), + &jsvals.baseline); + g_signal_connect (G_OBJECT (baseline), "toggled", + G_CALLBACK (make_preview), + NULL); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (baseline), jsvals.baseline); - gtk_widget_show (baseline); /* Subsampling */ menu = @@ -1828,7 +1838,7 @@ save_dialog (void) * [DindinX 2001-09-04]: this comment is still true with the text_buffer... */ - gtk_object_set_data (GTK_OBJECT (dlg), "text_buffer", text_buffer); + g_object_set_data (G_OBJECT (dlg), "text_buffer", text_buffer); gtk_widget_show (com_frame); @@ -1864,7 +1874,7 @@ save_ok_callback (GtkWidget *widget, jsint.run = TRUE; /* pw - get the comment text_buffer object and grab it's data */ - text_buffer = gtk_object_get_data (GTK_OBJECT (data), "text_buffer"); + text_buffer = g_object_get_data (G_OBJECT (data), "text_buffer"); gtk_text_buffer_get_bounds (text_buffer, &start_iter, &end_iter); image_comment = gtk_text_buffer_get_text (text_buffer, diff --git a/plug-ins/jpeg/jpeg.h b/plug-ins/jpeg/jpeg.h index 536c12825e..3e8e2f5d5c 100644 --- a/plug-ins/jpeg/jpeg.h +++ b/plug-ins/jpeg/jpeg.h @@ -222,7 +222,7 @@ static void run (gchar *name, gint *nreturn_vals, GimpParam **return_vals); static gint32 load_image (gchar *filename, - GimpRunMode runmode, + GimpRunMode runmode, gboolean preview); static gboolean save_image (gchar *filename, gint32 image_ID, @@ -356,7 +356,7 @@ run (gchar *name, GimpParam **return_vals) { static GimpParam values[2]; - GimpRunMode run_mode; + GimpRunMode run_mode; GimpPDBStatusType status = GIMP_PDB_SUCCESS; gint32 image_ID; gint32 drawable_ID; @@ -1507,10 +1507,9 @@ make_preview (void) else { gtk_label_set_text (GTK_LABEL (preview_size), _("Size: unknown")); - gtk_widget_draw (preview_size, NULL); - + gtk_widget_queue_draw (preview_size); + gimp_displays_flush (); - gdk_flush(); } } @@ -1582,9 +1581,9 @@ save_dialog (void) NULL); - gtk_signal_connect (GTK_OBJECT (dlg), "destroy", - GTK_SIGNAL_FUNC (save_close_callback), - NULL); + g_signal_connect (G_OBJECT (dlg), "destroy", + G_CALLBACK (save_close_callback), + NULL); main_vbox = gtk_vbox_new (FALSE, 4); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 6); @@ -1604,15 +1603,17 @@ save_dialog (void) preview = gtk_check_button_new_with_label (_("Preview (in image window)")); gtk_box_pack_start (GTK_BOX (vbox), preview, FALSE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (preview), "toggled", - GTK_SIGNAL_FUNC (gimp_toggle_button_update), - &jsvals.preview); - gtk_signal_connect (GTK_OBJECT (preview), "toggled", - GTK_SIGNAL_FUNC (make_preview), - NULL); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (preview), jsvals.preview); gtk_widget_show (preview); + g_signal_connect (G_OBJECT (preview), "toggled", + G_CALLBACK (gimp_toggle_button_update), + &jsvals.preview); + g_signal_connect (G_OBJECT (preview), "toggled", + G_CALLBACK (make_preview), + NULL); + + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (preview), jsvals.preview); + preview_size = gtk_label_new (_("Size: unknown")); gtk_misc_set_alignment (GTK_MISC (preview_size), 0.0, 0.5); gtk_box_pack_start (GTK_BOX (vbox), preview_size, FALSE, FALSE, 0); @@ -1647,14 +1648,15 @@ save_dialog (void) gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP); gtk_scale_set_digits (GTK_SCALE (scale), 2); gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED); - gtk_signal_connect (GTK_OBJECT (scale_data), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &jsvals.quality); - gtk_signal_connect (GTK_OBJECT (scale_data), "value_changed", - GTK_SIGNAL_FUNC (make_preview), - NULL); gtk_widget_show (scale); + g_signal_connect (G_OBJECT (scale_data), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &jsvals.quality); + g_signal_connect (G_OBJECT (scale_data), "value_changed", + G_CALLBACK (make_preview), + NULL); + label = gtk_label_new (_("Smoothing:")); gtk_misc_set_alignment (GTK_MISC (label), 1.0, 1.0); gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2, @@ -1669,14 +1671,15 @@ save_dialog (void) gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP); gtk_scale_set_digits (GTK_SCALE (scale), 2); gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED); - gtk_signal_connect (GTK_OBJECT (scale_data), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &jsvals.smoothing); - gtk_signal_connect (GTK_OBJECT (scale_data), "value_changed", - GTK_SIGNAL_FUNC (make_preview), - NULL); gtk_widget_show (scale); + g_signal_connect (G_OBJECT (scale_data), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &jsvals.smoothing); + g_signal_connect (G_OBJECT (scale_data), "value_changed", + G_CALLBACK (make_preview), + NULL); + /* sg - have to init scale here */ scale_data = gtk_adjustment_new ((jsvals.restart == 0) ? 1 : jsvals.restart, 1, 64, 1, 1, 0.0); @@ -1685,11 +1688,12 @@ save_dialog (void) restart = gtk_check_button_new_with_label (_("Restart markers")); gtk_table_attach (GTK_TABLE (table), restart, 0, 1, 2, 3, GTK_FILL, 0, 0, 0); - gtk_signal_connect (GTK_OBJECT (restart), "toggled", - GTK_SIGNAL_FUNC (save_restart_toggle_update), - scale_data); gtk_widget_show (restart); + g_signal_connect (G_OBJECT (restart), "toggled", + G_CALLBACK (save_restart_toggle_update), + scale_data); + restart_markers_label = gtk_label_new (_("Restart frequency (rows):")); gtk_misc_set_alignment (GTK_MISC (restart_markers_label), 1.0, 1.0); gtk_table_attach (GTK_TABLE (table), restart_markers_label, 0, 1, 3, 4, @@ -1708,9 +1712,9 @@ save_dialog (void) gtk_range_set_update_policy (GTK_RANGE (restart_markers_scale), GTK_UPDATE_DELAYED); - gtk_signal_connect (GTK_OBJECT (scale_data), "value_changed", - GTK_SIGNAL_FUNC (save_restart_update), - restart); + g_signal_connect (G_OBJECT (scale_data), "value_changed", + G_CALLBACK (save_restart_update), + restart); gtk_widget_set_sensitive (restart_markers_label, (jsvals.restart ? TRUE : FALSE)); @@ -1722,27 +1726,31 @@ save_dialog (void) toggle = gtk_check_button_new_with_label (_("Optimize")); gtk_table_attach (GTK_TABLE (table), toggle, 0, 3, 4, 5, GTK_FILL, 0, 0, 0); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - GTK_SIGNAL_FUNC (gimp_toggle_button_update), - &jsvals.optimize); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - GTK_SIGNAL_FUNC (make_preview), - NULL); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), jsvals.optimize); gtk_widget_show (toggle); + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (gimp_toggle_button_update), + &jsvals.optimize); + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (make_preview), + NULL); + + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), jsvals.optimize); + progressive = gtk_check_button_new_with_label (_("Progressive")); gtk_table_attach (GTK_TABLE (table), progressive, 0, 3, 5, 6, GTK_FILL, 0, 0, 0); - gtk_signal_connect (GTK_OBJECT (progressive), "toggled", - GTK_SIGNAL_FUNC (gimp_toggle_button_update), - &jsvals.progressive); - gtk_signal_connect (GTK_OBJECT (progressive), "toggled", - GTK_SIGNAL_FUNC (make_preview), - NULL); + gtk_widget_show (progressive); + + g_signal_connect (G_OBJECT (progressive), "toggled", + G_CALLBACK (gimp_toggle_button_update), + &jsvals.progressive); + g_signal_connect (G_OBJECT (progressive), "toggled", + G_CALLBACK (make_preview), + NULL); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (progressive), jsvals.progressive); - gtk_widget_show (progressive); #ifndef HAVE_PROGRESSIVE_JPEG gtk_widget_set_sensitive (progressive, FALSE); @@ -1751,15 +1759,17 @@ save_dialog (void) baseline = gtk_check_button_new_with_label (_("Force baseline JPEG (Readable by all decoders)")); gtk_table_attach (GTK_TABLE (table), baseline, 0, 3, 6, 7, GTK_FILL, 0, 0, 0); - gtk_signal_connect (GTK_OBJECT (baseline), "toggled", - GTK_SIGNAL_FUNC (gimp_toggle_button_update), - &jsvals.baseline); - gtk_signal_connect (GTK_OBJECT (baseline), "toggled", - GTK_SIGNAL_FUNC (make_preview), - NULL); + gtk_widget_show (baseline); + + g_signal_connect (G_OBJECT (baseline), "toggled", + G_CALLBACK (gimp_toggle_button_update), + &jsvals.baseline); + g_signal_connect (G_OBJECT (baseline), "toggled", + G_CALLBACK (make_preview), + NULL); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (baseline), jsvals.baseline); - gtk_widget_show (baseline); /* Subsampling */ menu = @@ -1828,7 +1838,7 @@ save_dialog (void) * [DindinX 2001-09-04]: this comment is still true with the text_buffer... */ - gtk_object_set_data (GTK_OBJECT (dlg), "text_buffer", text_buffer); + g_object_set_data (G_OBJECT (dlg), "text_buffer", text_buffer); gtk_widget_show (com_frame); @@ -1864,7 +1874,7 @@ save_ok_callback (GtkWidget *widget, jsint.run = TRUE; /* pw - get the comment text_buffer object and grab it's data */ - text_buffer = gtk_object_get_data (GTK_OBJECT (data), "text_buffer"); + text_buffer = g_object_get_data (G_OBJECT (data), "text_buffer"); gtk_text_buffer_get_bounds (text_buffer, &start_iter, &end_iter); image_comment = gtk_text_buffer_get_text (text_buffer, diff --git a/plug-ins/maze/maze_face.c b/plug-ins/maze/maze_face.c index 9b2cac48a2..fcbd5418ee 100644 --- a/plug-ins/maze/maze_face.c +++ b/plug-ins/maze/maze_face.c @@ -197,9 +197,9 @@ maze_dialog (void) NULL); - gtk_signal_connect (GTK_OBJECT (dlg), "destroy", - GTK_SIGNAL_FUNC (gtk_main_quit), - NULL); + g_signal_connect (G_OBJECT (dlg), "destroy", + G_CALLBACK (gtk_main_quit), + NULL); frame = gtk_frame_new (_("Parameter Settings")); gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_ETCHED_IN); @@ -253,41 +253,41 @@ maze_dialog (void) #ifdef SHOW_PRNG_PRIVATES /* Multiple input box */ entry = gtk_entry_new (); - gtk_widget_set_usize (entry, ENTRY_WIDTH, 0); + gtk_widget_set_size_request (entry, ENTRY_WIDTH, -1); g_snprintf (buffer, BUFSIZE, "%d", mvals.multiple); gtk_entry_set_text (GTK_ENTRY (entry), buffer ); gimp_table_attach_aligned (GTK_TABLE (table), 0, trow, _("Multiple (57):"), 1.0, 0.5, entry, 1, FALSE); trow++; - gtk_signal_connect (GTK_OBJECT (entry), "changed", - (GtkSignalFunc) maze_entry_callback, - &mvals.multiple); + g_signal_connect (G_OBJECT (entry), "changed", + G_CALLBACK (maze_entry_callback), + &mvals.multiple); /* Offset input box */ entry = gtk_entry_new (); - gtk_widget_set_usize (entry, ENTRY_WIDTH, 0); + gtk_widget_set_size_request (entry, ENTRY_WIDTH, -1); g_snprintf (buffer, BUFSIZE, "%d", mvals.offset); gtk_entry_set_text (GTK_ENTRY (entry), buffer ); gimp_table_attach_aligned (GTK_TABLE (table), 0, trow, _("Offset (1):"), 1.0, 0.5, entry, 1, FALSE); trow++; - gtk_signal_connect (GTK_OBJECT (entry), "changed", - (GtkSignalFunc) maze_entry_callback, - &mvals.offset); + g_signal_connect (G_OBJECT (entry), "changed", + G_CALLBACK (maze_entry_callback), + &mvals.offset); #endif /* Tileable checkbox */ tilecheck = gtk_check_button_new_with_label (_("Tileable")); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (tilecheck), mvals.tile); - gtk_signal_connect (GTK_OBJECT (tilecheck), "clicked", - GTK_SIGNAL_FUNC (gimp_toggle_button_update), - &mvals.tile); gimp_table_attach_aligned (GTK_TABLE (table), 0, trow, NULL, 1.0, 0.5, tilecheck, 1, FALSE); trow++; + g_signal_connect (G_OBJECT (tilecheck), "clicked", + G_CALLBACK (gimp_toggle_button_update), + &mvals.tile); /* Seed input box */ seed_hbox = gimp_random_seed_new (&mvals.seed, @@ -370,18 +370,18 @@ divbox_new (guint *max, buttonl = gtk_button_new (); buttonr = gtk_button_new (); - gtk_object_set_data (GTK_OBJECT (buttonl), "direction", GINT_TO_POINTER (LESS)); - gtk_object_set_data (GTK_OBJECT (buttonr), "direction", GINT_TO_POINTER (MORE)); + g_object_set_data (G_OBJECT (buttonl), "direction", GINT_TO_POINTER (LESS)); + g_object_set_data (G_OBJECT (buttonr), "direction", GINT_TO_POINTER (MORE)); *div_entry = gtk_entry_new (); - gtk_object_set_data (GTK_OBJECT (*div_entry), "max", max); - gtk_object_set_data (GTK_OBJECT (*div_entry), "friend", friend); + g_object_set_data (G_OBJECT (*div_entry), "max", max); + g_object_set_data (G_OBJECT (*div_entry), "friend", friend); gtk_container_add (GTK_CONTAINER (buttonl), arrowl); gtk_container_add (GTK_CONTAINER (buttonr), arrowr); - gtk_widget_set_usize (*div_entry, ENTRY_WIDTH, 0); + gtk_widget_set_size_request (*div_entry, ENTRY_WIDTH, -1); #if DIVBOX_LOOKS_LIKE_SPINBUTTON buttonbox = gtk_vbox_new (FALSE, 0); @@ -403,15 +403,15 @@ divbox_new (guint *max, gtk_widget_show_all (hbox); - gtk_signal_connect (GTK_OBJECT (buttonl), "clicked", - (GtkSignalFunc) div_button_callback, - *div_entry); - gtk_signal_connect (GTK_OBJECT (buttonr), "clicked", - (GtkSignalFunc) div_button_callback, - *div_entry); - gtk_signal_connect (GTK_OBJECT (*div_entry), "changed", - (GtkSignalFunc) div_entry_callback, - friend); + g_signal_connect (GTK_OBJECT (buttonl), "clicked", + G_CALLBACK (div_button_callback), + *div_entry); + g_signal_connect (GTK_OBJECT (buttonr), "clicked", + G_CALLBACK (div_button_callback), + *div_entry); + g_signal_connect (GTK_OBJECT (*div_entry), "changed", + G_CALLBACK (div_entry_callback), + friend); return align; } @@ -424,8 +424,8 @@ div_button_callback (GtkWidget *button, guint max, divs; gint direction; - direction = GPOINTER_TO_INT (gtk_object_get_data (GTK_OBJECT (button), "direction")); - max = *((guint*) gtk_object_get_data (GTK_OBJECT (entry), "max")); + direction = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (button), "direction")); + max = *((guint*) g_object_get_data (G_OBJECT (entry), "max")); /* Tileable mazes shall have only an even number of divisions. Other mazes have odd. */ @@ -531,7 +531,7 @@ div_entry_callback (GtkWidget *entry, if (divs < 4) /* If this is under 4 (e.g. 0), something's weird. */ return; /* But it'll probably be ok, so just return and ignore. */ - max = *((guint*) gtk_object_get_data (GTK_OBJECT (entry), "max")); + max = *((guint*) g_object_get_data (G_OBJECT (entry), "max")); /* I say "width" here, but it could be height.*/ @@ -539,7 +539,7 @@ div_entry_callback (GtkWidget *entry, g_snprintf (buffer, BUFSIZE, "%d", width); /* No tagbacks from our friend... */ - userdata = gtk_object_get_user_data (GTK_OBJECT (friend)); + userdata = g_object_get_data (G_OBJECT (friend), "userdata"); friend_callback = userdata->callback; userdata->callback = NULL; @@ -555,17 +555,22 @@ height_width_callback (gint width, guint divs, max; gpointer data; - max = *((guint*) gtk_object_get_data(GTK_OBJECT(*div_entry), "max")); + max = *((guint*) g_object_get_data(G_OBJECT(*div_entry), "max")); divs = max / width; g_snprintf (buffer, BUFSIZE, "%d", divs ); - data = gtk_object_get_data (GTK_OBJECT(*div_entry), "friend"); - gtk_signal_handler_block_by_data (GTK_OBJECT (*div_entry), data ); - + data = g_object_get_data (G_OBJECT(*div_entry), "friend"); + + g_signal_handlers_block_by_func (G_OBJECT (*div_entry), + entscale_int_entry_update, + data); + gtk_entry_set_text (GTK_ENTRY (*div_entry), buffer); - gtk_signal_handler_unblock_by_data (GTK_OBJECT(*div_entry), data ); + g_signal_handlers_unblock_by_func (G_OBJECT (*div_entry), + entscale_int_entry_update, + data); } static void @@ -709,11 +714,11 @@ entscale_int_new (GtkWidget *table, userdata->adjustment = adjustment = gtk_adjustment_new (constraint_val, min, max, 1.0, 1.0, 0.0); scale = gtk_hscale_new (GTK_ADJUSTMENT (adjustment)); - gtk_widget_set_usize (scale, ENTSCALE_INT_SCALE_WIDTH, 0); + gtk_widget_set_size_request (scale, ENTSCALE_INT_SCALE_WIDTH, -1); gtk_scale_set_draw_value (GTK_SCALE (scale), FALSE); userdata->entry = entry = gtk_entry_new (); - gtk_widget_set_usize (entry, ENTSCALE_INT_ENTRY_WIDTH, 0); + gtk_widget_set_size_request (entry, ENTSCALE_INT_ENTRY_WIDTH, -1); g_snprintf (buffer, BUFSIZE, "%d", *intvar); gtk_entry_set_text (GTK_ENTRY (entry), buffer); @@ -721,19 +726,19 @@ entscale_int_new (GtkWidget *table, userdata->call_data = call_data; /* userdata is done */ - gtk_object_set_user_data (GTK_OBJECT (adjustment), userdata); - gtk_object_set_user_data (GTK_OBJECT (entry), userdata); + g_object_set_data (G_OBJECT (adjustment), "userdata", userdata); + g_object_set_data (G_OBJECT (entry), "userdata", userdata); /* now ready for signals */ - gtk_signal_connect (GTK_OBJECT (entry), "changed", - (GtkSignalFunc) entscale_int_entry_update, - intvar); - gtk_signal_connect (GTK_OBJECT (adjustment), "value_changed", - (GtkSignalFunc) entscale_int_scale_update, - intvar); - gtk_signal_connect (GTK_OBJECT (entry), "destroy", - (GtkSignalFunc) entscale_int_destroy_callback, - userdata ); + g_signal_connect (G_OBJECT (entry), "changed", + G_CALLBACK (entscale_int_entry_update), + intvar); + g_signal_connect (G_OBJECT (adjustment), "value_changed", + G_CALLBACK (entscale_int_scale_update), + intvar); + g_signal_connect (G_OBJECT (entry), "destroy", + G_CALLBACK (entscale_int_destroy_callback), + userdata ); /* start packing */ hbox = gtk_hbox_new (FALSE, 5); @@ -774,7 +779,7 @@ entscale_int_scale_update (GtkAdjustment *adjustment, gint *intvar = data; gint new_val; - userdata = gtk_object_get_user_data (GTK_OBJECT (adjustment)); + userdata = g_object_get_data (G_OBJECT (adjustment), "userdata"); new_val = (gint) adjustment->value; @@ -784,9 +789,15 @@ entscale_int_scale_update (GtkAdjustment *adjustment, g_snprintf (buffer, BUFSIZE, "%d", (int) new_val); /* avoid infinite loop (scale, entry, scale, entry ...) */ - gtk_signal_handler_block_by_data (GTK_OBJECT (entry), data); + g_signal_handlers_block_by_func (G_OBJECT (entry), + entscale_int_entry_update, + data); + gtk_entry_set_text (entry, buffer); - gtk_signal_handler_unblock_by_data (GTK_OBJECT (entry), data); + + g_signal_handlers_unblock_by_func (G_OBJECT (entry), + entscale_int_entry_update, + data); if (userdata->callback) (*userdata->callback) (*intvar, userdata->call_data); @@ -801,7 +812,7 @@ entscale_int_entry_update (GtkWidget *widget, gint new_val, constraint_val; gint *intvar = data; - userdata = gtk_object_get_user_data (GTK_OBJECT (widget)); + userdata = g_object_get_data (G_OBJECT (widget), "userdata"); adjustment = GTK_ADJUSTMENT (userdata->adjustment); new_val = atoi (gtk_entry_get_text (GTK_ENTRY (widget))); @@ -817,9 +828,16 @@ entscale_int_entry_update (GtkWidget *widget, *intvar = new_val; adjustment->value = constraint_val; - gtk_signal_handler_block_by_data (GTK_OBJECT (adjustment), data); - gtk_signal_emit_by_name (GTK_OBJECT (adjustment), "value_changed"); - gtk_signal_handler_unblock_by_data (GTK_OBJECT (adjustment), data); + + g_signal_handlers_block_by_func (G_OBJECT (adjustment), + entscale_int_scale_update, + data); + + gtk_adjustment_value_changed (adjustment); + + g_signal_handlers_unblock_by_func (G_OBJECT (adjustment), + entscale_int_scale_update, + data); if (userdata->callback) (*userdata->callback) (*intvar, userdata->call_data); diff --git a/plug-ins/mosaic/mosaic.c b/plug-ins/mosaic/mosaic.c index 64aacda62a..eb0deba8e2 100644 --- a/plug-ins/mosaic/mosaic.c +++ b/plug-ins/mosaic/mosaic.c @@ -22,6 +22,7 @@ * Copyright (C) 1996 Spencer Kimball * Speedups by Elliot Lee */ + #include "config.h" #include @@ -553,9 +554,9 @@ mosaic_dialog (void) NULL); - gtk_signal_connect (GTK_OBJECT (dlg), "destroy", - GTK_SIGNAL_FUNC (gtk_main_quit), - NULL); + g_signal_connect (G_OBJECT (dlg), "destroy", + G_CALLBACK (gtk_main_quit), + NULL); /* The main hbox -- splits the scripts and the info vbox */ main_hbox = gtk_hbox_new (FALSE, 6); @@ -602,48 +603,53 @@ mosaic_dialog (void) toggle = gtk_check_button_new_with_label (_("Antialiasing")); gtk_box_pack_start (GTK_BOX (toggle_vbox), toggle, FALSE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - GTK_SIGNAL_FUNC (gimp_toggle_button_update), - &mvals.antialiasing); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), mvals.antialiasing); gtk_widget_show (toggle); + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (gimp_toggle_button_update), + &mvals.antialiasing); + toggle = gtk_check_button_new_with_label ( _("Color Averaging")); gtk_box_pack_start (GTK_BOX (toggle_vbox), toggle, FALSE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - GTK_SIGNAL_FUNC (gimp_toggle_button_update), - &mvals.color_averaging); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), mvals.color_averaging); gtk_widget_show (toggle); + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (gimp_toggle_button_update), + &mvals.color_averaging); + toggle = gtk_check_button_new_with_label ( _("Allow Tile splitting")); gtk_box_pack_start (GTK_BOX (toggle_vbox), toggle, FALSE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - GTK_SIGNAL_FUNC (gimp_toggle_button_update), - &mvals.tile_allow_split); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), mvals.tile_allow_split); gtk_widget_show (toggle); + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (gimp_toggle_button_update), + &mvals.tile_allow_split); + toggle = gtk_check_button_new_with_label ( _("Pitted Surfaces")); gtk_box_pack_start (GTK_BOX (toggle_vbox), toggle, FALSE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - GTK_SIGNAL_FUNC (gimp_toggle_button_update), - &mvals.tile_surface); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), (mvals.tile_surface == ROUGH)); gtk_widget_show (toggle); + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (gimp_toggle_button_update), + &mvals.tile_surface); + toggle = gtk_check_button_new_with_label ( _("FG/BG Lighting")); gtk_box_pack_start (GTK_BOX (toggle_vbox), toggle, FALSE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - GTK_SIGNAL_FUNC (gimp_toggle_button_update), - &mvals.grout_color); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), (mvals.grout_color == FG_BG)); gtk_widget_show (toggle); + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (gimp_toggle_button_update), + &mvals.grout_color); + gtk_widget_show (toggle_vbox); gtk_widget_show (frame); gtk_widget_show (hbox); @@ -682,27 +688,27 @@ mosaic_dialog (void) mvals.tile_size, 5.0, 100.0, 1.0, 10.0, 1, TRUE, 0, 0, NULL, NULL); - gtk_signal_connect (GTK_OBJECT (scale_data), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &mvals.tile_size); + g_signal_connect (G_OBJECT (scale_data), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &mvals.tile_size); scale_data = gimp_scale_entry_new (GTK_TABLE (table), 0, 1, _("Tile Height:"), SCALE_WIDTH, 0, mvals.tile_height, 1.0, 50.0, 1.0, 10.0, 1, TRUE, 0, 0, NULL, NULL); - gtk_signal_connect (GTK_OBJECT (scale_data), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &mvals.tile_height); + g_signal_connect (G_OBJECT (scale_data), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &mvals.tile_height); scale_data = gimp_scale_entry_new (GTK_TABLE (table), 0, 2, _("Tile Spacing:"), SCALE_WIDTH, 0, mvals.tile_spacing, 1.0, 50.0, 1.0, 10.0, 1, TRUE, 0, 0, NULL, NULL); - gtk_signal_connect (GTK_OBJECT (scale_data), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &mvals.tile_spacing); + g_signal_connect (G_OBJECT (scale_data), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &mvals.tile_spacing); scale_data = gimp_scale_entry_new (GTK_TABLE (table), 0, 3, _("Tile Neatness:"), SCALE_WIDTH, 0, @@ -710,18 +716,18 @@ mosaic_dialog (void) 0.0, 1.0, 0.10, 0.1, 2, TRUE, 0, 0, NULL, NULL); - gtk_signal_connect (GTK_OBJECT (scale_data), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &mvals.tile_neatness); + g_signal_connect (G_OBJECT (scale_data), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &mvals.tile_neatness); scale_data = gimp_scale_entry_new (GTK_TABLE (table), 0, 4, _("Light Direction:"), SCALE_WIDTH, 0, mvals.light_dir, 0.0, 360.0, 1.0, 15.0, 1, TRUE, 0, 0, NULL, NULL); - gtk_signal_connect (GTK_OBJECT (scale_data), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &mvals.light_dir); + g_signal_connect (G_OBJECT (scale_data), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &mvals.light_dir); scale_data = gimp_scale_entry_new (GTK_TABLE (table), 0, 5, _("Color Variation:"), SCALE_WIDTH, 0, @@ -729,9 +735,9 @@ mosaic_dialog (void) 0.0, 1.0, 0.01, 0.1, 2, TRUE, 0, 0, NULL, NULL); - gtk_signal_connect (GTK_OBJECT (scale_data), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &mvals.color_variation); + g_signal_connect (G_OBJECT (scale_data), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &mvals.color_variation); gtk_widget_show (frame); gtk_widget_show (table); diff --git a/plug-ins/pagecurl/pagecurl.c b/plug-ins/pagecurl/pagecurl.c index ea2c26d31e..b2492878f0 100644 --- a/plug-ins/pagecurl/pagecurl.c +++ b/plug-ins/pagecurl/pagecurl.c @@ -48,6 +48,7 @@ * - Exchanged the meaning of FG/BG Color, because mostly the FG * color is darker. */ + #include "config.h" #include @@ -228,7 +229,7 @@ run (gchar *name, GimpParam **return_vals) { static GimpParam values[2]; - GimpRunMode run_mode; + GimpRunMode run_mode; GimpPDBStatusType status = GIMP_PDB_SUCCESS; run_mode = param[0].data.d_int32; @@ -430,7 +431,7 @@ static void dialog_scale_update (GtkAdjustment *adjustment, gdouble *value) { - *value = ((double) adjustment->value) / 100.0; + *value = ((gdouble) adjustment->value) / 100.0; } static void @@ -513,16 +514,17 @@ do_dialog (void) GTK_WIN_POS_MOUSE, FALSE, TRUE, FALSE, - GTK_STOCK_OK, dialog_ok_callback, - NULL, NULL, NULL, TRUE, FALSE, GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, + GTK_STOCK_OK, dialog_ok_callback, + NULL, NULL, NULL, TRUE, FALSE, + NULL); - gtk_signal_connect (GTK_OBJECT (dialog), "destroy", - GTK_SIGNAL_FUNC (gtk_main_quit), - NULL); + g_signal_connect (G_OBJECT (dialog), "destroy", + G_CALLBACK (gtk_main_quit), + NULL); vbox = gtk_vbox_new (FALSE, 4); gtk_container_set_border_width (GTK_CONTAINER (vbox), 6); @@ -607,23 +609,22 @@ do_dialog (void) { button = gtk_radio_button_new_with_label ((button == NULL) ? - NULL : gtk_radio_button_group (GTK_RADIO_BUTTON (button)), + NULL : gtk_radio_button_get_group (GTK_RADIO_BUTTON (button)), gettext(name[i])); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), (i == 0 ? curl.do_upper_left : i == 1 ? curl.do_upper_right : i == 2 ? curl.do_lower_left : curl.do_lower_right)); - gtk_signal_connect (GTK_OBJECT (button), "toggled", - GTK_SIGNAL_FUNC (dialog_toggle_update), - (gpointer) i); - gtk_table_attach (GTK_TABLE (table), button, (i % 2) ? 2 : 0, (i % 2) ? 3 : 1, (i < 2) ? 0 : 2, (i < 2) ? 1 : 3, GTK_SHRINK, GTK_SHRINK, 0, 0); - gtk_widget_show (button); + + g_signal_connect (G_OBJECT (button), "toggled", + G_CALLBACK (dialog_toggle_update), + GINT_TO_POINTER (i)); } } @@ -651,18 +652,18 @@ do_dialog (void) { button = gtk_radio_button_new_with_label ((button == NULL) ? - NULL : gtk_radio_button_group (GTK_RADIO_BUTTON (button)), + NULL : gtk_radio_button_get_group (GTK_RADIO_BUTTON (button)), gettext(name[i])); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), (i == 0 ? curl.do_horizontal : curl.do_vertical)); - gtk_signal_connect (GTK_OBJECT (button), "toggled", - GTK_SIGNAL_FUNC (dialog_toggle_update), - (gpointer) (i + 5)); - gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0); gtk_widget_show (button); + + g_signal_connect (G_OBJECT (button), "toggled", + G_CALLBACK (dialog_toggle_update), + GINT_TO_POINTER (i + 5)); } } @@ -672,12 +673,13 @@ do_dialog (void) shade_button = gtk_check_button_new_with_label (_("Shade under Curl")); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (shade_button), curl.do_shade_under ? TRUE : FALSE); - gtk_signal_connect (GTK_OBJECT (shade_button), "toggled", - GTK_SIGNAL_FUNC (dialog_toggle_update), - (gpointer) 8); gtk_box_pack_start (GTK_BOX (vbox), shade_button, FALSE, FALSE, 0); gtk_widget_show (shade_button); + g_signal_connect (G_OBJECT (shade_button), "toggled", + G_CALLBACK (dialog_toggle_update), + GINT_TO_POINTER (8)); + gradient_button = gtk_check_button_new_with_label (_("Use Current Gradient\n" "instead of FG/BG-Color")); @@ -685,12 +687,13 @@ do_dialog (void) GTK_JUSTIFY_LEFT); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gradient_button), curl.do_curl_gradient ? TRUE : FALSE); - gtk_signal_connect (GTK_OBJECT (gradient_button), "toggled", - GTK_SIGNAL_FUNC (dialog_toggle_update), - (gpointer) 9); gtk_box_pack_start (GTK_BOX (vbox), gradient_button, FALSE, FALSE, 0); gtk_widget_show (gradient_button); + g_signal_connect (G_OBJECT (gradient_button), "toggled", + G_CALLBACK (dialog_toggle_update), + GINT_TO_POINTER (9)); + frame = gtk_frame_new (_("Curl Opacity")); gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0); gtk_widget_show (frame); @@ -702,12 +705,12 @@ do_dialog (void) adjustment = gtk_adjustment_new (curl.do_curl_opacity * 100, 0.0, 100.0, 1.0, 1.0, 0.0); - gtk_signal_connect (adjustment, "value_changed", - GTK_SIGNAL_FUNC (dialog_scale_update), - &(curl.do_curl_opacity)); + g_signal_connect (G_OBJECT (adjustment), "value_changed", + G_CALLBACK (dialog_scale_update), + &(curl.do_curl_opacity)); scale = gtk_hscale_new (GTK_ADJUSTMENT (adjustment)); - gtk_widget_set_usize (GTK_WIDGET (scale), 150, 30); + gtk_widget_set_size_request (GTK_WIDGET (scale), 150, 30); gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED); gtk_scale_set_digits (GTK_SCALE (scale), 0); gtk_scale_set_draw_value (GTK_SCALE (scale), TRUE); diff --git a/plug-ins/print/print_gimp.h b/plug-ins/print/print_gimp.h index e32fc4317d..9026cbfe02 100644 --- a/plug-ins/print/print_gimp.h +++ b/plug-ins/print/print_gimp.h @@ -29,6 +29,11 @@ #ifndef __PRINT_GIMP_H__ #define __PRINT_GIMP_H__ +#ifdef __GNUC__ +#warning GTK_DISABLE_DEPRECATED +#endif +#undef GTK_DISABLE_DEPRECATED + #include /* diff --git a/plug-ins/rcm/rcm_callback.c b/plug-ins/rcm/rcm_callback.c index c77ff1f423..a45b8e0c24 100644 --- a/plug-ins/rcm/rcm_callback.c +++ b/plug-ins/rcm/rcm_callback.c @@ -36,14 +36,21 @@ * *---------------------------------------------------------------------------*/ +#include "config.h" + #include #include -#include -#include "config.h" #include + +#ifdef __GNUC__ +#warning GTK_DISABLE_DEPRECATED +#endif +#undef GTK_DISABLE_DEPRECATED +#include + +#include "libgimpmath/gimpmath.h" #include "libgimp/gimp.h" -#include "libgimp/stdplugins-intl.h" #include "rcm.h" #include "rcm_misc.h" @@ -51,6 +58,8 @@ #include "rcm_dialog.h" #include "rcm_callback.h" +#include "libgimp/stdplugins-intl.h" + #include "pixmaps/rcm_ccw.xpm" #include "pixmaps/rcm_cw.xpm" @@ -133,7 +142,7 @@ rcm_360_degrees (GtkWidget *button, RcmCircle *circle) { circle->action_flag = DO_NOTHING; - gtk_widget_draw(circle->preview, NULL); + gtk_widget_queue_draw(circle->preview); circle->angle->beta = circle->angle->alpha-circle->angle->cw_ccw * 0.001; rcm_draw_arrows(circle->preview->window, circle->preview->style->black_gc, circle->angle); circle->action_flag = VIRGIN; @@ -161,7 +170,7 @@ rcm_a_to_b (GtkWidget *button, RcmCircle *circle) { circle->action_flag = DO_NOTHING; - gtk_widget_draw(circle->preview, NULL); + gtk_widget_queue_draw(circle->preview); SWAP(circle->angle->alpha, circle->angle->beta); @@ -390,8 +399,8 @@ rcm_change_preview (void) rcm_render_preview(Current.Bna->before, ORIGINAL); rcm_render_preview(Current.Bna->after, CURRENT); - gtk_widget_draw(Current.Bna->before, NULL); - gtk_widget_draw(Current.Bna->after, NULL); + gtk_widget_queue_draw(Current.Bna->before); + gtk_widget_queue_draw(Current.Bna->after); gtk_widget_show(Current.Bna->before); gtk_widget_show(Current.Bna->after); @@ -480,7 +489,7 @@ rcm_button_press_event (GtkWidget *widget, if (*(circle->target) != clicked_angle) { *(circle->target) = clicked_angle; - gtk_widget_draw(circle->preview, NULL); + gtk_widget_queue_draw(circle->preview); rcm_draw_arrows(widget->window, widget->style->black_gc, circle->angle); gtk_spin_button_set_value(GTK_SPIN_BUTTON(circle->alpha_entry), @@ -549,7 +558,7 @@ rcm_motion_notify_event (GtkWidget *widget, { if (circle->action_flag == DRAG_START) { - gtk_widget_draw(circle->preview, NULL); + gtk_widget_queue_draw(circle->preview); circle->action_flag = DRAGING; } else @@ -617,7 +626,7 @@ rcm_gray_button_press_event (GtkWidget *widget, circle->satur = sqrt (SQR (x) + SQR (y)) / GRAY_RADIUS; if (circle->satur > 1.0) circle->satur = 1; - gtk_widget_draw(circle->preview, NULL); + gtk_widget_queue_draw(circle->preview); rcm_draw_little_circle(widget->window, widget->style->black_gc, circle->hue, circle->satur); @@ -672,7 +681,7 @@ rcm_gray_motion_notify_event (GtkWidget *widget, if (circle->action_flag == DRAG_START) { - gtk_widget_draw(circle->preview, NULL); + gtk_widget_queue_draw(circle->preview); rcm_draw_large_circle(circle->preview->window, circle->preview->style->black_gc, circle->gray_sat); @@ -716,10 +725,10 @@ rcm_set_alpha (GtkWidget *entry, circle = (RcmCircle *) data; if (circle->action_flag != VIRGIN) return; - circle->angle->alpha = gtk_spin_button_get_value_as_float(GTK_SPIN_BUTTON(entry)) / - rcm_units_factor(Current.Units); + circle->angle->alpha = gtk_spin_button_get_value(GTK_SPIN_BUTTON(entry)) / + rcm_units_factor(Current.Units); - gtk_widget_draw(circle->preview, NULL); + gtk_widget_queue_draw(circle->preview); rcm_draw_arrows(circle->preview->window, circle->preview->style->black_gc, circle->angle); @@ -738,10 +747,10 @@ rcm_set_beta (GtkWidget *entry, circle=(RcmCircle *) data; if (circle->action_flag != VIRGIN) return; - circle->angle->beta = gtk_spin_button_get_value_as_float(GTK_SPIN_BUTTON(entry)) / - rcm_units_factor(Current.Units); + circle->angle->beta = gtk_spin_button_get_value(GTK_SPIN_BUTTON(entry)) / + rcm_units_factor(Current.Units); - gtk_widget_draw(circle->preview, NULL); + gtk_widget_queue_draw(circle->preview); rcm_draw_arrows(circle->preview->window, circle->preview->style->black_gc, circle->angle); @@ -760,10 +769,10 @@ rcm_set_hue (GtkWidget *entry, circle = (RcmGray *) data; if (circle->action_flag != VIRGIN) return; - circle->hue = gtk_spin_button_get_value_as_float(GTK_SPIN_BUTTON(entry)) / - rcm_units_factor(Current.Units); + circle->hue = gtk_spin_button_get_value(GTK_SPIN_BUTTON(entry)) / + rcm_units_factor(Current.Units); - gtk_widget_draw(circle->preview, NULL); + gtk_widget_queue_draw(circle->preview); rcm_draw_little_circle(circle->preview->window, circle->preview->style->black_gc, circle->hue, circle->satur); @@ -785,9 +794,9 @@ rcm_set_satur (GtkWidget *entry, circle=(RcmGray *) data; if (circle->action_flag != VIRGIN) return; - circle->satur = gtk_spin_button_get_value_as_float(GTK_SPIN_BUTTON(entry)); + circle->satur = gtk_spin_button_get_value(GTK_SPIN_BUTTON(entry)); - gtk_widget_draw(circle->preview, NULL); + gtk_widget_queue_draw(circle->preview); rcm_draw_little_circle(circle->preview->window, circle->preview->style->black_gc, circle->hue, circle->satur); @@ -807,9 +816,9 @@ rcm_set_gray_sat (GtkWidget *entry, circle=(RcmGray *) data; - circle->gray_sat = gtk_spin_button_get_value_as_float(GTK_SPIN_BUTTON(entry)); + circle->gray_sat = gtk_spin_button_get_value(GTK_SPIN_BUTTON(entry)); - gtk_widget_draw(circle->preview, NULL); + gtk_widget_queue_draw(circle->preview); rcm_draw_large_circle(circle->preview->window, circle->preview->style->black_gc, circle->gray_sat); diff --git a/plug-ins/rcm/rcm_dialog.c b/plug-ins/rcm/rcm_dialog.c index 35fa4ecb3a..1fe4fcba0b 100644 --- a/plug-ins/rcm/rcm_dialog.c +++ b/plug-ins/rcm/rcm_dialog.c @@ -165,7 +165,9 @@ rcm_create_pixmap_button (GtkWidget **label, { /* create button */ *xpm_button = gtk_button_new(); - gtk_signal_connect(GTK_OBJECT(*xpm_button), "clicked", callback, data); + g_signal_connect (G_OBJECT (*xpm_button), "clicked", + callback, + data); gtk_widget_show(*xpm_button); gtk_table_attach(GTK_TABLE(parent), *xpm_button, @@ -241,17 +243,21 @@ rcm_create_one_circle (gint height, /* set signals */ gtk_widget_set_events(st->preview, RANGE_ADJUST_MASK); - gtk_signal_connect_after(GTK_OBJECT(st->preview), "expose_event", - (GtkSignalFunc) rcm_expose_event, st); + g_signal_connect_after (G_OBJECT (st->preview), "expose_event", + G_CALLBACK (rcm_expose_event), + st); - gtk_signal_connect(GTK_OBJECT(st->preview), "button_press_event", - (GtkSignalFunc) rcm_button_press_event, st); + g_signal_connect (G_OBJECT (st->preview), "button_press_event", + G_CALLBACK (rcm_button_press_event), + st); - gtk_signal_connect(GTK_OBJECT(st->preview), "button_release_event", - (GtkSignalFunc) rcm_release_event, st); + g_signal_connect (G_OBJECT (st->preview), "button_release_event", + G_CALLBACK (rcm_release_event), + st); - gtk_signal_connect(GTK_OBJECT(st->preview), "motion_notify_event", - (GtkSignalFunc) rcm_motion_notify_event, st); + g_signal_connect (G_OBJECT (st->preview), "motion_notify_event", + G_CALLBACK (rcm_motion_notify_event), + st); rcm_render_circle(st->preview, SUM, MARGIN); @@ -298,10 +304,13 @@ rcm_create_one_circle (gint height, adj = (GtkAdjustment *) gtk_adjustment_new(st->angle->alpha, 0.0, 2.0, 0.0001, 0.001, 0.0); st->alpha_entry = entry = gtk_spin_button_new(adj, 0.01, 4); gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(entry), TRUE); - gtk_widget_show(entry); - gtk_signal_connect(GTK_OBJECT(entry), "changed", (GtkSignalFunc)rcm_set_alpha, st); gtk_table_attach(GTK_TABLE(legend_table), entry, 1,2, 0,1, GTK_EXPAND|GTK_FILL, GTK_EXPAND, 2, 4); + gtk_widget_show(entry); + + g_signal_connect (G_OBJECT (entry), "changed", + G_CALLBACK (rcm_set_alpha), + st); /* label */ st->alpha_units_label = gtk_label_new(rcm_units_string(Current.Units)); @@ -320,10 +329,13 @@ rcm_create_one_circle (gint height, adj = (GtkAdjustment *) gtk_adjustment_new(st->angle->beta, 0.0, 2.0, 0.0001, 0.001, 0.0); st->beta_entry = entry = gtk_spin_button_new(adj, 0.01, 4); gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(entry), TRUE); - gtk_widget_show(entry); - gtk_signal_connect(GTK_OBJECT(entry), "changed", (GtkSignalFunc)rcm_set_beta, st); gtk_table_attach(GTK_TABLE(legend_table), entry, 4,5, 0,1, GTK_EXPAND|GTK_FILL, GTK_EXPAND, 2, 4); + gtk_widget_show(entry); + + g_signal_connect (G_OBJECT (entry), "changed", + G_CALLBACK (rcm_set_beta), + st); /* label */ st->beta_units_label = gtk_label_new(rcm_units_string(Current.Units)); @@ -413,17 +425,21 @@ rcm_create_gray (void) gtk_widget_set_events (preview, RANGE_ADJUST_MASK); - gtk_signal_connect_after (GTK_OBJECT (preview), "expose_event", - (GtkSignalFunc) rcm_gray_expose_event, st); + g_signal_connect_after (G_OBJECT (preview), "expose_event", + G_CALLBACK (rcm_gray_expose_event), + st); - gtk_signal_connect (GTK_OBJECT (preview), "button_press_event", - (GtkSignalFunc) rcm_gray_button_press_event, st); + g_signal_connect (G_OBJECT (preview), "button_press_event", + G_CALLBACK (rcm_gray_button_press_event), + st); - gtk_signal_connect (GTK_OBJECT (preview), "button_release_event", - (GtkSignalFunc) rcm_gray_release_event, st); + g_signal_connect (G_OBJECT (preview), "button_release_event", + G_CALLBACK (rcm_gray_release_event), + st); - gtk_signal_connect (GTK_OBJECT (preview), "motion_notify_event", - (GtkSignalFunc) rcm_gray_motion_notify_event, st); + g_signal_connect (G_OBJECT (preview), "motion_notify_event", + G_CALLBACK (rcm_gray_motion_notify_event), + st); /* Gray: Circle: Legend */ legend_table = gtk_table_new (2, 3, FALSE); @@ -442,13 +458,15 @@ rcm_create_gray (void) adj = (GtkAdjustment *) gtk_adjustment_new (st->hue, 0.0, 2.0, 0.0001, 0.001, 0.0); st->hue_entry = entry = gtk_spin_button_new (adj, 0.01, 4); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON(entry), TRUE); - gtk_widget_set_usize (entry, 75, 0); - gtk_signal_connect (GTK_OBJECT(entry), "changed", - (GtkSignalFunc) rcm_set_hue, st); + gtk_widget_set_size_request (entry, 75, -1); gtk_table_attach (GTK_TABLE (legend_table), entry, 1, 2, 0, 1, GTK_EXPAND | GTK_FILL, GTK_EXPAND, 0, 0); gtk_widget_show (entry); + g_signal_connect (G_OBJECT (entry), "changed", + G_CALLBACK (rcm_set_hue), + st); + /* Gray: Circle: units label */ st->hue_units_label = gtk_label_new (rcm_units_string (Current.Units)); gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); @@ -467,13 +485,15 @@ rcm_create_gray (void) adj = (GtkAdjustment *) gtk_adjustment_new (st->satur, 0.0, 1.0, 0.0001, 0.001, 0.0); st->satur_entry = entry = gtk_spin_button_new (adj, 0.01, 4); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (entry), TRUE); - gtk_widget_set_usize (entry, 75, 0); - gtk_signal_connect (GTK_OBJECT (entry), "changed", - (GtkSignalFunc) rcm_set_satur, st); + gtk_widget_set_size_request (entry, 75, -1); gtk_table_attach (GTK_TABLE (legend_table), entry, 1, 2, 1, 2, GTK_EXPAND | GTK_FILL, GTK_EXPAND, 0, 2); gtk_widget_show (entry); + g_signal_connect (G_OBJECT (entry), "changed", + G_CALLBACK (rcm_set_satur), + st); + /** Gray: Operation-Mode **/ as_or_to_frame = gtk_frame_new (_("Mode")); gtk_widget_show (as_or_to_frame); @@ -485,24 +505,28 @@ rcm_create_gray (void) /* Gray: Operation-Mode: two radio buttons */ button = gtk_radio_button_new_with_label(group, _("Treat as this")); - gtk_widget_show (button); + group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (button)); gtk_box_pack_start (GTK_BOX (radio_box), button, FALSE, FALSE, 0); + gtk_widget_show (button); + if (Current.Gray_to_from == GRAY_FROM) gtk_button_clicked (GTK_BUTTON (button)); - gtk_signal_connect (GTK_OBJECT (button), "clicked", - (GtkSignalFunc) rcm_switch_to_gray_from, - &(Current.Gray_to_from)); - group = gtk_radio_button_group (GTK_RADIO_BUTTON (button)); + + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (rcm_switch_to_gray_from), + &(Current.Gray_to_from)); button = gtk_radio_button_new_with_label (group, _("Change to this")); - gtk_widget_show (button); + group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (button)); gtk_box_pack_start (GTK_BOX (radio_box), button, FALSE, FALSE, 0); + gtk_widget_show (button); + if (Current.Gray_to_from == GRAY_TO) gtk_button_clicked (GTK_BUTTON (button)); - gtk_signal_connect (GTK_OBJECT (button), "clicked", - (GtkSignalFunc) rcm_switch_to_gray_to, - &(Current.Gray_to_from)); - group = gtk_radio_button_group (GTK_RADIO_BUTTON (button)); + + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (rcm_switch_to_gray_to), + &(Current.Gray_to_from)); /** Gray: What is gray? **/ gray_sat_frame = gtk_frame_new(_("What is Gray?")); @@ -527,12 +551,14 @@ rcm_create_gray (void) adj = (GtkAdjustment *) gtk_adjustment_new (st->gray_sat, 0.0, 1.0, 0.0001, 0.001, 0.0); st->gray_sat_entry = entry = gtk_spin_button_new (adj, 0.01, 4); - gtk_widget_set_usize (entry, 75, 0); - gtk_widget_show (entry); - gtk_signal_connect (GTK_OBJECT (entry), "changed", - (GtkSignalFunc) rcm_set_gray_sat, st); + gtk_widget_set_size_request (entry, 75, -1); gtk_table_attach (GTK_TABLE (table), entry, 2, 3, 0, 1, GTK_EXPAND | GTK_FILL, GTK_EXPAND, 0, 0); + gtk_widget_show (entry); + + g_signal_connect (G_OBJECT (entry), "changed", + G_CALLBACK (rcm_set_gray_sat), + st); gtk_container_add (GTK_CONTAINER (gray_sat_frame), table); @@ -603,30 +629,39 @@ rcm_create_misc (void) /* Misc: Used unit selection: 3 radio buttons */ button = gtk_radio_button_new_with_label (units_group, _("Radians")); - gtk_widget_show (button); + units_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (button)); gtk_box_pack_start (GTK_BOX (units_vbox), button, FALSE, FALSE, 0); + gtk_widget_show (button); + if (Current.Units == RADIANS) gtk_button_clicked (GTK_BUTTON (button)); - gtk_signal_connect (GTK_OBJECT (button), "clicked", - (GtkSignalFunc) rcm_switch_to_radians, NULL); - units_group = gtk_radio_button_group (GTK_RADIO_BUTTON (button)); + + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (rcm_switch_to_radians), + NULL); button = gtk_radio_button_new_with_label (units_group, _("Radians/Pi")); - gtk_widget_show (button); + units_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (button)); gtk_box_pack_start (GTK_BOX (units_vbox), button, FALSE, FALSE, 0); + gtk_widget_show (button); + if (Current.Units == RADIANS_OVER_PI) gtk_button_clicked (GTK_BUTTON (button)); - gtk_signal_connect (GTK_OBJECT (button), "clicked", - (GtkSignalFunc) rcm_switch_to_radians_over_PI, NULL); - units_group = gtk_radio_button_group (GTK_RADIO_BUTTON (button)); + + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (rcm_switch_to_radians_over_PI), + NULL); button = gtk_radio_button_new_with_label (units_group, _("Degrees")); - gtk_widget_show (button); gtk_box_pack_start (GTK_BOX (units_vbox), button, FALSE, FALSE, 0); + gtk_widget_show (button); + if (Current.Units == DEGREES) gtk_button_clicked (GTK_BUTTON (button)); - gtk_signal_connect (GTK_OBJECT (button), "clicked", - (GtkSignalFunc) rcm_switch_to_degrees, NULL); + + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (rcm_switch_to_degrees), + NULL); /** Misc: Preview settings **/ @@ -642,12 +677,11 @@ rcm_create_misc (void) button = gtk_check_button_new_with_label (_("Continuous update")); gtk_box_pack_start(GTK_BOX(preview_vbox), button, FALSE, FALSE, 0); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), Current.RealTime); - - gtk_signal_connect (GTK_OBJECT (button), "clicked", - (GtkSignalFunc) (GtkSignalFunc) rcm_preview_as_you_drag, - &(Current.RealTime)); - gtk_widget_show (button); + + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (rcm_preview_as_you_drag), + &(Current.RealTime)); /* Misc: Preview settings: Area */ hbox = gtk_hbox_new (FALSE, 4); @@ -665,22 +699,28 @@ rcm_create_misc (void) preview_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (item)); gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); gtk_widget_show (item); - gtk_signal_connect (GTK_OBJECT (item), "activate", - (GtkSignalFunc) rcm_entire_image, NULL); + + g_signal_connect (G_OBJECT (item), "activate", + G_CALLBACK (rcm_entire_image), + NULL); item = gtk_radio_menu_item_new_with_label (preview_group, _("Selection")); preview_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (item)); gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); gtk_widget_show (item); - gtk_signal_connect (GTK_OBJECT (item), "activate", - (GtkSignalFunc) rcm_selection, NULL); + + g_signal_connect (G_OBJECT (item), "activate", + G_CALLBACK (rcm_selection), + NULL); item = gtk_radio_menu_item_new_with_label (preview_group, _("Context")); preview_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (item)); - gtk_widget_show (item); gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); - gtk_signal_connect (GTK_OBJECT (item), "activate", - (GtkSignalFunc) rcm_selection_in_context, NULL); + gtk_widget_show (item); + + g_signal_connect (G_OBJECT (item), "activate", + G_CALLBACK (rcm_selection_in_context), + NULL); /* create (options) menu */ root = gtk_option_menu_new (); @@ -740,9 +780,9 @@ rcm_dialog (void) Current.Bna->dlg = dlg; - gtk_signal_connect (GTK_OBJECT (dlg), "destroy", - GTK_SIGNAL_FUNC (gtk_main_quit), - NULL); + g_signal_connect (G_OBJECT (dlg), "destroy", + G_CALLBACK (gtk_main_quit), + NULL); /* Create sub-dialogs */ Current.reduced = rcm_reduce_image (Current.drawable, Current.mask, diff --git a/plug-ins/rcm/rcm_misc.c b/plug-ins/rcm/rcm_misc.c index 8e0d4b4dc5..998ed9d3b5 100644 --- a/plug-ins/rcm/rcm_misc.c +++ b/plug-ins/rcm/rcm_misc.c @@ -36,12 +36,21 @@ * *-----------------------------------------------------------------------------------*/ +#include "config.h" + #include #include #include #include -#include + +#ifdef __GNUC__ +#warning GTK_DISABLE_DEPRECATED +#endif +#undef GTK_DISABLE_DEPRECATED +#include + +#include "libgimp/gimp.h" #include "rcm.h" #include "rcm_misc.h" @@ -444,8 +453,7 @@ rcm_render_preview (GtkWidget *preview, } g_free (a); - gtk_widget_draw(preview, NULL); - gdk_flush(); + gtk_widget_queue_draw (preview); } /*-----------------------------------------------------------------------------------*/ @@ -487,6 +495,5 @@ rcm_render_circle (GtkWidget *preview, } g_free (a); - gtk_widget_draw (preview, NULL); - gdk_flush (); + gtk_widget_queue_draw (preview); } diff --git a/plug-ins/script-fu/script-fu-console.c b/plug-ins/script-fu/script-fu-console.c index 9e2c12e4d9..4c361538ed 100644 --- a/plug-ins/script-fu/script-fu-console.c +++ b/plug-ins/script-fu/script-fu-console.c @@ -209,7 +209,7 @@ script_fu_console_interface (void) g_object_unref (G_OBJECT (cint.console)); gtk_text_view_set_editable (GTK_TEXT_VIEW (cint.text_view), FALSE); - gtk_widget_set_usize (cint.text_view, TEXT_WIDTH, TEXT_HEIGHT); + gtk_widget_set_size_request (cint.text_view, TEXT_WIDTH, TEXT_HEIGHT); gtk_container_add (GTK_CONTAINER (scrolled_window), cint.text_view); gtk_widget_show (cint.text_view); @@ -242,7 +242,7 @@ script_fu_console_interface (void) "weak", "You should have received a copy of the GNU General Public License\n", "weak", "along with this program; if not, write to the Free Software\n", "weak", "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n\n\n", - "strong", "Script-Fu Console - FIXME(\\n)\n", + "strong", "Script-Fu Console - ", "emphasis", "Interactive Scheme Development\n\n", NULL }; @@ -268,7 +268,7 @@ script_fu_console_interface (void) gtk_widget_show (label); hbox = gtk_hbox_new (FALSE, 2); - gtk_widget_set_usize (hbox, ENTRY_WIDTH, 0); + gtk_widget_set_size_request (hbox, ENTRY_WIDTH, -1); gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, FALSE, 0); gtk_widget_show (hbox); @@ -450,8 +450,6 @@ script_fu_cc_key_function (GtkWidget *widget, switch (event->keyval) { case GDK_Return: - gtk_signal_emit_stop_by_name (GTK_OBJECT (widget), "key_press_event"); - if (script_fu_cc_is_empty ()) return TRUE; @@ -463,29 +461,19 @@ script_fu_cc_key_function (GtkWidget *widget, gtk_text_buffer_get_end_iter (cint.console, &cursor); gtk_text_buffer_insert_with_tags_by_name (cint.console, &cursor, - "=> FIXME(\\n)\n", -1, + "=> ", -1, "strong", NULL); - { - gchar *eek; - eek = g_strdup_printf ("%s\n\n", - gtk_entry_get_text (GTK_ENTRY (cint.cc))); + gtk_text_buffer_insert_with_tags_by_name (cint.console, &cursor, + gtk_entry_get_text (GTK_ENTRY (cint.cc)), -1, + "weak", + NULL); - gtk_text_buffer_insert_with_tags_by_name (cint.console, &cursor, - eek, -1, - "weak", - NULL); - - g_free (eek); - } - - /* gtk_text_buffer_insert_with_tags_by_name (cint.console, &cursor, "\n\n", -1, "weak", NULL); - */ script_fu_console_scroll_end (); @@ -510,32 +498,24 @@ script_fu_cc_key_function (GtkWidget *widget, case GDK_KP_Up: case GDK_Up: - gtk_signal_emit_stop_by_name (GTK_OBJECT (widget), "key_press_event"); direction = -1; break; case GDK_KP_Down: case GDK_Down: - gtk_signal_emit_stop_by_name (GTK_OBJECT (widget), "key_press_event"); direction = 1; break; case GDK_P: case GDK_p: if (event->state & GDK_CONTROL_MASK) - { - gtk_signal_emit_stop_by_name (GTK_OBJECT (widget), "key_press_event"); - direction = -1; - } + direction = -1; break; case GDK_N: case GDK_n: if (event->state & GDK_CONTROL_MASK) - { - gtk_signal_emit_stop_by_name (GTK_OBJECT (widget), "key_press_event"); - direction = 1; - } + direction = 1; break; default: diff --git a/plug-ins/script-fu/script-fu-interface.c b/plug-ins/script-fu/script-fu-interface.c index 55600f2352..1bd3d87d5b 100644 --- a/plug-ins/script-fu/script-fu-interface.c +++ b/plug-ins/script-fu/script-fu-interface.c @@ -1315,7 +1315,8 @@ script_fu_interface (SFScript *script) widget_leftalign = FALSE; sf_interface->args_widgets[i] = gtk_entry_new (); - gtk_widget_set_usize (sf_interface->args_widgets[i], TEXT_WIDTH, 0); + gtk_widget_set_size_request (sf_interface->args_widgets[i], + TEXT_WIDTH, -1); gtk_entry_set_text (GTK_ENTRY (sf_interface->args_widgets[i]), script->arg_values[i].sfa_value); break; @@ -1335,8 +1336,8 @@ script_fu_interface (SFScript *script) sf_interface->args_widgets[i] = gtk_hscale_new (script->arg_values[i].sfa_adjustment.adj); - gtk_widget_set_usize (GTK_WIDGET (sf_interface->args_widgets[i]), - SLIDER_WIDTH, -1); + gtk_widget_set_size_request (GTK_WIDGET (sf_interface->args_widgets[i]), + SLIDER_WIDTH, -1); gtk_scale_set_digits (GTK_SCALE (sf_interface->args_widgets[i]), script->arg_defaults[i].sfa_adjustment.digits); gtk_scale_set_draw_value (GTK_SCALE (sf_interface->args_widgets[i]), TRUE); @@ -1348,7 +1349,8 @@ script_fu_interface (SFScript *script) sf_interface->args_widgets[i] = gtk_spin_button_new (script->arg_values[i].sfa_adjustment.adj, 0, 0); gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (sf_interface->args_widgets[i]), TRUE); - gtk_widget_set_usize (sf_interface->args_widgets[i], SPINNER_WIDTH, 0); + gtk_widget_set_size_request (sf_interface->args_widgets[i], + SPINNER_WIDTH, -1); gtk_spin_button_set_digits (GTK_SPIN_BUTTON (sf_interface->args_widgets[i]), script->arg_defaults[i].sfa_adjustment.digits); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (sf_interface->args_widgets[i]), TRUE); @@ -1390,8 +1392,8 @@ script_fu_interface (SFScript *script) sf_interface->args_widgets[i] = gtk_button_new (); script->arg_values[i].sfa_font.preview = gtk_label_new (""); script->arg_values[i].sfa_font.dialog = NULL; - gtk_widget_set_usize (sf_interface->args_widgets[i], - FONT_PREVIEW_WIDTH, 0); + gtk_widget_set_size_request (sf_interface->args_widgets[i], + FONT_PREVIEW_WIDTH, -1); gtk_container_add (GTK_CONTAINER (sf_interface->args_widgets[i]), script->arg_values[i].sfa_font.preview); gtk_widget_show (script->arg_values[i].sfa_font.preview); @@ -1438,8 +1440,8 @@ script_fu_interface (SFScript *script) list = g_slist_next (list), j++) { menu_item = gtk_menu_item_new_with_label (gettext ((gchar *)list->data)); - gtk_object_set_user_data (GTK_OBJECT (menu_item), - GUINT_TO_POINTER (j)); + g_object_set_data (G_OBJECT (menu_item), "gimp-item-data", + GUINT_TO_POINTER (j)); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item); gtk_widget_show (menu_item); } @@ -1493,7 +1495,7 @@ script_fu_interface (SFScript *script) gtk_widget_show (hbox); bbox = gtk_hbutton_box_new (); - gtk_button_box_set_spacing (GTK_BUTTON_BOX (bbox), 4); + gtk_box_set_spacing (GTK_BOX (bbox), 4); gtk_box_pack_start (GTK_BOX (hbox), bbox, FALSE, FALSE, 0); gtk_widget_show (bbox); @@ -1507,7 +1509,7 @@ script_fu_interface (SFScript *script) script); bbox = gtk_hbutton_box_new (); - gtk_button_box_set_spacing (GTK_BUTTON_BOX (bbox), 4); + gtk_box_set_spacing (GTK_BOX (bbox), 4); gtk_box_pack_end (GTK_BOX (hbox), bbox, FALSE, FALSE, 0); gtk_widget_show (bbox); @@ -1537,7 +1539,7 @@ script_fu_interface (SFScript *script) gtk_widget_show (hbox); sf_interface->status = gtk_entry_new (); - gtk_entry_set_editable (GTK_ENTRY (sf_interface->status), FALSE); + gtk_editable_set_editable (GTK_EDITABLE (sf_interface->status), FALSE); gtk_box_pack_start (GTK_BOX (hbox), sf_interface->status, TRUE, TRUE, 2); gtk_entry_set_text (GTK_ENTRY (sf_interface->status), sf_interface->window_title); @@ -1828,7 +1830,7 @@ script_fu_ok_callback (GtkWidget *widget, case SF_SPINNER: script->arg_values[i].sfa_adjustment.value = - gtk_spin_button_get_value_as_float (GTK_SPIN_BUTTON (sf_interface->args_widgets[i])); + gtk_spin_button_get_value (GTK_SPIN_BUTTON (sf_interface->args_widgets[i])); g_snprintf (buffer, sizeof (buffer), "%f", script->arg_values[i].sfa_adjustment.value); text = buffer; @@ -1879,7 +1881,8 @@ script_fu_ok_callback (GtkWidget *widget, menu_item = gtk_menu_get_active (GTK_MENU (gtk_option_menu_get_menu (GTK_OPTION_MENU (sf_interface->args_widgets[i])))); script->arg_values[i].sfa_option.history = - GPOINTER_TO_UINT (gtk_object_get_user_data (GTK_OBJECT (menu_item))); + GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (menu_item), + "gimp-item-data")); g_snprintf (buffer, sizeof (buffer), "%d", script->arg_values[i].sfa_option.history); text = buffer; @@ -1976,7 +1979,7 @@ script_fu_about_callback (GtkWidget *widget, 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, 200, 60); + gtk_widget_set_size_request (text_view, 200, 60); gtk_container_add (GTK_CONTAINER (scrolled_window), text_view); gtk_widget_show (text_view); diff --git a/plug-ins/script-fu/script-fu-scripts.c b/plug-ins/script-fu/script-fu-scripts.c index 55600f2352..1bd3d87d5b 100644 --- a/plug-ins/script-fu/script-fu-scripts.c +++ b/plug-ins/script-fu/script-fu-scripts.c @@ -1315,7 +1315,8 @@ script_fu_interface (SFScript *script) widget_leftalign = FALSE; sf_interface->args_widgets[i] = gtk_entry_new (); - gtk_widget_set_usize (sf_interface->args_widgets[i], TEXT_WIDTH, 0); + gtk_widget_set_size_request (sf_interface->args_widgets[i], + TEXT_WIDTH, -1); gtk_entry_set_text (GTK_ENTRY (sf_interface->args_widgets[i]), script->arg_values[i].sfa_value); break; @@ -1335,8 +1336,8 @@ script_fu_interface (SFScript *script) sf_interface->args_widgets[i] = gtk_hscale_new (script->arg_values[i].sfa_adjustment.adj); - gtk_widget_set_usize (GTK_WIDGET (sf_interface->args_widgets[i]), - SLIDER_WIDTH, -1); + gtk_widget_set_size_request (GTK_WIDGET (sf_interface->args_widgets[i]), + SLIDER_WIDTH, -1); gtk_scale_set_digits (GTK_SCALE (sf_interface->args_widgets[i]), script->arg_defaults[i].sfa_adjustment.digits); gtk_scale_set_draw_value (GTK_SCALE (sf_interface->args_widgets[i]), TRUE); @@ -1348,7 +1349,8 @@ script_fu_interface (SFScript *script) sf_interface->args_widgets[i] = gtk_spin_button_new (script->arg_values[i].sfa_adjustment.adj, 0, 0); gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (sf_interface->args_widgets[i]), TRUE); - gtk_widget_set_usize (sf_interface->args_widgets[i], SPINNER_WIDTH, 0); + gtk_widget_set_size_request (sf_interface->args_widgets[i], + SPINNER_WIDTH, -1); gtk_spin_button_set_digits (GTK_SPIN_BUTTON (sf_interface->args_widgets[i]), script->arg_defaults[i].sfa_adjustment.digits); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (sf_interface->args_widgets[i]), TRUE); @@ -1390,8 +1392,8 @@ script_fu_interface (SFScript *script) sf_interface->args_widgets[i] = gtk_button_new (); script->arg_values[i].sfa_font.preview = gtk_label_new (""); script->arg_values[i].sfa_font.dialog = NULL; - gtk_widget_set_usize (sf_interface->args_widgets[i], - FONT_PREVIEW_WIDTH, 0); + gtk_widget_set_size_request (sf_interface->args_widgets[i], + FONT_PREVIEW_WIDTH, -1); gtk_container_add (GTK_CONTAINER (sf_interface->args_widgets[i]), script->arg_values[i].sfa_font.preview); gtk_widget_show (script->arg_values[i].sfa_font.preview); @@ -1438,8 +1440,8 @@ script_fu_interface (SFScript *script) list = g_slist_next (list), j++) { menu_item = gtk_menu_item_new_with_label (gettext ((gchar *)list->data)); - gtk_object_set_user_data (GTK_OBJECT (menu_item), - GUINT_TO_POINTER (j)); + g_object_set_data (G_OBJECT (menu_item), "gimp-item-data", + GUINT_TO_POINTER (j)); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item); gtk_widget_show (menu_item); } @@ -1493,7 +1495,7 @@ script_fu_interface (SFScript *script) gtk_widget_show (hbox); bbox = gtk_hbutton_box_new (); - gtk_button_box_set_spacing (GTK_BUTTON_BOX (bbox), 4); + gtk_box_set_spacing (GTK_BOX (bbox), 4); gtk_box_pack_start (GTK_BOX (hbox), bbox, FALSE, FALSE, 0); gtk_widget_show (bbox); @@ -1507,7 +1509,7 @@ script_fu_interface (SFScript *script) script); bbox = gtk_hbutton_box_new (); - gtk_button_box_set_spacing (GTK_BUTTON_BOX (bbox), 4); + gtk_box_set_spacing (GTK_BOX (bbox), 4); gtk_box_pack_end (GTK_BOX (hbox), bbox, FALSE, FALSE, 0); gtk_widget_show (bbox); @@ -1537,7 +1539,7 @@ script_fu_interface (SFScript *script) gtk_widget_show (hbox); sf_interface->status = gtk_entry_new (); - gtk_entry_set_editable (GTK_ENTRY (sf_interface->status), FALSE); + gtk_editable_set_editable (GTK_EDITABLE (sf_interface->status), FALSE); gtk_box_pack_start (GTK_BOX (hbox), sf_interface->status, TRUE, TRUE, 2); gtk_entry_set_text (GTK_ENTRY (sf_interface->status), sf_interface->window_title); @@ -1828,7 +1830,7 @@ script_fu_ok_callback (GtkWidget *widget, case SF_SPINNER: script->arg_values[i].sfa_adjustment.value = - gtk_spin_button_get_value_as_float (GTK_SPIN_BUTTON (sf_interface->args_widgets[i])); + gtk_spin_button_get_value (GTK_SPIN_BUTTON (sf_interface->args_widgets[i])); g_snprintf (buffer, sizeof (buffer), "%f", script->arg_values[i].sfa_adjustment.value); text = buffer; @@ -1879,7 +1881,8 @@ script_fu_ok_callback (GtkWidget *widget, menu_item = gtk_menu_get_active (GTK_MENU (gtk_option_menu_get_menu (GTK_OPTION_MENU (sf_interface->args_widgets[i])))); script->arg_values[i].sfa_option.history = - GPOINTER_TO_UINT (gtk_object_get_user_data (GTK_OBJECT (menu_item))); + GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (menu_item), + "gimp-item-data")); g_snprintf (buffer, sizeof (buffer), "%d", script->arg_values[i].sfa_option.history); text = buffer; @@ -1976,7 +1979,7 @@ script_fu_about_callback (GtkWidget *widget, 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, 200, 60); + gtk_widget_set_size_request (text_view, 200, 60); gtk_container_add (GTK_CONTAINER (scrolled_window), text_view); gtk_widget_show (text_view); diff --git a/plug-ins/script-fu/script-fu-server.c b/plug-ins/script-fu/script-fu-server.c index 7d17cb388c..5aaf9181a7 100644 --- a/plug-ins/script-fu/script-fu-server.c +++ b/plug-ins/script-fu/script-fu-server.c @@ -560,9 +560,9 @@ server_interface (void) NULL); - gtk_signal_connect (GTK_OBJECT (dlg), "destroy", - GTK_SIGNAL_FUNC (gtk_main_quit), - NULL); + g_signal_connect (G_OBJECT (dlg), "destroy", + G_CALLBACK (gtk_main_quit), + NULL); /* The table to hold port & logfile entries */ table = gtk_table_new (2, 2, FALSE); diff --git a/plug-ins/sel2path/sel2path.c b/plug-ins/sel2path/sel2path.c index 7267f46fdc..7a1ce972f0 100644 --- a/plug-ins/sel2path/sel2path.c +++ b/plug-ins/sel2path/sel2path.c @@ -29,18 +29,15 @@ #include "config.h" -#include - #include #include #include -#include -#include - -#include -#include +#include "libgimp/gimp.h" +#include "libgimp/gimpui.h" +#include "libgimpmath/gimpmath.h" +# #include "global.h" #include "types.h" #include "pxl-outline.h" @@ -342,11 +339,11 @@ sel2path_dialog (SELVALS *sels) NULL); - gtk_signal_connect (GTK_OBJECT (dlg), "destroy", - GTK_SIGNAL_FUNC (gtk_main_quit), - NULL); + g_signal_connect (G_OBJECT (dlg), "destroy", + G_CALLBACK (gtk_main_quit), + NULL); - table = dialog_create_selection_area(sels); + table = dialog_create_selection_area (sels); gtk_container_set_border_width (GTK_CONTAINER (table), 6); gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dlg)->vbox), table); gtk_widget_show (table); diff --git a/plug-ins/sel2path/sel2path_adv_dialog.c b/plug-ins/sel2path/sel2path_adv_dialog.c index 9cfb363f02..8478d10f39 100644 --- a/plug-ins/sel2path/sel2path_adv_dialog.c +++ b/plug-ins/sel2path/sel2path_adv_dialog.c @@ -27,11 +27,12 @@ * 0.1 First version. */ +#include "config.h" + #include #include #include - #include #include @@ -52,7 +53,8 @@ reset_adv_dialog (void) for (list = adjust_widgets; list; list = g_slist_next (list)) { widget = GTK_OBJECT (list->data); - value = (gdouble *) gtk_object_get_data (widget ,"default_value"); + value = (gdouble *) g_object_get_data (G_OBJECT (widget), + "default_value"); if (GTK_IS_ADJUSTMENT (widget)) { @@ -99,11 +101,11 @@ dialog_create_selection_area (SELVALS *sels) TRUE, 0, 0, "If two endpoints are closer than this," "they are made to be equal.", NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &sels->align_threshold); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &sels->align_threshold); adjust_widgets = g_slist_append (adjust_widgets, adj); - gtk_object_set_data (GTK_OBJECT (adj), "default_value", def_val (0.5)); + g_object_set_data (G_OBJECT (adj), "default_value", def_val (0.5)); adj = gimp_scale_entry_new (GTK_TABLE (table), 0, row++, "Corner Always Threshold:", SCALE_WIDTH, 0, @@ -114,11 +116,11 @@ dialog_create_selection_area (SELVALS *sels) "and successors is smaller than this, it's a corner, " "even if it's within `corner_surround' pixels of a " "point with a smaller angle.", NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &sels->corner_always_threshold); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &sels->corner_always_threshold); adjust_widgets = g_slist_append (adjust_widgets, adj); - gtk_object_set_data (GTK_OBJECT (adj), "default_value", def_val (60.0)); + g_object_set_data (G_OBJECT (adj), "default_value", def_val (60.0)); adj = gimp_scale_entry_new (GTK_TABLE (table), 0, row++, "Corner Surround:", SCALE_WIDTH, 0, @@ -127,11 +129,11 @@ dialog_create_selection_area (SELVALS *sels) TRUE, 0, 0, "Number of points to consider when determining if a " "point is a corner or not.", NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &sels->corner_surround); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &sels->corner_surround); adjust_widgets = g_slist_append (adjust_widgets, adj); - gtk_object_set_data (GTK_OBJECT (adj), "default_value", def_val (4.0)); + g_object_set_data (G_OBJECT (adj), "default_value", def_val (4.0)); adj = gimp_scale_entry_new (GTK_TABLE (table), 0, row++, "Corner Threshold:", SCALE_WIDTH, 0, @@ -141,11 +143,11 @@ dialog_create_selection_area (SELVALS *sels) "If a point, its predecessors, and its successors " "define an angle smaller than this, it's a corner.", NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &sels->corner_threshold); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &sels->corner_threshold); adjust_widgets = g_slist_append (adjust_widgets, adj); - gtk_object_set_data (GTK_OBJECT (adj), "default_value", def_val (100.0)); + g_object_set_data (G_OBJECT (adj), "default_value", def_val (100.0)); adj = gimp_scale_entry_new (GTK_TABLE (table), 0, row++, @@ -157,11 +159,11 @@ dialog_create_selection_area (SELVALS *sels) "unacceptable. If any pixel is further away " "than this from the fitted curve, we try again.", NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &sels->error_threshold); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &sels->error_threshold); adjust_widgets = g_slist_append (adjust_widgets, adj); - gtk_object_set_data (GTK_OBJECT (adj), "default_value", def_val (0.40)); + g_object_set_data (G_OBJECT (adj), "default_value", def_val (0.40)); adj = gimp_scale_entry_new (GTK_TABLE (table), 0, row++, "Filter Alternative Surround:", SCALE_WIDTH, 0, @@ -170,11 +172,11 @@ dialog_create_selection_area (SELVALS *sels) TRUE, 0, 0, "A second number of adjacent points to consider " "when filtering.", NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &sels->filter_alternative_surround); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &sels->filter_alternative_surround); adjust_widgets = g_slist_append (adjust_widgets, adj); - gtk_object_set_data (GTK_OBJECT (adj), "default_value", def_val (1.0)); + g_object_set_data (G_OBJECT (adj), "default_value", def_val (1.0)); adj = gimp_scale_entry_new (GTK_TABLE (table), 0, row++, @@ -186,11 +188,11 @@ dialog_create_selection_area (SELVALS *sels) "filter_surround and filter_alternative_surround " "points differ by more than this, use the one from " "filter_alternative_surround.", NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &sels->filter_epsilon); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &sels->filter_epsilon); adjust_widgets = g_slist_append (adjust_widgets, adj); - gtk_object_set_data (GTK_OBJECT (adj), "default_value", def_val (10.0)); + g_object_set_data (G_OBJECT (adj), "default_value", def_val (10.0)); adj = gimp_scale_entry_new (GTK_TABLE (table), 0, row++, "Filter Iteration Count:", SCALE_WIDTH, 0, @@ -202,11 +204,11 @@ dialog_create_selection_area (SELVALS *sels) "so --- can produce vastly better results. But if " "any points that ``should'' be corners aren't found, " "the curve goes to hell around that point.", NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &sels->filter_iteration_count); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &sels->filter_iteration_count); adjust_widgets = g_slist_append (adjust_widgets, adj); - gtk_object_set_data (GTK_OBJECT (adj), "default_value", def_val (4.0)); + g_object_set_data (G_OBJECT (adj), "default_value", def_val (4.0)); adj = gimp_scale_entry_new (GTK_TABLE (table), 0, row++, "Filter Percent:", SCALE_WIDTH, 0, @@ -215,11 +217,11 @@ dialog_create_selection_area (SELVALS *sels) TRUE, 0, 0, "To produce the new point, use the old point plus " "this times the neighbors.", NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &sels->filter_percent); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &sels->filter_percent); adjust_widgets = g_slist_append (adjust_widgets, adj); - gtk_object_set_data (GTK_OBJECT (adj), "default_value", def_val (0.33)); + g_object_set_data (G_OBJECT (adj), "default_value", def_val (0.33)); adj = gimp_scale_entry_new (GTK_TABLE (table), 0, row++, "Filter Secondary Surround:", SCALE_WIDTH, 0, @@ -229,11 +231,11 @@ dialog_create_selection_area (SELVALS *sels) "Number of adjacent points to consider if " "`filter_surround' points defines a straight line.", NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &sels->filter_secondary_surround); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &sels->filter_secondary_surround); adjust_widgets = g_slist_append (adjust_widgets, adj); - gtk_object_set_data (GTK_OBJECT (adj), "default_value", def_val (3.0)); + g_object_set_data (G_OBJECT (adj), "default_value", def_val (3.0)); adj = gimp_scale_entry_new (GTK_TABLE (table), 0, row++, "Filter Surround:", SCALE_WIDTH, 0, @@ -242,11 +244,11 @@ dialog_create_selection_area (SELVALS *sels) TRUE, 0, 0, "Number of adjacent points to consider when filtering.", NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &sels->filter_surround); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &sels->filter_surround); adjust_widgets = g_slist_append (adjust_widgets, adj); - gtk_object_set_data (GTK_OBJECT (adj), "default_value", def_val (2.0)); + g_object_set_data (G_OBJECT (adj), "default_value", def_val (2.0)); check = gtk_check_button_new_with_label ("Keep Knees"); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), sels->keep_knees); @@ -255,12 +257,12 @@ dialog_create_selection_area (SELVALS *sels) gimp_help_set_help_data (GTK_WIDGET (check), "Says whether or not to remove ``knee'' " "points after finding the outline.", NULL); - gtk_signal_connect (GTK_OBJECT (check), "toggled", - GTK_SIGNAL_FUNC (gimp_toggle_button_update), - &sels->keep_knees); + g_signal_connect (G_OBJECT (check), "toggled", + G_CALLBACK (gimp_toggle_button_update), + &sels->keep_knees); gtk_widget_show (check); adjust_widgets = g_slist_append (adjust_widgets, check); - gtk_object_set_data (GTK_OBJECT (check), "default_value", def_val ((gdouble)FALSE)); + g_object_set_data (G_OBJECT (check), "default_value", def_val ((gdouble)FALSE)); row++; adj = gimp_scale_entry_new (GTK_TABLE (table), 0, row++, @@ -273,11 +275,11 @@ dialog_create_selection_area (SELVALS *sels) "be changed back to a curve. This is weighted by the " "square of the curve length, to make shorter curves " "more likely to be reverted.", NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &sels->line_reversion_threshold); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &sels->line_reversion_threshold); adjust_widgets = g_slist_append (adjust_widgets, adj); - gtk_object_set_data (GTK_OBJECT (adj), "default_value", def_val (0.01)); + g_object_set_data (G_OBJECT (adj), "default_value", def_val (0.01)); adj = gimp_scale_entry_new (GTK_TABLE (table), 0, row++, "Line Threshold:", SCALE_WIDTH, 0, @@ -287,11 +289,11 @@ dialog_create_selection_area (SELVALS *sels) "How many pixels (on the average) a spline can " "diverge from the line determined by its endpoints " "before it is changed to a straight line.", NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &sels->line_threshold); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &sels->line_threshold); adjust_widgets = g_slist_append (adjust_widgets, adj); - gtk_object_set_data (GTK_OBJECT (adj), "default_value", def_val (0.5)); + g_object_set_data (G_OBJECT (adj), "default_value", def_val (0.5)); adj = gimp_scale_entry_new (GTK_TABLE (table), 0, row++, "Reparametrize Improvement:", SCALE_WIDTH, 0, @@ -301,11 +303,11 @@ dialog_create_selection_area (SELVALS *sels) "If reparameterization doesn't improve the fit by this " "much percent, stop doing it. ""Amount of error at which " "it is pointless to reparameterize.", NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &sels->reparameterize_improvement); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &sels->reparameterize_improvement); adjust_widgets = g_slist_append (adjust_widgets, adj); - gtk_object_set_data (GTK_OBJECT (adj), "default_value", def_val (0.01)); + g_object_set_data (G_OBJECT (adj), "default_value", def_val (0.01)); adj = gimp_scale_entry_new (GTK_TABLE (table), 0, row++, "Reparametrize Threshold:", SCALE_WIDTH, 0, @@ -318,11 +320,11 @@ dialog_create_selection_area (SELVALS *sels) "The initial fit is not good enough for the Newton-Raphson " "iteration to improve it. It may be that it would be better " "to detect the cases where we didn't find any corners.", NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &sels->reparameterize_threshold); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &sels->reparameterize_threshold); adjust_widgets = g_slist_append (adjust_widgets, adj); - gtk_object_set_data (GTK_OBJECT (adj), "default_value", def_val (1.0)); + g_object_set_data (G_OBJECT (adj), "default_value", def_val (1.0)); adj = gimp_scale_entry_new (GTK_TABLE (table), 0, row++, "Subdivide Search:", SCALE_WIDTH, 0, @@ -331,11 +333,11 @@ dialog_create_selection_area (SELVALS *sels) TRUE, 0, 0, "Percentage of the curve away from the worst point " "to look for a better place to subdivide.", NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &sels->subdivide_search); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &sels->subdivide_search); adjust_widgets = g_slist_append (adjust_widgets, adj); - gtk_object_set_data (GTK_OBJECT (adj), "default_value", def_val (0.1)); + g_object_set_data (G_OBJECT (adj), "default_value", def_val (0.1)); adj = gimp_scale_entry_new (GTK_TABLE (table), 0, row++, "Subdivide Surround:", SCALE_WIDTH, 0, @@ -345,11 +347,11 @@ dialog_create_selection_area (SELVALS *sels) "Number of points to consider when deciding whether " "a given point is a better place to subdivide.", NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &sels->subdivide_surround); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &sels->subdivide_surround); adjust_widgets = g_slist_append (adjust_widgets, adj); - gtk_object_set_data (GTK_OBJECT (adj), "default_value", def_val (4.0)); + g_object_set_data (G_OBJECT (adj), "default_value", def_val (4.0)); adj = gimp_scale_entry_new (GTK_TABLE (table), 0, row++, "Subdivide Threshold:", SCALE_WIDTH, 0, @@ -359,11 +361,11 @@ dialog_create_selection_area (SELVALS *sels) "How many pixels a point can diverge from a straight " "line and still be considered a better place to " "subdivide.", NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &sels->subdivide_threshold); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &sels->subdivide_threshold); adjust_widgets = g_slist_append (adjust_widgets, adj); - gtk_object_set_data (GTK_OBJECT (adj), "default_value", def_val (0.03)); + g_object_set_data (G_OBJECT (adj), "default_value", def_val (0.03)); adj = gimp_scale_entry_new (GTK_TABLE (table), 0, row++, "Tangent Surround:", SCALE_WIDTH, 0, @@ -373,13 +375,13 @@ dialog_create_selection_area (SELVALS *sels) "Number of points to look at on either side of a " "point when computing the approximation to the " "tangent at that point.", NULL); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &sels->tangent_surround); + g_signal_connect (G_OBJECT (adj), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &sels->tangent_surround); adjust_widgets = g_slist_append (adjust_widgets, adj); - gtk_object_set_data (GTK_OBJECT (adj), "default_value", def_val (3.0)); + g_object_set_data (G_OBJECT (adj), "default_value", def_val (3.0)); - return GTK_WIDGET(table); + return GTK_WIDGET (table); } diff --git a/plug-ins/sgi/sgi.c b/plug-ins/sgi/sgi.c index b284af02c1..959ffb4a33 100644 --- a/plug-ins/sgi/sgi.c +++ b/plug-ins/sgi/sgi.c @@ -42,10 +42,9 @@ #include #include -#include "libgimp/stdplugins-intl.h" - #include "sgi.h" /* SGI image library definitions */ +#include "libgimp/stdplugins-intl.h" /* @@ -60,16 +59,16 @@ */ static void query (void); -static void run (gchar *name, - gint nparams, +static void run (gchar *name, + gint nparams, GimpParam *param, - gint *nreturn_vals, + gint *nreturn_vals, GimpParam **return_vals); -static gint32 load_image (gchar *filename); -static gint save_image (gchar *filename, - gint32 image_ID, - gint32 drawable_ID); +static gint32 load_image (gchar *filename); +static gint save_image (gchar *filename, + gint32 image_ID, + gint32 drawable_ID); static gint save_dialog (void); @@ -155,17 +154,17 @@ query (void) } static void -run (gchar *name, - gint nparams, +run (gchar *name, + gint nparams, GimpParam *param, - gint *nreturn_vals, + gint *nreturn_vals, GimpParam **return_vals) { - static GimpParam values[2]; - GimpRunMode run_mode; - GimpPDBStatusType status = GIMP_PDB_SUCCESS; - gint32 image_ID; - gint32 drawable_ID; + static GimpParam values[2]; + GimpRunMode run_mode; + GimpPDBStatusType status = GIMP_PDB_SUCCESS; + gint32 image_ID; + gint32 drawable_ID; GimpExportReturnType export = GIMP_EXPORT_CANCEL; run_mode = param[0].data.d_int32; @@ -204,9 +203,9 @@ run (gchar *name, case GIMP_RUN_WITH_LAST_VALS: gimp_ui_init ("sgi", FALSE); export = gimp_export_image (&image_ID, &drawable_ID, "SGI", - (GIMP_EXPORT_CAN_HANDLE_RGB | + (GIMP_EXPORT_CAN_HANDLE_RGB | GIMP_EXPORT_CAN_HANDLE_GRAY | - GIMP_EXPORT_CAN_HANDLE_ALPHA )); + GIMP_EXPORT_CAN_HANDLE_ALPHA)); if (export == GIMP_EXPORT_CANCEL) { values[0].data.d_status = GIMP_PDB_CANCEL; @@ -508,7 +507,7 @@ save_image (gchar *filename, drawable->height, FALSE, FALSE); zsize = 0; - switch (gimp_drawable_type(drawable_ID)) + switch (gimp_drawable_type (drawable_ID)) { case GIMP_GRAY_IMAGE : zsize = 1; @@ -633,31 +632,33 @@ save_dialog (void) GTK_WIN_POS_MOUSE, FALSE, FALSE, FALSE, - GTK_STOCK_OK, save_ok_callback, - NULL, NULL, NULL, TRUE, FALSE, GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, + GTK_STOCK_OK, save_ok_callback, + NULL, NULL, NULL, TRUE, FALSE, + NULL); - gtk_signal_connect (GTK_OBJECT (dlg), "destroy", - GTK_SIGNAL_FUNC (gtk_main_quit), - NULL); + g_signal_connect (G_OBJECT (dlg), "destroy", + G_CALLBACK (gtk_main_quit), + NULL); frame = gimp_radio_group_new2 (TRUE, _("Compression Type"), G_CALLBACK (gimp_radio_button_update), - &compression, (gpointer) compression, + &compression, + GINT_TO_POINTER (compression), _("No Compression"), - (gpointer) SGI_COMP_NONE, NULL, + GINT_TO_POINTER (SGI_COMP_NONE), NULL, _("RLE Compression"), - (gpointer) SGI_COMP_RLE, NULL, + GINT_TO_POINTER (SGI_COMP_RLE), NULL, _("Aggressive RLE\n(Not Supported by SGI)"), - (gpointer) SGI_COMP_ARLE, NULL, + GINT_TO_POINTER (SGI_COMP_ARLE), NULL, NULL); - gtk_container_set_border_width (GTK_CONTAINER(frame), 6); + gtk_container_set_border_width (GTK_CONTAINER (frame), 6); gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), frame, TRUE, TRUE, 0); gtk_widget_show (frame); diff --git a/plug-ins/webbrowser/webbrowser.c b/plug-ins/webbrowser/webbrowser.c index 6e493ee77d..31e5102dd7 100644 --- a/plug-ins/webbrowser/webbrowser.c +++ b/plug-ins/webbrowser/webbrowser.c @@ -277,16 +277,18 @@ open_url_dialog (void) _("About"), about_callback, NULL, NULL, NULL, FALSE, FALSE, - GTK_STOCK_OK, ok_callback, - NULL, NULL, NULL, TRUE, FALSE, + GTK_STOCK_CANCEL, gtk_widget_destroy, NULL, 1, NULL, FALSE, TRUE, + GTK_STOCK_OK, ok_callback, + NULL, NULL, NULL, TRUE, FALSE, + NULL); - gtk_signal_connect (GTK_OBJECT (dlg), "destroy", - GTK_SIGNAL_FUNC (gtk_main_quit), - NULL); + g_signal_connect (G_OBJECT (dlg), "destroy", + G_CALLBACK (gtk_main_quit), + NULL); /* table */ table = gtk_table_new (2, 2, FALSE); @@ -298,15 +300,15 @@ open_url_dialog (void) /* URL */ entry = gtk_entry_new (); - gtk_widget_set_usize (entry, 200, 0); + gtk_widget_set_size_request (entry, 200, 0); g_snprintf (buffer, sizeof (buffer), "%s", url_info.url); gtk_entry_set_text (GTK_ENTRY (entry), buffer); gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, _("URL:"), 1.0, 0.5, entry, 1, FALSE); - gtk_signal_connect (GTK_OBJECT (entry), "changed", - GTK_SIGNAL_FUNC (url_callback), - &url_info.url); + g_signal_connect (G_OBJECT (entry), "changed", + G_CALLBACK (url_callback), + &url_info.url); gtk_widget_show (entry); /* Window */ @@ -316,25 +318,27 @@ open_url_dialog (void) hbox, 1, FALSE); button = gtk_radio_button_new_with_label (NULL, _("New")); - group = gtk_radio_button_group (GTK_RADIO_BUTTON (button)); + group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (button)); if (url_info.new_window == OPEN_URL_NEW_WINDOW) gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE); gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (button), "toggled", - GTK_SIGNAL_FUNC (new_window_callback), - (gpointer) OPEN_URL_NEW_WINDOW); gtk_widget_show (button); + g_signal_connect (G_OBJECT (button), "toggled", + G_CALLBACK (new_window_callback), + (gpointer) OPEN_URL_NEW_WINDOW); + button = gtk_radio_button_new_with_label (group, _("Current")); - group = gtk_radio_button_group (GTK_RADIO_BUTTON (button)); + group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (button)); if (url_info.new_window == OPEN_URL_CURRENT_WINDOW) gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE); gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (button), "toggled", - GTK_SIGNAL_FUNC (new_window_callback), - (gpointer) OPEN_URL_CURRENT_WINDOW); gtk_widget_show (button); + g_signal_connect (G_OBJECT (button), "toggled", + G_CALLBACK (new_window_callback), + (gpointer) OPEN_URL_CURRENT_WINDOW); + gtk_widget_show (dlg); gtk_main (); diff --git a/plug-ins/xjt/xjt.c b/plug-ins/xjt/xjt.c index 064135da31..af3669ec8b 100644 --- a/plug-ins/xjt/xjt.c +++ b/plug-ins/xjt/xjt.c @@ -794,9 +794,9 @@ save_dialog (void) NULL); - gtk_signal_connect (GTK_OBJECT (dlg), "destroy", - GTK_SIGNAL_FUNC (gtk_main_quit), - NULL); + g_signal_connect (G_OBJECT (dlg), "destroy", + G_CALLBACK (gtk_main_quit), + NULL); /* parameter settings */ frame = gtk_frame_new (_("Parameter Settings")); @@ -814,38 +814,40 @@ save_dialog (void) gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), jsvals.optimize); gtk_table_attach (GTK_TABLE (table), toggle, 0, 3, 0, 1, GTK_FILL, 0, 0, 0); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - GTK_SIGNAL_FUNC (gimp_toggle_button_update), - &jsvals.optimize); gtk_widget_show (toggle); + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (gimp_toggle_button_update), + &jsvals.optimize); + toggle = gtk_check_button_new_with_label (_("Clear Transparent")); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), jsvals.clr_transparent); gtk_table_attach (GTK_TABLE (table), toggle, 0, 3, 1, 2, GTK_FILL, 0, 0, 0); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", - GTK_SIGNAL_FUNC (gimp_toggle_button_update), - &jsvals.clr_transparent); gtk_widget_show (toggle); + g_signal_connect (G_OBJECT (toggle), "toggled", + G_CALLBACK (gimp_toggle_button_update), + &jsvals.clr_transparent); + scale_data = gimp_scale_entry_new (GTK_TABLE (table), 0, 2, _("Quality:"), SCALE_WIDTH, 0, jsvals.quality, 0.0, 1.0, 0.01, 0.11, 2, TRUE, 0, 0, NULL, NULL); - gtk_signal_connect (GTK_OBJECT (scale_data), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &jsvals.quality); + g_signal_connect (G_OBJECT (scale_data), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &jsvals.quality); scale_data = gimp_scale_entry_new (GTK_TABLE (table), 0, 3, _("Smoothing:"), SCALE_WIDTH, 0, jsvals.smoothing, 0.0, 1.0, 0.01, 0.1, 2, TRUE, 0, 0, NULL, NULL); - gtk_signal_connect (GTK_OBJECT (scale_data), "value_changed", - GTK_SIGNAL_FUNC (gimp_double_adjustment_update), - &jsvals.smoothing); + g_signal_connect (G_OBJECT (scale_data), "value_changed", + G_CALLBACK (gimp_double_adjustment_update), + &jsvals.smoothing); gtk_widget_show (frame); gtk_widget_show (table); diff --git a/themes/Default/Makefile.am b/themes/Default/Makefile.am index 8a0cd8c3bf..e9f526c0ff 100644 --- a/themes/Default/Makefile.am +++ b/themes/Default/Makefile.am @@ -50,6 +50,15 @@ STOCK_VARIABLES = @STRIP_BEGIN@ \ stock_button_selection_intersect \ $(srcdir)/images/stock-button-selection-intersect.png \ \ + stock_button_hchain \ + $(srcdir)/images/stock-button-hchain.png \ + stock_button_hchain_broken \ + $(srcdir)/images/stock-button-hchain-broken.png \ + stock_button_vchain \ + $(srcdir)/images/stock-button-vchain.png \ + stock_button_vchain_broken \ + $(srcdir)/images/stock-button-vchain-broken.png \ + \ stock_menu_navigation \ $(srcdir)/images/stock-menu-navigation.png \ stock_menu_qmask_off \ diff --git a/themes/Default/images/Makefile.am b/themes/Default/images/Makefile.am index 50b00946d3..58fa75582f 100644 --- a/themes/Default/images/Makefile.am +++ b/themes/Default/images/Makefile.am @@ -25,6 +25,10 @@ STOCK_IMAGES = @STRIP_BEGIN@ \ stock-button-selection-add.png \ stock-button-selection-subtract.png \ stock-button-selection-intersect.png \ + stock-button-hchain.png \ + stock-button-hchain-broken.png \ + stock-button-vchain.png \ + stock-button-vchain-broken.png \ stock-menu-navigation.png \ stock-menu-qmask-off.png \ stock-menu-qmask-on.png \ diff --git a/themes/Default/images/stock-button-hchain-broken.png b/themes/Default/images/stock-button-hchain-broken.png new file mode 100644 index 0000000000000000000000000000000000000000..2e961a3e7956e25846ebf90a491f10d6d10d8b33 GIT binary patch literal 325 zcmeAS@N?(olHy`uVBq!ia0vp^5|gW!U_%O``R3p^r= z85p>QK$!8;-MT+OLG}_)Usv{vJVFd+ymx>9`VJJj-rONmD{*#E^{fpT%>WRZ1zEk%Zeda1wAKyF;kqRciPBjxp2k2>nAmr3bd_O zU#Y|2=fQVu`6K7VGiL=o)fpRR-oNIk5-YP_kj2};_}S;kmgC`f!Dv^la9FEvF)_k49U!0j33(dr7rzr;aBr%zWq+) RzdO)(44$rjF6*2UngB2jgBSn+ literal 0 HcmV?d00001 diff --git a/themes/Default/images/stock-button-hchain.png b/themes/Default/images/stock-button-hchain.png new file mode 100644 index 0000000000000000000000000000000000000000..5bc2eedcacf36ced3749e623c07dd9c813823b29 GIT binary patch literal 302 zcmeAS@N?(olHy`uVBq!ia0vp^5|gW!U_%O``R3p^r= z85p>QK$!8;-MT+OLG}_)Usv{vJVLBG`ul2|m4QOLJzX3_D&{07EHF%Pd1hd^@z3$4 zAMWqBPg&V&JYz=0KX(@wgD+pd8ttk0$mDwX-(Pl#uI}!KQZs>4-@kn`TCsAak%YAL z;uW^l-*lSSua|FYmH=tXzq{+Ly|6I1>yM+|)BjJbJ>Hblxn+wa}0^Cu~WJ9bwe zcq%C&Au-Rcw(DU~2kVM`?jH}fa*JoaZm#_N%;?Mv!`6dm&Ir9bwcKCcu;%YCVP(FA oeNOz1+qQ*?7|vR*G>e(xp+&>v+dL~)1HHlE>FVdQ&MBb@0N=rVZ2$lO literal 0 HcmV?d00001 diff --git a/themes/Default/images/stock-button-vchain-broken.png b/themes/Default/images/stock-button-vchain-broken.png new file mode 100644 index 0000000000000000000000000000000000000000..8ef1363ce98d44add645aa5f74b3bd69f7342b66 GIT binary patch literal 333 zcmeAS@N?(olHy`uVBq!ia0vp^oIotW!3HEXq_67%DYhhUcNd2LAh=-f^2s121s;*b z3=G^tAk28_ZrvZCAbW|YuPggS9w7#E-T!^B>wrSHJY5_^D&}0B?8wz@AmF;+nNP8T z$MHqz5_OG7zIVhI-gDaijmc?`lj0<~1Fj1#?#{U4qWyN0Jd!)5sI0Xt|nBLS-V|8(!i7NoM_bRa-sjS(VHd&y^?nAPHYlpSdhD3S~ESo^ln7^YM*1FBCdXa#Fd0}QqR||&EWjOF4N($L32^2 zf1pT2@2O24r*G^$cS6Ll@A22!WxRh`X3op)?J}6XYFC1U$d+pyhXrD~ zJLmcI-e!-2K#?^e=e@q_q#lkeOM0$2@xiKH1`{{9ziw|m(U4hH;+3&>zo%16bcRHm zz>9yIy}5la3o}f3p3dNK`<_`)-L6TSHp*7b^a(GNvEIl0*O+@PYxUC(7U_d&BB_yw zqE82XxOD$Y3X8huqiilAIhL6}bJn`f@Q#f)>|@??tz!{K?Da^EKfm84