diff options
Diffstat (limited to 'views/controls/button/text_button.cc')
| -rw-r--r-- | views/controls/button/text_button.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/views/controls/button/text_button.cc b/views/controls/button/text_button.cc index 1d56f1d..58c0030 100644 --- a/views/controls/button/text_button.cc +++ b/views/controls/button/text_button.cc @@ -264,7 +264,8 @@ void TextButtonNativeThemeBorder::GetInsets(gfx::Insets* insets) const { //////////////////////////////////////////////////////////////////////////////// // TextButtonBase, public: -TextButtonBase::TextButtonBase(ButtonListener* listener, const string16& text) +TextButtonBase::TextButtonBase(ButtonListener* listener, + const std::wstring& text) : CustomButton(listener), alignment_(ALIGN_LEFT), font_(ResourceBundle::GetSharedInstance().GetFont( @@ -303,9 +304,9 @@ void TextButtonBase::SetIsDefault(bool is_default) { SchedulePaint(); } -void TextButtonBase::SetText(const string16& text) { - text_ = text; - SetAccessibleName(text); +void TextButtonBase::SetText(const std::wstring& text) { + text_ = WideToUTF16Hack(text); + SetAccessibleName(WideToUTF16Hack(text)); UpdateTextSize(); } @@ -652,7 +653,7 @@ gfx::NativeTheme::State TextButtonBase::GetForegroundThemeState( TextButton::TextButton(ButtonListener* listener, const std::wstring& text) - : TextButtonBase(listener, WideToUTF16Hack(text)), + : TextButtonBase(listener, text), icon_placement_(ICON_ON_LEFT), has_hover_icon_(false), has_pushed_icon_(false), |