dont try free the widget's pixmap until it is no longer in use

[chaz/openbox] / otk / label.hh

diff --git a/otk/label.hh b/otk/label.hh
index ad938f102e70f7ef72460062cfa1536099853fdf..ff1755d78fe82b143c85bf941a461bed7fb8ba0a 100644 (file)
--- a/otk/label.hh
+++ b/otk/label.hh
@@ -3,7 +3,6 @@
 #define __label_hh
 
 #include "widget.hh"
-#include "font.hh"
 
 namespace otk {
 
@@ -17,15 +16,17 @@ public:
   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);
 
 private:
-  //! Object used by Xft to render to the drawable
-  XftDraw *_xftdraw;
-  //! Text displayed in the label
+  //! 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;
 };
 
 }