try this for distinguishing inner and outer tabs

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

diff --git a/src/frontends/xforms/Color.C b/src/frontends/xforms/Color.C
index b8035a58946f9ea53bb659f2dc8d2eda12cf4982..ec269bb95f225f496a62cb00ee843270d64c97f8 100644 (file)
--- a/src/frontends/xforms/Color.C
+++ b/src/frontends/xforms/Color.C
@@ -18,13 +18,10 @@
 
 #include <algorithm> // max
 #include <cmath> // floor
-#include <fstream> // ofstream
 #include "Color.h"
-#include "lyxlex.h"
 
 using std::max;
 using std::min;
-using std::ofstream;
 
 static int const nohue = -1;
 
@@ -97,13 +94,12 @@ RGBColor::RGBColor(HSVColor const & hsv)
 
 HSVColor::HSVColor(RGBColor const & rgb)
 {
-       // r, g, b lie in the range 0-1, not 0-255.
        double const r = rgb.r / 255.0;
        double const g = rgb.g / 255.0;
        double const b = rgb.b / 255.0;
 
        double const maxval = max( max( r, g ), b );
-       double const minval = max( min( r, g ), b );
+       double const minval = min( min( r, g ), b );
 
        v = maxval;
 
@@ -131,92 +127,3 @@ HSVColor::HSVColor(RGBColor const & rgb)
                        h += 360;
        }
 }
-
-
-// sorted by hand to prevent LyXLex from complaining on read().
-static
-keyword_item xformTags[] = {
-//     { "\\gui_active_tab", FL_LIGHTER_COL1 },
-       { "\\gui_background", FL_COL1 },
-       { "\\gui_buttonbottom", FL_BOTTOM_BCOL },
-       { "\\gui_buttonleft", FL_LEFT_BCOL },
-       { "\\gui_buttonright", FL_RIGHT_BCOL },
-       { "\\gui_buttontop", FL_TOP_BCOL },
-       { "\\gui_inactive", FL_INACTIVE },
-       { "\\gui_push_button", FL_YELLOW },
-       { "\\gui_selected", FL_MCOL },  
-       { "\\gui_text", FL_BLACK }
-};
-
-
-static const int xformCount = sizeof(xformTags) / sizeof(keyword_item);
-
-
-bool XformColor::read(string const & filename)
-{
-       LyXLex lexrc(xformTags, xformCount);
-       if (!lexrc.setFile(filename))
-               return false;
-
-       while (lexrc.IsOK()) {
-               int const le = lexrc.lex();
-
-               switch (le) {
-               case LyXLex::LEX_UNDEF:
-                       lexrc.printError("Unknown tag `$$Token'");
-                       continue; 
-               case LyXLex::LEX_FEOF:
-                       continue;
-               default: break;
-               }
-
-               RGBColor col;
-
-               if (!lexrc.next()) break;
-               col.r = lexrc.GetInteger();
-
-               if (!lexrc.next()) break;
-               col.g = lexrc.GetInteger();
-
-               if (!lexrc.next()) break;
-               col.b = lexrc.GetInteger();
-
-               fl_mapcolor(le, col.r, col.g, col.b);
-       }
-       
-       return true;
-}
-
-
-bool XformColor::write(string const & filename)
-{
-       ofstream os(filename.c_str());
-       if (!os)
-               return false;
-
-       os << "### This file is part of\n"
-          << "### ========================================================\n"
-          << "###          LyX, The Document Processor\n"
-          << "###\n"
-          << "###          Copyright 1995 Matthias Ettrich\n"
-          << "###          Copyright 1995-2000 The LyX Team.\n"
-          << "###\n"
-          << "### ========================================================\n"
-          << "\n"
-          << "# This file is written by LyX, if you want to make your own\n"
-          << "# modifications you should do them from inside LyX and save\n"
-          << "\n";
-
-       for (int i = 0; i < xformCount; ++i) {
-               string const tag  = xformTags[i].tag;
-               int const colorID = xformTags[i].code;
-               RGBColor color;
-
-               fl_getmcolor(colorID, &color.r, &color.g, &color.b);
-
-               os << tag << " "
-                  << color.r << " " << color.g << " " << color.b << "\n";
-       }
-
-       return true;
-}