From 5676298385a1abe5b04490e06485e965f5c54107 Mon Sep 17 00:00:00 2001 From: Gilbert Ramirez Date: Thu, 17 Dec 1998 05:42:33 +0000 Subject: A patch spread across many files to let Ethereal compile under GTK+-1.1.x. Tests for GTK versions are done during compilation, not during "./configure". The big problems have been taken care of in this patch (functional change in the packet clist and conversion of menu_factory to item_factory), but plenty of smaller problems with dialogue boxes abound. I have fixed a small problem with file_open*(), but have left 2 comments in just in case I'm not going about this the right way. Can someone verify? svn path=/trunk/; revision=127 --- menu.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'menu.h') diff --git a/menu.h b/menu.h index 70159dad5b..c8726fe7ad 100644 --- a/menu.h +++ b/menu.h @@ -1,7 +1,7 @@ /* menu.h * Menu definitions * - * $Id: menu.h,v 1.3 1998/10/12 01:40:51 gerald Exp $ + * $Id: menu.h,v 1.4 1998/12/17 05:42:27 gram Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -30,8 +30,14 @@ extern "C" { #endif /* __cplusplus */ -void menus_init (void); + +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); -- cgit v1.2.3