X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2Fmath_gridinset.h;h=7b0b329552cf40efaeb3b22545c92c69f01e50be;hb=701b99ecd70ac472aa53c8b2317af44def4f9670;hp=d34834f60ccc83de11f011116c6777add197ac94;hpb=2fe5f35d48c5dc9fb372671a10ef78f75097b2ce;p=lyx.git

diff --git a/src/mathed/math_gridinset.h b/src/mathed/math_gridinset.h
index d34834f60c..7b0b329552 100644
--- a/src/mathed/math_gridinset.h
+++ b/src/mathed/math_gridinset.h
@@ -14,14 +14,12 @@
 
 #include "math_nestinset.h"
 #include "lyxlength.h"
-#include "support/std_string.h"
 
 
 /** Gridded math inset base class.
  *  This is the base to all grid-like editable math objects
  */
 class MathGridInset : public MathNestInset {
-
 public:
 
 	/// additional per-cell information
@@ -31,7 +29,7 @@ public:
 		/// a dummy cell before a multicolumn cell
 		int dummy_;
 		/// special multi colums alignment
-		string align_;
+		std::string align_;
 		/// these should be a per-cell property, but ok to have it here
 		/// for single-column grids like paragraphs
 		mutable int glue_;
@@ -87,16 +85,14 @@ public:
 	/// sets nrows and ncols to 1
 	MathGridInset();
 	/// constructor from columns description, creates one row
-	MathGridInset(char valign, string const & halign);
+	MathGridInset(char valign, std::string const & halign);
 	/// Note: columns first!
 	MathGridInset(col_type m, row_type n);
 	///
-	MathGridInset(col_type m, row_type n, char valign, string const & halign);
+	MathGridInset(col_type m, row_type n, char valign, std::string const & halign);
 	/// Ensures that the dialog is closed.
 	~MathGridInset();
 	///
-	virtual std::auto_ptr<InsetBase> clone() const;
-	///
 	void metrics(MetricsInfo & mi) const;
 	///
 	void metrics(MetricsInfo & mi, Dimension &) const;
@@ -107,13 +103,13 @@ public:
 	///
 	void drawT(TextPainter & pi, int x, int y) const;
 	///
-	void halign(string const & align);
+	void halign(std::string const & align);
 	///
 	void halign(char c, col_type col);
 	///
 	char halign(col_type col) const;
 	///
-	string halign() const;
+	std::string halign() const;
 	///
 	void valign(char c);
 	///
@@ -136,9 +132,6 @@ public:
 	MathGridInset * asGridInset() { return this; }
 	/// identifies GridInset
 	MathGridInset const * asGridInset() const { return this; }
-	/// local dispatcher
-	dispatch_result dispatch(FuncRequest const & cmd, idx_type & idx, pos_type & pos);
-
 	///
 	col_type ncols() const;
 	///
@@ -149,19 +142,15 @@ public:
 	row_type row(idx_type idx) const;
 
 	///
-	bool idxUpDown(idx_type & idx, pos_type & pos, bool up, int targetx) const;
+	bool idxUpDown(LCursor &, bool up) const;
 	///
-	bool idxLeft(idx_type & idx, pos_type & pos) const;
+	bool idxLeft(LCursor &) const;
 	///
-	bool idxRight(idx_type & idx, pos_type & pos) const;
+	bool idxRight(LCursor &) const;
 	///
-	bool idxFirst(idx_type & idx, pos_type & pos) const;
+	bool idxFirst(LCursor &) const;
 	///
-	bool idxLast(idx_type & idx, pos_type & pos) const;
-	///
-	bool idxHome(idx_type & idx, pos_type & pos) const;
-	///
-	bool idxEnd(idx_type & idx, pos_type & pos) const;
+	bool idxLast(LCursor &) const;
 	///
 	bool idxDelete(idx_type & idx);
 	/// pulls cell after pressing erase
@@ -219,18 +208,22 @@ public:
 	//void octave(OctaveStream &) const;
 
 protected:
+	virtual void doDispatch(LCursor & cur, FuncRequest & cmd);
+	///
+	bool getStatus(LCursor & cur, FuncRequest const & cmd,
+		FuncStatus & flag) const;
 	/// returns x offset of cell compared to inset
 	int cellXOffset(idx_type idx) const;
 	/// returns y offset of cell compared to inset
 	int cellYOffset(idx_type idx) const;
 	/// returns proper 'end of line' code for LaTeX
-	virtual string eolString(row_type row, bool fragile = false) const;
+	virtual std::string eolString(row_type row, bool fragile = false) const;
 	/// returns proper 'end of column' code for LaTeX
-	virtual string eocString(col_type col, col_type lastcol) const;
+	virtual std::string eocString(col_type col, col_type lastcol) const;
 	/// extract number of columns from alignment string
-	col_type guessColumns(string const & halign) const;
+	col_type guessColumns(std::string const & halign) const;
 	/// splits cells and shifts right part to the next cell
-	void splitCell(idx_type &, pos_type & pos);
+	void splitCell(LCursor & cur);
 
 public:
 	/// row info
@@ -241,6 +234,8 @@ public:
 	std::vector<CellInfo> cellinfo_;
 	///
 	char v_align_; // add approp. type
+private:
+	virtual std::auto_ptr<InsetBase> doClone() const;
 };
 
 #endif