aboutsummaryrefslogtreecommitdiffstats
path: root/globals.h
diff options
context:
space:
mode:
authorGilbert Ramirez <gram@alumni.rice.edu>1999-10-20 22:36:05 +0000
committerGilbert Ramirez <gram@alumni.rice.edu>1999-10-20 22:36:05 +0000
commitb0cfa341690586b0a6abc4d16dce97e5926c7a04 (patch)
treed3857f6b991005aef915871f86f9d7091ddac059 /globals.h
parent32a4854f3eea4b75cf591e5dc3242d3ae718909e (diff)
Move GTK-related stuff out of globals.h and put it in gtk/gtkglobals.h
svn path=/trunk/; revision=896
Diffstat (limited to 'globals.h')
-rw-r--r--globals.h12
1 files changed, 4 insertions, 8 deletions
diff --git a/globals.h b/globals.h
index 873d4fc..5385407 100644
--- a/globals.h
+++ b/globals.h
@@ -1,7 +1,7 @@
/* globals.h
* Global defines, etc.
*
- * $Id: globals.h,v 1.10 1999/10/02 19:24:19 guy Exp $
+ * $Id: globals.h,v 1.11 1999/10/20 22:35:57 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -34,10 +34,6 @@
#include "packet.h"
#endif
-#ifndef __GTK_H__
-#include <gtk/gtk.h>
-#endif
-
#ifndef __PRINT_H__
#include "print.h"
#endif
@@ -85,9 +81,9 @@
extern FILE *data_out_file;
extern packet_info pi;
extern capture_file cf;
-extern GtkWidget *file_sel, *packet_list, *tree_view, *byte_view, *prog_bar,
+/*extern GtkWidget *file_sel, *packet_list, *tree_view, *byte_view, *prog_bar,
*info_bar;
-extern GdkFont *m_r_font, *m_b_font;
+extern GdkFont *m_r_font, *m_b_font;*/
extern guint main_ctx, file_ctx;
extern gchar comp_info_str[256];
extern gchar *ethereal_path;
@@ -99,7 +95,7 @@ extern int g_resolving_actif;
extern ts_type timestamp_type;
-extern GtkStyle *item_style;
+/*extern GtkStyle *item_style;*/
#define PF_DIR ".ethereal"