X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/80539f0490f5a5858568d3ed79b021594c23c521..777819af7b7b4ad98ac69a7cd5a96728c197b1fc:/src/common/filefn.cpp

diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp
index 2d97a8a741..f0bfce34c2 100644
--- a/src/common/filefn.cpp
+++ b/src/common/filefn.cpp
@@ -403,11 +403,9 @@ void wxStripExtension(wxString& buffer)
 template<typename CharType>
 static CharType *wxDoRealPath (CharType *path)
 {
+  static const CharType SEP = wxFILE_SEP_PATH;
 #ifdef __WXMSW__
-  static const CharType SEP = wxT('\\');
   wxUnix2DosFilename(path);
-#else
-  static const CharType SEP = wxT('/');
 #endif
   if (path[0] && path[1]) {
     /* MATTHEW: special case "/./x" */
@@ -539,11 +537,11 @@ static CharType *wxDoExpandPath(CharType *buf, const wxString& name)
     trimchars[2] = wxT('\t');
     trimchars[3] = 0;
 
+    static const CharType SEP = wxFILE_SEP_PATH;
 #ifdef __WXMSW__
-    const CharType     SEP = wxT('\\');
-#else
-    const CharType     SEP = wxT('/');
+    //wxUnix2DosFilename(path);
 #endif
+
     buf[0] = wxT('\0');
     if (name.empty())
         return buf;
@@ -1375,7 +1373,12 @@ wxChar *wxGetTempFileName(const wxString& prefix, wxChar *buf)
         return NULL;
 
     if ( buf )
+#ifdef _PACC_VER
+        // work around the PalmOS pacc compiler bug
+        wxStrcpy(buf, filename.data());
+#else
         wxStrcpy(buf, filename);
+#endif
     else
         buf = MYcopystring(filename);
 
@@ -1703,7 +1706,7 @@ bool wxFindFileInPath(wxString *pStr, const wxString& szPath, const wxString& sz
     return false;
 }
 
-void WXDLLEXPORT wxSplitPath(const wxString& fileName,
+void WXDLLIMPEXP_BASE wxSplitPath(const wxString& fileName,
                              wxString *pstrPath,
                              wxString *pstrName,
                              wxString *pstrExt)
@@ -1713,7 +1716,7 @@ void WXDLLEXPORT wxSplitPath(const wxString& fileName,
 
 #if wxUSE_DATETIME
 
-time_t WXDLLEXPORT wxFileModificationTime(const wxString& filename)
+time_t WXDLLIMPEXP_BASE wxFileModificationTime(const wxString& filename)
 {
     wxDateTime mtime;
     if ( !wxFileName(filename).GetTimes(NULL, &mtime, NULL) )
@@ -1729,7 +1732,7 @@ time_t WXDLLEXPORT wxFileModificationTime(const wxString& filename)
 // Returns 0 if none or if there's a problem.
 // filterStr is in the form: "All files (*.*)|*.*|JPEG Files (*.jpeg)|*.jpeg"
 
-int WXDLLEXPORT wxParseCommonDialogsFilter(const wxString& filterStr,
+int WXDLLIMPEXP_BASE wxParseCommonDialogsFilter(const wxString& filterStr,
                                            wxArrayString& descriptions,
                                            wxArrayString& filters)
 {