in_update is unneeded.
--
Those who desire to give up Freedom in order to gain Security, will not have,
nor do they deserve, either one. (T. Jefferson or B. Franklin or both...)
Index: rowpainter.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/rowpainter.C,v
retrieving revision 1.24
diff -u -p -r1.24 rowpainter.C
--- rowpainter.C 17 Jul 2003 06:45:37 -0000 1.24
+++ rowpainter.C 17 Jul 2003 07:37:09 -0000
@@ -178,9 +178,6 @@ void RowPainter::paintInset(pos_type con
Assert(inset);
-#warning inset->update FIXME
- //inset->update(perv(bv_), false);
-
PainterInfo pi(perv(bv_));
pi.base.font = getFont(pos);
int const w = inset->width(perv(bv_), pi.base.font);
Index: insets/insettabular.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insettabular.C,v
retrieving revision 1.299
diff -u -p -r1.299 insettabular.C
--- insets/insettabular.C 17 Jul 2003 07:32:00 -0000 1.299
+++ insets/insettabular.C 17 Jul 2003 07:37:09 -0000
@@ -167,7 +167,6 @@ InsetTabular::InsetTabular(Buffer const
actrow = actcell = 0;
clearSelection();
need_update = INIT;
- in_update = false;
in_reset_pos = 0;
inset_x = 0;
inset_y = 0;
@@ -186,7 +185,6 @@ InsetTabular::InsetTabular(InsetTabular
actrow = actcell = 0;
clearSelection();
need_update = INIT;
- in_update = false;
in_reset_pos = 0;
inset_x = 0;
inset_y = 0;
Index: insets/insettabular.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insettabular.h,v
retrieving revision 1.130
diff -u -p -r1.130 insettabular.h
--- insets/insettabular.h 17 Jul 2003 07:32:01 -0000 1.130
+++ insets/insettabular.h 17 Jul 2003 07:37:09 -0000
@@ -345,8 +345,6 @@ private:
///
mutable UpdateCodes need_update;
///
- bool in_update;
- ///
mutable int in_reset_pos;
};
Index: insets/insettext.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insettext.C,v
retrieving revision 1.433
diff -u -p -r1.433 insettext.C
--- insets/insettext.C 17 Jul 2003 07:32:01 -0000 1.433
+++ insets/insettext.C 17 Jul 2003 07:37:09 -0000
@@ -125,7 +125,7 @@ void InsetText::restoreLyXTextState() co
InsetText::InsetText(BufferParams const & bp)
- : UpdatableInset(), in_update(false), text_(0, this)
+ : UpdatableInset(), text_(0, this)
{
paragraphs.push_back(Paragraph());
paragraphs.begin()->layout(bp.getLyXTextClass().defaultLayout());
@@ -136,7 +136,7 @@ InsetText::InsetText(BufferParams const
InsetText::InsetText(InsetText const & in)
- : UpdatableInset(in), in_update(false), text_(0, this)
+ : UpdatableInset(in), text_(0, this)
{
init(&in);
}
Index: insets/insettext.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insettext.h,v
retrieving revision 1.177
diff -u -p -r1.177 insettext.h
--- insets/insettext.h 17 Jul 2003 07:32:01 -0000 1.177
+++ insets/insettext.h 17 Jul 2003 07:37:09 -0000
@@ -362,8 +362,6 @@ private:
mutable int frame_y;
mutable int frame_w;
mutable int frame_h;
- ///
- bool in_update; /* as update is not reentrant! */
mutable bool in_insetAllowed;
///
// these are used to check for mouse movement in Motion selection code
