diff options
| author | Gilbert Ramirez <gram@alumni.rice.edu> | 1998-12-17 05:42:33 +0000 |
|---|---|---|
| committer | Gilbert Ramirez <gram@alumni.rice.edu> | 1998-12-17 05:42:33 +0000 |
| commit | 5676298385a1abe5b04490e06485e965f5c54107 (patch) | |
| tree | c7a1862fa9f17082e0a5b4adc6b86abe34808761 /menu.h | |
| parent | f5e3259b0a1ef70517093cd93e25a7d5b0cd1563 (diff) | |
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
Diffstat (limited to 'menu.h')
| -rw-r--r-- | menu.h | 10 |
1 files changed, 8 insertions, 2 deletions
@@ -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 <gerald@zing.org> @@ -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); |