Fix loop when opening TOC widget in an empty document, basically by Richard Heck.

[lyx.git] / src / lyxtext.h

diff --git a/src/lyxtext.h b/src/lyxtext.h
index 897808cca860789ac90c57995140309b4efb7b67..49a4c97a3ec1557c289ce07390ef4d18eed5e2b9 100644 (file)
--- a/src/lyxtext.h
+++ b/src/lyxtext.h
@@ -37,7 +37,6 @@ class FuncStatus;
 class InsetBase;
 class LColor_color;
 class LCursor;
-class LyXTextClass;
 class PainterInfo;
 class Row;
 class RowMetrics;
@@ -63,11 +62,8 @@ public:
        ///
        void setCharFont(Buffer const & buffer, pit_type pit, pos_type pos,
                LyXFont const & font);
-       ///
-       void setCharFont(Buffer const & buffer, pit_type pit, pos_type pos,
-               LyXFont const & font, bool toggleall);
 
-       /// what you expect when pressing <enter> at cursor position
+       /// what you expect when pressing \<enter\> at cursor position
        void breakParagraph(LCursor & cur, bool keep_layout = false);
 
        /// set layout over selection
@@ -139,10 +135,9 @@ public:
        /// This method uses the BufferView CoordCache to locate the
        /// paragraph. The y-coodinate is allowed to be off-screen and
        /// the CoordCache will be automatically updated if needed. This is
-       /// the reason why we need a non const BufferView and why this
-       /// method is non-const.
+       /// the reason why we need a non const BufferView.
        /// FIXME: move to TextMetrics.
-       pit_type getPitNearY(BufferView & bv, int y);
+       pit_type getPitNearY(BufferView & bv, int y) const;
 
        /** Find the word under \c from in the relative location
         *  defined by \c word_location.
@@ -192,6 +187,8 @@ public:
        \retval inset is non-null if the cursor is positionned inside
        */
        /// FIXME: move to TextMetrics.
+       /// FIXME: cleanup to use BufferView::getCoveringInset() and
+       /// setCursorFromCoordinates() instead of checkInsetHit().
        InsetBase * editXY(LCursor & cur, int x, int y);
        
        /// Move cursor one line up.
@@ -284,6 +281,9 @@ public:
        void insertStringAsParagraphs(LCursor & cur, docstring const & str);
 
        /// Returns an inset if inset was hit, or 0 if not.
+       /// \warning This method is not recursive! It will return the
+       /// outermost inset within this LyXText.
+       /// \sa BufferView::getCoveringInset() to get the innermost inset.
        InsetBase * checkInsetHit(BufferView &, int x, int y);
 
        ///