* gmain.c (x_init_dlg): Don't install handler for "delete_event"

if DLG_GNOME_APP flag is set.
* gview.c (gview_quit): Check view_ok_to_quit().
(quit_view): Likewise.
This commit is contained in:
Pavel Roskin 2001-07-29 02:32:30 +00:00
parent 813cf40ac4
commit 8f09a060e0
3 changed files with 16 additions and 6 deletions

View File

@ -1,3 +1,10 @@
2001-07-28 Pavel Roskin <proski@gnu.org>
* gmain.c (x_init_dlg): Don't install handler for "delete_event"
if DLG_GNOME_APP flag is set.
* gview.c (gview_quit): Check view_ok_to_quit().
(quit_view): Likewise.
2001-07-27 Pavel Roskin <proski@gnu.org>
* gmc-chargrid.c: Try 14-point clean and monospaced fonts

View File

@ -330,8 +330,10 @@ x_init_dlg (Dlg_head *h)
gtk_widget_show (GTK_WIDGET (h->wdata));
}
gtk_signal_connect (GTK_OBJECT ((void *)h->wdata), "delete_event",
GTK_SIGNAL_FUNC (gnome_dlg_send_destroy), h);
if (!(h->grided & DLG_GNOME_APP)) {
gtk_signal_connect (GTK_OBJECT ((void *)h->wdata), "delete_event",
GTK_SIGNAL_FUNC (gnome_dlg_send_destroy), h);
}
if (h->current)
x_focus_widget (h->current);

View File

@ -250,8 +250,10 @@ gview_status (WView *view)
static void
gview_quit (GtkWidget *widget, WView *view)
{
dlg_run_done (view->widget.parent);
destroy_dlg (view->widget.parent);
if (view_ok_to_quit (view)) {
dlg_run_done (view->widget.parent);
destroy_dlg (view->widget.parent);
}
}
static void
@ -346,8 +348,7 @@ GnomeUIInfo gview_top_menu [] = {
static int
quit_view (GtkWidget *widget, GdkEvent *event, WView *view)
{
gview_quit (widget, view);
return TRUE;
return !view_ok_to_quit (view);
}
int