Add a "color.h" file that declares a nominally-toolkit-independent

"color_t" structure to store color values (although currently it has all
the same fields that a GdkColor has; its currently advantage is that you
don't have to include any GTK/GDK stuff to declare it).

Add routines in the "gtk" directory to convert between "color_t" and
GdkColor values.

Define, in "prefs.h", all colors as "color_t" values rather than
GdkColor values.  "prefs.h" now no longer needs to include <gtk/gtk.h>,
so don't include it.

svn path=/trunk/; revision=2692

1 files changed, 8 insertions, 8 deletions

diff --git a/prefs.h b/prefs.h
index 5975e5944d..154abd6904 100644
--- a/prefs.h
+++ b/prefs.h
@@ -1,7 +1,7 @@
 /* prefs.h
  * Definitions for preference handling routines
  *
- * $Id: prefs.h,v 1.25 2000/11/18 21:41:36 guy Exp $
+ * $Id: prefs.h,v 1.26 2000/11/21 23:54:08 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -26,13 +26,13 @@
 #ifndef __PREFS_H__
 #define __PREFS_H__
 
+#include <glib.h>
+
+#include "color.h"
+
 #define PR_DEST_CMD  0
 #define PR_DEST_FILE 1
 
-#ifndef __GTK_H__
-#include <gtk/gtk.h>
-#endif
-
 typedef struct _e_prefs {
   gint     pr_format;
   gint     pr_dest;
@@ -40,7 +40,7 @@ typedef struct _e_prefs {
   gchar   *pr_cmd;
   GList   *col_list;
   gint     num_cols;
-  GdkColor st_client_fg, st_client_bg, st_server_fg, st_server_bg;
+  color_t  st_client_fg, st_client_bg, st_server_fg, st_server_bg;
   gboolean gui_scrollbar_on_right;
   gboolean gui_plist_sel_browse;
   gboolean gui_ptree_sel_browse;
@@ -48,8 +48,8 @@ typedef struct _e_prefs {
   gint     gui_ptree_expander_style;
   gboolean gui_hex_dump_highlight_style;
   gchar   *gui_font_name;
-  GdkColor gui_marked_fg;
-  GdkColor gui_marked_bg;
+  color_t  gui_marked_fg;
+  color_t  gui_marked_bg;
 } e_prefs;
 
 extern e_prefs prefs;