X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/08942a0c0d68756cf12f98b48387d9a8b323d11c..15d4df3c71597f424b5b98cd6d2776d00fc51782:/src/common/filefn.cpp diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp index dc4910db9a..b2cf5e2950 100644 --- a/src/common/filefn.cpp +++ b/src/common/filefn.cpp @@ -122,9 +122,7 @@ extern wxChar *wxBuffer; #include "fspcompa.h" #endif -#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxPathList, wxStringList) -#endif // ---------------------------------------------------------------------------- // private globals @@ -612,7 +610,6 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name) return wxRealPath(buf); } - /* Contract Paths to be build upon an environment variable component: @@ -946,9 +943,9 @@ wxDos2UnixFilename (char *s) void #if defined(__WXMSW__) || defined(__WXPM__) -wxUnix2DosFilename (char *s) +wxUnix2DosFilename (wxChar *s) #else -wxUnix2DosFilename (char *WXUNUSED(s) ) +wxUnix2DosFilename (wxChar *WXUNUSED(s) ) #endif { // Yes, I really mean this to happen under DOS only! JACS @@ -1220,6 +1217,18 @@ wxChar *wxGetTempFileName(const wxString& prefix, wxChar *buf) #endif } +bool wxGetTempFileName(const wxString& prefix, wxString& buf) +{ + wxChar buf2[512]; + if (wxGetTempFileName(prefix, buf2) != (wxChar*) NULL) + { + buf = buf2; + return TRUE; + } + else + return FALSE; +} + // Get first file name matching given wild card. #ifdef __UNIX__ @@ -1293,7 +1302,9 @@ wxString wxFindNextFile() nextDir != NULL; nextDir = readdir(gs_dirStream) ) { - if (wxMatchWild(name, nextDir->d_name)) + if (wxMatchWild(name, nextDir->d_name, FALSE) && // RR: added FALSE to find hidden files + strcmp(nextDir->d_name, ".") && + strcmp(nextDir->d_name, "..") ) { result.Empty(); if ( !path.IsEmpty() )