func_status cleanup from Martin; fix small configure bug

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

diff --git a/src/insets/insettabular.h b/src/insets/insettabular.h
index 2d7a61b4f683e5175a65f44d1a2a31699e9986f9..c0f97e46b20061867856e4f9ee8f575a02a697cd 100644 (file)
--- a/src/insets/insettabular.h
+++ b/src/insets/insettabular.h
@@ -56,7 +56,7 @@
 #include "tabular.h"
 #include "LString.h"
 #include "lyxcursor.h"
-#include "func_status.h"
+#include "FuncStatus.h"
 
 class LyXLex;
 class Painter;
@@ -125,15 +125,13 @@ public:
        ///
        bool insertInset(BufferView *, Inset *);
        ///
-       bool insetAllowed(Inset::Code) const {
-               return the_locking_inset != 0;
-       }
+       bool insetAllowed(Inset::Code code) const;
        ///
        bool isTextInset() const { return true; }
        ///
        bool display() const { return tabular->IsLongTabular(); }
        ///
-       void insetButtonRelease(BufferView *, int, int, int);
+       bool insetButtonRelease(BufferView *, int, int, int);
        ///
        void insetButtonPress(BufferView *, int, int, int);
        ///
@@ -150,7 +148,7 @@ public:
        ///
        int linuxdoc(Buffer const *, std::ostream &) const;
        ///
-       int docBook(Buffer const *, std::ostream &) const;
+       int docbook(Buffer const *, std::ostream &) const;
        ///
        void validate(LaTeXFeatures & features) const;
        ///
@@ -185,7 +183,7 @@ public:
        ///
        bool showInsetDialog(BufferView *) const;
        ///
-       func_status::value_type getStatus(string const & argument) const;
+       FuncStatus getStatus(string const & argument) const;
        ///
        std::vector<string> const getLabelList() const;
        ///
@@ -210,9 +208,12 @@ public:
        ///
        Paragraph * firstParagraph() const;
        ///
+       Paragraph * getFirstParagraph(int) const;
+       ///
        LyXCursor const & cursor(BufferView *) const;
        ///
-       string const selectNextWord(BufferView *, float & value) const;
+       bool allowSpellcheck() { return true; }
+       string const selectNextWordToSpellcheck(BufferView *, float & value) const;
        void selectSelectedWord(BufferView *);
        void toggleSelection(BufferView *, bool kill_selection);
        ///
@@ -221,6 +222,10 @@ public:
        bool searchBackward(BufferView *, string const &,
                            bool const & = true, bool const & = false);
 
+       // this should return true if we have a "normal" cell, otherwise true.
+       // "normal" means without width set!
+       bool forceDefaultParagraphs(Inset const * in) const;
+       
        //
        // Public structures and variables
        ///
@@ -259,7 +264,7 @@ private:
        ///
        bool movePrevCell(BufferView *, bool lock = false);
        ///
-       bool deletable();
+       bool deletable() const;
        ///
        int getCellXPos(int cell) const;
        ///
@@ -268,11 +273,17 @@ private:
        void removeTabularRow();
        ///
        bool hasSelection() const {
-               return sel_cell_start != sel_cell_end;
+               return has_selection;
        }
        ///
        void clearSelection() const {
-       sel_cell_start = sel_cell_end = 0;
+               sel_cell_start = sel_cell_end = 0;
+               has_selection = false;
+       }
+       void setSelection(int start, int end) const {
+               sel_cell_start = start;
+               sel_cell_end = end;
+               has_selection = true;
        }
        ///
        bool activateCellInset(BufferView *, int x = 0, int y = 0,
@@ -315,9 +326,11 @@ private:
        mutable unsigned int inset_x;
        ///
        mutable unsigned int inset_y;
-       ///
+       /// true if a set of cells are selected
+       mutable bool has_selection;
+       /// the starting cell selection nr
        mutable int sel_cell_start;
-       ///
+       /// the ending cell selection nr
        mutable int sel_cell_end;
        ///
        mutable int actcell;
@@ -337,5 +350,7 @@ private:
        mutable UpdateCodes need_update;
        ///
        bool in_update;
+       ///
+       mutable bool in_reset_pos;
 };
 #endif