app/gimpprogress.c app/nav_window.c app/ops_buttons.c app/undo_history.c
2001-12-29 Michael Natterer <mitch@gimp.org> * app/gimpprogress.c * app/nav_window.c * app/ops_buttons.c * app/undo_history.c * app/display/gimpdisplayshell.c * app/gui/about-dialog.c * app/gui/brush-editor.c * app/gui/channels-commands.c * app/gui/color-area.c * app/gui/color-notebook.c * app/gui/color-select.c * app/gui/colormap-dialog.c * app/gui/convert-dialog.c * app/gui/device-status-dialog.c * app/gui/file-new-dialog.c * app/gui/file-open-dialog.c * app/gui/file-save-dialog.c * app/gui/gradient-editor.c * app/gui/info-dialog.c * app/gui/layers-commands.c * app/gui/module-browser.c * app/gui/offset-dialog.c * app/gui/palette-editor.c * app/gui/palettes-commands.c * app/gui/paths-dialog.c * app/gui/qmask-commands.c * app/gui/resize-dialog.c * app/gui/resolution-calibrate-dialog.c * app/gui/splash.c * app/gui/tips-dialog.c * app/gui/toolbox.c * app/gui/user-install-dialog.c * app/tools/gimpbrightnesscontrasttool.c * app/tools/gimpbycolorselecttool.c * app/tools/gimpcolorbalancetool.c * app/tools/gimpcolorpickertool.c * app/tools/gimpcroptool.c * app/tools/gimpcurvestool.c * app/tools/gimphuesaturationtool.c * app/tools/gimpinktool.c * app/tools/gimplevelstool.c * app/tools/gimpposterizetool.c * app/tools/gimprotatetool.c * app/tools/gimpthresholdtool.c * app/tools/paint_options.c * app/tools/selection_options.c * app/widgets/gimpchannellistview.c * app/widgets/gimpcolorpanel.c * app/widgets/gimpcomponentlistitem.c * app/widgets/gimpconstrainedhwrapbox.c * app/widgets/gimpcontainergridview.c * app/widgets/gimpcontainerlistview.c * app/widgets/gimpcontainermenuimpl.c * app/widgets/gimpdialogfactory.c * app/widgets/gimpdnd.c * app/widgets/gimpdock.c * app/widgets/gimpdockbook.c * app/widgets/gimpdrawablelistitem.c * app/widgets/gimpdrawablelistview.c * app/widgets/gimpfontselection-dialog.c * app/widgets/gimphistogramview.c * app/widgets/gimpitemfactory.c * app/widgets/gimplayerlistitem.c * app/widgets/gimplistitem.[ch] * app/widgets/gimpmenuitem.c * app/widgets/gimppreview.[ch] * app/widgets/gtkhwrapbox.c * app/widgets/gtkvwrapbox.c * app/widgets/gtkwrapbox.c * libgimp/gimpbrushmenu.c * libgimp/gimpexport.c * libgimp/gimpgradientmenu.c * libgimp/gimpmenu.c * libgimp/gimppatternmenu.c * libgimpwidgets/gimpbutton.c * libgimpwidgets/gimpchainbutton.[ch] * libgimpwidgets/gimpcolorarea.h * libgimpwidgets/gimpcolorbutton.c * libgimpwidgets/gimpfileselection.c * libgimpwidgets/gimphelpui.c * libgimpwidgets/gimpoffsetarea.c * libgimpwidgets/gimppatheditor.c * libgimpwidgets/gimppixmap.h * libgimpwidgets/gimpquerybox.c * libgimpwidgets/gimpstock.[ch] * libgimpwidgets/gimpwidgets.h * plug-ins/FractalExplorer/Dialogs.c * plug-ins/FractalExplorer/Events.c * plug-ins/FractalExplorer/FractalExplorer.c * plug-ins/Lighting/lighting_ui.c * plug-ins/MapObject/mapobject_ui.c * plug-ins/bmp/bmpwrite.c * plug-ins/dbbrowser/dbbrowser_utils.c * plug-ins/fits/fits.c * plug-ins/flame/flame.c * plug-ins/fp/fp_gtk.c * plug-ins/fp/fp_misc.c * plug-ins/gfig/gfig.c * plug-ins/gflare/gflare.c * plug-ins/gfli/gfli.c * plug-ins/gimpressionist/*.c * plug-ins/imagemap/*.[ch] * plug-ins/maze/maze_face.c * plug-ins/mosaic/mosaic.c * plug-ins/pagecurl/pagecurl.c * plug-ins/print/print_gimp.h * plug-ins/rcm/rcm_callback.c * plug-ins/rcm/rcm_dialog.c * plug-ins/rcm/rcm_misc.c * plug-ins/script-fu/script-fu-console.c * plug-ins/script-fu/script-fu-scripts.c * plug-ins/script-fu/script-fu-server.c * plug-ins/sel2path/sel2path.c * plug-ins/sel2path/sel2path_adv_dialog.c * plug-ins/sgi/sgi.c * plug-ins/webbrowser/webbrowser.c * plug-ins/xjt/xjt.c * plug-ins/common/[A-n]*.c: compile with GTK_DISABLE_DEPRECATED defined. Not everything is fully ported yet, had to #undef GTK_DISABLE_DEPRECATED in many places and added #warnings when doing so. * pixmaps/Makefile.am * pixmaps/chain.xpm: removed. * themes/Default/Makefile.am * themes/Default/images/Makefile.am * themes/Default/images/stock-button-hchain-broken.png * themes/Default/images/stock-button-hchain.png * themes/Default/images/stock-button-vchain-broken.png * themes/Default/images/stock-button-vchain.png: new stock icons.
This commit is contained in:
committed by
Michael Natterer
parent
64424f6c1e
commit
14d0a3ff07
@ -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);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user