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

FINISHED_POP -> FINISHED

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8002 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Lars Gullik Bjønnes 2003-10-29 13:34:11 +00:00
parent 1d7a715329
commit 3df493e9d6
6 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ChangeLog
View File

@ -1,3 +1,8 @@
2003-10-29 Lars Gullik Bjønnes <larsbj@gullik.net>
* dispatchresult.h: remove FINISHED_POP as FINISHED has the same
meaning.
2003-10-29 Lars Gullik Bjønnes <larsbj@gullik.net> 2003-10-29 Lars Gullik Bjønnes <larsbj@gullik.net>
* dispatchresult.h: rename DISPATCHED_POP to FINISHED_POP, remove * dispatchresult.h: rename DISPATCHED_POP to FINISHED_POP, remove

3
src/dispatchresult.h
View File

@ -35,8 +35,7 @@ enum dispatch_result_t {
FINISHED, FINISHED,
FINISHED_RIGHT, FINISHED_RIGHT,
FINISHED_UP, FINISHED_UP,
FINISHED_DOWN, FINISHED_DOWN
FINISHED_POP
}; };
/** \c DispatchResult is a wrapper for dispatch_result_t. /** \c DispatchResult is a wrapper for dispatch_result_t.

7
src/mathed/ChangeLog
View File

@ -2,7 +2,14 @@
* math_hullinset.C (priv_dispatch): * math_hullinset.C (priv_dispatch):
* math_gridinset.C (priv_dispatch): * math_gridinset.C (priv_dispatch):
* math_cursor.C (dispatch): FINISHED_POP -> FINISHED
2003-10-29 Lars Gullik Bjřnnes <larsbj@gullik.net>
* math_hullinset.C (priv_dispatch):
* math_gridinset.C (priv_dispatch):
* math_cursor.C (dispatch): DISPATCHED_POP -> FINISHED_POP * math_cursor.C (dispatch): DISPATCHED_POP -> FINISHED_POP
(dispatch):
* math_scriptinset.h: change dispatch to priv_dispatch and make it * math_scriptinset.h: change dispatch to priv_dispatch and make it
protected protected

2
src/mathed/math_cursor.C
View File

@ -1439,7 +1439,7 @@ DispatchResult MathCursor::dispatch(FuncRequest const & cmd)
CursorPos & pos = Cursor_[i]; CursorPos & pos = Cursor_[i];
DispatchResult res = pos.inset_->dispatch(cmd, pos.idx_, pos.pos_); DispatchResult res = pos.inset_->dispatch(cmd, pos.idx_, pos.pos_);
if (res != UNDISPATCHED) { if (res != UNDISPATCHED) {
if (res == FINISHED_POP) { if (res == FINISHED) {
Cursor_.shrink(i + 1); Cursor_.shrink(i + 1);
selClear(); selClear();
} }

12
src/mathed/math_gridinset.C
View File

@ -1072,12 +1072,12 @@ DispatchResult MathGridInset::priv_dispatch(FuncRequest const & cmd,
idx = nargs() - 1; idx = nargs() - 1;
if (pos > cell(idx).size()) if (pos > cell(idx).size())
pos = cell(idx).size(); pos = cell(idx).size();
return FINISHED_POP; return FINISHED;
case LFUN_CELL_SPLIT: case LFUN_CELL_SPLIT:
//recordUndo(bv, Undo::ATOMIC); //recordUndo(bv, Undo::ATOMIC);
splitCell(idx, pos); splitCell(idx, pos);
return FINISHED_POP; return FINISHED;
case LFUN_BREAKLINE: { case LFUN_BREAKLINE: {
//recordUndo(bv, Undo::INSERT); //recordUndo(bv, Undo::INSERT);
@ -1096,7 +1096,7 @@ DispatchResult MathGridInset::priv_dispatch(FuncRequest const & cmd,
pos = cell(idx).size(); pos = cell(idx).size();
//mathcursor->normalize(); //mathcursor->normalize();
return FINISHED_POP; return FINISHED;
} }
case LFUN_TABULAR_FEATURE: { case LFUN_TABULAR_FEATURE: {
@ -1152,8 +1152,8 @@ DispatchResult MathGridInset::priv_dispatch(FuncRequest const & cmd,
swapCol(col(idx)); swapCol(col(idx));
else else
return UNDISPATCHED; return UNDISPATCHED;
lyxerr << "returning DISPATCHED_POP" << endl; lyxerr << "returning FINISHED" << endl;
return FINISHED_POP; return FINISHED;
} }
case LFUN_PASTE: { case LFUN_PASTE: {
@ -1184,7 +1184,7 @@ DispatchResult MathGridInset::priv_dispatch(FuncRequest const & cmd,
for (col_type c = 0; c < grid.ncols(); ++c) for (col_type c = 0; c < grid.ncols(); ++c)
cell(i).append(grid.cell(grid.index(r, c))); cell(i).append(grid.cell(grid.index(r, c)));
} }
return FINISHED_POP; return FINISHED;
} }
default: default:

8
src/mathed/math_hullinset.C
View File

@ -782,7 +782,7 @@ DispatchResult MathHullInset::priv_dispatch
mutate("eqnarray"); mutate("eqnarray");
idx = 1; idx = 1;
pos = 0; pos = 0;
return FINISHED_POP; return FINISHED;
} }
return MathGridInset::priv_dispatch(cmd, idx, pos); return MathGridInset::priv_dispatch(cmd, idx, pos);
@ -837,7 +837,7 @@ DispatchResult MathHullInset::priv_dispatch
case LFUN_MATH_EXTERN: case LFUN_MATH_EXTERN:
doExtern(cmd, idx, pos); doExtern(cmd, idx, pos);
return FINISHED_POP; return FINISHED;
case LFUN_MATH_MUTATE: { case LFUN_MATH_MUTATE: {
lyxerr << "Hull: MUTATE: " << cmd.argument << endl; lyxerr << "Hull: MUTATE: " << cmd.argument << endl;
@ -849,14 +849,14 @@ DispatchResult MathHullInset::priv_dispatch
idx = nargs() - 1; idx = nargs() - 1;
if (pos > cell(idx).size()) if (pos > cell(idx).size())
pos = cell(idx).size(); pos = cell(idx).size();
return FINISHED_POP; return FINISHED;
} }
case LFUN_MATH_DISPLAY: { case LFUN_MATH_DISPLAY: {
mutate(type_ == "simple" ? "equation" : "simple"); mutate(type_ == "simple" ? "equation" : "simple");
idx = 0; idx = 0;
pos = cell(idx).size(); pos = cell(idx).size();
return FINISHED_POP; return FINISHED;
} }
default: default: