X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsettext.h;h=ad86205f1bf06cefa66fd67023a5e0b8abc36932;hb=183239b7def8ca0e51432f2d88891d4b9f055953;hp=d0ae16da7599e23bbdfae3e134da4cc27942f3e9;hpb=fc52df82433c1108667dea9d38f0ac4f557b3f0c;p=lyx.git

diff --git a/src/insets/insettext.h b/src/insets/insettext.h
index d0ae16da75..ad86205f1b 100644
--- a/src/insets/insettext.h
+++ b/src/insets/insettext.h
@@ -13,7 +13,6 @@
 #define INSETTEXT_H
 
 #include "updatableinset.h"
-#include "ParagraphList_fwd.h"
 #include "RowList_fwd.h"
 #include "lyxfont.h"
 #include "lyxtext.h"
@@ -29,7 +28,7 @@ class Dimension;
 class LColor_color;
 class CursorSlice;
 class Painter;
-class Paragraph;
+class ParagraphList;
 class Row;
 
 
@@ -39,23 +38,10 @@ class Row;
  */
 class InsetText : public UpdatableInset {
 public:
-	///
-	enum DrawFrame {
-		///
-		NEVER = 0,
-		///
-		LOCKED,
-		///
-		ALWAYS
-	};
 	///
 	explicit InsetText(BufferParams const &);
 	///
-	InsetText(InsetText const &);
-	///
-	virtual std::auto_ptr<InsetBase> clone() const;
-	///
-	void operator=(InsetText const & it);
+	InsetText();
 	/// empty inset to empty par, or just mark as erased
 	void clear(bool just_mark_erased);
 	///
@@ -80,18 +66,16 @@ public:
 		  OutputParams const &) const;
 	///
 	int linuxdoc(Buffer const &, std::ostream &,
-		     OutputParams const &) const ;
+		     OutputParams const &) const;
 	///
 	int docbook(Buffer const &, std::ostream &,
-		    OutputParams const &) const ;
+		    OutputParams const &) const;
 	///
 	void validate(LaTeXFeatures & features) const;
 	///
-	InsetOld::Code lyxCode() const { return InsetOld::TEXT_CODE; }
+	Code lyxCode() const { return TEXT_CODE; }
 	/// FIXME, document
-	void getCursorPos(CursorSlice const & cur, int & x, int & y) const;
-	///
-	bool insetAllowed(InsetOld::Code) const;
+	void getCursorPos(LCursor const & cur, int & x, int & y) const;
 	///
 	void setFont(BufferView *, LyXFont const &,
 		     bool toggleall = false,
@@ -103,7 +87,7 @@ public:
 	///
 	bool getAutoBreakRows() const { return autoBreakRows_; }
 	///
-	void setDrawFrame(DrawFrame);
+	void setDrawFrame(bool);
 	///
 	LColor_color frameColor() const;
 	///
@@ -115,20 +99,12 @@ public:
 	/// Appends \c list with all labels found within this inset.
 	void getLabelList(Buffer const &, std::vector<std::string> & list) const;
 	///
-	int scroll(bool recursive = true) const;
-	///
-	void scroll(BufferView & bv, float sx) const {
-		UpdatableInset::scroll(bv, sx);
-	}
-	///
-	void scroll(BufferView & bv, int offset) const {
-		UpdatableInset::scroll(bv, offset);
-	}
-	///
 	LyXText * getText(int) const;
+	///
+	bool getStatus(LCursor & cur, FuncRequest const & cmd, FuncStatus &) const;
 
 	/// mark as erased for change tracking
-	void markErased() { clear(true); };
+	void markErased() { clear(true); }
 	/**
 	 * Mark as new. Used when pasting in tabular, and adding rows
 	 * or columns. Note that pasting will ensure that tracking already
@@ -147,23 +123,30 @@ public:
 	///
 	void edit(LCursor & cur, bool left);
 	///
-	InsetBase * editXY(LCursor & cur, int x, int y);
+	InsetBase * editXY(LCursor & cur, int x, int y) const;
 
 	/// number of cells in this inset
 	size_t nargs() const { return 1; }
 	///
-	ParagraphList & paragraphs() const;
+	ParagraphList & paragraphs();
+	///
+	ParagraphList const & paragraphs() const;
+	///
+	bool insetAllowed(Code) const { return true; }
+	///
+	bool allowSpellCheck() const { return true; }
 
-private:
+protected:
+	InsetText(InsetText const &);
 	///
-	void priv_dispatch(LCursor & cur, FuncRequest const & cmd);
+	virtual void doDispatch(LCursor & cur, FuncRequest & cmd);
+private:
+	virtual std::auto_ptr<InsetBase> doClone() const;
+
 	///
 	void updateLocal(LCursor &);
 	///
 	void init();
-	// If the inset is empty set the language of the current font to the
-	// language to the surronding text (if different).
-	void sanitizeEmptyText(BufferView &);
 	///
 	void setCharFont(Buffer const &, int pos, LyXFont const & font);
 	///
@@ -176,18 +159,13 @@ private:
 	///
 	bool autoBreakRows_;
 	///
-	DrawFrame drawFrame_;
+	bool drawFrame_;
 	/** We store the LColor::color value as an int to get LColor.h out
 	 *  of the header file.
 	 */
 	int frame_color_;
 	///
-	mutable lyx::paroffset_type old_par;
-
-	/** to remember old painted frame dimensions to clear it on
-	 *  the right spot!
-	 */
-	mutable bool in_insetAllowed;
+	mutable lyx::pit_type old_par;
 public:
 	///
 	mutable LyXText text_;