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

15
source/gui/programming_interface.cpp
View File

@@ -220,7 +220,7 @@ namespace API
}
}
std::string window_caption(window wd) throw()
::nana::detail::native_string_type window_caption(window wd) throw()
{
auto const iwd = reinterpret_cast<basic_window*>(wd);
internal_scope_guard isg;
@@ -234,7 +234,7 @@ namespace API
return {};
}
void window_caption(window wd, std::string title)
void window_caption(window wd, ::nana::detail::native_string_type title)
{
auto const iwd = reinterpret_cast<basic_window*>(wd);
internal_scope_guard lock;
@@ -823,12 +823,15 @@ namespace API
auto const iwd = reinterpret_cast<basic_window*>(wd);
internal_scope_guard lock;
if (restrict::wd_manager().available(iwd))
iwd->widget_notifier->caption(title_utf8);
iwd->widget_notifier->caption(to_native_string(title_utf8));
}
void window_caption(window wd, const nana::string& title)
void window_caption(window wd, const std::wstring& title)
{
window_caption(wd, static_cast<std::string>(::nana::charset(title).to_bytes(::nana::unicode::utf8)));
auto const iwd = reinterpret_cast<basic_window*>(wd);
internal_scope_guard lock;
if (restrict::wd_manager().available(iwd))
iwd->widget_notifier->caption(to_native_string(title));
}
std::string window_caption(window wd)
@@ -836,7 +839,7 @@ namespace API
auto const iwd = reinterpret_cast<basic_window*>(wd);
internal_scope_guard lock;
if (restrict::wd_manager().available(iwd))
return iwd->widget_notifier->caption();
return to_utf8(iwd->widget_notifier->caption());
return{};
}