Imported Upstream version 3.0.0

[glabels] / src / color.h

diff --git a/src/color.h b/src/color.h
index c4403ad5dc24b73b1437eb530c154e7d11764849..48feed7ec491a72ecb15593a48e70175517d0e0c 100644 (file)
--- a/src/color.h
+++ b/src/color.h
@@ -1,32 +1,28 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */
-
 /*
- *  (GLABELS) Label and Business Card Creation program for GNOME
- *
- *  color.h:  various small utilities for dealing with canvas colors
+ *  color.h
+ *  Copyright (C) 2002-2009  Jim Evins <evins@snaught.com>.
  *
- *  Copyright (C) 2002-2007  Jim Evins <evins@snaught.com>.
+ *  This file is part of gLabels.
  *
- *  This program is free software; you can redistribute it and/or modify
+ *  gLabels 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
+ *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
- *  This program is distributed in the hope that it will be useful,
+ *  gLabels 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
+ *  along with gLabels.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __COLOR_H__
 #define __COLOR_H__
 
 #include "merge.h"
-#include <gdk/gdkcolor.h>
+#include <gdk/gdk.h>
 
 G_BEGIN_DECLS
 
@@ -45,6 +41,13 @@ G_BEGIN_DECLS
 
 
 #define GL_COLOR_NONE                  GL_COLOR_A(0,0,0,0)
+#define GL_COLOR_BLACK                 GL_COLOR_A(0,0,0,255)
+#define GL_COLOR_WHITE                 GL_COLOR_A(255,255,255,255)
+
+#define GL_COLOR_TEXT_DEFAULT          GL_COLOR_BLACK
+#define GL_COLOR_BC_DEFAULT            GL_COLOR_BLACK
+#define GL_COLOR_NO_LINE               GL_COLOR_NONE
+#define GL_COLOR_NO_FILL               GL_COLOR_NONE
 #define GL_COLOR_FILL_MERGE_DEFAULT    GL_COLOR_A(255,255,255,128)
 #define GL_COLOR_MERGE_DEFAULT         GL_COLOR_A(0,0,0,128)
 #define GL_COLOR_SHADOW_DEFAULT        GL_COLOR(0,0,0)
@@ -117,3 +120,14 @@ void         gl_color_node_free           (glColorNode    **color_node);
 G_END_DECLS
 
 #endif /* __COLOR_H__ */
+
+
+
+/*
+ * Local Variables:       -- emacs
+ * mode: C                -- emacs
+ * c-basic-offset: 8      -- emacs
+ * tab-width: 8           -- emacs
+ * indent-tabs-mode: nil  -- emacs
+ * End:                   -- emacs
+ */