From 53a4f68cb2d5c44bc1cd4b95feb0459ce1e16723 Mon Sep 17 00:00:00 2001
From: orbitcowboy <orbitcowboy@web.de>
Date: Fri, 25 Dec 2020 12:16:06 +0100
Subject: [PATCH] wxwidgets.cfg: Added support for more interface, found by
 daca@home

---
 cfg/wxwidgets.cfg     | 22 ++++++++++++++++++++++
 lib/importproject.cpp |  3 ++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/cfg/wxwidgets.cfg b/cfg/wxwidgets.cfg
index df44c8265..8a50db972 100644
--- a/cfg/wxwidgets.cfg
+++ b/cfg/wxwidgets.cfg
@@ -7751,12 +7751,34 @@
   <!-- bool wxFileName::AppendDir( const wxString & dir ) -->
   <function name="wxFileName::AppendDir">
     <noreturn>false</noreturn>
+    <leak-ignore/>
     <returnValue type="bool"/>
     <arg nr="1" direction="in"/>
   </function>
+  <!--        bool wxFileName::DirExists( void ) const -->
+  <!-- static bool wxFileName::DirExists( const wxString & dir ) -->
+  <function name="wxFileName::DirExists">
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <use-retval/>
+    <returnValue type="bool"/>
+    <arg nr="1" direction="in" default="wxEmptyString"/>
+  </function>
+  <!-- bool wxFileName::Normalize(int flags = wxPATH_NORM_ALL, const wxString & cwd = wxEmptyString, wxPathFormat format = wxPATH_NATIVE) -->
+  <function name="wxFileName::Normalize">
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <returnValue type="bool"/>
+    <arg nr="1" direction="in" default="wxPATH_NORM_ALL">
+      <not-uninit/>
+    </arg>
+    <arg nr="2" direction="in" default="wxEmptyString"/>
+    <arg nr="3" direction="in" default="wxPATH_NATIVE"/>
+  </function>
   <!-- bool wxGetEnv( const wxString & var, wxString * value ) -->
   <function name="wxGetEnv">
     <noreturn>false</noreturn>
+    <leak-ignore/>
     <returnValue type="bool"/>
     <use-retval/>
     <arg nr="1" direction="in"/>
diff --git a/lib/importproject.cpp b/lib/importproject.cpp
index 580d5995d..64f978485 100644
--- a/lib/importproject.cpp
+++ b/lib/importproject.cpp
@@ -239,7 +239,8 @@ static std::string readUntil(const std::string &command, std::string::size_type
     return ret;
 }
 
-static std::string unescape(const std::string &in) {
+static std::string unescape(const std::string &in)
+{
     std::string out;
     bool escape = false;
     for (char c: in) {