begin conversion to ustring. add some more members.

[chaz/openbox] / otk / label.hh

diff --git a/otk/label.hh b/otk/label.hh
index 94ebe0b3bcad15b49bf432079cb6062f0d0f9d10..0366c262c7195285abc1b6acc5090c331b061d65 100644 (file)
--- a/otk/label.hh
+++ b/otk/label.hh
@@ -4,7 +4,6 @@
 
 #include "widget.hh"
 #include "font.hh"
-#include "userstring.hh"
 
 namespace otk {
 
@@ -15,8 +14,8 @@ public:
   Label(Widget *parent);
   ~Label();
 
-  inline const userstring &getText(void) const { return _text; }
-  void setText(const userstring &text) { _text = text; _dirty = true; }
+  inline const std::string &getText(void) const { return _text; }
+  void setText(const std::string &text) { _text = text; _dirty = true; }
 
   void update(void);
 
@@ -26,7 +25,7 @@ private:
   //! Object used by Xft to render to the drawable
   XftDraw *_xftdraw;
   //! Text displayed in the label
-  userstring _text;
+  std::string _text;
 };
 
 }