From 25e6749eb4c65abe0a2761beb3baf0c54050e047 Mon Sep 17 00:00:00 2001 From: Ulf Lamping Date: Thu, 17 Jun 2004 16:35:26 +0000 Subject: move font related stuff to new file font_utils.c/.h do some font related renaming/code cleanup svn path=/trunk/; revision=11166 --- gtk/gtkglobals.h | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) (limited to 'gtk/gtkglobals.h') diff --git a/gtk/gtkglobals.h b/gtk/gtkglobals.h index d2e428afe0..31fd095a11 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.29 2004/06/05 12:12:13 ulfl Exp $ + * $Id: gtkglobals.h,v 1.30 2004/06/17 16:35:24 ulfl Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -54,24 +54,6 @@ extern GtkWidget *byte_nb_ptr; /** The filter text entry in the filter toolbar. */ extern GtkWidget *main_display_filter_widget; -#if GTK_MAJOR_VERSION < 2 -/** Normal font. */ -extern GdkFont *m_r_font; -/** Bold font. */ -extern GdkFont *m_b_font; -/** Font height. */ -extern guint m_font_height; -/** Font width. */ -extern guint m_font_width; -/** Widget style (font, color, ...). */ -extern GtkStyle *item_style; -#else -/** Normal font. */ -extern PangoFontDescription *m_r_font; -/** Bold font. */ -extern PangoFontDescription *m_b_font; -#endif - #if GTK_MAJOR_VERSION >= 2 || GTK_MINOR_VERSION >= 3 /** * XXX - "isprint()" can return "true" for non-ASCII characters, but -- cgit v1.2.3