Have "gtk/color_utils.c" contain routines with toolkit-independent APIs,

but toolkit-dependent implementations, for manipulating colors, and have
"gtk/color_utils.h" declare them (the header file should eventually be
moved to the top-level directory).  Move the routines to convert between
GdkColor and color_t out of there into "colors.c", and move their
declarations into "colors.h", as their APIs are toolkit-dependent.

Have the first such routine be a "create_color()" routine, which takes
RGB values and initializes a "color_t", including doing any
toolkit-dependent work necessary for that; use that in the
"gtk/color_filters.c" code (the goal is to remove as many of the toolkit
dependencies as possible from that code, and move it to the top-level
directory).

svn path=/trunk/; revision=11497

1 files changed, 10 insertions, 14 deletions

diff --git a/gtk/color_utils.h b/gtk/color_utils.h
index 36f27ce2f9..28ebbf689a 100644
--- a/gtk/color_utils.h
+++ b/gtk/color_utils.h
@@ -5,10 +5,9 @@
  * $Id$
  *
  * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@zing.org>
+ * By Gerald Combs <gerald@ethereal.com>
  * 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
@@ -28,22 +27,19 @@
 #define __COLOR_UTILS_H__
 
 /** @file
- * Utilities for converting between "toolkit-independent"
- * and GDK notions of color.
- */
-
-/** Convert color_t to GdkColor.
- *
- * @param target the GdkColor to be filled
- * @param source the source color_t
+ * Toolkit-dependent implementations of routines to handle colors.
  */
-void color_t_to_gdkcolor(GdkColor *target, color_t *source);
 
-/** Convert GdkColor to color_t.
+/** Create a color from R, G, and B values, and do whatever toolkit-dependent
+ ** work needs to be done.
  *
- * @param target the source color_t
+ * @param color the color_t to be filled
+ * @param red the red value for the color
+ * @param green the green value for the color
+ * @param blue the blue value for the color
  * @param source the GdkColor to be filled
+ * @return TRUE if it succeeds, FALSE if it fails
  */
-void gdkcolor_to_color_t(color_t *target, GdkColor *source);
+gboolean create_color(color_t *color, guint16 red, guint16 green, guint16 blue);
 
 #endif