Remove #include "LColor.h" from insettext.h. Deps down 10 to 95.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7768 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Angus Leeming 2003-09-16 10:30:59 +00:00
parent b9f0cff285
commit f4af685bd3
11 changed files with 42 additions and 7 deletions

View File

@ -1,6 +1,11 @@
2003-09-16 Angus Leeming <leeming@lyx.org>
* bufferparams.C, paragraph_pimpl.C: add #include "LColor.h".
* bufferparams.C:
* bufferview_funcs.C:
* lyxfunc.C:
* paragraph_pimpl.C:
* rowpainter.C:
* text.C: add #include "LColor.h".
2003-09-16 Angus Leeming <leeming@lyx.org>

View File

@ -21,6 +21,7 @@
#include "BufferView.h"
#include "gettext.h"
#include "language.h"
#include "LColor.h"
#include "lyxlex.h"
#include "lyxrow.h"
#include "paragraph.h"

View File

@ -1,3 +1,17 @@
2003-09-16 Angus Leeming <leeming@lyx.org>
* insettext.[Ch] (frameColor): new accessor function.
(frame_color_): stored as an int, allows us to remove #include "LColor.h" from
insettext.h
* insetbranch.C:
* insettabular.C:
* insettext.C:
add #include "LColor.h".
* insetcollapsable.h: add #include "LColor.h"
(for its framecolor member variable).
2003-09-16 Angus Leeming <leeming@lyx.org>
* insetenv.C (constructor): use accessor functions to access InsetText variables.

View File

@ -17,6 +17,7 @@
#include "BufferView.h"
#include "funcrequest.h"
#include "gettext.h"
#include "LColor.h"
#include "lyxlex.h"
#include "paragraph.h"

View File

@ -18,6 +18,7 @@
#include "insettext.h"
#include "box.h"
#include "LColor.h"
#include "lyxfont.h"
#include <boost/weak_ptr.hpp>

View File

@ -20,6 +20,7 @@
#include "FuncStatus.h"
#include "gettext.h"
#include "language.h"
#include "LColor.h"
#include "lyx_cb.h"
#include "lyxlex.h"
#include "metricsinfo.h"

View File

@ -22,6 +22,7 @@
#include "funcrequest.h"
#include "gettext.h"
#include "intl.h"
#include "LColor.h"
#include "lyxfind.h"
#include "lyxlex.h"
#include "lyxrc.h"
@ -102,11 +103,11 @@ void InsetText::init(InsetText const * ins)
autoBreakRows_ = ins->autoBreakRows_;
drawFrame_ = ins->drawFrame_;
frame_color_ = ins->frame_color_;
setFrameColor(ins->frameColor());
} else {
textwidth_ = 0; // broken
drawFrame_ = NEVER;
frame_color_ = LColor::insetframe;
setFrameColor(LColor::insetframe);
autoBreakRows_ = false;
}
the_locking_inset = 0;
@ -280,7 +281,7 @@ void InsetText::drawFrame(Painter & pain, int x) const
int const frame_y = top_baseline - dim_.asc + ttoD2;
int const frame_w = dim_.wid - TEXT_TO_INSET_OFFSET;
int const frame_h = dim_.asc + dim_.des - TEXT_TO_INSET_OFFSET;
pain.rectangle(frame_x, frame_y, frame_w, frame_h, frame_color_);
pain.rectangle(frame_x, frame_y, frame_w, frame_h, frameColor());
}
@ -1451,6 +1452,12 @@ void InsetText::setDrawFrame(DrawFrame how)
}
EnumLColor InsetText::frameColor() const
{
return LColor::color(frame_color_);
}
void InsetText::setFrameColor(EnumLColor col)
{
frame_color_ = col;

View File

@ -13,7 +13,6 @@
#define INSETTEXT_H
#include "updatableinset.h"
#include "LColor.h"
#include "ParagraphList_fwd.h"
#include "RowList_fwd.h"
#include "lyxtext.h"
@ -129,6 +128,7 @@ public:
///
void setDrawFrame(DrawFrame);
///
EnumLColor frameColor() const;
void setFrameColor(EnumLColor);
///
LyXText * getLyXText(BufferView const *,
@ -268,8 +268,10 @@ private:
bool autoBreakRows_;
///
DrawFrame drawFrame_;
///
LColor::color frame_color_;
/** We store the LColor::color value as an int to get LColor.h out
* of the header file.
*/
int frame_color_;
///
mutable bool locked;
///

View File

@ -37,6 +37,7 @@
#include "intl.h"
#include "iterators.h"
#include "kbmap.h"
#include "LColor.h"
#include "lyx_cb.h"
#include "LyXAction.h"
#include "lyxfind.h"

View File

@ -19,6 +19,7 @@
#include "encoding.h"
#include "gettext.h"
#include "language.h"
#include "LColor.h"
#include "lyxrc.h"
#include "lyxrow.h"
#include "lyxrow_funcs.h"

View File

@ -26,6 +26,7 @@
#include "funcrequest.h"
#include "gettext.h"
#include "language.h"
#include "LColor.h"
#include "lyxlength.h"
#include "lyxrc.h"
#include "lyxrow.h"