*** empty log message ***

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5401 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
André Pönitz 2002-10-15 06:21:59 +00:00
parent 260f646231
commit 3c3a628e81
3 changed files with 5 additions and 18 deletions

View File

@ -1483,25 +1483,10 @@ MathCursorPos MathCursor::normalAnchor() const
MathInset::result_type MathCursor::dispatch(FuncRequest const & cmd) MathInset::result_type MathCursor::dispatch(FuncRequest const & cmd)
{ {
// try to dispatch to adajcent items if they are not editable
// actually, this should only happen for mouse clicks...
idx_type d1;
pos_type d2;
if (hasNextAtom() && !openable(nextAtom(), false)) {
MathInset::result_type res = nextAtom().nucleus()->dispatch(cmd, d1, d2);
if (res != MathInset::UNDISPATCHED)
return res;
}
if (hasPrevAtom() && !openable(prevAtom(), false)) {
MathInset::result_type res = prevAtom().nucleus()->dispatch(cmd, d1, d2);
if (res != MathInset::UNDISPATCHED)
return res;
}
for (int i = Cursor_.size() - 1; i >= 0; --i) { for (int i = Cursor_.size() - 1; i >= 0; --i) {
MathCursorPos & pos = Cursor_[i]; MathCursorPos & pos = Cursor_[i];
MathInset::result_type const res MathInset::result_type
= pos.par_->dispatch(cmd, pos.idx_, pos.pos_); res = pos.par_->dispatch(cmd, pos.idx_, pos.pos_);
if (res != MathInset::UNDISPATCHED) { if (res != MathInset::UNDISPATCHED) {
if (res == MathInset::DISPATCHED_POP) { if (res == MathInset::DISPATCHED_POP) {
Cursor_.shrink(i + 1); Cursor_.shrink(i + 1);

View File

@ -66,6 +66,7 @@ void MathArray::insert(size_type pos, MathAtom const & t)
void MathArray::insert(size_type pos, MathArray const & ar) void MathArray::insert(size_type pos, MathArray const & ar)
{ {
lyx::Assert(pos <= size());
base_type::insert(begin() + pos, ar.begin(), ar.end()); base_type::insert(begin() + pos, ar.begin(), ar.end());
} }

View File

@ -332,7 +332,8 @@ MathInset::result_type MathNestInset::dispatch
case LFUN_PASTESELECTION: case LFUN_PASTESELECTION:
return return
dispatch(FuncRequest(bv, LFUN_PASTE, bv->getClipboard()), idx, pos); dispatch(
FuncRequest(bv, LFUN_PASTE, bv->getClipboard()), idx, pos);
case LFUN_MOUSE_PRESS: case LFUN_MOUSE_PRESS:
if (cmd.button() == mouse_button::button2) if (cmd.button() == mouse_button::button2)