Account for old versions of Pygments

[lyx.git] / src / TextMetrics.h

diff --git a/src/TextMetrics.h b/src/TextMetrics.h
index ade98739ed8c59d50c18d4f1a5860928fa12f48a..0518231a8da9212f1bed27274bd9888278f36d9d 100644 (file)
--- a/src/TextMetrics.h
+++ b/src/TextMetrics.h
@@ -94,6 +94,8 @@ public:
        bool redoParagraph(pit_type const pit);
        /// Clear cache of paragraph metrics
        void clear() { par_metrics_.clear(); }
+       /// Is cache of paragraph metrics empty ?
+       bool empty() const { return par_metrics_.empty(); }
 
        ///
        int ascent() const { return dim_.asc; }
@@ -150,8 +152,7 @@ public:
        /// returns the position near the specified x-coordinate of the row.
        /// x is an absolute screen coord, it is set to the real beginning
        /// of this column. This takes in account horizontal cursor row scrolling.
-       pos_type getPosNearX(Row const & row, int & x, bool & boundary,
-                            bool select = false) const;
+       pos_type getPosNearX(Row const & row, int & x, bool & boundary) const;
 
        /// returns pos in given par at given x coord.
        pos_type x2pos(pit_type pit, int row, int x) const;
@@ -180,7 +181,9 @@ public:
            that is completely visible
        \param up whether we are going up or down (only used when
            assert_in_view is true
-       \retval inset is non-null if the cursor is positionned inside
+       \retval inset is null if the cursor is positioned over normal
+              text in the current Text object. Otherwise it is the inset
+              that the cursor points to, like for Inset::editXY.
        */
        /// FIXME: cleanup to use BufferView::getCoveringInset() and
        /// setCursorFromCoordinates() instead of checkInsetHit().
@@ -189,10 +192,7 @@ public:
 
        /// sets cursor only within this Text.
        /// x,y are screen coordinates
-       /// If select is true, move to the next position if closer to the right
-       /// edge.
-       void setCursorFromCoordinates(Cursor & cur, int x, int y,
-                                     bool select = false);
+       void setCursorFromCoordinates(Cursor & cur, int x, int y);
 
        ///
        int cursorX(CursorSlice const & cursor, bool boundary) const;