Fix the missing "Figure #:" label from the caption of a figure float.

[lyx.git] / src / BufferView_pimpl.h

diff --git a/src/BufferView_pimpl.h b/src/BufferView_pimpl.h
index 58704e2d704817caaab6877184bebeba1c599232..d98925866c443819e2cf567a3f3ba0053491e733 100644 (file)
--- a/src/BufferView_pimpl.h
+++ b/src/BufferView_pimpl.h
@@ -19,6 +19,7 @@
 #define BUFFERVIEW_PIMPL_H
 
 #include "BufferView.h"
+#include "cursor.h"
 #include "errorlist.h"
 
 #include "insets/inset.h"
@@ -39,18 +40,20 @@ class LyXView;
 class WorkArea;
 class LyXScreen;
 class FuncRequest;
+class FuncStatus;
+
 
 ///
 struct BufferView::Pimpl : public boost::signals::trackable {
        ///
-       Pimpl(BufferView * i, LyXView * o,
+       Pimpl(BufferView & bv, LyXView * owner,
              int xpos, int ypos, int width, int height);
        ///
        Painter & painter() const;
        /// return the screen for this bview
        LyXScreen & screen() const;
        ///
-       void buffer(Buffer *);
+       void setBuffer(Buffer * buf);
        /// Return true if the cursor was fitted.
        bool fitCursor();
        ///
@@ -59,12 +62,8 @@ struct BufferView::Pimpl : public boost::signals::trackable {
        void resizeCurrentBuffer();
        ///
        void update();
-       /**
-        * Repaint pixmap. Used for when we've made a visible
-        * change but don't need the full update() logic
-        */
        ///
-       bool newFile(std::string const &, std::string const &, bool);
+       void newFile(std::string const &, std::string const &, bool);
        ///
        bool loadLyXFile(std::string const &, bool);
        ///
@@ -73,9 +72,7 @@ struct BufferView::Pimpl : public boost::signals::trackable {
        void updateScrollbar();
        ///
        void scrollDocView(int value);
-       /**
-        * Wheel mouse scroll, move by multiples of text->defaultRowHeight().
-        */
+       /// Wheel mouse scroll, move by multiples of text->defaultRowHeight().
        void scroll(int lines);
        ///
        typedef boost::shared_ptr<LyXKeySym> LyXKeySymPtr;
@@ -92,8 +89,6 @@ struct BufferView::Pimpl : public boost::signals::trackable {
        /// get the change at the cursor position
        Change const getCurrentChange();
        ///
-       void beforeChange(LyXText *);
-       ///
        void savePosition(unsigned int i);
        ///
        void restorePosition(unsigned int i);
@@ -102,15 +97,11 @@ struct BufferView::Pimpl : public boost::signals::trackable {
        ///
        void switchKeyMap();
        ///
-       void insetUnlock();
-       ///
        void center();
-       ///
-       bool insertInset(InsetOld * inset, std::string const & lout = std::string());
-       ///
-       void updateInset(InsetOld const * inset);
        /// a function should be executed from the workarea
        bool workAreaDispatch(FuncRequest const & ev);
+       /// return true for events that will handle
+       FuncStatus getStatus(FuncRequest const & cmd);
        /// a function should be executed
        bool dispatch(FuncRequest const & ev);
        ///
@@ -147,13 +138,6 @@ private:
        /// notify readonly status
        void showReadonly(bool);
 
-       /**
-        * Change all insets with the given code's contents to a new
-        * string. May only be used with InsetCommand-derived insets
-        * Returns true if a screen update is needed.
-        */
-       bool ChangeInsets(InsetOld::Code code, std::string const & from,
-                         std::string const & to);
 
        ///
        friend class BufferView;
@@ -191,10 +175,18 @@ private:
        ///
        std::vector<Position> saved_positions;
        /// Get next inset of this class from current cursor position
-       InsetOld * getInsetByCode(InsetOld::Code code);
+       InsetBase * getInsetByCode(InsetBase::Code code);
        ///
        void MenuInsertLyXFile(std::string const & filen);
        /// our workarea
        WorkArea & workarea() const;
+       /// this is used to handle XSelection events in the right manner
+       struct {
+               CursorSlice cursor;
+               CursorSlice anchor;
+               bool set;
+       } xsel_cache_;
+       ///
+       LCursor cursor_;
 };
 #endif // BUFFERVIEW_PIMPL_H