"delete_event" is an event, so its handler takes three arguments, not

two, and it returns a gboolean.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@11133 f5534014-38df-0310-8fa8-9805f1628bb7

4 files changed, 65 insertions, 43 deletions

diff --git a/gtk/dfilter_expr_dlg.c b/gtk/dfilter_expr_dlg.c
index f6710430d7..8a1e87c121 100644
--- a/gtk/dfilter_expr_dlg.c
+++ b/gtk/dfilter_expr_dlg.c
@@ -7,7 +7,7 @@
  * Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com> and
  * Guy Harris <guy@alum.mit.edu>
  *
- * $Id: dfilter_expr_dlg.c,v 1.58 2004/06/10 09:46:26 guy Exp $
+ * $Id: dfilter_expr_dlg.c,v 1.59 2004/06/10 10:09:58 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -1019,6 +1019,15 @@ dfilter_expr_dlg_accept_cb(GtkWidget *w, gpointer filter_te_arg)
 #endif
 }
 
+/* Treat this as a cancel, by calling "prefs_main_cancel_cb()" */
+static gboolean
+dfilter_expr_dlg_delete_event_cb(GtkWidget *w _U_, GdkEvent *event _U_,
+                                 gpointer parent_w)
+{
+	dfilter_expr_dlg_cancel_cb(NULL, parent_w);
+	return FALSE;
+}
+
 static void
 dfilter_expr_dlg_cancel_cb(GtkWidget *w _U_, gpointer parent_w)
 {
@@ -1474,7 +1483,8 @@ dfilter_expr_dlg_new(GtkWidget *filter_te)
                                   GTK_SELECTION_BROWSE);
 #endif
 
-    SIGNAL_CONNECT(window, "delete_event", dfilter_expr_dlg_cancel_cb, window);
+    SIGNAL_CONNECT(window, "delete_event", dfilter_expr_dlg_delete_event_cb,
+                   window);
 
     /*
      * Catch the "destroy" signal on our top-level window, and,
diff --git a/gtk/prefs_dlg.c b/gtk/prefs_dlg.c
index d5e6f3b032..6e73d31a4c 100644
--- a/gtk/prefs_dlg.c
+++ b/gtk/prefs_dlg.c
@@ -1,7 +1,7 @@
 /* prefs_dlg.c
  * Routines for handling preferences
  *
- * $Id: prefs_dlg.c,v 1.86 2004/05/27 21:42:54 guy Exp $
+ * $Id: prefs_dlg.c,v 1.87 2004/06/10 10:09:58 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -62,7 +62,7 @@ static void     prefs_main_ok_cb(GtkWidget *, gpointer);
 static void     prefs_main_apply_cb(GtkWidget *, gpointer);
 static void     prefs_main_save_cb(GtkWidget *, gpointer);
 static void     prefs_main_cancel_cb(GtkWidget *, gpointer);
-static gboolean prefs_main_delete_cb(GtkWidget *, gpointer);
+static gboolean prefs_main_delete_event_cb(GtkWidget *, GdkEvent *, gpointer);
 static void     prefs_main_destroy_cb(GtkWidget *, gpointer);
 #if GTK_MAJOR_VERSION < 2
 static void	prefs_tree_select_cb(GtkCTree *, GtkCTreeNode *, gint,
@@ -610,7 +610,7 @@ prefs_cb(GtkWidget *w _U_, gpointer dummy _U_)
 
   gtk_widget_grab_default(ok_bt);
 
-  SIGNAL_CONNECT(prefs_w, "delete_event", prefs_main_delete_cb, prefs_w);
+  SIGNAL_CONNECT(prefs_w, "delete_event", prefs_main_delete_event_cb, prefs_w);
   SIGNAL_CONNECT(prefs_w, "destroy", prefs_main_destroy_cb, prefs_w);
 
   gtk_widget_show(prefs_w);
@@ -1229,9 +1229,10 @@ prefs_main_cancel_cb(GtkWidget *cancel_bt _U_, gpointer parent_w)
 
 /* Treat this as a cancel, by calling "prefs_main_cancel_cb()" */
 static gboolean
-prefs_main_delete_cb(GtkWidget *prefs_w _U_, gpointer parent_w)
+prefs_main_delete_event_cb(GtkWidget *prefs_w, GdkEvent *event _U_,
+                           gpointer parent_w _U_)
 {
-  prefs_main_cancel_cb(NULL, parent_w);
+  prefs_main_cancel_cb(NULL, prefs_w);
   return FALSE;
 }
 
diff --git a/gtk/proto_dlg.c b/gtk/proto_dlg.c
index ca42e0b4f1..7053a263fb 100644
--- a/gtk/proto_dlg.c
+++ b/gtk/proto_dlg.c
@@ -1,6 +1,6 @@
 /* proto_dlg.c
  *
- * $Id: proto_dlg.c,v 1.34 2004/05/27 19:59:49 ulfl Exp $
+ * $Id: proto_dlg.c,v 1.35 2004/06/10 10:09:58 guy Exp $
  *
  * Laurent Deniel <laurent.deniel@free.fr>
  *
@@ -43,7 +43,7 @@
 #include "disabled_protos.h"
 #include <epan/filesystem.h>
 
-static gboolean proto_delete_cb(GtkWidget *, gpointer);
+static gboolean proto_delete_event_cb(GtkWidget *, GdkEvent *, gpointer);
 static void proto_ok_cb(GtkWidget *, gpointer);
 static void proto_apply_cb(GtkWidget *, gpointer);
 static void proto_save_cb(GtkWidget *, gpointer);
@@ -236,7 +236,7 @@ proto_cb(GtkWidget *w _U_, gpointer data _U_)
   button = OBJECT_GET_DATA(bbox, GTK_STOCK_CANCEL);
   window_set_cancel_button(proto_w, button, proto_cancel_cb);
 
-  SIGNAL_CONNECT(proto_w, "delete_event", proto_delete_cb, NULL);
+  SIGNAL_CONNECT(proto_w, "delete_event", proto_delete_event_cb, NULL);
   SIGNAL_CONNECT(proto_w, "destroy", proto_destroy_cb, NULL);
 
   gtk_quit_add_destroy(gtk_main_level(), GTK_OBJECT(proto_w));
@@ -391,7 +391,8 @@ proto_destroy_cb(GtkWidget *w _U_, gpointer data _U_)
    a higher-level handler that says "OK, we've been asked to delete
    this, so destroy it"? */
 static gboolean
-proto_delete_cb(GtkWidget *proto_w, gpointer dummy _U_)
+proto_delete_event_cb(GtkWidget *proto_w, GdkEvent *event _U_,
+                      gpointer dummy _U_)
 {
   proto_cancel_cb(NULL, proto_w);
   return FALSE;
diff --git a/gtk/tcp_graph.c b/gtk/tcp_graph.c
index b54275808f..a957562ee5 100644
--- a/gtk/tcp_graph.c
+++ b/gtk/tcp_graph.c
@@ -3,7 +3,7 @@
  * By Pavel Mores <pvl@uh.cz>
  * Win32 port:  rwh@unifiedtech.com
  *
- * $Id: tcp_graph.c,v 1.62 2004/05/26 03:49:24 ulfl Exp $
+ * $Id: tcp_graph.c,v 1.63 2004/06/10 10:09:58 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -405,6 +405,7 @@ static void control_panel_add_origin_page (struct graph * , GtkWidget * );
 static void control_panel_add_cross_page (struct graph * , GtkWidget * );
 static void control_panel_add_graph_type_page (struct graph * , GtkWidget * );
 static void callback_toplevel_destroy (GtkWidget * , gpointer );
+static gboolean callback_delete_event(GtkWidget * , GdkEvent * , gpointer);
 static void callback_close (GtkWidget * , gpointer );
 static void callback_time_origin (GtkWidget * , gpointer );
 static void callback_seq_origin (GtkWidget * , gpointer );
@@ -865,50 +866,50 @@ static void callback_toplevel_destroy (GtkWidget *widget _U_, gpointer data)
 
 static void control_panel_create (struct graph *g)
 {
-	GtkWidget *toplevel, *notebook;
-	GtkWidget *table;
-	GtkWidget *help_bt, *close_bt, *bbox;
+    GtkWidget *toplevel, *notebook;
+    GtkWidget *table;
+    GtkWidget *help_bt, *close_bt, *bbox;
 #define WINDOW_TITLE_LENGTH 64
-	char window_title[WINDOW_TITLE_LENGTH];
+    char window_title[WINDOW_TITLE_LENGTH];
 
-	debug(DBS_FENTRY) puts ("control_panel_create()");
+    debug(DBS_FENTRY) puts ("control_panel_create()");
 
-	notebook = gtk_notebook_new ();
-	control_panel_add_zoom_page (g, notebook);
-	control_panel_add_magnify_page (g, notebook);
-	control_panel_add_origin_page (g, notebook);
-	control_panel_add_cross_page (g, notebook);
-	control_panel_add_graph_type_page (g, notebook);
+    notebook = gtk_notebook_new ();
+    control_panel_add_zoom_page (g, notebook);
+    control_panel_add_magnify_page (g, notebook);
+    control_panel_add_origin_page (g, notebook);
+    control_panel_add_cross_page (g, notebook);
+    control_panel_add_graph_type_page (g, notebook);
 
-	g_snprintf (window_title, WINDOW_TITLE_LENGTH,
-				"Graph %d - Control - Ethereal", refnum);
-	toplevel = dlg_window_new ("tcp-graph-control");
+    g_snprintf (window_title, WINDOW_TITLE_LENGTH,
+                "Graph %d - Control - Ethereal", refnum);
+    toplevel = dlg_window_new ("tcp-graph-control");
     gtk_window_set_title(GTK_WINDOW(toplevel), window_title);
 
-	table = gtk_table_new (2, 1,  FALSE);
-	gtk_container_add (GTK_CONTAINER (toplevel), table);
+    table = gtk_table_new (2, 1,  FALSE);
+    gtk_container_add (GTK_CONTAINER (toplevel), table);
 
-	gtk_table_attach (GTK_TABLE (table), notebook, 0, 1, 0, 1,
-                          GTK_FILL|GTK_EXPAND, GTK_FILL, 5, 5);
+    gtk_table_attach (GTK_TABLE (table), notebook, 0, 1, 0, 1,
+                      GTK_FILL|GTK_EXPAND, GTK_FILL, 5, 5);
 
-	/* Button row. */
-	bbox = dlg_button_row_new(GTK_STOCK_HELP, GTK_STOCK_CLOSE, NULL);
-	gtk_table_attach (GTK_TABLE (table), bbox, 0, 1, 1, 2,
-                          GTK_FILL|GTK_EXPAND, GTK_FILL, 5, 5);
+    /* Button row. */
+    bbox = dlg_button_row_new(GTK_STOCK_HELP, GTK_STOCK_CLOSE, NULL);
+    gtk_table_attach (GTK_TABLE (table), bbox, 0, 1, 1, 2,
+                      GTK_FILL|GTK_EXPAND, GTK_FILL, 5, 5);
 
-	help_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_HELP);
-	SIGNAL_CONNECT(help_bt, "clicked", callback_create_help, g);
+    help_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_HELP);
+    SIGNAL_CONNECT(help_bt, "clicked", callback_create_help, g);
 
-	close_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_CLOSE);
+    close_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_CLOSE);
     window_set_cancel_button(toplevel, close_bt, NULL);
-	SIGNAL_CONNECT(close_bt, "clicked", callback_close, g);
+    SIGNAL_CONNECT(close_bt, "clicked", callback_close, g);
 
-    SIGNAL_CONNECT(toplevel, "delete_event", callback_close, g);
-	SIGNAL_CONNECT(toplevel, "destroy", callback_toplevel_destroy, g);
+    SIGNAL_CONNECT(toplevel, "delete_event", callback_delete_event, g);
+    SIGNAL_CONNECT(toplevel, "destroy", callback_toplevel_destroy, g);
 
-	/* gtk_widget_show_all (table); */
-	/* g->gui.control_panel = table; */
-	gtk_widget_show_all (toplevel);
+    /* gtk_widget_show_all (table); */
+    /* g->gui.control_panel = table; */
+    gtk_widget_show_all (toplevel);
     window_present(toplevel);
 
     g->gui.control_panel = toplevel;
@@ -1011,6 +1012,15 @@ static void control_panel_add_graph_type_page (struct graph *g, GtkWidget *n)
 	gtk_notebook_append_page (GTK_NOTEBOOK (n), frame, label);
 }
 
+/* Treat this as a cancel, by calling "callback_close()" */
+static gboolean
+callback_delete_event(GtkWidget *widget _U_, GdkEvent *event _U_,
+                      gpointer data)
+{
+	callback_close(NULL, data);
+	return FALSE;
+}
+
 static void callback_close (GtkWidget *widget _U_, gpointer data)
 {
 	struct graph *g = (struct graph * )data;