Changeset 8619 in orxonox.OLD for trunk/src/lib/gui/gl/glgui_inputline.h

Timestamp:

Jun 20, 2006, 1:24:11 PM (18 years ago)

Author:

bensch

Message:

trunk: merged the gui-branche back.
merged with command:
svn merge -r8520:HEAD ​https://svn.orxonox.net/orxonox/branches/gui
no conflicts

File:

• trunk/src/lib/gui/gl/glgui_inputline.h (modified) (3 diffs)

trunk/src/lib/gui/gl/glgui_inputline.h

@@ -9 +9 @@
 
 #include "glgui_widget.h"
-#include "text.h"
+#include "limited_width_text.h"
 #include "event.h"
 
@@ -32 +32 @@
 
     /** @returns the text of the inputLine */
-    const std::string& _getText() const { return this->_text.getText(); };
+    const std::string& _getText() const { return this->_text.text(); };
 
     void setText(const std::string& text);
@@ -66 +66 @@
 
   private:
-    Text                    _text;            //!< The Text to display inside of the InputLine.
+    LimitedWidthText        _text;            //!< The Text to display inside of the InputLine.
     bool                    _clearOnEnter;    //!< Clear on Enter