more cursor dispatch

[lyx.git] / src / factory.C

diff --git a/src/factory.C b/src/factory.C
index f5a79b3ec543ba7d9fae794743371a4f566aac82..b0f443fdab9ed8ea3a06f3662e6510cce9fe6d71 100644 (file)
--- a/src/factory.C
+++ b/src/factory.C
@@ -52,11 +52,13 @@
 #include "insets/inseturl.h"
 #include "insets/insetvspace.h"
 #include "insets/insetwrap.h"
+
 #include "mathed/formulamacro.h"
-#include "mathed/formula.h"
+#include "mathed/math_hullinset.h"
 
 #include "frontends/Dialogs.h"
 #include "frontends/LyXView.h"
+
 #include "support/lstrings.h"
 #include "support/std_sstream.h"
 
@@ -69,7 +71,7 @@ using std::endl;
 using std::string;
 
 
-InsetOld * createInset(BufferView * bv, FuncRequest const & cmd)
+InsetBase * createInset(BufferView * bv, FuncRequest const & cmd)
 {
        BufferParams const & params = bv->buffer()->params();
 
@@ -179,16 +181,19 @@ InsetOld * createInset(BufferView * bv, FuncRequest const & cmd)
                bv->owner()->getDialogs().show("tabularcreate");
                return 0;
 
-       case LFUN_INSET_CAPTION: 
-       if (!bv->innerInset()) {
-               auto_ptr<InsetCaption> inset(new InsetCaption(params));
-               inset->setOwner(bv->innerInset());
-               inset->setAutoBreakRows(true);
-               inset->setDrawFrame(InsetText::LOCKED);
-               inset->setFrameColor(LColor::captionframe);
-               return inset.release();
+       case LFUN_INSET_CAPTION: {
+               UpdatableInset * up = bv->cursor().inset()
+                       ? bv->cursor().inset()->asUpdatableInset() : 0;
+               if (!up) {
+                       auto_ptr<InsetCaption> inset(new InsetCaption(params));
+                       inset->setOwner(up);
+                       inset->setAutoBreakRows(true);
+                       inset->setDrawFrame(InsetText::LOCKED);
+                       inset->setFrameColor(LColor::captionframe);
+                       return inset.release();
+               }
+               return 0;
        }
-       return 0;
 
        case LFUN_INDEX_PRINT:
                return new InsetPrintIndex(InsetCommandParams("printindex"));
@@ -327,7 +332,7 @@ InsetOld * createInset(BufferView * bv, FuncRequest const & cmd)
 }
 
 
-InsetOld * readInset(LyXLex & lex, Buffer const & buf)
+InsetBase * readInset(LyXLex & lex, Buffer const & buf)
 {
        // consistency check
        if (lex.getString() != "\\begin_inset") {
@@ -335,7 +340,7 @@ InsetOld * readInset(LyXLex & lex, Buffer const & buf)
                       << endl;
        }
 
-       auto_ptr<InsetOld> inset;
+       auto_ptr<InsetBase> inset;
 
        LyXTextClass tclass = buf.params().getLyXTextClass();
                
@@ -402,7 +407,7 @@ InsetOld * readInset(LyXLex & lex, Buffer const & buf)
                } else if (tmptok == "FormulaMacro") {
                        inset.reset(new InsetFormulaMacro);
                } else if (tmptok == "Formula") {
-                       inset.reset(new InsetFormula);
+                       inset.reset(new MathHullInset);
                } else if (tmptok == "Graphics") {
                        inset.reset(new InsetGraphics);
                } else if (tmptok == "Note") {