diff options
| author | Mike Kestner <mkestner@src.gnome.org> | 2002-11-01 05:30:57 +0800 |
|---|---|---|
| committer | Mike Kestner <mkestner@src.gnome.org> | 2002-11-01 05:30:57 +0800 |
| commit | 613453b1095e325149b8d37e5731d415e1d5f9bd (patch) | |
| tree | 1c0d7f9be4d4a87aa67d8e185ae2bb23d02254b7 /widgets/misc/e-colors.h | |
| parent | ec242d6c30d7bf056c8f59710b8576c942f93583 (diff) | |
| download | gsoc2013-evolution-613453b1095e325149b8d37e5731d415e1d5f9bd.tar gsoc2013-evolution-613453b1095e325149b8d37e5731d415e1d5f9bd.tar.gz gsoc2013-evolution-613453b1095e325149b8d37e5731d415e1d5f9bd.tar.bz2 gsoc2013-evolution-613453b1095e325149b8d37e5731d415e1d5f9bd.tar.lz gsoc2013-evolution-613453b1095e325149b8d37e5731d415e1d5f9bd.tar.xz gsoc2013-evolution-613453b1095e325149b8d37e5731d415e1d5f9bd.tar.zst gsoc2013-evolution-613453b1095e325149b8d37e5731d415e1d5f9bd.zip | |
merging the gal-2 branch back to the trunk.
merging the gal-2 branch back to the trunk.
svn path=/trunk/; revision=18471
Diffstat (limited to 'widgets/misc/e-colors.h')
| -rw-r--r-- | widgets/misc/e-colors.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/widgets/misc/e-colors.h b/widgets/misc/e-colors.h index 29e96811f1..596fd2b0a5 100644 --- a/widgets/misc/e-colors.h +++ b/widgets/misc/e-colors.h @@ -26,19 +26,19 @@ #include <glib.h> #include <gdk/gdk.h> -#include <libgnome/gnome-defs.h> +#include <gtk/gtkwidget.h> -BEGIN_GNOME_DECLS +G_BEGIN_DECLS void e_color_init (void); /* Return the pixel value for the given red, green and blue */ -int e_color_alloc (gushort red, gushort green, gushort blue); -void e_color_alloc_name (const char *name, GdkColor *color); -void e_color_alloc_gdk (GdkColor *color); +gulong e_color_alloc (gushort red, gushort green, gushort blue); +void e_color_alloc_name (GtkWidget *widget, const char *name, GdkColor *color); +void e_color_alloc_gdk (GtkWidget *widget, GdkColor *color); extern GdkColor e_white, e_dark_gray, e_black; -END_GNOME_DECLS +G_END_DECLS #endif /* GNOME_APP_LIBS_COLOR_H */ |