Merge branch 'hotfix-1.5' into develop

2017-05-09 04:50:04 +08:00
parent e7e7b5336d 8d4a734272
commit 601debc420
2 changed files with 13 additions and 8 deletions
--- a/include/nana/gui/widgets/skeletons/text_editor.hpp
+++ b/include/nana/gui/widgets/skeletons/text_editor.hpp
@@ -230,7 +230,10 @@ namespace nana{	namespace widgets

 			void _m_reset_content_size(bool calc_lines = false);
 			void _m_reset();
+
+			//Inserts text at position where the caret is
 			::nana::upoint _m_put(::std::wstring);
+
 			::nana::upoint _m_erase_select();

 			::std::wstring _m_make_select_string() const;