Trivial fixes to some warnings thrown up by MSVS.Net 2003.

[lyx.git] / src / BufferView.h

diff --git a/src/BufferView.h b/src/BufferView.h
index 130a2632182c302b13744d0a11831f08851672b5..531b38f08bc67830f7d52b5695970440bbacab78 100644 (file)
--- a/src/BufferView.h
+++ b/src/BufferView.h
@@ -35,6 +35,27 @@ class LyXView;
 class Painter;
 class ParIterator;
 
+
+namespace Update {
+       enum flags {
+               FitCursor = 1,
+               Force = 2,
+               SinglePar = 4
+       };
+
+inline flags operator|(flags const f, flags const g)
+{
+       return static_cast<flags>(int(f) | int(g));
+}
+
+inline flags operator&(flags const f, flags const g)
+{
+       return static_cast<flags>(int(f) & int(g));
+}
+
+} // namespace
+
+
 /**
  * A buffer view encapsulates a view onto a particular
  * buffer, and allows access to operate upon it. A view
@@ -81,7 +102,8 @@ public:
         *  position changes. \c forceupdate means to force an update
         *  in any case.
         */
-       void update(bool fitcursor = true, bool forceupdate = true);
+
+       void update(Update::flags flags = Update::FitCursor | Update::Force);
        /// move the screen to fit the cursor. Only to be called with
        /// good y coordinates (after a bv::metrics)
        bool fitCursor();
@@ -102,7 +124,10 @@ public:
        Change const getCurrentChange();
 
        /// return the lyxtext we are using
-       LyXText * getLyXText() const;
+       LyXText * getLyXText();
+
+       /// return the lyxtext we are using
+       LyXText const * getLyXText() const;
 
        /// simple replacing. Use the font of the first selected character
        void replaceSelectionWithString(std::string const & str);
@@ -154,7 +179,7 @@ public:
        int offset_ref() const;
        /// access to anchor
        lyx::pit_type anchor_ref() const;
-       
+
        /// access to full cursor
        LCursor & cursor();
        /// access to full cursor
@@ -162,7 +187,7 @@ public:
        ///
        LyXText * text() const;
        ///
-       void setCursor(ParIterator const & par, lyx::pos_type pos);
+       void setCursor(DocIterator const &);
        /* Sets the selection. When \c backwards == false, set anchor
         * to \c cur and cursor to \c cur + \c length. When \c
         * backwards == true, set anchor to \c cur and cursor to \c
@@ -174,9 +199,9 @@ public:
 
 private:
        ///
-       struct Pimpl;
+       class Pimpl;
        ///
-       friend struct BufferView::Pimpl;
+       friend class BufferView::Pimpl;
        ///
        Pimpl * pimpl_;
 };