Angus insetindex patch + protect patch from Dekel

[lyx.git] / src / BufferView.h

diff --git a/src/BufferView.h b/src/BufferView.h
index e714c63d33f5b1b199ab62c41fb326d3eb9019d9..dd923183f0c4c80cf9ce2c62a417b76715d3b751 100644 (file)
--- a/src/BufferView.h
+++ b/src/BufferView.h
@@ -18,15 +18,17 @@
 
 #include FORMS_H_LOCATION
 #include "undo.h"
+#include "support/utility.hpp"
 
 class LyXView;
 class LyXText;
 class TeXErrors;
 class Buffer;
 class LyXScreen;
+class WorkArea;
 
 ///
-class BufferView {
+class BufferView : public noncopyable {
 public:
        ///
        enum UpdateCodes {
@@ -47,6 +49,8 @@ public:
        ///
        LyXScreen * screen() const;
        ///
+       WorkArea * workarea() const;
+       ///
        void buffer(Buffer * b);
        ///
        void resize(int, int, int, int);
@@ -63,6 +67,8 @@ public:
        ///
        void updateScrollbar();
        ///
+       Inset * checkInsetHit(LyXText *, int & x, int & y, unsigned int button);
+       /// 
        void redoCurrentBuffer();
        ///
        int resizeCurrentBuffer();
@@ -148,14 +154,18 @@ public:
        void menuUndo();
        ///
        void menuRedo();
+#ifndef NEW_INSETS
        ///
        void toggleFloat();
        ///
        void openStuff();
+#endif
        ///
        void insertNote();
+#ifndef NEW_INSETS
        ///
        void allFloats(char flag, char figmar);
+#endif
        /// removes all autodeletable insets
        bool removeAutoInsets();
        ///
@@ -168,7 +178,7 @@ public:
        bool insertInset(Inset * inset, string const & lout = string(),
                         bool no_table = false);
        /// open and lock an updatable inset
-       void open_new_inset(UpdatableInset * new_inset);
+       bool open_new_inset(UpdatableInset * new_inset);
        /// Inserts a lyx file at cursor position. Returns false if it fails.
        bool insertLyXFile(string const & file);
        ///
@@ -234,6 +244,7 @@ public:
        void stuffClipboard(string const &) const;
 private:
        struct Pimpl;
+       friend struct BufferView::Pimpl;
        Pimpl * pimpl_;
 };