osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Move the declaration of "create_color()" up to "color.h", so it's 

declared in a toolkit-independent header file.  Get rid of
"gtk/color_utils.h", as there's nothing left in it.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@11498 f5534014-38df-0310-8fa8-9805f1628bb7
This commit is contained in:
guy 2004-07-24 00:49:19 +00:00
parent 23b476f6b4
commit c690355be7
5 changed files with 13 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
color.h
View File

@ -44,6 +44,18 @@ typedef struct {
guint16 blue;
} color_t;
/** Create a color from R, G, and B values, and do whatever toolkit-dependent
** work needs to be done.
*
* @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
*/
gboolean create_color(color_t *color, guint16 red, guint16 green, guint16 blue);
/* Data for a color filter. */
typedef struct _color_filter {
gchar *filter_name; /* name of the filter */

1
gtk/Makefile.am
View File

@ -39,7 +39,6 @@ noinst_HEADERS = \
capture_prefs.h \
color_dlg.h \
color_filters.h \
color_utils.h \
colors.h \
column_prefs.h \
compat_macros.h \

1
gtk/color_filters.c
View File

@ -38,7 +38,6 @@
#include "color.h"
#include "colors.h"
#include "color_filters.h"
#include "color_utils.h"
#include "color_dlg.h"
#include "file.h"
#include <epan/dfilter/dfilter.h>

2
gtk/color_utils.c
View File

@ -30,7 +30,7 @@
#include "color.h"
#include "color_utils.h"
#include "colors.h"
/*
* Create a color from R, G, and B values, and do whatever toolkit-dependent

45
gtk/color_utils.h
View File

@ -1,45 +0,0 @@
/* color_utils.h
* Declarations of utilities for converting between "toolkit-independent"
* and GDK notions of color
*
* $Id$
*
* Ethereal - Network traffic analyzer
* 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
* 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 __COLOR_UTILS_H__
#define __COLOR_UTILS_H__
/** @file
* Toolkit-dependent implementations of routines to handle colors.
*/
/** Create a color from R, G, and B values, and do whatever toolkit-dependent
** work needs to be done.
*
* @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
*/
gboolean create_color(color_t *color, guint16 red, guint16 green, guint16 blue);
#endif