forked from osmocom/wireshark
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. svn path=/trunk/; revision=11498
This commit is contained in:
parent
34de3c15d9
commit
d5425a709a
12
color.h
12
color.h
|
@ -44,6 +44,18 @@ typedef struct {
|
||||||
guint16 blue;
|
guint16 blue;
|
||||||
} color_t;
|
} 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. */
|
/* Data for a color filter. */
|
||||||
typedef struct _color_filter {
|
typedef struct _color_filter {
|
||||||
gchar *filter_name; /* name of the filter */
|
gchar *filter_name; /* name of the filter */
|
||||||
|
|
|
@ -39,7 +39,6 @@ noinst_HEADERS = \
|
||||||
capture_prefs.h \
|
capture_prefs.h \
|
||||||
color_dlg.h \
|
color_dlg.h \
|
||||||
color_filters.h \
|
color_filters.h \
|
||||||
color_utils.h \
|
|
||||||
colors.h \
|
colors.h \
|
||||||
column_prefs.h \
|
column_prefs.h \
|
||||||
compat_macros.h \
|
compat_macros.h \
|
||||||
|
|
|
@ -38,7 +38,6 @@
|
||||||
#include "color.h"
|
#include "color.h"
|
||||||
#include "colors.h"
|
#include "colors.h"
|
||||||
#include "color_filters.h"
|
#include "color_filters.h"
|
||||||
#include "color_utils.h"
|
|
||||||
#include "color_dlg.h"
|
#include "color_dlg.h"
|
||||||
#include "file.h"
|
#include "file.h"
|
||||||
#include <epan/dfilter/dfilter.h>
|
#include <epan/dfilter/dfilter.h>
|
||||||
|
|
|
@ -30,7 +30,7 @@
|
||||||
|
|
||||||
#include "color.h"
|
#include "color.h"
|
||||||
|
|
||||||
#include "color_utils.h"
|
#include "colors.h"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Create a color from R, G, and B values, and do whatever toolkit-dependent
|
* Create a color from R, G, and B values, and do whatever toolkit-dependent
|
||||||
|
|
|
@ -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
|
|
Loading…
Reference in New Issue