anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Small fix and remove some warinings.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2125 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jürgen Vigna 2001-06-14 14:10:25 +00:00
parent 0ba8b80b15
commit 3eaf3246be
4 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/BufferView_pimpl.C
View File

@ -945,8 +945,7 @@ void BufferView::Pimpl::workAreaExpose()
void BufferView::Pimpl::update() void BufferView::Pimpl::update()
{ {
if (screen_.get() && if (screen_.get() &&
(!bv_->text->theLockingInset() || (!bv_->theLockingInset() || !bv_->theLockingInset()->nodraw()))
!bv_->text->theLockingInset()->nodraw()))
{ {
screen_->Update(bv_->text, bv_); screen_->Update(bv_->text, bv_);
} }

4
src/insets/ChangeLog
View File

@ -1,3 +1,7 @@
2001-06-14 Juergen Vigna <jug@sad.it>
* insettext.C (draw): removed warinings.
2001-06-13 Juergen Vigna <jug@sad.it> 2001-06-13 Juergen Vigna <jug@sad.it>
* insettabular.C (nodraw): only go down the tree if we don't have * insettabular.C (nodraw): only go down the tree if we don't have

12
src/insets/insettext.C
View File

@ -292,7 +292,9 @@ void InsetText::draw(BufferView * bv, LyXFont const & f,
return; return;
if (top_x != int(x)) { if (top_x != int(x)) {
if ((getMaxWidth(bv, this) > 0) && (TEXT(bv)->width != old_max_width)){ if ((getMaxWidth(bv, this) > 0) &&
(TEXT(bv)->width != old_max_width))
{
resizeLyXText(bv); resizeLyXText(bv);
need_update |= FULL; need_update |= FULL;
old_max_width = TEXT(bv)->width; old_max_width = TEXT(bv)->width;
@ -330,12 +332,6 @@ void InsetText::draw(BufferView * bv, LyXFont const & f,
} }
x += TEXT_TO_INSET_OFFSET; x += TEXT_TO_INSET_OFFSET;
#ifdef WITH_WARNINGS
#warning Jürgen, why is this a block of its own? (Lgb)
#warning because you told me to define variables only in local context (Jug)!
#warning then make it a function/method of its own. (Lgb)
#endif
{
int y = 0; int y = 0;
Row * row = TEXT(bv)->GetRowNearY(y); Row * row = TEXT(bv)->GetRowNearY(y);
int y_offset = baseline - row->ascent_of_text(); int y_offset = baseline - row->ascent_of_text();
@ -379,7 +375,7 @@ void InsetText::draw(BufferView * bv, LyXFont const & f,
bv->screen()->Update(TEXT(bv), bv, y_offset, int(x)); bv->screen()->Update(TEXT(bv), bv, y_offset, int(x));
locked = true; locked = true;
} }
}
TEXT(bv)->refresh_y = 0; TEXT(bv)->refresh_y = 0;
TEXT(bv)->status = LyXText::UNCHANGED; TEXT(bv)->status = LyXText::UNCHANGED;
if ((need_update != CURSOR_PAR) && if ((need_update != CURSOR_PAR) &&

2
src/insets/insettext.h
View File

@ -303,7 +303,7 @@ private:
/// ///
mutable int inset_y; mutable int inset_y;
/// ///
mutable int old_max_width; mutable unsigned int old_max_width;
/// ///
bool no_selection; bool no_selection;
/// ///