X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Flabel.cc;h=da9edfd179708c591b30b6fbbe2e6f4ff6ceed59;hb=e3eeac5b6eee29009f3417f309a261d43fd39d27;hp=cacbb08e18f8df6c2ae1293566c502796c6a94e4;hpb=74061b4e2d33d7e2101c4edda26cfc2a1294f32b;p=chaz%2Fopenbox

diff --git a/otk/label.cc b/otk/label.cc
index cacbb08e..da9edfd1 100644
--- a/otk/label.cc
+++ b/otk/label.cc
@@ -11,8 +11,8 @@ namespace otk {
 Label::Label(Widget *parent)
   : Widget(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());
 }
 
@@ -35,7 +35,7 @@ void Label::update(void)
     const Font *ft = style()->getFont();
     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