X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=otk%2Ffocuslabel.hh;h=8db444d36d47cc2cd872425b96394c02c6b9c6b8;hb=edcd9726300534de19c767f88022ae0fcc7a7b75;hp=b3db60747063f3c4712d2d8d668d1d90480a6d0e;hpb=74061b4e2d33d7e2101c4edda26cfc2a1294f32b;p=chaz%2Fopenbox

diff --git a/otk/focuslabel.hh b/otk/focuslabel.hh
index b3db6074..8db444d3 100644
--- a/otk/focuslabel.hh
+++ b/otk/focuslabel.hh
@@ -1,10 +1,8 @@
 // -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
-#ifndef __label_hh
-#define __label_hh
+#ifndef __focuslabel_hh
+#define __focuslabel_hh
 
 #include "focuswidget.hh"
-#include "font.hh"
-#include "userstring.hh"
 
 namespace otk {
 
@@ -15,20 +13,18 @@ public:
   FocusLabel(Widget *parent);
   ~FocusLabel();
 
-  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();
 
-  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;
+  ustring _text;
 };
 
 }
 
-#endif
+#endif // __focuslabel_hh