reorder how theyre destroyed, probably doesnt matter anyways.

[chaz/openbox] / src / labelwidget.hh

diff --git a/src/labelwidget.hh b/src/labelwidget.hh
index def81fefe5de801a10ecae291a26d11dd9b779e1..094cf86814845e1e091433125333888f190ca12c 100644 (file)
--- a/src/labelwidget.hh
+++ b/src/labelwidget.hh
@@ -2,22 +2,41 @@
 #ifndef   __oblabelwidget_hh
 #define   __oblabelwidget_hh
 
-#include "otk/focuslabel.hh"
-#include "widget.hh"
+#include "widgetbase.hh"
+#include "otk/widget.hh"
+#include "otk/font.hh"
+#include "otk/style.hh"
+#include "otk/ustring.hh"
 
 namespace ob {
 
-class OBLabelWidget : public otk::OtkFocusLabel, public OBWidget
+class LabelWidget : public otk::Widget, public WidgetBase
 {
 private:
+  void setTextures();
+  const otk::Font *_font;
+  otk::Color *_text_color;
+  int _sidemargin;
+  otk::Style::TextJustify _justify;
+  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);
 
   virtual void adjust();
+
+  virtual void focus();
+  virtual void unfocus();
+
+  virtual void update();
+
+  inline const otk::ustring &text() const { return _text; }
+  void setText(const otk::ustring &text);
 };
 
 }