X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Ffocuslabel.cc;h=397a2cac8928b0e113b37fb2b159c8a47980e644;hb=8f8acc24933830d4f5784616b9b0c5896bde0b93;hp=136eb742c08c9498edf5c46d75e8907f1025b719;hpb=06de24ec6666578759eff2b348e50f5e8e20f3bd;p=chaz%2Fopenbox

diff --git a/otk/focuslabel.cc b/otk/focuslabel.cc
index 136eb742..397a2cac 100644
--- a/otk/focuslabel.cc
+++ b/otk/focuslabel.cc
@@ -10,34 +10,34 @@
 
 namespace otk {
 
-OtkFocusLabel::OtkFocusLabel(OtkWidget *parent)
-  : OtkFocusWidget(parent), _text("")
+FocusLabel::FocusLabel(Widget *parent)
+  : FocusWidget(parent), _text("")
 {
-  const ScreenInfo *info = OBDisplay::screenInfo(screen());
-  _xftdraw = XftDrawCreate(OBDisplay::display, window(), info->visual(),
+  const ScreenInfo *info = Display::screenInfo(screen());
+  _xftdraw = XftDrawCreate(Display::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(style->getLabelFocus());
   setUnfocusTexture(style->getLabelUnfocus());
 }
 
 
-void OtkFocusLabel::update(void)
+void FocusLabel::update(void)
 {
   if (_dirty) {
-    const BFont &ft = style()->getFont();
-    BColor *text_color = (isFocused() ? style()->getTextFocus()
+    const Font *ft = style()->getFont();
+    Color *text_color = (isFocused() ? style()->getTextFocus()
                           : style()->getTextUnfocus());
     unsigned int sidemargin = style()->getBevelWidth() * 2;
 
@@ -54,7 +54,7 @@ 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
@@ -70,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();
 }
 
 }