From Alejandro Vaquero:

[obnox/wireshark/wip.git] / gtk / gtkglobals.h

diff --git a/gtk/gtkglobals.h b/gtk/gtkglobals.h
index 9e1df4ddf74d9ae6fd81d678f57f9be563e3ede9..3099a069743218be1030a7787942e168842f28f2 100644 (file)
--- a/gtk/gtkglobals.h
+++ b/gtk/gtkglobals.h
@@ -1,10 +1,10 @@
 /* gtkglobals.h
  * GTK-related Global defines, etc.
  *
- * $Id: gtkglobals.h,v 1.26 2004/06/02 07:12:10 ulfl Exp $
+ * $Id$
  *
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
  * This program is free software; you can redistribute it and/or
@@ -25,56 +25,33 @@
 #ifndef __GTKGLOBALS_H__
 #define __GTKGLOBALS_H__
 
+/** @mainpage GTK subsystem
+ *
+ * @section intro Introduction
+ *
+ * Wireshark uses GTK (the Gimp ToolKit) as its user interface toolkit.
+ *
+ * See Modules for a list of submodules.
+ *
+ */
+
 /** @file
- *  GTK globals like the main application window.
+ *  GTK global definitions. For example a pointer to the main application window.
  */
 
-/** application window */
+/** Application window. */
 extern GtkWidget *top_level;
 
-/** packet list pane */
+/** Packet list pane. */
 extern GtkWidget *packet_list;
 
-/** tree view (packet details) pane */
+/** Tree view (packet details) pane. */
 extern GtkWidget *tree_view;
 
-/** byte notebook (packet bytes) pane */
+/** Byte notebook (packet bytes) pane. */
 extern GtkWidget *byte_nb_ptr;
 
-/** the filter text entry in the filter toolbar */
+/** 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;
-/** ??? 
- * @todo what's this?
- */
-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
- * those don't work with GTK+ 1.3 or later, as they take UTF-8 strings
- * as input.  Until we fix up Ethereal to properly handle non-ASCII
- * characters in all output (both GUI displays and text printouts)
- * in those versions of GTK+, we work around the problem by escaping
- * all characters that aren't printable ASCII.
- */
-#undef isprint
-#define isprint(c) (c >= 0x20 && c < 0x7f)
-#endif
-
 #endif