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/filesystem/filesystem.cpp
View File

@@ -11,7 +11,8 @@
* provide some interface for file managment
*/
#include <nana/filesystem/filesystem.hpp>
#include <nana/filesystem/filesystem_ext.hpp>
#if NANA_USING_NANA_FILESYSTEM
#include <vector>
#if defined(NANA_WINDOWS)
#include <windows.h>
@@ -369,7 +370,7 @@ namespace nana { namespace experimental { namespace filesystem
// return path_;
//}
const path& directory_entry::path() const
const nana_fs::path& directory_entry::path() const
{
return path_;
}
@@ -888,3 +889,5 @@ namespace nana { namespace experimental { namespace filesystem
}//end namespace filesystem
} //end namespace experimental
}//end namespace nana
#endif

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();

4
source/paint/detail/image_bmp.hpp
View File

@@ -13,8 +13,8 @@
#ifndef NANA_PAINT_DETAIL_IMAGE_BMP_HPP
#define NANA_PAINT_DETAIL_IMAGE_BMP_HPP
#include "image_pixbuf.hpp"
#include <memory>
#include "image_pixbuf.hpp"
namespace nana{ namespace paint
{
@@ -309,7 +309,7 @@ namespace nana{ namespace paint
return true;
}
bool open(const nana::experimental::filesystem::path& filename) override
bool open(const std::experimental::filesystem::path& filename) override
{
std::ifstream ifs(filename.string(), std::ios::binary);
if(ifs)

4
source/paint/detail/image_ico.hpp
View File

@@ -1,8 +1,8 @@
#ifndef NANA_PAINT_DETAIL_IMAGE_ICO_HPP
#define NANA_PAINT_DETAIL_IMAGE_ICO_HPP
#include <nana/filesystem/filesystem_ext.hpp>
#include <nana/paint/detail/image_impl_interface.hpp>
#include <nana/filesystem/filesystem.hpp>
namespace nana{ namespace paint
{
@@ -24,7 +24,7 @@ namespace nana{ namespace paint
image_ico(bool is_ico);
bool open(const ::nana::experimental::filesystem::path& filename) override;
bool open(const std::experimental::filesystem::path& filename) override;
bool open(const void* data, std::size_t bytes) override;
bool alpha_channel() const override;
bool empty() const override;

4
source/paint/image.cpp
View File

@@ -21,7 +21,7 @@
#include <nana/paint/detail/image_impl_interface.hpp>
#include <nana/paint/pixel_buffer.hpp>
#include <nana/filesystem/filesystem.hpp>
#include <nana/filesystem/filesystem_ext.hpp>
#if defined(NANA_ENABLE_JPEG)
#include "detail/image_jpeg.hpp"
@@ -36,7 +36,7 @@
#include "image_accessor.hpp"
namespace fs = nana::experimental::filesystem;
namespace fs = std::experimental::filesystem;
namespace nana
{