remove unneeded in_update_ members

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7299 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
André Pönitz 2003-07-17 07:43:55 +00:00
parent e62ce55f8c
commit 52b22859af
6 changed files with 7 additions and 11 deletions

View File

@ -1,4 +1,9 @@
2003-07-17 André Pönitz <poenitz@gmx.net>
* insettext.[Ch]:
* insettabular.[Ch]: remove unneeded in_update_ members
2003-07-17 André Pönitz <poenitz@gmx.net> 2003-07-17 André Pönitz <poenitz@gmx.net>
* insetcollapsable.C: * insetcollapsable.C:

View File

@ -167,7 +167,6 @@ InsetTabular::InsetTabular(Buffer const & buf, int rows, int columns)
actrow = actcell = 0; actrow = actcell = 0;
clearSelection(); clearSelection();
need_update = INIT; need_update = INIT;
in_update = false;
in_reset_pos = 0; in_reset_pos = 0;
inset_x = 0; inset_x = 0;
inset_y = 0; inset_y = 0;
@ -186,7 +185,6 @@ InsetTabular::InsetTabular(InsetTabular const & tab)
actrow = actcell = 0; actrow = actcell = 0;
clearSelection(); clearSelection();
need_update = INIT; need_update = INIT;
in_update = false;
in_reset_pos = 0; in_reset_pos = 0;
inset_x = 0; inset_x = 0;
inset_y = 0; inset_y = 0;

View File

@ -345,8 +345,6 @@ private:
/// ///
mutable UpdateCodes need_update; mutable UpdateCodes need_update;
/// ///
bool in_update;
///
mutable int in_reset_pos; mutable int in_reset_pos;
}; };

View File

@ -125,7 +125,7 @@ void InsetText::restoreLyXTextState() const
InsetText::InsetText(BufferParams const & bp) InsetText::InsetText(BufferParams const & bp)
: UpdatableInset(), in_update(false), text_(0, this) : UpdatableInset(), text_(0, this)
{ {
paragraphs.push_back(Paragraph()); paragraphs.push_back(Paragraph());
paragraphs.begin()->layout(bp.getLyXTextClass().defaultLayout()); paragraphs.begin()->layout(bp.getLyXTextClass().defaultLayout());
@ -136,7 +136,7 @@ InsetText::InsetText(BufferParams const & bp)
InsetText::InsetText(InsetText const & in) InsetText::InsetText(InsetText const & in)
: UpdatableInset(in), in_update(false), text_(0, this) : UpdatableInset(in), text_(0, this)
{ {
init(&in); init(&in);
} }

View File

@ -362,8 +362,6 @@ private:
mutable int frame_y; mutable int frame_y;
mutable int frame_w; mutable int frame_w;
mutable int frame_h; mutable int frame_h;
///
bool in_update; /* as update is not reentrant! */
mutable bool in_insetAllowed; mutable bool in_insetAllowed;
/// ///
// these are used to check for mouse movement in Motion selection code // these are used to check for mouse movement in Motion selection code

View File

@ -178,9 +178,6 @@ void RowPainter::paintInset(pos_type const pos)
Assert(inset); Assert(inset);
#warning inset->update FIXME
//inset->update(perv(bv_), false);
PainterInfo pi(perv(bv_)); PainterInfo pi(perv(bv_));
pi.base.font = getFont(pos); pi.base.font = getFont(pos);
int const w = inset->width(perv(bv_), pi.base.font); int const w = inset->width(perv(bv_), pi.base.font);