GTK graphics dialog: Default to scaling 100% when no scaling or size is given

[lyx.git] / src / vspace.h

diff --git a/src/vspace.h b/src/vspace.h
index 99d85d0102716929e508831b11c6e8f0ed4988c6..dd21209ab33c19c86537913d29974f871fb92931 100644 (file)
--- a/src/vspace.h
+++ b/src/vspace.h
@@ -14,7 +14,6 @@
 
 #include "lyxgluelength.h"
 
-#include "LString.h"
 
 class BufferParams;
 class BufferView;
@@ -25,7 +24,6 @@ class VSpace {
 public:
        /// The different kinds of spaces.
        enum vspace_kind {
-               NONE, ///< no added vertical space
                DEFSKIP,
                SMALLSKIP,
                MEDSKIP,
@@ -43,12 +41,12 @@ public:
        explicit VSpace(LyXGlueLength const & l);
 
        /// Constructor for reading from a .lyx file
-       explicit VSpace(string const & data);
+       explicit VSpace(std::string const & data);
 
        /// return the type of vertical space
        vspace_kind kind() const;
        /// return the length of this space
-       LyXGlueLength length() const;
+       LyXGlueLength const & length() const;
 
        // a flag that switches between \vspace and \vspace*
        bool keep() const;
@@ -60,9 +58,11 @@ public:
        // conversion
 
        /// how it goes into the LyX file
-       string const asLyXCommand() const;
+       std::string const asLyXCommand() const;
        /// the latex representation
-       string const asLatexCommand(BufferParams const & params) const;
+       std::string const asLatexCommand(BufferParams const & params) const;
+       /// how it is seen in the LyX window
+       std::string const asGUIName() const;
        /// the size of the space on-screen
        int inPixels(BufferView const & bv) const;