remove unneeded in_update_ members

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

diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog
index f939571026ae3127c20b802ff3982ee945d242a7..0419ff718f14c81aa91db95ccf768c0dbc47c7b4 100644 (file)
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -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>
 
        * insetcollapsable.C:

diff --git a/src/insets/insettabular.C b/src/insets/insettabular.C
index 1672bdfa5bc31a1aaf62823f9eb5654ebdfa47c9..b81346ad2250552bb7566d6bea61cc7e33e00ada 100644 (file)
--- a/src/insets/insettabular.C
+++ b/src/insets/insettabular.C
@@ -167,7 +167,6 @@ InsetTabular::InsetTabular(Buffer const & buf, int rows, int columns)
        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 const & tab)
        actrow = actcell = 0;
        clearSelection();
        need_update = INIT;
-       in_update = false;
        in_reset_pos = 0;
        inset_x = 0;
        inset_y = 0;

diff --git a/src/insets/insettabular.h b/src/insets/insettabular.h
index 9ff09c9c461a94943144ff78167adfae6e0b301a..816f833c77a8d1ab12478f3ea99f3a9020e3eb71 100644 (file)
--- a/src/insets/insettabular.h
+++ b/src/insets/insettabular.h
@@ -345,8 +345,6 @@ private:
        ///
        mutable UpdateCodes need_update;
        ///
-       bool in_update;
-       ///
        mutable int in_reset_pos;
 };
 

diff --git a/src/insets/insettext.C b/src/insets/insettext.C
index d359758e083def086a735d8e3c8c85778751aa04..68d66833674fe2d2f966bed3de2b62bb7fb99984 100644 (file)
--- a/src/insets/insettext.C
+++ b/src/insets/insettext.C
@@ -125,7 +125,7 @@ void InsetText::restoreLyXTextState() const
 
 
 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 & bp)
 
 
 InsetText::InsetText(InsetText const & in)
-       : UpdatableInset(in), in_update(false), text_(0, this)
+       : UpdatableInset(in), text_(0, this)
 {
        init(&in);
 }

diff --git a/src/insets/insettext.h b/src/insets/insettext.h
index 8672ae8071cda37046faf34ce93aff9219623112..02260dab77f2a889d3b009d08515ec006c16eff6 100644 (file)
--- a/src/insets/insettext.h
+++ b/src/insets/insettext.h
@@ -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

diff --git a/src/rowpainter.C b/src/rowpainter.C
index dab05373fbff91b51f3f055de1a0d443c6e838bd..92000456b58ea31dff02c4d341d093be039bf86c 100644 (file)
--- a/src/rowpainter.C
+++ b/src/rowpainter.C
@@ -178,9 +178,6 @@ void RowPainter::paintInset(pos_type const pos)
 
        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);