fixed wxIsPathSeparator() to work for Mac

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13348 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/filefn.h b/include/wx/filefn.h
index b235f2b1dc99718016793f822cb05796d458a5d7..4d914f458fd9b98f65e5920d88a1f46bdc20a5d2 100644 (file)
--- a/include/wx/filefn.h
+++ b/include/wx/filefn.h
@@ -303,7 +303,14 @@ WXDLLEXPORT bool wxRmdir(const wxString& dir, int flags = 0);
 
 // is the char a path separator?
 inline bool wxIsPathSeparator(wxChar c)
 
 // is the char a path separator?
 inline bool wxIsPathSeparator(wxChar c)

-  { return c == wxFILE_SEP_PATH_DOS || c == wxFILE_SEP_PATH_UNIX; }
+{
+    // under DOS/Windows we should understand both Unix and DOS file separators
+#if defined(__UNIX__) || defined(__MAC__)
+    return c == wxFILE_SEP_PATH;
+#else
+    return c == wxFILE_SEP_PATH_DOS || c == wxFILE_SEP_PATH_UNIX;
+#endif
+}

 
 // does the string ends with path separator?
 WXDLLEXPORT bool wxEndsWithPathSeparator(const wxChar *pszFileName);
 
 // does the string ends with path separator?
 WXDLLEXPORT bool wxEndsWithPathSeparator(const wxChar *pszFileName);

diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp
index 4bbe6747d1f7dd80aea9bd1ae7fb4fba14b6ab40..bbaac43d9082f9adccbc99248a3914052ffb68dd 100644 (file)
--- a/src/common/filefn.cpp
+++ b/src/common/filefn.cpp
@@ -1519,11 +1519,9 @@ wxString wxGetOSDirectory()
 
 bool wxEndsWithPathSeparator(const wxChar *pszFileName)
 {
 
 bool wxEndsWithPathSeparator(const wxChar *pszFileName)
 {

-  size_t len = wxStrlen(pszFileName);
-  if ( len == 0 )
-    return FALSE;
-  else
-    return wxIsPathSeparator(pszFileName[len - 1]);
+    size_t len = wxStrlen(pszFileName);
+
+    return len && wxIsPathSeparator(pszFileName[len - 1]);

 }
 
 // find a file in a list of directories, returns false if not found
 }
 
 // find a file in a list of directories, returns false if not found

diff --git a/src/common/filename.cpp b/src/common/filename.cpp
index 0499c50adb978fed2eaa2e821a88444d672c405e..330828e74a6f7c3f953274a83203d563d6cad847 100644 (file)
--- a/src/common/filename.cpp
+++ b/src/common/filename.cpp
@@ -550,9 +550,9 @@ wxFileName::CreateTempFileName(const wxString& prefix, wxFile *fileTemp)
         {
             // default
             #ifdef __DOS__
         {
             // default
             #ifdef __DOS__

-            dir = _T(".");
+                dir = _T(".");

             #else
             #else

-            dir = _T("/tmp");
+                dir = _T("/tmp");

             #endif
         }
 #endif
             #endif
         }
 #endif