X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsettext.h;h=d89bb3413e4aee9d0ec14c8dfea50240d7d174c1;hb=5603df4a5b7e511b31026c9a4f8f55b2b10fde57;hp=e7a2fd5303b87342abe007a96ae194ea9cf83705;hpb=09e11f4d38aaade9cbf835818dfdf904fbde49dc;p=lyx.git

diff --git a/src/insets/insettext.h b/src/insets/insettext.h
index e7a2fd5303..d89bb3413e 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"
@@ -22,7 +21,6 @@
 
 #include "frontends/mouse_state.h"
 
-
 class Buffer;
 class BufferParams;
 class BufferView;
@@ -30,13 +28,13 @@ class Dimension;
 class LColor_color;
 class CursorSlice;
 class Painter;
-class Paragraph;
+class ParagraphList;
 class Row;
 
+
 /**
  A text inset is like a TeX box to write full text
  (including styles and other insets) in a given space.
- @author: Jürgen Vigna
  */
 class InsetText : public UpdatableInset {
 public:
@@ -52,6 +50,8 @@ public:
 	///
 	explicit InsetText(BufferParams const &);
 	///
+	explicit InsetText();
+	///
 	InsetText(InsetText const &);
 	///
 	virtual std::auto_ptr<InsetBase> clone() const;
@@ -81,18 +81,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; }
 	/// 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,
@@ -116,20 +114,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
@@ -146,18 +136,25 @@ public:
 	void addPreview(lyx::graphics::PreviewLoader &) const;
 
 	///
-	void edit(LCursor & cur, bool);
+	void edit(LCursor & cur, bool left);
 	///
-	void edit(LCursor & cur, int, int);
+	InsetBase * editXY(LCursor & cur, int x, int y);
 
+	/// number of cells in this inset
+	size_t nargs() const { return 1; }
+	///
+	ParagraphList & paragraphs();
 	///
-	int numParagraphs() const { return 1; }
+	ParagraphList const & paragraphs() const;
 	///
-	ParagraphList & paragraphs() const;
+	bool insetAllowed(Code) const { return true; }
+	///
+	bool allowSpellCheck() const { return true; }
 
-private:
+protected:
 	///
-	DispatchResult priv_dispatch(LCursor & cur, FuncRequest const & cmd);
+	void priv_dispatch(LCursor & cur, FuncRequest & cmd);
+private:
 	///
 	void updateLocal(LCursor &);
 	///
@@ -174,7 +171,6 @@ private:
 	///
 	void clearInset(Painter &, int x, int y) const;
 
-	/* Private structures and variables */
 	///
 	bool autoBreakRows_;
 	///
@@ -184,12 +180,7 @@ private:
 	 */
 	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::par_type old_par;
 public:
 	///
 	mutable LyXText text_;