// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
-// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
#ifdef HAVE_CONFIG_H
# include "../config.h"
: otk::Widget(parent),
WidgetBase(type)
{
- const otk::ScreenInfo *info = otk::Display::screenInfo(_screen);
- _xftdraw = XftDrawCreate(otk::Display::display, _window, info->visual(),
+ const otk::ScreenInfo *info = otk::display->screenInfo(_screen);
+ _xftdraw = XftDrawCreate(**otk::display, _window, info->visual(),
info->colormap());
}
}
-void LabelWidget::setText(const std::string &text)
+void LabelWidget::setText(const otk::ustring &text)
{
_text = text;
_dirty = true;
otk::Widget::update();
if (draw) {
- std::string t = _text;
+ otk::ustring t = _text;
int x = _sidemargin; // x coord for the text
// find a string that will fit inside the area for text