aboutsummaryrefslogtreecommitdiffstats
path: root/menu.h
diff options
context:
space:
mode:
authorgram <gram@f5534014-38df-0310-8fa8-9805f1628bb7>1999-07-13 03:08:06 +0000
committergram <gram@f5534014-38df-0310-8fa8-9805f1628bb7>1999-07-13 03:08:06 +0000
commitf45154c0d53f7fafdb3ca36a90a8f49ddeeabb61 (patch)
tree7fb6f84d48629d0d313933df47676f574f35c2ed /menu.h
parent5ac565b736a239c22d34ffb75b39a98a60e31c09 (diff)
Since ethereal is now dependent on GTK+-1.2.x (because of proto_tree and
display filter code, which uses features in GLIB-1.2.x), I removed the vestigial code supporting old 1.0.x and 1.1.x GTK+ versions. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@360 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'menu.h')
-rw-r--r--menu.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/menu.h b/menu.h
index c8726fe7ad..bc7a9d015d 100644
--- a/menu.h
+++ b/menu.h
@@ -1,7 +1,7 @@
/* menu.h
* Menu definitions
*
- * $Id: menu.h,v 1.4 1998/12/17 05:42:27 gram Exp $
+ * $Id: menu.h,v 1.5 1999/07/13 03:08:06 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -30,14 +30,11 @@
extern "C" {
#endif /* __cplusplus */
+#define GTK_MENU_FUNC(a) ((GtkItemFactoryCallback)(a))
void menus_init(void);
-#ifdef GTK_HAVE_FEATURES_1_1_0
void get_main_menu (GtkWidget **, GtkAccelGroup **);
-#else
-void get_main_menu (GtkWidget **, GtkAcceleratorTable **);
-#endif
void set_menu_sensitivity (gchar *, gint);
void set_menu_object_data (gchar *path, gchar *key, gpointer data);
void menus_create (GtkMenuEntry *, int);