more DLL compilation changes

[wxWidgets.git] / src / common / filefn.cpp

diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp
index fd63c60c7e634d1a9820a66f2e4bdaefbe0980fc..33b30d58327dacf4c3a32a6be12b98c9fc01b1fb 100644 (file)
--- a/src/common/filefn.cpp
+++ b/src/common/filefn.cpp
@@ -277,7 +277,7 @@ bool wxFileExists(const char *pszFileName)
 bool
 wxIsAbsolutePath (const wxString& filename)
 {
 bool
 wxIsAbsolutePath (const wxString& filename)
 {

-  if (filename != "")
+  if (filename != _T(""))

     {
       if (filename[0] == _T('/')
 #ifdef __VMS__
     {
       if (filename[0] == _T('/')
 #ifdef __VMS__


@@ -514,7 +514,8 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name)
         /* prefix ~ */
         if (nm[1] == SEP || nm[1] == 0)
         {        /* ~/filename */
         /* prefix ~ */
         if (nm[1] == SEP || nm[1] == 0)
         {        /* ~/filename */

-            if ((s = wxGetUserHome(_T(""))) != NULL) {
+           // FIXME: wxGetUserHome could return temporary storage in Unicode mode
+            if ((s = WXSTRINGCAST wxGetUserHome(_T(""))) != NULL) {

                 if (*++nm)
                     nm++;
             }
                 if (*++nm)
                     nm++;
             }


@@ -527,7 +528,8 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name)
             was_sep = (*s == SEP);
             nnm = *s ? s + 1 : s;
             *s = 0;
             was_sep = (*s == SEP);
             nnm = *s ? s + 1 : s;
             *s = 0;

-            if ((home = wxGetUserHome(wxString(nm + 1))) == NULL) {
+           // FIXME: wxGetUserHome could return temporary storage in Unicode mode
+            if ((home = WXSTRINGCAST wxGetUserHome(wxString(nm + 1))) == NULL) {

                if (was_sep) /* replace only if it was there: */
                    *s = SEP;
                 s = _T("");
                if (was_sep) /* replace only if it was there: */
                    *s = SEP;
                 s = _T("");


@@ -577,7 +579,7 @@ wxContractPath (const wxString& filename, const wxString& envname, const wxStrin
 #endif
 
   // Handle environment
 #endif
 
   // Handle environment

-  wxChar *val = (wxChar *) NULL;
+  const wxChar *val = (const wxChar *) NULL;

   wxChar *tcp = (wxChar *) NULL;
   if (envname != WXSTRINGCAST NULL && (val = wxGetenv (WXSTRINGCAST envname)) != NULL &&
      (tcp = wxStrstr (dest, val)) != NULL)
   wxChar *tcp = (wxChar *) NULL;
   if (envname != WXSTRINGCAST NULL && (val = wxGetenv (WXSTRINGCAST envname)) != NULL &&
      (tcp = wxStrstr (dest, val)) != NULL)


@@ -719,7 +721,7 @@ wxPathOnly (wxChar *path)
 // Return just the directory, or NULL if no directory
 wxString wxPathOnly (const wxString& path)
 {
 // Return just the directory, or NULL if no directory
 wxString wxPathOnly (const wxString& path)
 {

-  if (path != "")
+  if (path != _T(""))

     {
       wxChar buf[_MAXPATHLEN];
 
     {
       wxChar buf[_MAXPATHLEN];
 


@@ -992,7 +994,7 @@ bool wxMkdir(const wxString& dir, int perm)
 
     // assume mkdir() has 2 args on non Windows platforms and on Windows too
     // for the GNU compiler
 
     // assume mkdir() has 2 args on non Windows platforms and on Windows too
     // for the GNU compiler

-#if !defined(__WXMSW__) || (defined(__GNUWIN32__) && !defined(__MINGW32__))
+#if !defined(__WXMSW__) || (defined(__GNUWIN32__) && !defined(__MINGW32__)) || defined(__WXWINE__)

     if ( mkdir(wxFNCONV(dirname), perm) != 0 )
 #else  // MSW
     if ( mkdir(wxFNCONV(dirname)) != 0 )
     if ( mkdir(wxFNCONV(dirname), perm) != 0 )
 #else  // MSW
     if ( mkdir(wxFNCONV(dirname)) != 0 )


@@ -1508,9 +1510,9 @@ wxString wxGetOSDirectory()
 #endif
 }
 
 #endif
 }
 

-bool wxEndsWithPathSeparator(const char *pszFileName)
+bool wxEndsWithPathSeparator(const wxChar *pszFileName)

 {
 {

-  size_t len = Strlen(pszFileName);
+  size_t len = wxStrlen(pszFileName);

   if ( len == 0 )
     return FALSE;
   else
   if ( len == 0 )
     return FALSE;
   else