Merge branch 'mihaizh-fix_filebox_multi_select' into hotfix-1.7.2

This commit is contained in:
Jinhao 2019-09-02 05:41:39 +08:00
commit e6b0332bad
2 changed files with 17 additions and 7 deletions

View File

@ -44,7 +44,7 @@ matrix:
before_install:
- cd ..
- git clone --depth=1 --branch=develop https://github.com/qPCR4vir/nana-demo.git nana-demo
- git clone --depth=1 --branch=master https://github.com/qPCR4vir/nana-demo.git nana-demo
- export PATH="$HOME/bin:$PATH"
- wget --no-check-certificate --no-clobber -O /tmp/tools/cmake https://cmake.org/files/v3.12/cmake-3.12.0-rc3-Linux-x86_64.sh || true
- chmod -R +x /tmp/tools

View File

@ -1517,6 +1517,15 @@ namespace nana
path_type parent_path{ str };
str += (len + 1);
// if only one file was selected, the ofn.lpstrFile
// is returning only that file, without any parent
if (!*str)
{
targets.emplace_back(parent_path);
impl_->path = parent_path.parent_path().u8string();
}
else
{
while(*str)
{
len = ::wcslen(str);
@ -1525,6 +1534,7 @@ namespace nana
}
impl_->path = parent_path.u8string();
}
}
else
{
wfile.resize(std::wcslen(wfile.data()));