Merge branch 'hotfix-1.6.2' into develop-1.7

This commit is contained in:
Jinhao
2018-12-07 06:54:42 +08:00
12 changed files with 253 additions and 166 deletions

View File

@@ -230,7 +230,6 @@ namespace nana {
{
cv_scroll->vert.create(window_handle);
cv_scroll->vert.events().value_changed.connect_unignorable(event_fn);
API::take_active(cv_scroll->vert, false, window_handle);
this->passive = false;
}
@@ -261,7 +260,6 @@ namespace nana {
{
cv_scroll->horz.create(window_handle);
cv_scroll->horz.events().value_changed.connect_unignorable(event_fn);
API::take_active(cv_scroll->horz, false, window_handle);
this->passive = false;
}