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 /ethereal.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 'ethereal.h')
| -rw-r--r-- | ethereal.h | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/ethereal.h b/ethereal.h index fd7e0eb64e..009b5dff50 100644 --- a/ethereal.h +++ b/ethereal.h @@ -1,7 +1,7 @@ /* ethereal.h * Global defines, etc. * - * $Id: ethereal.h,v 1.8 1998/11/17 04:28:45 gerald Exp $ + * $Id: ethereal.h,v 1.9 1998/12/17 05:42:22 gram Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -66,6 +66,20 @@ #ifndef MIN #define MIN(x, y) ((x) < (y) ? (x) : (y)) #endif + +/* Determine whether we use menu factories or item factories. This + * code snippet is taken from cheops.h of cheops-0.57, a GPL'ed + * network utility program Copyright (C) 1998, Mark Spencer + */ +#if (GTK_MINOR_VERSION > 1) || ((GTK_MICRO_VERSION > 1) && (GTK_MINOR_VERSION > 0)) + #define USE_ITEM + #define GTK_MENU_FUNC(a) ((GtkItemFactoryCallback)(a)) +#else + #undef USE_ITEM + typedef void (*_GTK_MENU_FUNC_T)(GtkWidget *, void *); + #define GTK_MENU_FUNC(a) ((_GTK_MENU_FUNC_T)(a)) +#endif + typedef struct _selection_info { GtkWidget *tree; |