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

6
source/gui/widgets/label.cpp
View File

@@ -807,7 +807,7 @@ namespace nana
if(impl->renderer.format(f))
{
window wd = *this;
impl->renderer.parse(::nana::charset(API::dev::window_caption(wd), ::nana::unicode::utf8));
impl->renderer.parse(::nana::to_wstring(API::dev::window_caption(wd)));
API::refresh_window(wd);
}
return *this;
@@ -869,11 +869,11 @@ namespace nana
return *this;
}
void label::_m_caption(std::string&& str)
void label::_m_caption(native_string_type&& str)
{
internal_scope_guard lock;
window wd = *this;
get_drawer_trigger().impl()->renderer.parse(::nana::charset(str, nana::unicode::utf8));
get_drawer_trigger().impl()->renderer.parse(to_wstring(str));
API::dev::window_caption(wd, std::move(str));
API::refresh_window(wd);
}