add native_string_type for internal use

2015-12-03 01:49:44 +08:00
parent ed4d2af7dd
commit e8266b5ae8
24 changed files with 185 additions and 85 deletions
--- a/source/gui/widgets/button.cpp
+++ b/source/gui/widgets/button.cpp
@@ -511,11 +511,11 @@ namespace nana{	namespace drawerbase
 				});
 			}

-			void button::_m_caption(std::string&& text)
+			void button::_m_caption(native_string_type&& text)
 			{
 				API::unregister_shortkey(handle());

-				std::wstring wtext = ::nana::charset(text, ::nana::unicode::utf8);
+				std::wstring wtext = ::nana::to_wstring(text);

 				wchar_t shortkey;
 				API::transform_shortkey_text(wtext, shortkey, 0);