diff options
author | Matthew Barnes <mbarnes@redhat.com> | 2010-01-05 06:06:00 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@redhat.com> | 2010-01-05 09:22:21 +0800 |
commit | 69945127d8a7933512bb14eb20ff85354704b5cc (patch) | |
tree | 5c8c697cc60d192c6ac68000ae22e01b2a5cb392 | |
parent | 1501b8588c33f96310cf30b39b8a75f5a55afab0 (diff) | |
download | gsoc2013-evolution-69945127d8a7933512bb14eb20ff85354704b5cc.tar gsoc2013-evolution-69945127d8a7933512bb14eb20ff85354704b5cc.tar.gz gsoc2013-evolution-69945127d8a7933512bb14eb20ff85354704b5cc.tar.bz2 gsoc2013-evolution-69945127d8a7933512bb14eb20ff85354704b5cc.tar.lz gsoc2013-evolution-69945127d8a7933512bb14eb20ff85354704b5cc.tar.xz gsoc2013-evolution-69945127d8a7933512bb14eb20ff85354704b5cc.tar.zst gsoc2013-evolution-69945127d8a7933512bb14eb20ff85354704b5cc.zip |
Kill widgets/misc/e-colors.[ch].
-rw-r--r-- | widgets/misc/Makefile.am | 2 | ||||
-rw-r--r-- | widgets/misc/e-colors.c | 91 | ||||
-rw-r--r-- | widgets/misc/e-colors.h | 41 |
3 files changed, 0 insertions, 134 deletions
diff --git a/widgets/misc/Makefile.am b/widgets/misc/Makefile.am index 0ab566c19d..5853039fb0 100644 --- a/widgets/misc/Makefile.am +++ b/widgets/misc/Makefile.am @@ -43,7 +43,6 @@ widgetsinclude_HEADERS = \ e-canvas-vbox.h \ e-cell-renderer-combo.h \ e-charset-combo-box.h \ - e-colors.h \ e-combo-cell-editable.h \ e-dateedit.h \ e-focus-tracker.h \ @@ -119,7 +118,6 @@ libemiscwidgets_la_SOURCES = \ e-canvas-vbox.c \ e-cell-renderer-combo.c \ e-charset-combo-box.c \ - e-colors.c \ e-combo-cell-editable.c \ e-dateedit.c \ e-focus-tracker.c \ diff --git a/widgets/misc/e-colors.c b/widgets/misc/e-colors.c deleted file mode 100644 index 5e2fddabc8..0000000000 --- a/widgets/misc/e-colors.c +++ /dev/null @@ -1,91 +0,0 @@ -/* - * e-colors.c - General color allocation utilities - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) version 3. - * - * 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> - * - * - * Authors: - * Miguel de Icaza <miguel@ximian.com> - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * - */ - -/* We keep our own color context, as the color allocation might take - * place before things are realized. - */ - -#include <config.h> - -#include "e-colors.h" - -GdkColor e_white, e_dark_gray, e_black; - -void -e_color_alloc_gdk (GtkWidget *widget, GdkColor *c) -{ - GdkColormap *map; - - e_color_init (); - - if (widget) - map = gtk_widget_get_colormap (widget); - else /* FIXME: multi depth broken ? */ - map = gtk_widget_get_default_colormap (); - - gdk_rgb_find_color (map, c); -} - -void -e_color_alloc_name (GtkWidget *widget, const gchar *name, GdkColor *c) -{ - GdkColormap *map; - - e_color_init (); - - gdk_color_parse (name, c); - - if (widget) - map = gtk_widget_get_colormap (widget); - else /* FIXME: multi depth broken ? */ - map = gtk_widget_get_default_colormap (); - - gdk_rgb_find_color (map, c); -} - -void -e_color_init (void) -{ - static gboolean e_color_inited = FALSE; - - /* It's surprisingly easy to end up calling this twice. Survive. */ - if (e_color_inited) - return; - - e_color_inited = TRUE; - - /* Allocate the default colors */ - e_white.red = 65535; - e_white.green = 65535; - e_white.blue = 65535; - e_color_alloc_gdk (NULL, &e_white); - - e_black.red = 0; - e_black.green = 0; - e_black.blue = 0; - e_color_alloc_gdk (NULL, &e_black); - - e_color_alloc_name (NULL, "gray20", &e_dark_gray); -} - diff --git a/widgets/misc/e-colors.h b/widgets/misc/e-colors.h deleted file mode 100644 index c867d6425c..0000000000 --- a/widgets/misc/e-colors.h +++ /dev/null @@ -1,41 +0,0 @@ -/* - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) version 3. - * - * 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> - * - * - * Authors: - * Miguel de Icaza (miguel@kernel.org) - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * - */ - -#ifndef GNOME_APP_LIBS_COLOR_H -#define GNOME_APP_LIBS_COLOR_H - -#include <gtk/gtk.h> - -G_BEGIN_DECLS - -void e_color_init (void); - -/* Return the pixel value for the given red, green and blue */ -gulong e_color_alloc (gushort red, gushort green, gushort blue); -void e_color_alloc_name (GtkWidget *widget, const gchar *name, GdkColor *color); -void e_color_alloc_gdk (GtkWidget *widget, GdkColor *color); - -extern GdkColor e_white, e_dark_gray, e_black; - -G_END_DECLS - -#endif /* GNOME_APP_LIBS_COLOR_H */ |