diff options
| author | Olivier Abad <oabad@noos.fr> | 2002-11-03 17:38:45 +0000 |
|---|---|---|
| committer | Olivier Abad <oabad@noos.fr> | 2002-11-03 17:38:45 +0000 |
| commit | 05ef1fc475a3e569a641424a75b81f74d90ba8ca (patch) | |
| tree | e205dc0b1cb685304fd20edb3ebd398884c30ba3 /gtk/gtkglobals.h | |
| parent | ae2198ea4ecf9896ef2dc3ed54526fbfbe764077 (diff) | |
Merge gtk and gtk2 directories.
svn path=/trunk/; revision=6552
Diffstat (limited to 'gtk/gtkglobals.h')
| -rw-r--r-- | gtk/gtkglobals.h | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/gtk/gtkglobals.h b/gtk/gtkglobals.h index c8d4c713fa..5508203a43 100644 --- a/gtk/gtkglobals.h +++ b/gtk/gtkglobals.h @@ -1,7 +1,7 @@ /* gtkglobals.h * GTK-related Global defines, etc. * - * $Id: gtkglobals.h,v 1.19 2002/09/05 18:47:46 jmayer Exp $ + * $Id: gtkglobals.h,v 1.20 2002/11/03 17:38:33 oabad Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -25,14 +25,20 @@ #ifndef __GTKGLOBALS_H__ #define __GTKGLOBALS_H__ -extern GtkWidget *top_level, *packet_list, *tree_view, *byte_nb_ptr; -extern GdkFont *m_r_font, *m_b_font; -extern guint m_font_height, m_font_width; +extern GtkWidget *top_level, *packet_list, *tree_view, *byte_nb_ptr; +#if GTK_MAJOR_VERSION < 2 +extern GdkFont *m_r_font, *m_b_font; +extern guint m_font_height, m_font_width; -extern GtkStyle *item_style; +extern GtkStyle *item_style; -void set_plist_sel_browse(gboolean); void set_plist_font(GdkFont *font); +#else +extern PangoFontDescription *m_r_font, *m_b_font; + +void set_plist_font(PangoFontDescription *font); +#endif +void set_plist_sel_browse(gboolean); #ifdef _WIN32 /* It appears that isprint() is not working well |