mewin/nana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

change some APIs for accepting utf8

Browse Source
This commit is contained in:
Jinhao
2015-11-27 01:54:26 +08:00
parent 3b8e113745
commit 12358a5dc0
55 changed files with 517 additions and 483 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/gui/widgets/spinbox.cpp
View File

@@ -677,20 +677,22 @@ namespace nana
modifier(static_cast<std::wstring>(::nana::charset(prefix_utf8, ::nana::unicode::utf8)), static_cast<std::wstring>(::nana::charset(suffix_utf8, ::nana::unicode::utf8)));
}
::nana::string spinbox::_m_caption() const throw()
::std::string spinbox::_m_caption() const throw()
{
internal_scope_guard lock;
auto editor = get_drawer_trigger().impl()->editor();
return (editor ? editor->text() : nana::string());
if (editor)
return ::nana::charset(editor->text());
return std::string();
}
void spinbox::_m_caption(::nana::string&& text)
void spinbox::_m_caption(::std::string&& text)
{
internal_scope_guard lock;
auto editor = get_drawer_trigger().impl()->editor();
if (editor)
{
editor->text(std::move(text));
editor->text(::nana::charset(text, ::nana::unicode::utf8));
API::refresh_window(*this);
}
}