mewin/nana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'wjiali6-master' into develop

Browse Source
This commit is contained in:
Jinhao 2017-09-25 21:54:42 +08:00
commit a777447cfd
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/nana/gui/widgets/textbox.hpp
View File

@ -185,7 +185,7 @@ namespace nana
/// Appends an string. If `at_caret` is `true`, the string is inserted at the position of caret, otherwise, it is appended at end of the textbox.
textbox& append(const std::string& text, bool at_caret);
textbox& append(const std::wstring& text, bool at_caret);
/// Determines whether the text is line wrapped.
bool line_wrapped() const;
textbox& line_wrapped(bool);

16
source/gui/widgets/textbox.cpp
View File

@ -435,7 +435,23 @@ namespace drawerbase {
}
return *this;
}
//a native wstring version textbox::append
textbox& textbox::append(const std::wstring& text, bool at_caret)
{
internal_scope_guard lock;
auto editor = get_drawer_trigger().editor();
if(editor)
{
if(at_caret == false)
editor->move_caret_end(false);
editor->put(text);
editor->try_refresh();
API::update_window(this->handle());
}
return *this;
}
/// Determine wheter the text is auto-line changed.
bool textbox::line_wrapped() const
{