X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Flabel.hh;h=e24858f19fe731ef91db71afae7c6bc04def9a58;hb=225d4302d0b2bd40d03d3bfa54116c0adfe3143e;hp=94ebe0b3bcad15b49bf432079cb6062f0d0f9d10;hpb=74061b4e2d33d7e2101c4edda26cfc2a1294f32b;p=chaz%2Fopenbox

diff --git a/otk/label.hh b/otk/label.hh
index 94ebe0b3..e24858f1 100644
--- a/otk/label.hh
+++ b/otk/label.hh
@@ -3,8 +3,6 @@
 #define __label_hh
 
 #include "widget.hh"
-#include "font.hh"
-#include "userstring.hh"
 
 namespace otk {
 
@@ -15,18 +13,20 @@ public:
   Label(Widget *parent);
   ~Label();
 
-  inline const userstring &getText(void) const { return _text; }
-  void setText(const userstring &text) { _text = text; _dirty = true; }
+  inline const ustring &getText(void) const { return _text; }
+  void setText(const ustring &text) { _text = text; _dirty = true; }
 
-  void update(void);
+  virtual void renderForeground(void);
 
-  virtual void setStyle(Style *style);
+  virtual void setStyle(RenderStyle *style);
 
 private:
-  //! Object used by Xft to render to the drawable
-  XftDraw *_xftdraw;
-  //! Text displayed in the label
-  userstring _text;
+  //! Text to be displayed in the label
+  ustring _text;
+  //! The actual text being shown, may be a subset of _text
+  ustring _drawtext;
+  //! The drawing offset for the text
+  int _drawx;
 };
 
 }