fix #832

[lyx.git] / src / insets / insettabular.h

diff --git a/src/insets/insettabular.h b/src/insets/insettabular.h
index fc6bc9ea112774f56f91665d26212678e861a3c1..b1992c9ccadb16782fcc5ffbd7bf8eebfad9b231 100644 (file)
--- a/src/insets/insettabular.h
+++ b/src/insets/insettabular.h
@@ -45,10 +45,6 @@
 #ifndef INSETTABULAR_H
 #define INSETTABULAR_H
 
-#ifdef __GNUG__
-#pragma interface
-#endif
-
 #include "inset.h"
 #include "tabular.h"
 #include "LString.h"
@@ -56,13 +52,13 @@
 #include "FuncStatus.h"
 
 #include <boost/scoped_ptr.hpp>
-
-#include <boost/signals/signal0.hpp>
+#include <boost/weak_ptr.hpp>
 
 class LyXLex;
 class Painter;
 class BufferView;
 class Buffer;
+class BufferParams;
 class Paragraph;
 
 class InsetTabular : public UpdatableInset {
@@ -95,21 +91,15 @@ public:
        ///
        int width(BufferView *, LyXFont const & f) const;
        ///
-       void draw(BufferView *, const LyXFont &, int , float &, bool) const;
+       void draw(BufferView *, const LyXFont &, int , float &) const;
        ///
-       void update(BufferView *, LyXFont const &, bool = false);
+       void update(BufferView *, bool = false);
        ///
        string const editMessage() const;
-       ///
-       void edit(BufferView *, int x, int y, mouse_button::state);
-       ///
-       void edit(BufferView * bv, bool front = true);
-       ///
-       bool doClearArea() const;
-       ///
+       //
        void insetUnlock(BufferView *);
        ///
-       void updateLocal(BufferView *, UpdateCodes, bool mark_dirty) const;
+       void updateLocal(BufferView *, UpdateCodes) const;
        ///
        bool lockInsetInInset(BufferView *, UpdatableInset *);
        ///
@@ -149,10 +139,10 @@ public:
        void validate(LaTeXFeatures & features) const;
        ///
        Inset::Code lyxCode() const { return Inset::TABULAR_CODE; }
-       ///
+       /// FIXME, document
        void getCursorPos(BufferView *, int & x, int & y) const;
-       ///
-       void toggleInsetCursor(BufferView *);
+       /// Get the absolute document x,y of the cursor
+       virtual void getCursor(BufferView &, int &, int &) const;
        ///
        bool tabularFeatures(BufferView * bv, string const & what);
        ///
@@ -198,17 +188,13 @@ public:
                UpdatableInset::scroll(bv, offset);
        }
        ///
-       Paragraph * getParFromID(int id) const;
-       ///
        Inset * getInsetFromID(int id) const;
        ///
-       Paragraph * firstParagraph() const;
-       ///
-       Paragraph * getFirstParagraph(int) const;
+       ParagraphList * getParagraphs(int) const;
        ///
        LyXCursor const & cursor(BufferView *) const;
        ///
-       bool allowSpellcheck() { return true; }
+       bool allowSpellcheck() const { return true; }
        ///
        WordLangTuple const
        selectNextWordToSpellcheck(BufferView *, float & value) const;
@@ -216,6 +202,11 @@ public:
        void selectSelectedWord(BufferView *);
        ///
        void toggleSelection(BufferView *, bool kill_selection);
+
+       void markErased();
+
+       /// find next change
+       bool nextChange(BufferView *, lyx::pos_type & length);
        ///
        bool searchForward(BufferView *, string const &,
                           bool = true, bool = false);
@@ -233,13 +224,14 @@ public:
        // Public structures and variables
        ///
        boost::scoped_ptr<LyXTabular> tabular;
-       ///
-       boost::signal0<void> hideDialog;
 
        /// are some cells selected ?
        bool hasSelection() const {
                return has_selection;
        }
+
+       ///
+       virtual BufferView * view() const;
 private:
        ///
        void lfunMousePress(FuncRequest const &);
@@ -252,8 +244,7 @@ private:
        ///
        void lfunMouseMotion(FuncRequest const &);
        ///
-       bool calculate_dimensions_of_cells(BufferView *, LyXFont const &,
-                                          bool = false) const;
+       bool calculate_dimensions_of_cells(BufferView *, bool = false) const;
        ///
        void drawCellLines(Painter &, int x, int baseline,
                           int row, int cell) const;
@@ -261,10 +252,6 @@ private:
        void drawCellSelection(Painter &, int x, int baseline,
                               int row, int column, int cell) const;
        ///
-       void showInsetCursor(BufferView *, bool show=true);
-       ///
-       void hideInsetCursor(BufferView *);
-       ///
        void fitInsetCursor(BufferView *) const;
        ///
        void setPos(BufferView *, int x, int y) const;
@@ -281,8 +268,6 @@ private:
        ///
        bool movePrevCell(BufferView *, bool lock = false);
        ///
-       bool deletable() const;
-       ///
        int getCellXPos(int cell) const;
        ///
        void resetPos(BufferView *) const;
@@ -316,7 +301,7 @@ private:
        ///
        bool pasteSelection(BufferView *);
        ///
-       bool cutSelection();
+       bool cutSelection(BufferParams const & bp);
        ///
        bool isRightToLeft(BufferView *);
        ///
@@ -368,4 +353,32 @@ private:
        ///
        mutable int in_reset_pos;
 };
+
+
+#include "mailinset.h"
+
+
+class InsetTabularMailer : public MailInset {
+public:
+       ///
+       InsetTabularMailer(InsetTabular & inset);
+       ///
+       virtual InsetBase & inset() const { return inset_; }
+       ///
+       virtual string const & name() const { return name_; }
+       ///
+       virtual string const inset2string() const;
+       /// Returns the active cell if successful, else -1.
+       static int string2params(string const &, InsetTabular &);
+       ///
+       static string const params2string(InsetTabular const &);
+private:
+       ///
+       static string const name_;
+       ///
+       InsetTabular & inset_;
+};
+
+string const featureAsString(LyXTabular::Feature feature);
+
 #endif