X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Flabel.hh;h=e24858f19fe731ef91db71afae7c6bc04def9a58;hb=ee356f4265d09a542d77474ac2f4b5057e7d04fe;hp=0366c262c7195285abc1b6acc5090c331b061d65;hpb=8f8acc24933830d4f5784616b9b0c5896bde0b93;p=chaz%2Fopenbox

diff --git a/otk/label.hh b/otk/label.hh
index 0366c262..e24858f1 100644
--- a/otk/label.hh
+++ b/otk/label.hh
@@ -3,7 +3,6 @@
 #define __label_hh
 
 #include "widget.hh"
-#include "font.hh"
 
 namespace otk {
 
@@ -14,18 +13,20 @@ public:
   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 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
-  std::string _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;
 };
 
 }