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

FIX crash in VS consistently using filesysten_ext

Browse Source
This commit is contained in:
qPCR4vir
2016-06-24 23:48:53 +02:00
parent 70b1b0b9ee
commit 4450ff9678
12 changed files with 49 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/gui/filebox.cpp
View File

@@ -12,7 +12,7 @@
#include <nana/gui.hpp>
#include <nana/gui/filebox.hpp>
#include <nana/filesystem/filesystem.hpp>
#include <nana/filesystem/filesystem_ext.hpp>
#if defined(NANA_WINDOWS)
#include <windows.h>
@@ -24,13 +24,12 @@
#include <nana/gui/widgets/textbox.hpp>
#include <nana/gui/widgets/treebox.hpp>
#include <nana/gui/widgets/combox.hpp>
#include <nana/filesystem/filesystem.hpp>
#include <nana/gui/place.hpp>
#include <stdexcept>
#include <algorithm>
#endif
namespace fs = nana::experimental::filesystem;
namespace fs = std::experimental::filesystem;
namespace nana
{
@@ -528,8 +527,6 @@ namespace nana
if((path.size() == 0) || (path[path.size() - 1] != '/'))
path += '/';
namespace fs = ::nana::experimental::filesystem;
auto beg_node = tree_.selected();
while(!beg_node.empty() && (beg_node != nodes_.home) && (beg_node != nodes_.filesystem))
beg_node = beg_node.owner();