elimiate nana::string for listbox

2015-12-10 00:24:31 +08:00
parent 049a36e1f7
commit 112deadd16
12 changed files with 384 additions and 202 deletions
--- a/source/gui/widgets/combox.cpp
+++ b/source/gui/widgets/combox.cpp
@@ -987,7 +987,7 @@ namespace nana
 			internal_scope_guard lock;
 			auto editor = _m_impl().editor();
 			if (editor)
-				return to_native_string(editor->text());
+				return to_nstring(editor->text());
 			return native_string_type();
 		}

@@ -997,7 +997,7 @@ namespace nana

 			auto editor = _m_impl().editor();
 			if (editor)
-				editor->text(to_native_string(str));
+				editor->text(to_nstring(str));

 			API::refresh_window(*this);
 		}