Kill macro mode when using LFUN_ESCAPE

[lyx.git] / src / mathed / InsetMathNest.h

diff --git a/src/mathed/InsetMathNest.h b/src/mathed/InsetMathNest.h
index 06668c9d2aa33a7cf1302b151f6e19afef86b8d9..3d4977d63c44e38a9d42c4dbf954bd8953760259 100644 (file)
--- a/src/mathed/InsetMathNest.h
+++ b/src/mathed/InsetMathNest.h
@@ -33,21 +33,10 @@ 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
-       void metrics(MetricsInfo const & mi) const;
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
+       /// Update the cells metrics
+       void cellsMetrics(MetricsInfo const & mi) const;
        /// draw background if locked
        void draw(PainterInfo & pi, int x, int y) const;
-       /// draw selection background
-       void drawSelection(PainterInfo & pi, int x, int y) const;
        ///
        void updateBuffer(ParIterator const &, UpdateType);
        /// identifies NestInsets
@@ -58,7 +47,7 @@ public:
        void cursorPos(BufferView const & bv, CursorSlice const & sl,
                bool boundary, int & x, int & y) const;
        ///
-       void edit(Cursor & cur, bool front, 
+       void edit(Cursor & cur, bool front,
                EntryDirection entry_from = ENTRY_DIRECTION_IGNORE);
        ///
        Inset * editXY(Cursor & cur, int x, int y);
@@ -118,7 +107,7 @@ public:
        ///
        bool setMouseHover(BufferView const * bv, bool mouse_hover) const;
        ///
-       bool mouseHovered(BufferView const * bv) const 
+       bool mouseHovered(BufferView const * bv) const
                { return mouse_hover_[bv]; }
 
        ///
@@ -140,6 +129,9 @@ public:
        ///
        InsetCode lyxCode() const { return MATH_NEST_CODE; }
 
+       ///
+       bool confirmDeletion() const { return nargs() > 0; }
+
 protected:
        ///
        InsetMathNest(InsetMathNest const & inset);
@@ -201,7 +193,7 @@ protected:
        bool lock_;
        ///
        mutable std::map<BufferView const *, bool> mouse_hover_;
-};     
+};