diff options
| author | Guy Harris <guy@alum.mit.edu> | 2004-02-12 22:24:28 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2004-02-12 22:24:28 +0000 |
| commit | 90cf9a6b7b850a9ddd69baf1eb8535dde06a3510 (patch) | |
| tree | bff8e905f0757abd0edb742830da25baaac19e01 /gtk/main.c | |
| parent | 26536d7a419e04261f04035b287a050889e77a98 (diff) | |
The HIG's and/or GUI toolkit documentation for:
Mac OS X
GNOME
Qt
KDE
Windows
all indicate that {message,alert} boxes are modal, at least for the
window to which they apply. (Presumably the idea is that not forcing
the user to pay attention to the alert box, and allowing more than one
alert box to be up for a given window, causes more problems than not
letting the user do stuff to that window in order to figure out what the
underlying problem is or figure out what to do to fix it - the message
should be sufficient, in most if not all cases, to let you know what the
problem is.)
Make "simple_dialog()" unconditionally make the alert box modal, and get
rid of ESD_TYPE_MODAL. XXX - we need to make it possible to make an
alert box modal for a given window, rather than just the top-level
window.
svn path=/trunk/; revision=10051
Diffstat (limited to 'gtk/main.c')
| -rw-r--r-- | gtk/main.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/gtk/main.c b/gtk/main.c index cecc6dcbb0..3bf04a8246 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -1,6 +1,6 @@ /* main.c * - * $Id: main.c,v 1.394 2004/02/11 09:19:54 guy Exp $ + * $Id: main.c,v 1.395 2004/02/12 22:24:28 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -1211,8 +1211,7 @@ main_window_delete_event_cb(GtkWidget *widget _U_, GdkEvent *event _U_, gpointer if((cfile.state != FILE_CLOSED) && !cfile.user_saved) { /* user didn't saved his current file, ask him */ - dialog = simple_dialog(ESD_TYPE_CONFIRMATION | ESD_TYPE_MODAL, - ESD_BTNS_YES_NO_CANCEL, + dialog = simple_dialog(ESD_TYPE_CONFIRMATION, ESD_BTNS_YES_NO_CANCEL, PRIMARY_TEXT_START "Save capture file before program quit?" PRIMARY_TEXT_END "\n\n" "If you quit the program without saving, your capture data will be discarded."); simple_dialog_set_cb(dialog, file_quit_answered_cb, NULL); @@ -1333,8 +1332,7 @@ file_quit_cmd_cb(GtkWidget *widget _U_, gpointer data _U_) if((cfile.state != FILE_CLOSED) && !cfile.user_saved) { /* user didn't saved his current file, ask him */ - dialog = simple_dialog(ESD_TYPE_CONFIRMATION | ESD_TYPE_MODAL, - ESD_BTNS_YES_NO_CANCEL, + dialog = simple_dialog(ESD_TYPE_CONFIRMATION, ESD_BTNS_YES_NO_CANCEL, PRIMARY_TEXT_START "Save capture file before program quit?" PRIMARY_TEXT_END "\n\n" "If you quit the program without saving, your capture data will be discarded."); simple_dialog_set_cb(dialog, file_quit_answered_cb, NULL); @@ -1765,7 +1763,7 @@ GtkSelectionData *selection_data, guint info, guint t _U_, gpointer data _U_) /* ask the user to save it's current capture file first */ if((cfile.state != FILE_CLOSED) && !cfile.user_saved) { /* user didn't saved his current file, ask him */ - dialog = simple_dialog(ESD_TYPE_CONFIRMATION | ESD_TYPE_MODAL, + dialog = simple_dialog(ESD_TYPE_CONFIRMATION, ESD_BTNS_YES_NO_CANCEL, PRIMARY_TEXT_START "Save capture file before opening a new one?" PRIMARY_TEXT_END "\n\n" "If you open a new capture file without saving, your current capture data will be discarded."); |