use "userstring" for all user viewable strings

[chaz/openbox] / otk / label.hh

diff --git a/otk/label.hh b/otk/label.hh
index f80f76c78ac9b54e2281ac3371e260434a82fd4d..94ebe0b3bcad15b49bf432079cb6062f0d0f9d10 100644 (file)
--- a/otk/label.hh
+++ b/otk/label.hh
@@ -1,20 +1,22 @@
+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
 #ifndef __label_hh
 #define __label_hh
 
 #include "widget.hh"
 #include "font.hh"
+#include "userstring.hh"
 
 namespace otk {
 
-class OtkLabel : public OtkWidget {
+class Label : public Widget {
 
 public:
 
-  OtkLabel(OtkWidget *parent);
-  ~OtkLabel();
+  Label(Widget *parent);
+  ~Label();
 
-  inline const std::string &getText(void) const { return _text; }
-  void setText(const std::string &text) { _text = text; _dirty = true; }
+  inline const userstring &getText(void) const { return _text; }
+  void setText(const userstring &text) { _text = text; _dirty = true; }
 
   void update(void);
 
@@ -24,7 +26,7 @@ private:
   //! Object used by Xft to render to the drawable
   XftDraw *_xftdraw;
   //! Text displayed in the label
-  std::string _text;
+  userstring _text;
 };
 
 }