Dekels tabular/textinset patches

[lyx.git] / src / BufferView.h

diff --git a/src/BufferView.h b/src/BufferView.h
index e1b3bc621812798597dc185814dfec066d444b7d..b9ca44b8b5d9d5119429c932e7d09c85f8837948 100644 (file)
--- a/src/BufferView.h
+++ b/src/BufferView.h
@@ -18,7 +18,7 @@
 
 #include FORMS_H_LOCATION
 #include "undo.h"
-#include "support/utility.hpp"
+#include <boost/utility.hpp>
 
 class LyXView;
 class LyXText;
@@ -26,6 +26,7 @@ class TeXErrors;
 class Buffer;
 class LyXScreen;
 class WorkArea;
+class Language;
 
 ///
 class BufferView : public noncopyable {
@@ -63,7 +64,7 @@ public:
        ///
        void redraw();
        ///
-       void fitCursor();
+       void fitCursor(LyXText *);
        ///
        void update();
        //
@@ -80,9 +81,9 @@ public:
        ///
        void gotoError();
        ///
-       void cursorPrevious();
+       void cursorPrevious(LyXText *);
        ///
-       void cursorNext();
+       void cursorNext(LyXText *);
        /// 
        bool available() const;
        ///
@@ -100,9 +101,17 @@ public:
        */
        LyXText * text;
        ///
+       LyXText * getLyXText() const;
+       ///
+       LyXText * getParentText(Inset * inset) const;
+       ///
+       Language const * getParentLanguage(Inset * inset) const;
+       ///
        int workWidth() const;
        ///
-       UpdatableInset * the_locking_inset;
+       UpdatableInset * theLockingInset() const;
+       ///
+       void theLockingInset(UpdatableInset * inset); 
        ///
        void updateInset(Inset * inset, bool mark_dirty);
        ///
@@ -124,7 +133,7 @@ public:
        ///
        void selectLastWord();
        ///
-       char * nextWord(float & value);
+       string const nextWord(float & value);
        ///
        void insertCorrectQuote();
        ///
@@ -184,7 +193,7 @@ public:
        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);
+       bool open_new_inset(UpdatableInset * new_inset, bool behind = false);
        /** Inserts a lyx file at cursor position.
            @return #false# if it fails.
        */
@@ -192,11 +201,11 @@ public:
        ///
        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);
        ///
@@ -228,6 +237,7 @@ public:
 
        ///
        void pushIntoUpdateList(Inset * i);
+#if 0
        ///
        void workAreaExpose();
        ///
@@ -244,9 +254,12 @@ public:
        void enterView();
        ///
        void leaveView();
+#endif
        ///
        bool ChangeRefs(string const & from, string const & to);
        ///
+       bool ChangeRefsIfUnique(string const & from, string const & to);
+       ///
        void pasteClipboard(bool asPara);
        ///
        void stuffClipboard(string const &) const;