X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathNest.h;h=80f5f6d9d67f3a46f4f78a4f8a0ac20dac607e39;hb=5fdc577badb1cb133d6a0dc7d831bb1f82576adb;hp=a503fb96db3563c7ce2f527c5ba8985db940ec35;hpb=586124c6a7bbad3d28bb756622613334da4a9a23;p=lyx.git diff --git a/src/mathed/InsetMathNest.h b/src/mathed/InsetMathNest.h index a503fb96db..80f5f6d9d6 100644 --- a/src/mathed/InsetMathNest.h +++ b/src/mathed/InsetMathNest.h @@ -13,6 +13,7 @@ #define MATH_NESTINSET_H #include "InsetMath.h" +#include "MathData.h" #include @@ -32,9 +33,17 @@ public: /// void setBuffer(Buffer &); + // The method below hides inset::metrics() intentionally! + // We have to tell clang not to be fussy about that. +#ifdef __clang__ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Woverloaded-virtual" +#endif /// the size is usually some sort of convex hull of the cells - /// hides inset::metrics() intentionally! void metrics(MetricsInfo const & mi) const; +#ifdef __clang__ +#pragma clang diagnostic pop +#endif /// draw background if locked void draw(PainterInfo & pi, int x, int y) const; /// draw selection background @@ -182,9 +191,9 @@ private: /// afterwards if found bool findMacroToFoldUnfold(Cursor & searchCur, bool fold) const; /// move cursor forward - bool cursorMathForward(Cursor & cur); + bool cursorMathForward(Cursor & cur, bool enter = true); /// move cursor backwards - bool cursorMathBackward(Cursor & cur); + bool cursorMathBackward(Cursor & cur, bool enter = true); protected: /// we store the cells in a vector