fix typo that put too many include paths for most people

[lyx.git] / src / BufferView_pimpl.h

diff --git a/src/BufferView_pimpl.h b/src/BufferView_pimpl.h
index ed6062e6b1eec8719351b1839cb16713c0bd74d6..9391bb6d2f791b52b4f672af8fe611f5f0d022e9 100644 (file)
--- a/src/BufferView_pimpl.h
+++ b/src/BufferView_pimpl.h
@@ -6,12 +6,12 @@
 #include <boost/smart_ptr.hpp>
 
 #include "BufferView.h"
-#include "UpdateInset.h"
 #include "commandtags.h"
 #include "frontends/Timeout.h"
 #include "WorkArea.h"
-#include "paragraph.h"
+#include "box.h"
 #include "insets/insetspecialchar.h"
+#include "support/types.h"
 
 #ifdef __GNUG__
 #pragma interface
@@ -46,7 +46,7 @@ struct BufferView::Pimpl : public SigC::Object {
        void update();
        //
        void update(LyXText *, BufferView::UpdateCodes);
-       /// Update pixmap of screen
+       /// Update pixmap of screen
        void updateScreen();
        ///
        void workAreaExpose();
@@ -54,10 +54,13 @@ struct BufferView::Pimpl : public SigC::Object {
        void updateScrollbar();
        ///
        void scrollCB(double value);
+       /**
+        * Returns an inset if inset was hit, or 0 if not.
+        *
+        * If hit, the coordinates are changed relative to the inset.
+        */
+       Inset * checkInsetHit(LyXText *, int & x, int & y);
        ///
-       Inset * checkInsetHit(LyXText *, int & x, int & y,
-                             unsigned int button);
-       /// 
        int scrollUp(long time);
        ///
        int scrollDown(long time);
@@ -74,6 +77,10 @@ struct BufferView::Pimpl : public SigC::Object {
        ///
        void tripleClick(int x, int y, unsigned int button);
        ///
+       void selectionRequested();
+       ///
+       void selectionLost();
+       ///
        void enterView();
        ///
        void leaveView();
@@ -126,13 +133,22 @@ struct BufferView::Pimpl : public SigC::Object {
        ///
        bool Dispatch(kb_action action, string const & argument);
 private:
+       /**
+        * Return the on-screen dimensions of the inset at the cursor.
+        * Pre-condition: the cursor must be at an inset.
+        */
+       Box insetDimensions(LyXText const & text, LyXCursor const & cursor) const;
+       /**
+        * check if the given co-ordinates are inside an inset at the given cursor,
+        * if one exists. If so, the inset is returned, and the co-ordinates are
+        * made relative. Otherwise, 0 is returned.
+        */
+       Inset * checkInset(LyXText const & text, LyXCursor const & cursor, int & x, int & y) const;
        ///
        friend class BufferView;
        /// open and lock an updatable inset
        bool open_new_inset(UpdatableInset * new_inset, bool behind = false);
        ///
-       void protectedBlank(LyXText * lt);
-       /// 
        void specialChar(InsetSpecialChar::Kind);
        ///
        void newline();
@@ -162,8 +178,6 @@ private:
        ///
        WorkArea workarea_;
        ///
-       UpdateInset updatelist;
-       ///
        void pasteClipboard(bool asPara);
        ///
        void stuffClipboard(string const &) const;
@@ -172,22 +186,22 @@ private:
        ///
        struct Position {
                /// Filename
-                string filename;
-                /// Cursor paragraph Id
-                int par_id;
-                /// Cursor position
-                Paragraph::size_type par_pos;
+               string filename;
+               /// Cursor paragraph Id
+               int par_id;
+               /// Cursor position
+               lyx::pos_type par_pos;
                ///
                Position() : par_id(0), par_pos(0) {}
                ///
-               Position(string const & f, int id, Paragraph::size_type pos)
-                        : filename(f), par_id(id), par_pos(pos) {}
+               Position(string const & f, int id, lyx::pos_type pos)
+                       : filename(f), par_id(id), par_pos(pos) {}
        };
        ///
        std::vector<Position> saved_positions;
        ///
        void moveCursorUpdate(bool selecting);
-        /// Get next inset of this class from current cursor position  
+       /// Get next inset of this class from current cursor position
        Inset * getInsetByCode(Inset::Code code);
        ///
        void MenuInsertLyXFile(string const & filen);