include algorthm forstd::find

[chaz/openbox] / src / labelwidget.hh

diff --git a/src/labelwidget.hh b/src/labelwidget.hh
index 92c35c3c56d5c93388e7616b191bc15860311f97..6373e1d30431ca08dad5d329abb1a820e8afbf65 100644 (file)
--- a/src/labelwidget.hh
+++ b/src/labelwidget.hh
@@ -5,7 +5,8 @@
 #include "widgetbase.hh"
 #include "otk/widget.hh"
 #include "otk/font.hh"
-#include "otk/style.hh"
+#include "otk/renderstyle.hh"
+#include "otk/ustring.hh"
 
 namespace ob {
 
@@ -14,18 +15,16 @@ class LabelWidget : public otk::Widget, public WidgetBase
 private:
   void setTextures();
   const otk::Font *_font;
-  otk::Color *_text_color;
+  otk::RenderColor *_text_color;
   int _sidemargin;
-  otk::Style::TextJustify _justify;
-  std::string _text;
-  //! Object used by Xft to render to the drawable
-  XftDraw *_xftdraw;
+  otk::RenderStyle::TextJustify _justify;
+  otk::ustring _text;
   
 public:
   LabelWidget(otk::Widget *parent, WidgetBase::WidgetType type);
   virtual ~LabelWidget();
 
-  virtual void setStyle(otk::Style *style);
+  virtual void setStyle(otk::RenderStyle *style);
 
   virtual void adjust();
 
@@ -34,8 +33,10 @@ public:
 
   virtual void update();
 
-  inline const std::string &text() const { return _text; }
-  void setText(const std::string &text);
+  virtual void renderForeground();
+
+  inline const otk::ustring &text() const { return _text; }
+  void setText(const otk::ustring &text);
 };
 
 }