More fixes to insettabular/text (and some missing features added).

[lyx.git] / src / BufferView_pimpl.h

diff --git a/src/BufferView_pimpl.h b/src/BufferView_pimpl.h
index 7f9aae0b96dbb979280bd70f1fe023b556d51a7f..7eaef53b6d3cffeb37ef0492aaed15112641377c 100644 (file)
--- a/src/BufferView_pimpl.h
+++ b/src/BufferView_pimpl.h
@@ -16,7 +16,13 @@ class LyXView;
 class WorkArea;
 class LyXScreen;
 
-struct BufferView::Pimpl : public SigC::Object {
+#ifdef SIGC_CXX_NAMESPACES
+using SigC::Object;
+#endif
+
+///
+struct BufferView::Pimpl : public Object {
+       ///
        Pimpl(BufferView * i, LyXView * o,
              int xpos, int ypos, int width, int height);
        ///
@@ -30,14 +36,14 @@ struct BufferView::Pimpl : public SigC::Object {
        ///
        void redraw();
        /// Return true if the cursor was fitted.
-       bool fitCursor();
+       bool fitCursor(LyXText *);
        ///
        void redoCurrentBuffer();
        ///
        int resizeCurrentBuffer();
        ///
        void update();
-       ///
+       //
        void update(BufferView::UpdateCodes);
        ///
        void gotoError();
@@ -50,12 +56,15 @@ struct BufferView::Pimpl : public SigC::Object {
        ///
        void scrollCB(double value);
        ///
-       Inset * checkInsetHit(int & x, int & y, unsigned int button);
+       Inset * checkInsetHit(LyXText *, int & x, int & y,
+                             unsigned int button);
        /// 
        int scrollUp(long time);
        ///
        int scrollDown(long time);
        ///
+       void workAreaKeyPress(KeySym, unsigned int state);
+       ///
        void workAreaMotionNotify(int x, int y, unsigned int state);
        ///
        void workAreaButtonPress(int x, int y, unsigned int button);
@@ -72,9 +81,9 @@ struct BufferView::Pimpl : public SigC::Object {
        ///
        void cursorToggle();
        ///
-       void cursorPrevious();
+       void cursorPrevious(LyXText *);
        ///
-       void cursorNext();
+       void cursorNext(LyXText *);
        ///
        bool available() const;
        ///
@@ -128,7 +137,9 @@ struct BufferView::Pimpl : public SigC::Object {
         ///
         BackStack backstack;
        ///
-       int last_click_x, last_click_y;
+       int last_click_x;
+       ///
+       int last_click_y;
        ///
        WorkArea * workarea_;
        ///
@@ -138,6 +149,7 @@ struct BufferView::Pimpl : public SigC::Object {
        ///
        void stuffClipboard(string const &) const;
 private:
+       ///
        bool using_xterm_cursor;
 };
 #endif