anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-23 16:52:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

YABG from Alfredo

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@6887 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
John Levon 2003-04-29 19:56:04 +00:00
parent 3a2a63d322
commit 8406bbecb7
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/ChangeLog
View File

@ -1,5 +1,8 @@
2003-04-29 Alfredo Braunstein <abraunst@libero.it>
2003-04-29 André Pönitz <poenitz@gmx.net> * text3.C (gotoInset): YABG (yet another bad getChar)
2003-04-29 André Pönitz <poenitz@gmx.net>
* paragraph.h: make operator= private unimplemented as long as * paragraph.h: make operator= private unimplemented as long as
it is unusable it is unusable
@ -7,17 +10,20 @@
* ParagraphList.C: whitespace * ParagraphList.C: whitespace
* paragraph.[Ch]: * paragraph.[Ch]:
paragraph_pimpl.[Ch]: * paragraph_pimpl.[Ch]:
paragraph_funcs.C: * paragraph_funcs.C:
CutAndPaste.C: * CutAndPaste.C:
undo_funcs.C: whitespace + Paragraph * -> Paragraph (const) & * undo_funcs.C: whitespace + Paragraph * -> Paragraph (const) &
* text2.C: * text2.C:
undo_funcs.[Ch]: Paragraph * -> ParagraphList::iterator undo_funcs.[Ch]: Paragraph * -> ParagraphList::iterator
2003-04-29 Alfredo Braunstein <abraunst@libero.it> 2003-04-29 Alfredo Braunstein <abraunst@libero.it>
* CutAndPaste.C (cutSelection): big rework, some bugs fixed * CutAndPaste.[Ch] (cutSelection): big rework, some bugs fixed
* paragraph.[Ch] (erase):
* paragraph_pimpl.[Ch] (erase): change return type and value
* text2.C (cutSelection): some rework
2003-04-28 John Levon <levon@movementarian.org> 2003-04-28 John Levon <levon@movementarian.org>
@ -30,7 +36,7 @@
* buffer.C (readFile): ws changes only. * buffer.C (readFile): ws changes only.
2003-04-28 André Pönitz <poenitz@gmx.net> 2003-04-28 André Pönitz <poenitz@gmx.net>
* undo_funcs.C: * undo_funcs.C:
* lyxfunc.C: * lyxfunc.C:
@ -38,7 +44,7 @@
* BufferView_pimpl.C: * BufferView_pimpl.C:
* BufferView.C: getParFromID related ParagraphList::iterator changes * BufferView.C: getParFromID related ParagraphList::iterator changes
2003-04-28 André Pönitz <poenitz@gmx.net> 2003-04-28 André Pönitz <poenitz@gmx.net>
* tabular.[Ch]: part of Lars' Paragraph * -> ParagraphList::iterator * tabular.[Ch]: part of Lars' Paragraph * -> ParagraphList::iterator
Changes Changes

7
src/text3.C
View File

@ -201,14 +201,15 @@ bool LyXText::gotoNextInset(vector<Inset::Code> const & codes,
void LyXText::gotoInset(vector<Inset::Code> const & codes, void LyXText::gotoInset(vector<Inset::Code> const & codes,
bool same_content) bool same_content)
{ {
bv()->hideCursor(); bv()->hideCursor();
bv()->beforeChange(this); bv()->beforeChange(this);
update(); update();
string contents; string contents;
if (same_content && cursor.par()->isInset(cursor.pos())) { if (same_content && cursor.pos() < cursor.par()->size()
&& cursor.par()->isInset(cursor.pos())) {
Inset const * inset = cursor.par()->getInset(cursor.pos()); Inset const * inset = cursor.par()->getInset(cursor.pos());
if (find(codes.begin(), codes.end(), inset->lyxCode()) if (find(codes.begin(), codes.end(), inset->lyxCode())
!= codes.end()) != codes.end())
@ -1403,9 +1404,7 @@ Inset::RESULT LyXText::dispatch(FuncRequest const & cmd)
UpdatableInset * inset = static_cast<UpdatableInset *>(inset_hit); UpdatableInset * inset = static_cast<UpdatableInset *>(inset_hit);
selection_possible = false; selection_possible = false;
bv->owner()->message(inset->editMessage()); bv->owner()->message(inset->editMessage());
//inset->edit(bv, x, y, cmd.button());
// We just have to lock the inset before calling a PressEvent on it! // We just have to lock the inset before calling a PressEvent on it!
// we don't need the edit() call here! (Jug20020329)
if (!bv->lockInset(inset)) if (!bv->lockInset(inset))
lyxerr[Debug::INSETS] << "Cannot lock inset" << endl; lyxerr[Debug::INSETS] << "Cannot lock inset" << endl;
FuncRequest cmd1(bv, LFUN_MOUSE_PRESS, x, y, cmd.button()); FuncRequest cmd1(bv, LFUN_MOUSE_PRESS, x, y, cmd.button());