X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=otk%2Ffocuslabel.cc;h=b1b8c76498a1d9d95bf532ea1afa31a1b218058b;hb=67bb7f8ce08d3ef625843ab7ea2c4434b1620ecf;hp=007c795733c00186a57d9011530b7131bbc21446;hpb=ee896d9d664b6076635da98dced82b8b3258cebe;p=chaz%2Fopenbox

diff --git a/otk/focuslabel.cc b/otk/focuslabel.cc
index 007c7957..b1b8c764 100644
--- a/otk/focuslabel.cc
+++ b/otk/focuslabel.cc
@@ -10,39 +10,38 @@
 
 namespace otk {
 
-OtkFocusLabel::OtkFocusLabel(OtkWidget *parent)
-  : OtkFocusWidget(parent), _text("")
+FocusLabel::FocusLabel(Widget *parent)
+  : FocusWidget(parent), _text("")
 {
-  const ScreenInfo *info = OBDisplay::screenInfo(getScreen());
-  _xftdraw = XftDrawCreate(OBDisplay::display, getWindow(), info->getVisual(),
-                           info->getColormap());
-  setStyle(getStyle());
+  const ScreenInfo *info = display->screenInfo(screen());
+  _xftdraw = XftDrawCreate(**display, window(), info->visual(),
+                           info->colormap());
 }
 
-OtkFocusLabel::~OtkFocusLabel()
+FocusLabel::~FocusLabel()
 {
   XftDrawDestroy(_xftdraw);
 }
 
 
-void OtkFocusLabel::setStyle(Style *style)
+void FocusLabel::setStyle(Style *style)
 {
-  OtkFocusWidget::setStyle(style);
+  FocusWidget::setStyle(style);
   
-  setTexture(getStyle()->getLabelFocus());
-  setUnfocusTexture(getStyle()->getLabelUnfocus());
+  setTexture(style->getLabelFocus());
+  setUnfocusTexture(style->getLabelUnfocus());
 }
 
 
-void OtkFocusLabel::update(void)
+void FocusLabel::update(void)
 {
   if (_dirty) {
-    const BFont &ft = getStyle()->getFont();
-    BColor *text_color = (isFocused() ? getStyle()->getTextFocus()
-                          : getStyle()->getTextUnfocus());
-    unsigned int sidemargin = getStyle()->getBevelWidth() * 2;
+    const Font *ft = style()->getFont();
+    Color *text_color = (isFocused() ? style()->getTextFocus()
+                          : style()->getTextUnfocus());
+    unsigned int sidemargin = style()->getBevelWidth() * 2;
 
-    std::string t = _text; // the actual text to draw
+    ustring t = _text; // the actual text to draw
     int x = sidemargin;    // x coord for the text
 
     // find a string that will fit inside the area for text
@@ -55,11 +54,11 @@ void OtkFocusLabel::update(void)
       
       do {
         t.resize(text_len);
-        length = ft.measureString(t);
+        length = ft->measureString(t);
       } while (length > max_length && text_len-- > 0);
 
       // justify the text
-      switch (getStyle()->textJustify()) {
+      switch (style()->textJustify()) {
       case Style::RightJustify:
         x += max_length - length;
         break;
@@ -71,11 +70,11 @@ void OtkFocusLabel::update(void)
       }
     }
 
-    OtkFocusWidget::update();
+    FocusWidget::update();
 
-    ft.drawString(_xftdraw, x, 0, *text_color, t);
+    ft->drawString(_xftdraw, x, 0, *text_color, t);
   } else
-    OtkFocusWidget::update();
+    FocusWidget::update();
 }
 
 }