Angus insetindex patch + protect patch from Dekel

[lyx.git] / src / lyxtext.h

diff --git a/src/lyxtext.h b/src/lyxtext.h
index 09881225959b2f46d52fdfe71c79dc938a0fd4a0..1a0d5c4cfaf785c6829b047b3bd2575489a5fa4d 100644 (file)
--- a/src/lyxtext.h
+++ b/src/lyxtext.h
@@ -70,9 +70,6 @@ public:
        ///
        InsetText * inset_owner;
 
-       ///
-       //      void owner(BufferView *);
-       
        ///
        LyXFont GetFont(Buffer const *, LyXParagraph * par,
                        LyXParagraph::size_type pos) const;
@@ -152,8 +149,10 @@ public:
            Returns true if something was broken. */
         bool FullRebreak(BufferView *);
 
+#ifndef NEW_INSETS
        ///
        LyXParagraph::footnote_flag GetFootnoteFlag(int row);
+#endif
        ///
        Row * need_break_row;
        ///
@@ -270,7 +269,8 @@ public:
 
        ///
        void SetCursorFromCoordinates(BufferView *, int x, long y) const;
-       void SetCursorFromCoordinates(BufferView *, LyXCursor &, int x, long y) const;
+       void SetCursorFromCoordinates(BufferView *, LyXCursor &,
+                                     int x, long y) const;
        ///
        void CursorUp(BufferView *) const;
        ///
@@ -329,6 +329,7 @@ public:
        void GetVisibleRow(BufferView *, int y_offset, int x_offset,
                           Row * row_ptr, long y, bool cleared=false);
 
+#ifndef NEW_INSETS
        /* footnotes: */
        ///
        void ToggleFootnote(BufferView *);
@@ -350,6 +351,7 @@ public:
                                       LyXParagraph::footnote_kind kind);
        ///
        void MeltFootnoteEnvironment(BufferView *);
+#endif
        ///
        void CutSelection(BufferView *, bool = true);
        ///
@@ -501,8 +503,6 @@ public:
        ///
        int workWidth(BufferView *) const;
        ///
-       //      Buffer * buffer() const;
-       ///
        void ComputeBidiTables(Buffer const *, Row * row) const;
 
        /// Maps positions in the visual string to positions in logical string.