Bugfixes: checkboxes to radiobuttons (from J�rgen S) and remove a little

[lyx.git] / src / frontends / xforms / Color.h

diff --git a/src/frontends/xforms/Color.h b/src/frontends/xforms/Color.h
index 8ce8548f05404f1fff5d98fd1e32de39ec4aadf6..48b1d88599a829ec305b2a6d1a609877d18ae87f 100644 (file)
--- a/src/frontends/xforms/Color.h
+++ b/src/frontends/xforms/Color.h
@@ -5,15 +5,13 @@
  *           LyX, The Document Processor
  *      
  *         Copyright 1995 Matthias Ettrich
- *          Copyright 1995-2000 The LyX Team.
+ *          Copyright 1995-2001 The LyX Team.
  *
  *======================================================*/
 
 #ifndef COLOR_H
 #define COLOR_H
 
-#include <utility> // for pair
-
 #ifdef __GNUG_
 #pragma interface
 #endif
@@ -42,17 +40,13 @@ struct RGBColor {
        RGBColor(HSVColor const &);
 };
 
-typedef std::pair<string, RGBColor> X11Color;
-
-/// struct holding xform-specific colors
-struct XformColor {
+struct NamedColor : public RGBColor {
        string name;
-       int colorID;
-       RGBColor col;
-       XformColor() : colorID(0) {}
+       NamedColor() : RGBColor() {}
+       NamedColor(string const & n, RGBColor const & c )
+               : RGBColor(c), name(n) {}
+       RGBColor const & color() const { return *this; }
        string const & getname() const { return name; }
-       static bool read(string const &);
-       static bool write(string const &);
 };
 
 inline