* InsetMathMBox.C: Make it compile.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17307
a592a061-630c-0410-9148-
cb99ea01b6c8
list(REMOVE_ITEM mathed_sources
${TOP_SRC_DIR}/src/mathed/InsetMathXYArrow.C
list(REMOVE_ITEM mathed_sources
${TOP_SRC_DIR}/src/mathed/InsetMathXYArrow.C
- ${TOP_SRC_DIR}/src/mathed/InsetMathMBox.C
${TOP_SRC_DIR}/src/mathed/InsetFormulaMacro.C)
lyx_add_msvc_pch(mathed)
${TOP_SRC_DIR}/src/mathed/InsetFormulaMacro.C)
lyx_add_msvc_pch(mathed)
#include "InsetMathMBox.h"
#include "MathData.h"
#include "InsetMathMBox.h"
#include "MathData.h"
#include "BufferView.h"
#include "buffer.h"
#include "BufferView.h"
#include "buffer.h"
#include "outputparams.h"
#include "paragraph.h"
#include "texrow.h"
#include "outputparams.h"
#include "paragraph.h"
#include "texrow.h"
+#include "TextMetrics.h"
+//using support::odocstream;
using std::auto_ptr;
using std::endl;
InsetMathMBox::InsetMathMBox(BufferView & bv)
using std::auto_ptr;
using std::endl;
InsetMathMBox::InsetMathMBox(BufferView & bv)
{
text_.paragraphs().clear();
text_.paragraphs().push_back(Paragraph());
text_.paragraphs().back().
layout(bv.buffer()->params().getLyXTextClass().defaultLayout());
{
text_.paragraphs().clear();
text_.paragraphs().push_back(Paragraph());
text_.paragraphs().back().
layout(bv.buffer()->params().getLyXTextClass().defaultLayout());
- text_.redoParagraph(0);
bool InsetMathMBox::metrics(MetricsInfo & mi, Dimension & dim) const
{
bool InsetMathMBox::metrics(MetricsInfo & mi, Dimension & dim) const
{
- text_.metrics(mi, dim);
+ TextMetrics & tm = mi.base.bv->textMetrics(&text_);
+ tm.metrics(mi, dim);
metricsMarkers2(dim);
if (dim_ == dim)
return false;
metricsMarkers2(dim);
if (dim_ == dim)
return false;
void InsetMathMBox::cursorPos(BufferView const & bv,
CursorSlice const & sl, bool boundary, int & x, int & y) const
{
void InsetMathMBox::cursorPos(BufferView const & bv,
CursorSlice const & sl, bool boundary, int & x, int & y) const
{
- x = text_.cursorX(sl, boundary);
- y = text_.cursorY(sl, boundary);
+ x = text_.cursorX(bv, sl, boundary);
+ y = text_.cursorY(bv, sl, boundary);