From b0cfa341690586b0a6abc4d16dce97e5926c7a04 Mon Sep 17 00:00:00 2001 From: Gilbert Ramirez Date: Wed, 20 Oct 1999 22:36:05 +0000 Subject: [PATCH] Move GTK-related stuff out of globals.h and put it in gtk/gtkglobals.h svn path=/trunk/; revision=896 --- capture.c | 3 ++- globals.h | 12 ++++-------- gtk/file_dlg.c | 5 ++++- gtk/gtkglobals.h | 39 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 49 insertions(+), 10 deletions(-) create mode 100644 gtk/gtkglobals.h diff --git a/capture.c b/capture.c index 1bad4275ce..ed7ac6f5a9 100644 --- a/capture.c +++ b/capture.c @@ -1,7 +1,7 @@ /* capture.c * Routines for packet capture windows * - * $Id: capture.c,v 1.79 1999/10/02 19:57:23 guy Exp $ + * $Id: capture.c,v 1.80 1999/10/20 22:35:57 gram Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -80,6 +80,7 @@ #endif #include "gtk/main.h" +#include "gtk/gtkglobals.h" #include "packet.h" #include "file.h" #include "gtk/menu.h" diff --git a/globals.h b/globals.h index 873d4fc1f2..5385407651 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 @@ -34,10 +34,6 @@ #include "packet.h" #endif -#ifndef __GTK_H__ -#include -#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" diff --git a/gtk/file_dlg.c b/gtk/file_dlg.c index 09e4fdd3d3..663733d295 100644 --- a/gtk/file_dlg.c +++ b/gtk/file_dlg.c @@ -1,7 +1,7 @@ /* file_dlg.c * Dialog boxes for handling files * - * $Id: file_dlg.c,v 1.10 1999/10/12 05:01:07 guy Exp $ + * $Id: file_dlg.c,v 1.11 1999/10/20 22:36:05 gram Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -40,6 +40,9 @@ #ifndef __GLOBALS_H__ #include "globals.h" #endif +#ifndef __GTKGLOBALS_H__ +#include "gtkglobals.h" +#endif #ifndef __KEYS_H__ #include "keys.h" diff --git a/gtk/gtkglobals.h b/gtk/gtkglobals.h new file mode 100644 index 0000000000..60f34068cb --- /dev/null +++ b/gtk/gtkglobals.h @@ -0,0 +1,39 @@ +/* gtkglobals.h + * GTK-related Global defines, etc. + * + * $Id: gtkglobals.h,v 1.1 1999/10/20 22:36:05 gram Exp $ + * + * Ethereal - Network traffic analyzer + * By Gerald Combs + * Copyright 1998 Gerald Combs + * + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#ifndef __GTKGLOBALS_H__ +#define __GTKGLOBALS_H__ + +#ifndef __GTK_H__ +#include +#endif + +extern GtkWidget *file_sel, *packet_list, *tree_view, *byte_view, *prog_bar, + *info_bar; +extern GdkFont *m_r_font, *m_b_font; + +extern GtkStyle *item_style; + +#endif