X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Ffocuslabel.cc;h=b1b8c76498a1d9d95bf532ea1afa31a1b218058b;hb=24b33ef877808f0af5b967f21c011ab8b314e780;hp=e82fa1ed75c4b8fb05f18e34d02f284d33aa159c;hpb=74061b4e2d33d7e2101c4edda26cfc2a1294f32b;p=chaz%2Fopenbox

diff --git a/otk/focuslabel.cc b/otk/focuslabel.cc
index e82fa1ed..b1b8c764 100644
--- a/otk/focuslabel.cc
+++ b/otk/focuslabel.cc
@@ -13,8 +13,8 @@ namespace otk {
 FocusLabel::FocusLabel(Widget *parent)
   : FocusWidget(parent), _text("")
 {
-  const ScreenInfo *info = Display::screenInfo(screen());
-  _xftdraw = XftDrawCreate(Display::display, window(), info->visual(),
+  const ScreenInfo *info = display->screenInfo(screen());
+  _xftdraw = XftDrawCreate(**display, window(), info->visual(),
                            info->colormap());
 }
 
@@ -41,7 +41,7 @@ void FocusLabel::update(void)
                           : style()->getTextUnfocus());
     unsigned int sidemargin = style()->getBevelWidth() * 2;
 
-    userstring 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