#include "math_data.h"
#include "math_mathmlstream.h"
#include "math_streamstr.h"
+#include "dispatchresult.h"
#include "debug.h"
#include "funcrequest.h"
+#include "LColor.h"
#include "frontends/Painter.h"
#include "support/std_sstream.h"
using std::min;
using std::swap;
+using std::string;
using std::auto_ptr;
using std::istream;
using std::istringstream;
data << name() << " active_cell " << 0 << '\n';
WriteStream ws(data);
inset_.write(ws);
- return STRCONV(data.str());
+ return data.str();
}
protected:
}
-dispatch_result MathGridInset::dispatch
- (FuncRequest const & cmd, idx_type & idx, pos_type & pos)
+DispatchResult MathGridInset::priv_dispatch(FuncRequest const & cmd,
+ idx_type & idx, pos_type & pos)
{
switch (cmd.action) {
case LFUN_MOUSE_RELEASE:
//if (cmd.button() == mouse_button::button3) {
// GridInsetMailer(*this).showDialog();
- // return DISPATCHED;
+ // return DispatchResult(true, true);
//}
- return UNDISPATCHED;
+ return DispatchResult(false);
case LFUN_INSET_DIALOG_UPDATE:
GridInsetMailer(*this).updateDialog(cmd.view());
- return UNDISPATCHED;
+ return DispatchResult(false);
// insert file functions
case LFUN_DELETE_LINE_FORWARD:
idx = nargs() - 1;
if (pos > cell(idx).size())
pos = cell(idx).size();
- return DISPATCHED_POP;
+ return DispatchResult(true, FINISHED);
case LFUN_CELL_SPLIT:
//recordUndo(bv, Undo::ATOMIC);
splitCell(idx, pos);
- return DISPATCHED_POP;
+ return DispatchResult(true, FINISHED);
case LFUN_BREAKLINE: {
//recordUndo(bv, Undo::INSERT);
pos = cell(idx).size();
//mathcursor->normalize();
- return DISPATCHED_POP;
+ return DispatchResult(true, FINISHED);
}
case LFUN_TABULAR_FEATURE: {
//lyxerr << "handling tabular-feature " << cmd.argument << endl;
- istringstream is(STRCONV(cmd.argument));
+ istringstream is(cmd.argument);
string s;
is >> s;
if (s == "valign-top")
else if (s == "swap-column")
swapCol(col(idx));
else
- return UNDISPATCHED;
- lyxerr << "returning DISPATCHED_POP" << endl;
- return DISPATCHED_POP;
+ return DispatchResult(false);
+ lyxerr << "returning DispatchResult(true, FINISHED)" << endl;
+ return DispatchResult(true, FINISHED);
}
case LFUN_PASTE: {
for (row_type r = 0; r < numrows; ++r) {
for (col_type c = 0; c < numcols; ++c) {
idx_type i = index(r + row(idx), c + col(idx));
- cell(i).append(grid.cell(grid.index(r, c)));
+ cell(i).insert(0, grid.cell(grid.index(r, c)));
}
// append the left over horizontal cells to the last column
idx_type i = index(r + row(idx), ncols() - 1);
for (col_type c = 0; c < grid.ncols(); ++c)
cell(i).append(grid.cell(grid.index(r, c)));
}
- return DISPATCHED_POP;
+ return DispatchResult(true, FINISHED);
}
default:
- return MathNestInset::dispatch(cmd, idx, pos);
+ return MathNestInset::priv_dispatch(cmd, idx, pos);
}
}