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

Merge branch 'filesystem' of https://github.com/qPCR4vir/nana into qPCR4vir-filesystem

Browse Source
This commit is contained in:
Jinhao
2019-12-04 01:09:55 +08:00
parent d78157efba 0e7261228c
commit d2ce5fafd2
8 changed files with 935 additions and 624 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/gui/filebox.cpp
View File

@@ -1522,7 +1522,7 @@ namespace nana
if (!*str)
{
targets.emplace_back(parent_path);
impl_->path = parent_path.parent_path().u8string();
impl_->path = parent_path.parent_path().string();
}
else
{
@@ -1532,7 +1532,7 @@ namespace nana
targets.emplace_back(parent_path / path_type{str});
str += (len + 1);
}
impl_->path = parent_path.u8string();
impl_->path = parent_path.string();
}
}
else
@@ -1540,7 +1540,7 @@ namespace nana
wfile.resize(std::wcslen(wfile.data()));
targets.emplace_back(wfile);
impl_->path = targets.front().parent_path().u8string();
impl_->path = targets.front().parent_path().string();
}
#elif defined(NANA_POSIX)

2
source/gui/msgbox.cpp
View File

@@ -1267,7 +1267,7 @@ namespace nana
auto files = impl->fbox.show();
if(!files.empty())
{
impl->value = files.front().u8string();
impl->value = files.front().string();
impl->path_edit.caption(impl->value);
}
});