bug + spped fixes + small stuff

[lyx.git] / src / mathed / command_inset.C

diff --git a/src/mathed/command_inset.C b/src/mathed/command_inset.C
index cbd82038a9632b6b73f04b052ea9d008a0899ec0..8ddd8fbe9aff80b96dc6d302888d40f4f986e5a7 100644 (file)
--- a/src/mathed/command_inset.C
+++ b/src/mathed/command_inset.C
@@ -11,10 +11,14 @@
 #include <config.h>
 
 #include "command_inset.h"
+#include "math_data.h"
 #include "math_mathmlstream.h"
+#include "dispatchresult.h"
 #include "funcrequest.h"
 #include "support/std_sstream.h"
 
+
+using std::string;
 using std::auto_ptr;
 using std::ostringstream;
 
@@ -49,14 +53,15 @@ void CommandInset::draw(PainterInfo & pi, int x, int y) const
        button_.draw(pi, x, y);
 }
 
-dispatch_result
-CommandInset::dispatch(FuncRequest const & cmd, idx_type & idx, pos_type & pos)
+
+DispatchResult
+CommandInset::priv_dispatch(LCursor & bv, FuncRequest const & cmd)
 {
        switch (cmd.action) {
                default:
-                       return MathNestInset::dispatch(cmd, idx, pos);
+                       return MathNestInset::priv_dispatch(bv, cmd);
        }
-       return UNDISPATCHED;
+       return DispatchResult(false);
 }
 
 
@@ -82,5 +87,5 @@ string const CommandInset::createDialogStr(string const & name) const
        WriteStream wsdata(data);
        write(wsdata);
        wsdata << "\n\\end_inset\n\n";
-       return STRCONV(data.str());
+       return data.str();
 }