remove a ColorHandler reference

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4611 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/ChangeLog b/src/ChangeLog
index 5dcd1d769941212f2756e0034f00dcce22677a15..ae72761610ec6a02cf491b35b66cd94bfb8c98c7 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2002-07-12  John Levon  <moz@compsoc.man.ac.uk>
+
+       * lyxfunc.C: use lyx_gui::update_color()
+ 
 2002-07-11  John Levon  <moz@compsoc.man.ac.uk>
 
        * bufferlist.C:

diff --git a/src/frontends/ChangeLog b/src/frontends/ChangeLog
index 58d13634d7ec3074a7987ba15f0edbbe55a5a1dd..f8216c10d5183be13bfc8261be0311dd7a4aa07f 100644 (file)
--- a/src/frontends/ChangeLog
+++ b/src/frontends/ChangeLog
@@ -1,3 +1,7 @@
+2002-07-12  John Levon  <moz@compsoc.man.ac.uk>
+
+       * lyx_gui.h: add update_color
+ 
 2002-07-09  John Levon  <moz@compsoc.man.ac.uk>
 
        * Painter.C:

diff --git a/src/frontends/lyx_gui.h b/src/frontends/lyx_gui.h
index 98f68cd878a32bd488bf8037172fa1fb8c223160..b839db26cb81e1b21e5324ad162097458cb34972 100644 (file)
--- a/src/frontends/lyx_gui.h
+++ b/src/frontends/lyx_gui.h
@@ -41,6 +41,11 @@ namespace lyx_gui {
         *      passing LColor::white returns "ffffff".
         */
        string const hexname(LColor::color col);
+
+       /**
+        * update an altered GUI color
+        */
+       void update_color(LColor::color col);
 }
 
 #endif // LYX_GUI_H

diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog
index 349b55bb03de60353fe8596ef5ec9872aa1e25d8..5940891742383569ee9f5ec159cdfc7c8e3cc60a 100644 (file)
--- a/src/frontends/qt2/ChangeLog
+++ b/src/frontends/qt2/ChangeLog
@@ -1,3 +1,7 @@
+2002-07-12  John Levon  <moz@compsoc.man.ac.uk>
+
+       * lyx_gui.C: add un-needed update_color()
+
 2002-07-12  John Levon  <moz@compsoc.man.ac.uk>
 
        * QtView.h:

diff --git a/src/frontends/qt2/lyx_gui.C b/src/frontends/qt2/lyx_gui.C
index e8a7e766becff4d6c65319e7b0b5f7a00bb58339..7826081da65dd51664e57023e0a82b113a14ccc5 100644 (file)
--- a/src/frontends/qt2/lyx_gui.C
+++ b/src/frontends/qt2/lyx_gui.C
@@ -126,3 +126,9 @@ string const lyx_gui::hexname(LColor::color col)
        // FIXME
        return "";
 }
+
+
+void lyx_gui::update_color(LColor::color col)
+{
+       // no need
+}

diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index 15f7b08be9546eac05f7309d5b93249f29cf1df1..76fd8b5e17fae50b6a131629ce949b548af08e4e 100644 (file)
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -1,3 +1,7 @@
+2002-07-12  John Levon  <moz@compsoc.man.ac.uk>
+
+       * lyx_gui.C: add update_color()
+ 
 2002-07-11  John Levon  <moz@compsoc.man.ac.uk>
 
        * FormPreferences.C:

diff --git a/src/frontends/xforms/lyx_gui.C b/src/frontends/xforms/lyx_gui.C
index bf859d2c7e2d261e3563f16ea9bb5598e136f3ad..33b7f49736fb60237f5da5e2ed3261ed4b4f03cd 100644 (file)
--- a/src/frontends/xforms/lyx_gui.C
+++ b/src/frontends/xforms/lyx_gui.C
@@ -339,3 +339,8 @@ string const lyx_gui::hexname(LColor::color col)
        return os.str().c_str();
 }
 
+
+void lyx_gui::update_color(LColor::color col)
+{
+       lyxColorHandler->updateColor(col);
+}

diff --git a/src/lyxfunc.C b/src/lyxfunc.C
index d88688876ca8006d4a68178a13ac8cdf04f18af6..1071eb048e73ea66eefae4b6b9712a70c3118cf3 100644 (file)
--- a/src/lyxfunc.C
+++ b/src/lyxfunc.C
@@ -20,7 +20,6 @@
 #include "lyxrow.h"
 #include "bufferlist.h"
 #include "BufferView.h"
-#include "frontends/xforms/ColorHandler.h"
 #include "lyxserver.h"
 #include "intl.h"
 #include "lyx_main.h"
@@ -35,13 +34,13 @@
 #include "layout.h"
 #include "bufferview_funcs.h"
 #include "frontends/MiniBuffer.h"
-#include "vspace.h"
 #include "frontends/LyXView.h"
+#include "frontends/lyx_gui.h"
+#include "vspace.h"
 #include "FloatList.h"
 #include "converter.h"
 #include "exporter.h"
 #include "importer.h"
-#include "frontends/font_loader.h"
 #include "TextCache.h"
 #include "lyxfind.h"
 #include "undo_funcs.h"
@@ -100,6 +99,7 @@
 #include <utility>
 #include <algorithm>
 
+#include "frontends/font_loader.h"
 
 using std::pair;
 using std::make_pair;
@@ -1613,7 +1613,7 @@ string const LyXFunc::dispatch(kb_action action, string argument)
                        break;
                }
 
-               lyxColorHandler->updateColor(lcolor.getFromLyXName(lyx_name));
+               lyx_gui::update_color(lcolor.getFromLyXName(lyx_name));
 
                if (graphicsbg_changed) {
 #ifdef WITH_WARNINGS