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

add native_string_type for internal use

Browse Source
This commit is contained in:
Jinhao
2015-12-03 01:49:44 +08:00
parent ed4d2af7dd
commit e8266b5ae8
24 changed files with 185 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -677,22 +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)));
}
::std::string spinbox::_m_caption() const throw()
auto spinbox::_m_caption() const throw() -> native_string_type
{
internal_scope_guard lock;
auto editor = get_drawer_trigger().impl()->editor();
if (editor)
return ::nana::charset(editor->text());
return std::string();
return to_native_string(editor->text());
return native_string_type();
}
void spinbox::_m_caption(::std::string&& text)
void spinbox::_m_caption(native_string_type&& text)
{
internal_scope_guard lock;
auto editor = get_drawer_trigger().impl()->editor();
if (editor)
{
editor->text(::nana::charset(text, ::nana::unicode::utf8));
editor->text(to_wstring(text));
API::refresh_window(*this);
}
}