Fixes to insettabular/text.

[lyx.git] / src / BufferView.h

diff --git a/src/BufferView.h b/src/BufferView.h
index c29a3447e6c28a4e7a56e6561ef0688b9774e5c7..e13893664aa5b8b7e1d1c411a4e983c8aa932d96 100644 (file)
--- a/src/BufferView.h
+++ b/src/BufferView.h
@@ -18,6 +18,7 @@
 
 #include FORMS_H_LOCATION
 #include "undo.h"
+#include <boost/utility.hpp>
 
 class LyXView;
 class LyXText;
@@ -27,13 +28,17 @@ class LyXScreen;
 class WorkArea;
 
 ///
-class BufferView {
+class BufferView : public noncopyable {
 public:
        ///
        enum UpdateCodes {
+               ///
                UPDATE = 0,
+               ///
                SELECT = 1,
+               ///
                FITCUR = 2,
+               ///
                CHANGE = 4
        };
                                            
@@ -58,15 +63,16 @@ public:
        ///
        void redraw();
        ///
-       void fitCursor();
+       void fitCursor(LyXText *);
        ///
        void update();
-       ///
+       //
        void update(UpdateCodes uc);
        ///
        void updateScrollbar();
        ///
-       Inset * checkInsetHit(LyXText *, int & x, int & y, unsigned int button);
+       Inset * checkInsetHit(LyXText *, int & x, int & y,
+                             unsigned int button);
        /// 
        void redoCurrentBuffer();
        ///
@@ -118,7 +124,7 @@ public:
        ///
        void selectLastWord();
        ///
-       char * nextWord(float & value);
+       string const nextWord(float & value);
        ///
        void insertCorrectQuote();
        ///
@@ -171,23 +177,26 @@ public:
        void insertErrors(TeXErrors & terr);
        ///
        void setCursorFromRow(int row);
-       /** Insert an inset into the buffer
-           Insert inset into buffer, placing it in a layout of lout,
-           if no_table make sure that it doesn't end up in a table. */
+       /** Insert an inset into the buffer.
+           Placie it in a layout of lout,
+           if no_table make sure that it doesn't end up in a table.
+       */
        bool insertInset(Inset * inset, string const & lout = string(),
                         bool no_table = false);
        /// open and lock an updatable inset
        bool open_new_inset(UpdatableInset * new_inset);
-       /// Inserts a lyx file at cursor position. Returns false if it fails.
+       /** Inserts a lyx file at cursor position.
+           @return #false# if it fails.
+       */
        bool insertLyXFile(string const & file);
        ///
        bool lockInset(UpdatableInset * inset);
        ///
-       void showLockedInsetCursor(long x, long y, int asc, int desc);
+       void showLockedInsetCursor(int x, int y, int asc, int desc);
        ///
        void hideLockedInsetCursor();
        ///
-       void fitLockedInsetCursor(long x, long y, int asc, int desc);
+       void fitLockedInsetCursor(int x, int y, int asc, int desc);
        ///
        int unlockInset(UpdatableInset * inset);
        ///
@@ -243,11 +252,14 @@ public:
        void stuffClipboard(string const &) const;
 private:
        struct Pimpl;
+       ///
        friend struct BufferView::Pimpl;
+       ///
        Pimpl * pimpl_;
 };
 
 
+///
 BufferView::UpdateCodes operator|(BufferView::UpdateCodes uc1,
                                  BufferView::UpdateCodes uc2);