Initialize definition_ correctly

[lyx.git] / src / Length.h

diff --git a/src/Length.h b/src/Length.h
index 41033084c79e4ac40dbede9ebc992244d43bb55d..ef17bac760671d55c933f27e92451cc19064eee7 100644 (file)
--- a/src/Length.h
+++ b/src/Length.h
@@ -20,6 +20,8 @@
 
 namespace lyx {
 
+class MetricsBase;
+
 // Solaris/x86 version 9 and earlier define these
 #undef PC
 #undef SP
@@ -67,8 +69,6 @@ public:
        /// "data" must be a decimal number, followed by a unit
        explicit Length(std::string const & data);
 
-       ///
-       void swap(Length & rhs);
        ///
        double value() const;
        ///
@@ -89,8 +89,18 @@ public:
        std::string const asLatexString() const;
        /// return string representation for HTML
        std::string const asHTMLString() const;
-       /// return the on-screen size of this length
+       /** return the on-screen size of this length.
+        *
+        *      If the second argument is not provided, then the unit EM will
+        *      only be approximated. It is better if possible to use
+        *      FontMetrics::em() to get this value.
+        */
        int inPixels(int text_width, int em_width = 0) const;
+       /** return the on-screen size of this length
+        *
+        *  This version of the function uses the right EM definition.
+        */
+       int inPixels(MetricsBase const &) const;
        /// return the value in Big Postscript points.
        int inBP() const;
 
@@ -100,8 +110,6 @@ public:
        friend bool isValidLength(std::string const & data, Length * result);
 
 private:
-       /// This HSpace kind
-       HSpaceKind kind_;
        ///
        double val_;
        ///