From 6b6306fc86e7cc7983ca4b1e0b33f5195a7ad983 Mon Sep 17 00:00:00 2001 From: Twan van Laarhoven Date: Sat, 16 May 2020 20:04:10 +0200 Subject: [PATCH] Don't use wxMkDir, it shows stupid error messages --- src/util/file_utils.cpp | 8 ++++++++ src/util/file_utils.hpp | 2 ++ src/util/io/package.cpp | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/util/file_utils.cpp b/src/util/file_utils.cpp index c55cc77a..2e4bfccf 100644 --- a/src/util/file_utils.cpp +++ b/src/util/file_utils.cpp @@ -113,6 +113,14 @@ time_t file_modified_time(const String& path) { // ----------------------------------------------------------------------------- : Directories +bool create_directory(const String& path) { + #if defined(__WX_MSW__) + return _wmkdir(path.fn_str()) == 0; + #else + return mkdir(path.fn_str()) == 0; + #endif +} + bool create_parent_dirs(const String& file) { for (size_t pos = file.find_first_of(_("\\/"), 1) ; pos != String::npos ; diff --git a/src/util/file_utils.hpp b/src/util/file_utils.hpp index 9bb55d89..ebd9b3df 100644 --- a/src/util/file_utils.hpp +++ b/src/util/file_utils.hpp @@ -45,6 +45,8 @@ time_t file_modified_time(const String& name); // ----------------------------------------------------------------------------- : Removing and renaming +bool create_directory(const String& path); + /// Ensure that the parent directories of the given filename exist bool create_parent_dirs(const String& file); diff --git a/src/util/io/package.cpp b/src/util/io/package.cpp index b54f53cc..1f1f949e 100644 --- a/src/util/io/package.cpp +++ b/src/util/io/package.cpp @@ -401,7 +401,7 @@ void Package::openZipfile() { void Package::saveToDirectory(const String& saveAs, bool remove_unused, bool is_copy) { // create directory? - wxMkdir(saveAs); + create_directory(saveAs); // write to a directory VCSP vcs = getVCS(); FOR_EACH(f, files) {