From: André Pönitz Date: Thu, 17 Jul 2003 07:43:55 +0000 (+0000) Subject: remove unneeded in_update_ members X-Git-Tag: 1.6.10~16525 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=52b22859afd8ce2ea11ad2ede546b5b02040bf71;p=lyx.git 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 f939571026..0419ff718f 100644 --- a/src/insets/ChangeLog +++ b/src/insets/ChangeLog @@ -1,4 +1,9 @@ +2003-07-17 André Pönitz + + * insettext.[Ch]: + * insettabular.[Ch]: remove unneeded in_update_ members + 2003-07-17 André Pönitz * insetcollapsable.C: diff --git a/src/insets/insettabular.C b/src/insets/insettabular.C index 1672bdfa5b..b81346ad22 100644 --- 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 9ff09c9c46..816f833c77 100644 --- 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 d359758e08..68d6683367 100644 --- 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 8672ae8071..02260dab77 100644 --- 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 dab05373fb..92000456b5 100644 --- 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);