reorder how theyre destroyed, probably doesnt matter anyways.

[chaz/openbox] / src / labelwidget.hh

diff --git a/src/labelwidget.hh b/src/labelwidget.hh
index 1ee104cd397322e63a82540388bb63df396e3e8f..094cf86814845e1e091433125333888f190ca12c 100644 (file)
--- a/src/labelwidget.hh
+++ b/src/labelwidget.hh
@@ -6,24 +6,25 @@
 #include "otk/widget.hh"
 #include "otk/font.hh"
 #include "otk/style.hh"
+#include "otk/ustring.hh"
 
 namespace ob {
 
-class OBLabelWidget : public otk::OtkWidget, public OBWidget
+class LabelWidget : public otk::Widget, public WidgetBase
 {
 private:
   void setTextures();
-  const otk::BFont *_font;
-  otk::BColor *_text_color;
+  const otk::Font *_font;
+  otk::Color *_text_color;
   int _sidemargin;
   otk::Style::TextJustify _justify;
-  std::string _text;
+  otk::ustring _text;
   //! Object used by Xft to render to the drawable
   XftDraw *_xftdraw;
   
 public:
-  OBLabelWidget(otk::OtkWidget *parent, OBWidget::WidgetType type);
-  virtual ~OBLabelWidget();
+  LabelWidget(otk::Widget *parent, WidgetBase::WidgetType type);
+  virtual ~LabelWidget();
 
   virtual void setStyle(otk::Style *style);
 
@@ -34,8 +35,8 @@ public:
 
   virtual void update();
 
-  inline const std::string &text() const { return _text; }
-  void setText(const std::string &text);
+  inline const otk::ustring &text() const { return _text; }
+  void setText(const otk::ustring &text);
 };
 
 }