anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 21:21:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

* mathed/CMakeLists.txt: do not exclude InsetMathMBox.C

Browse Source 
* InsetMathMBox.C: Make it compile.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17307 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Abdelrazak Younes 2007-02-22 21:17:34 +00:00
parent e8c63241d7
commit 986786c1c1
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
development/cmake/src/mathed/CMakeLists.txt
View File

@ -11,7 +11,6 @@ file(GLOB mathed_headers ${TOP_SRC_DIR}/src/mathed/*.h)
list(REMOVE_ITEM mathed_sources list(REMOVE_ITEM mathed_sources
${TOP_SRC_DIR}/src/mathed/InsetMathXYArrow.C ${TOP_SRC_DIR}/src/mathed/InsetMathXYArrow.C
${TOP_SRC_DIR}/src/mathed/InsetMathMBox.C
${TOP_SRC_DIR}/src/mathed/InsetFormulaMacro.C) ${TOP_SRC_DIR}/src/mathed/InsetFormulaMacro.C)
lyx_add_msvc_pch(mathed) lyx_add_msvc_pch(mathed)

15
src/mathed/InsetMathMBox.C
View File

@ -12,6 +12,7 @@
#include "InsetMathMBox.h" #include "InsetMathMBox.h"
#include "MathData.h" #include "MathData.h"
#include "MathStream.h"
#include "BufferView.h" #include "BufferView.h"
#include "buffer.h" #include "buffer.h"
@ -23,24 +24,23 @@
#include "outputparams.h" #include "outputparams.h"
#include "paragraph.h" #include "paragraph.h"
#include "texrow.h" #include "texrow.h"
#include "TextMetrics.h"
namespace lyx { namespace lyx {
using odocstream; //using support::odocstream;
using std::auto_ptr; using std::auto_ptr;
using std::endl; using std::endl;
InsetMathMBox::InsetMathMBox(BufferView & bv) InsetMathMBox::InsetMathMBox(BufferView & bv)
: text_(&bv), bv_(&bv) : text_(), bv_(&bv)
{ {
text_.paragraphs().clear(); text_.paragraphs().clear();
text_.paragraphs().push_back(Paragraph()); text_.paragraphs().push_back(Paragraph());
text_.paragraphs().back(). text_.paragraphs().back().
layout(bv.buffer()->params().getLyXTextClass().defaultLayout()); layout(bv.buffer()->params().getLyXTextClass().defaultLayout());
text_.redoParagraph(0);
} }
@ -52,7 +52,8 @@ auto_ptr<InsetBase> InsetMathMBox::doClone() const
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); metricsMarkers2(dim);
if (dim_ == dim) if (dim_ == dim)
return false; return false;
@ -114,8 +115,8 @@ LyXText * InsetMathMBox::getText(int) const
void InsetMathMBox::cursorPos(BufferView const & bv, void InsetMathMBox::cursorPos(BufferView const & bv,
CursorSlice const & sl, bool boundary, int & x, int & y) const CursorSlice const & sl, bool boundary, int & x, int & y) const
{ {
x = text_.cursorX(sl, boundary); x = text_.cursorX(bv, sl, boundary);
y = text_.cursorY(sl, boundary); y = text_.cursorY(bv, sl, boundary);
} }