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

Merge branch 'hotfix-1.4.1' into develop

Browse Source
This commit is contained in:
Jinhao
2017-03-16 02:07:37 +08:00
parent 57ae7822c8 cc24607a48
commit 33424f0c75
24 changed files with 451 additions and 368 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
source/gui/widgets/skeletons/text_editor.cpp
View File

@@ -2050,24 +2050,29 @@ namespace nana{ namespace widgets
void text_editor::paste()
{
std::wstring text;
nana::system::dataexch().get(text);
auto text = system::dataexch{}.wget();
//If it is required check the acceptable
if (accepts::no_restrict != impl_->capacities.acceptive)
if ((accepts::no_restrict != impl_->capacities.acceptive) || impl_->capacities.pred_acceptive)
{
for (auto i = text.begin(); i != text.end(); ++i)
{
if (!_m_accepts(*i))
if (_m_accepts(*i))
{
if (accepts::no_restrict == impl_->capacities.acceptive)
put(*i);
continue;
}
if (accepts::no_restrict != impl_->capacities.acceptive)
{
text.erase(i, text.end());
break;
put(std::move(text));
}
break;
}
}
if (!text.empty())
put(std::move(text));
}
void text_editor::enter(bool record_undo)
@@ -2794,8 +2799,12 @@ namespace nana{ namespace widgets
bool text_editor::_m_accepts(char_type ch) const
{
if(accepts::no_restrict == impl_->capacities.acceptive)
if (accepts::no_restrict == impl_->capacities.acceptive)
{
if (impl_->capacities.pred_acceptive)
return impl_->capacities.pred_acceptive(ch);
return true;
}
//Checks the input whether it meets the requirement for a numeric.
auto str = text();