X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Ffocuslabel.hh;h=c25ab29c95175971c4546e9404b2bb146b352116;hb=5072931be0ff28cd9447926d50fe5ea202e2c370;hp=54a7f06f078ba177e6291c6fab17db95b26ba6d3;hpb=8f8acc24933830d4f5784616b9b0c5896bde0b93;p=chaz%2Fopenbox

diff --git a/otk/focuslabel.hh b/otk/focuslabel.hh
index 54a7f06f..c25ab29c 100644
--- a/otk/focuslabel.hh
+++ b/otk/focuslabel.hh
@@ -1,9 +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"
 
 namespace otk {
 
@@ -14,20 +13,23 @@ public:
   FocusLabel(Widget *parent);
   ~FocusLabel();
 
-  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();
 
-  virtual void setStyle(Style *style);
+  virtual void update();
+
+  void fitString(const std::string &str);
+  void fitSize(int w, int h);
+
+  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;
+  ustring _text;
 };
 
 }
 
-#endif
+#endif // __focuslabel_hh