Applied Angus patch to compile on DEC C++ and to avoid name clashes

[lyx.git] / src / lyxtext.h

diff --git a/src/lyxtext.h b/src/lyxtext.h
index b1acc90325804564599465397d88179c246e5b70..b8439b2d4b1ba3d4b8a9ac72f45e4debb523ceac 100644 (file)
--- a/src/lyxtext.h
+++ b/src/lyxtext.h
@@ -66,7 +66,8 @@ public:
        /// the current font
        mutable LyXFont real_current_font;
        /// first visible pixel-row is set from LyXScreen!!!
-       unsigned int first;
+       // unsigned is wrong here for text-insets!
+       int first;
        ///
        BufferView * bv_owner;
        ///
@@ -74,6 +75,8 @@ public:
        ///
        UpdatableInset * the_locking_inset;
 
+       ///
+       int GetRealCursorX(BufferView *) const;
        ///
        LyXFont const GetFont(Buffer const *, LyXParagraph * par,
                        LyXParagraph::size_type pos) const;
@@ -230,9 +233,9 @@ public:
        LyXCursor toggle_end_cursor;
    
        /// need the selection cursor:
-       void SetSelection();
+       void SetSelection(BufferView *);
        ///
-       void ClearSelection() const;
+       void ClearSelection(BufferView *) const;
        ///
        string const selectionAsString(Buffer const *) const;
        
@@ -390,21 +393,16 @@ public:
                          LyXAlignment align, 
                          string labelwidthstring,
                          bool noindent);
+#ifndef NO_PEXTRA
        ///
        void SetParagraphExtraOpt(BufferView *, int type,
                                  string const & width,
                                  string const & widthp,
                                  int alignment, bool hfill,
                                  bool start_minipage);
-
+#endif
        /* these things are for search and replace */
 
-       /** returns true if the specified string is at the specified
-         position
-         */
-       bool IsStringInText(LyXParagraph * par,
-                           LyXParagraph::size_type pos,
-                           string const & str) const;
        /** sets the selection over the number of characters of string,
          no check!!
          */
@@ -415,22 +413,15 @@ public:
          */
        void ReplaceSelectionWithString(BufferView *, string const & str);
 
-       /** if the string can be found: return true and set the cursor to
-         the new position */
-       bool SearchForward(BufferView *, string const & str) const;
-       ///
-       bool SearchBackward(BufferView *, string const & str) const;
-
        /// needed to insert the selection
        void InsertStringA(BufferView *, string const & str);
        /// needed to insert the selection
        void InsertStringB(BufferView *, string const & str);
 
-       /// usefull when texing from within LyX
-       bool GotoNextError(BufferView *) const;
-
-       /// just another feature :)
-       bool GotoNextNote(BufferView *) const;
+       /// Find next inset of some specified type.
+       bool GotoNextInset(BufferView *, std::vector<Inset::Code> const & codes,
+                          string const & contents = string()) const;
+       ///
 
        /* for the greater insets */
   
@@ -506,7 +497,7 @@ public:
        }
        ///
        inline
-       int bidi_level(LyXParagraph::size_type pos) const {
+       LyXParagraph::size_type bidi_level(LyXParagraph::size_type pos) const {
                if (bidi_start == -1)
                        return 0;
                else