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

diff --git a/otk/focuslabel.cc b/otk/focuslabel.cc
index a5c85127..b1b8c764 100644
--- a/otk/focuslabel.cc
+++ b/otk/focuslabel.cc
@@ -10,38 +10,38 @@
 
 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, 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;
 
-    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
@@ -70,11 +70,11 @@ void OtkFocusLabel::update(void)
       }
     }
 
-    OtkFocusWidget::update();
+    FocusWidget::update();
 
     ft->drawString(_xftdraw, x, 0, *text_color, t);
   } else
-    OtkFocusWidget::update();
+    FocusWidget::update();
 }
 
 }