fix compile errors under Linux

2015-12-16 01:21:44 +08:00
parent c260eebbc3
commit 2ca11d4e25
21 changed files with 274 additions and 279 deletions
--- a/source/gui/widgets/combox.cpp
+++ b/source/gui/widgets/combox.cpp
@@ -997,7 +997,7 @@ namespace nana

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

 			API::refresh_window(*this);
 		}