Get rid of lyxstring, remove usage of STRCONV.

[lyx.git] / src / mathed / math_hullinset.h

diff --git a/src/mathed/math_hullinset.h b/src/mathed/math_hullinset.h
index 8204d5fbf2501d356c62c595ad1a0ccdca0a6295..6c9237351a8faf37ed5d09b131482d4398791400 100644 (file)
--- a/src/mathed/math_hullinset.h
+++ b/src/mathed/math_hullinset.h
@@ -1,19 +1,23 @@
 // -*- C++ -*-
+/**
+ * \file math_hullinset.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author André Pönitz
+ *
+ * Full author contact details are available in file CREDITS.
+ */
+
 #ifndef MATH_HULLINSET_H
 #define MATH_HULLINSET_H
 
 #include "math_gridinset.h"
 
-#ifdef __GNUG__
-#pragma interface
-#endif
-
-/** This provides an interface between "LyX insets" and "LyX math insets"
- *  \author André Pönitz
- */
 
 class LaTeXFeatures;
 
+/// This provides an interface between "LyX insets" and "LyX math insets"
 class MathHullInset : public MathGridInset {
 public:
        ///
@@ -21,15 +25,15 @@ public:
        ///
        explicit MathHullInset(string const & type);
        ///
-       MathInset * clone() const;
+       virtual std::auto_ptr<InsetBase> clone() const;
        ///
        mode_type currentMode() const;
        ///
-       void metrics(MathMetricsInfo & mi) const;
+       void metrics(MetricsInfo & mi, Dimension & dim) const;
        ///
-       void draw(MathPainterInfo &, int x, int y) const;
+       void draw(PainterInfo &, int x, int y) const;
        ///
-       void metricsT(TextMetricsInfo const & mi) const;
+       void metricsT(TextMetricsInfo const & mi, Dimension & dim) const;
        ///
        void drawT(TextPainter &, int x, int y) const;
        ///
@@ -47,8 +51,8 @@ public:
        ///
        bool ams() const;
        /// local dispatcher
-       result_type dispatch(FuncRequest const & cmd, idx_type & idx, pos_type & pos);
-       /// 
+       dispatch_result dispatch(FuncRequest const & cmd, idx_type & idx, pos_type & pos);
+       ///
        void getLabelList(std::vector<string> &) const;
        ///
        void validate(LaTeXFeatures & features) const;
@@ -57,14 +61,14 @@ public:
        /// identifies HullInset
        MathHullInset * asHullInset() { return this; }
 
-       ///
-       void addRow(row_type);
-       ///
-       void delRow(row_type);
-       ///
-       void addFancyCol(col_type);
-       ///
-       void delFancyCol(col_type);
+       /// add a row
+       void addRow(row_type row);
+       /// delete a row
+       void delRow(row_type row);
+       /// add a column
+       void addCol(col_type col);
+       /// delete a column
+       void delCol(col_type col);
 
        /// get type
        string const & getType() const;
@@ -80,6 +84,8 @@ public:
        ///
        bool idxLast(idx_type &, pos_type &) const;
 
+       ///
+       string fileInsetLabel() const;
        ///
        void write(WriteStream & os) const;
        ///
@@ -89,6 +95,10 @@ public:
        ///
        void infoize(std::ostream & os) const;
 
+protected:
+       ///
+       string eolString(row_type row, bool fragile) const;
+
 private:
        ///
        void setType(string const & type);
@@ -101,11 +111,15 @@ private:
        ///
        string nicelabel(row_type row) const;
        ///
+       void doExtern(FuncRequest const & func, idx_type & idx, pos_type & pos);
+       ///
        void glueall();
        ///
        char const * standardFont() const;
        /// consistency check
        void check() const;
+       /// can this change its number of cols?
+       bool colChangeOK() const;
 
        /// "none", "simple", "display", "eqnarray",...
        string type_;