Get rid of Inset::setPosCache

[lyx.git] / src / mathed / CommandInset.cpp

diff --git a/src/mathed/CommandInset.cpp b/src/mathed/CommandInset.cpp
index 01337c595f40a5422a0007ea2ee20255af48ca01..6b9466481cd44c8a948130ee409208c164ccb1fb 100644 (file)
--- a/src/mathed/CommandInset.cpp
+++ b/src/mathed/CommandInset.cpp
@@ -3,7 +3,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author André Pönitz
+ * \author André Pönitz
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -14,17 +14,17 @@
 #include "MathData.h"
 #include "MathStream.h"
 #include "DispatchResult.h"
-#include "FuncRequest.h"
 
 #include <sstream>
 
+using namespace std;
 
 namespace lyx {
 
-using std::string;
 
-CommandInset::CommandInset(docstring const & name)
-       : InsetMathNest(2), name_(name), set_label_(false)
+CommandInset::CommandInset(Buffer * buf, docstring const & name, bool needs_math_mode)
+       : InsetMathNest(buf, 2), name_(name), needs_math_mode_(needs_math_mode),
+         set_label_(false)
 {
        lock_ = true;
 }
@@ -58,14 +58,15 @@ Inset * CommandInset::editXY(Cursor & cur, int /*x*/, int /*y*/)
 void CommandInset::draw(PainterInfo & pi, int x, int y) const
 {
        button_.draw(pi, x, y);
-       setPosCache(pi, x, y);
 }
 
 
 void CommandInset::write(WriteStream & os) const
 {
-       os << '\\' << name_.c_str();
-       if (cell(1).size())
+       ModeSpecifier specifier(os, currentMode(), lockedMode(), asciiOnly());
+       MathEnsurer ensurer(os, needs_math_mode_);
+       os << '\\' << name_;
+       if (!cell(1).empty())
                os << '[' << cell(1) << ']';
        os << '{' << cell(0) << '}';
 }