almost done the ustring conversion

[chaz/openbox] / src / labelwidget.cc

diff --git a/src/labelwidget.cc b/src/labelwidget.cc
index 9ff45298a834f59a5bcc4f17c91169f217e33b5f..16c8eae2b37cc2a1549aec4dd918deef53a2b184 100644 (file)
--- a/src/labelwidget.cc
+++ b/src/labelwidget.cc
@@ -1,5 +1,4 @@
 // -*- 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"
@@ -27,7 +26,7 @@ LabelWidget::~LabelWidget()
 }
 
 
-void LabelWidget::setText(const std::string &text)
+void LabelWidget::setText(const otk::ustring &text)
 {
   _text = text;
   _dirty = true;
@@ -78,7 +77,7 @@ void LabelWidget::update()
   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