From b90477deccf264e84eb5b7170c467bb82642e4c9 Mon Sep 17 00:00:00 2001 From: John Levon Date: Fri, 12 Jul 2002 02:27:42 +0000 Subject: [PATCH] remove a ColorHandler reference git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4611 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/ChangeLog | 4 ++++ src/frontends/ChangeLog | 4 ++++ src/frontends/lyx_gui.h | 5 +++++ src/frontends/qt2/ChangeLog | 4 ++++ src/frontends/qt2/lyx_gui.C | 6 ++++++ src/frontends/xforms/ChangeLog | 4 ++++ src/frontends/xforms/lyx_gui.C | 5 +++++ src/lyxfunc.C | 8 ++++---- 8 files changed, 36 insertions(+), 4 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 5dcd1d7699..ae72761610 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2002-07-12 John Levon + + * lyxfunc.C: use lyx_gui::update_color() + 2002-07-11 John Levon * bufferlist.C: diff --git a/src/frontends/ChangeLog b/src/frontends/ChangeLog index 58d13634d7..f8216c10d5 100644 --- a/src/frontends/ChangeLog +++ b/src/frontends/ChangeLog @@ -1,3 +1,7 @@ +2002-07-12 John Levon + + * lyx_gui.h: add update_color + 2002-07-09 John Levon * Painter.C: diff --git a/src/frontends/lyx_gui.h b/src/frontends/lyx_gui.h index 98f68cd878..b839db26cb 100644 --- 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 349b55bb03..5940891742 100644 --- a/src/frontends/qt2/ChangeLog +++ b/src/frontends/qt2/ChangeLog @@ -1,3 +1,7 @@ +2002-07-12 John Levon + + * lyx_gui.C: add un-needed update_color() + 2002-07-12 John Levon * QtView.h: diff --git a/src/frontends/qt2/lyx_gui.C b/src/frontends/qt2/lyx_gui.C index e8a7e766be..7826081da6 100644 --- 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 15f7b08be9..76fd8b5e17 100644 --- a/src/frontends/xforms/ChangeLog +++ b/src/frontends/xforms/ChangeLog @@ -1,3 +1,7 @@ +2002-07-12 John Levon + + * lyx_gui.C: add update_color() + 2002-07-11 John Levon * FormPreferences.C: diff --git a/src/frontends/xforms/lyx_gui.C b/src/frontends/xforms/lyx_gui.C index bf859d2c7e..33b7f49736 100644 --- 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 d88688876c..1071eb048e 100644 --- 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 #include +#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 -- 2.39.5