make --static flag act on --cppflags too.

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

diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp
index ada206ba1c3e16a77428fd5f3d0bfa5871c0cbd2..38a95a1b30cc71f86b83de1d3bbed0c7a1b06924 100644 (file)
--- a/src/common/filefn.cpp
+++ b/src/common/filefn.cpp
@@ -143,11 +143,7 @@ const off_t wxInvalidOffset = (off_t)-1;
 // ----------------------------------------------------------------------------
 
 // we need to translate Mac filenames before passing them to OS functions
 // ----------------------------------------------------------------------------
 
 // we need to translate Mac filenames before passing them to OS functions

-#if defined(__WXMAC__) && defined(__DARWIN__)
-    #define OS_FILENAME(s) wxMac2UnixFilename(s.fn_str())
-#else
-    #define OS_FILENAME(s) (s.fn_str())
-#endif
+#define OS_FILENAME(s) (s.fn_str())

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation


@@ -293,33 +289,33 @@ wxFileExists (const wxString& filename)
 bool
 wxIsAbsolutePath (const wxString& filename)
 {
 bool
 wxIsAbsolutePath (const wxString& filename)
 {

-#ifdef __WXMAC__

     if (filename != wxT(""))
     {
     if (filename != wxT(""))
     {

+#if defined(__WXMAC__) && !defined(__DARWIN__)
+        // Classic or Carbon CodeWarrior like
+        // Carbon with Apple DevTools is Unix like
+        

         // This seems wrong to me, but there is no fix. since
         // "MacOS:MyText.txt" is absolute whereas "MyDir:MyText.txt"
         // is not. Or maybe ":MyDir:MyText.txt" has to be used? RR.
         // This seems wrong to me, but there is no fix. since
         // "MacOS:MyText.txt" is absolute whereas "MyDir:MyText.txt"
         // is not. Or maybe ":MyDir:MyText.txt" has to be used? RR.

-

         if (filename.Find(':') != wxNOT_FOUND && filename[0] != ':')
             return TRUE ;
         if (filename.Find(':') != wxNOT_FOUND && filename[0] != ':')
             return TRUE ;

-    }
-    return FALSE ;

 #else
 #else

-  if (filename != wxT(""))
-    {
-      if (filename[0] == wxT('/')
+        // Unix like or Windows
+        if (filename[0] == wxT('/'))
+            return TRUE;
+#endif

 #ifdef __VMS__
 #ifdef __VMS__

-      || (filename[0] == wxT('[') && filename[1] != wxT('.'))
+        if ((filename[0] == wxT('[') && filename[1] != wxT('.')))
+            return TRUE;

 #endif
 #ifdef __WINDOWS__
 #endif
 #ifdef __WINDOWS__

-      /* MSDOS */
-      || filename[0] == wxT('\\') || (wxIsalpha (filename[0]) && filename[1] == wxT(':'))
+        // MSDOS like
+        if (filename[0] == wxT('\\') || (wxIsalpha (filename[0]) && filename[1] == wxT(':')))
+            return TRUE;

 #endif
 #endif

-        )
-        return TRUE;

     }
     }

-  return FALSE;
-#endif
+    return FALSE ;

 }
 
 /*
 }
 
 /*


@@ -662,171 +658,184 @@ wxContractPath (const wxString& filename, const wxString& envname, const wxStrin
 // (basename)
 wxChar *wxFileNameFromPath (wxChar *path)
 {
 // (basename)
 wxChar *wxFileNameFromPath (wxChar *path)
 {

-  if (path)
+    if (path)

     {
     {

-      register wxChar *tcp;
-
-      tcp = path + wxStrlen (path);
-      while (--tcp >= path)
+        register wxChar *tcp;
+        
+        tcp = path + wxStrlen (path);
+        while (--tcp >= path)

         {
         {

-#ifdef __WXMAC__
-          if (*tcp == wxT(':') )
-#else
-          if (*tcp == wxT('/') || *tcp == wxT('\\')
-#ifdef __VMS__
-     || *tcp == wxT(':') || *tcp == wxT(']'))
+#if defined(__WXMAC__) && !defined(__DARWIN__)
+            // Classic or Carbon CodeWarrior like
+            // Carbon with Apple DevTools is Unix like
+            if (*tcp == wxT(':'))
+                return tcp + 1;

 #else
 #else

-     )
+            // Unix like or Windows
+            if (*tcp == wxT('/') || *tcp == wxT('\\'))
+                return tcp + 1;

 #endif
 #endif

+#ifdef __VMS__
+            if (*tcp == wxT(':') || *tcp == wxT(']'))
+                return tcp + 1;

 #endif
 #endif

-            return tcp + 1;
-        }                        /* while */
+        } /* while */

 #if defined(__WXMSW__) || defined(__WXPM__)
 #if defined(__WXMSW__) || defined(__WXPM__)

-      if (wxIsalpha (*path) && *(path + 1) == wxT(':'))
-        return path + 2;
+        // MSDOS like
+        if (wxIsalpha (*path) && *(path + 1) == wxT(':'))
+            return path + 2;

 #endif
     }
 #endif
     }

-  return path;
+    return path;

 }
 
 wxString wxFileNameFromPath (const wxString& path1)
 {
 }
 
 wxString wxFileNameFromPath (const wxString& path1)
 {

-  if (path1 != wxT(""))
-  {
-
-      wxChar *path = WXSTRINGCAST path1 ;
-      register wxChar *tcp;
-
-      tcp = path + wxStrlen (path);
-      while (--tcp >= path)
-          {
-#ifdef __WXMAC__
-           if (*tcp == wxT(':') )
-#else
-            if (*tcp == wxT('/') || *tcp == wxT('\\')
-#ifdef __VMS__
-        || *tcp == wxT(':') || *tcp == wxT(']'))
+    if (path1 != wxT(""))
+    {
+        wxChar *path = WXSTRINGCAST path1 ;
+        register wxChar *tcp;
+        
+        tcp = path + wxStrlen (path);
+        while (--tcp >= path)
+        {
+#if defined(__WXMAC__) && !defined(__DARWIN__)
+            // Classic or Carbon CodeWarrior like
+            // Carbon with Apple DevTools is Unix like
+            if (*tcp == wxT(':') )
+                return wxString(tcp + 1);

 #else
 #else

-        )
-#endif
+            // Unix like or Windows
+            if (*tcp == wxT('/') || *tcp == wxT('\\'))
+                return wxString(tcp + 1);

 #endif
 #endif

+#ifdef __VMS__
+            if (*tcp == wxT(':') || *tcp == wxT(']'))

                 return wxString(tcp + 1);
                 return wxString(tcp + 1);

-            }                        /* while */
+#endif
+        } /* while */

 #if defined(__WXMSW__) || defined(__WXPM__)
 #if defined(__WXMSW__) || defined(__WXPM__)

-      if (wxIsalpha (*path) && *(path + 1) == wxT(':'))
+        // MSDOS like
+        if (wxIsalpha (*path) && *(path + 1) == wxT(':'))

             return wxString(path + 2);
 #endif
     }
             return wxString(path + 2);
 #endif
     }

-  // Yes, this should return the path, not an empty string, otherwise
-  // we get "thing.txt" -> "".
-  return path1;
+    // Yes, this should return the path, not an empty string, otherwise
+    // we get "thing.txt" -> "".
+    return path1;

 }
 
 // Return just the directory, or NULL if no directory
 wxChar *
 wxPathOnly (wxChar *path)
 {
 }
 
 // Return just the directory, or NULL if no directory
 wxChar *
 wxPathOnly (wxChar *path)
 {

-  if (path && *path)
+    if (path && *path)

     {
     {

-      static wxChar buf[_MAXPATHLEN];
-
-      // Local copy
-      wxStrcpy (buf, path);
-
-      int l = wxStrlen(path);
-      bool done = FALSE;
-
-      int i = l - 1;
-
-      // Search backward for a backward or forward slash
-      while (!done && i > -1)
-      {
-        // ] is for VMS
-#ifdef __WXMAC__
-        if (path[i] == wxT(':') )
+        static wxChar buf[_MAXPATHLEN];
+        
+        // Local copy
+        wxStrcpy (buf, path);
+        
+        int l = wxStrlen(path);
+        int i = l - 1;
+        
+        // Search backward for a backward or forward slash
+        while (i > -1)
+        {
+#if defined(__WXMAC__) && !defined(__DARWIN__)
+            // Classic or Carbon CodeWarrior like
+            // Carbon with Apple DevTools is Unix like
+            if (path[i] == wxT(':') )
+            {
+                buf[i] = 0;
+                return buf;
+            }

 #else
 #else

-        if (path[i] == wxT('/') || path[i] == wxT('\\') || path[i] == wxT(']'))
+            // Unix like or Windows
+            if (path[i] == wxT('/') || path[i] == wxT('\\'))
+            {
+                buf[i] = 0;
+                return buf;
+            }

 #endif
 #endif

-        {
-          done = TRUE;

 #ifdef __VMS__
 #ifdef __VMS__

-           if ( path[i] == wxT(']') )
-             buf[i+1] = 0;
-           else
+            if (path[i] == wxT(']'))
+            {
+                buf[i+1] = 0;
+                return buf;
+            }

 #endif
 #endif

-          buf[i] = 0;
-
-          return buf;
+            i --;

         }
         }

-        else i --;
-      }
-
+        

 #if defined(__WXMSW__) || defined(__WXPM__)
 #if defined(__WXMSW__) || defined(__WXPM__)

-      // Try Drive specifier
-      if (wxIsalpha (buf[0]) && buf[1] == wxT(':'))
+        // Try Drive specifier
+        if (wxIsalpha (buf[0]) && buf[1] == wxT(':'))

         {
         {

-          // A:junk --> A:. (since A:.\junk Not A:\junk)
-          buf[2] = wxT('.');
-          buf[3] = wxT('\0');
-          return buf;
+            // A:junk --> A:. (since A:.\junk Not A:\junk)
+            buf[2] = wxT('.');
+            buf[3] = wxT('\0');
+            return buf;

         }
 #endif
     }
         }
 #endif
     }

-
-  return (wxChar *) NULL;
+    return (wxChar *) NULL;

 }
 
 // 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 != wxT(""))
+    if (path != wxT(""))

     {
     {

-      wxChar buf[_MAXPATHLEN];
-
-      // Local copy
-      wxStrcpy (buf, WXSTRINGCAST path);
-
-      int l = path.Length();
-      bool done = FALSE;
-
-      int i = l - 1;
-
-      // Search backward for a backward or forward slash
-      while (!done && i > -1)
-      {
-        // ] is for VMS
-#ifdef __WXMAC__
-        if (path[i] == wxT(':') )
+        wxChar buf[_MAXPATHLEN];
+        
+        // Local copy
+        wxStrcpy (buf, WXSTRINGCAST path);
+        
+        int l = path.Length();
+        int i = l - 1;
+
+        // Search backward for a backward or forward slash
+        while (i > -1)
+        {
+#if defined(__WXMAC__) && !defined(__DARWIN__)
+            // Classic or Carbon CodeWarrior like
+            // Carbon with Apple DevTools is Unix like
+            if (path[i] == wxT(':') )
+            {
+                buf[i] = 0;
+                return wxString(buf);
+            }

 #else
 #else

-        if (path[i] == wxT('/') || path[i] == wxT('\\') || path[i] == wxT(']'))
+            // Unix like or Windows
+            if (path[i] == wxT('/') || path[i] == wxT('\\'))
+            {
+                buf[i] = 0;
+                return wxString(buf);
+            }

 #endif
 #endif

-        {
-          done = TRUE;

 #ifdef __VMS__
 #ifdef __VMS__

-           if ( path[i] == wxT(']') )
-             buf[i+1] = 0;
-           else
+            if (path[i] == wxT(']'))
+            {
+                buf[i+1] = 0;
+                return wxString(buf);
+            }

 #endif
 #endif

-          buf[i] = 0;
-
-          return wxString(buf);
+            i --;

         }
         }

-        else i --;
-      }
-
+        

 #if defined(__WXMSW__) || defined(__WXPM__)
 #if defined(__WXMSW__) || defined(__WXPM__)

-      // Try Drive specifier
-      if (wxIsalpha (buf[0]) && buf[1] == wxT(':'))
+        // Try Drive specifier
+        if (wxIsalpha (buf[0]) && buf[1] == wxT(':'))

         {
         {

-          // A:junk --> A:. (since A:.\junk Not A:\junk)
-          buf[2] = wxT('.');
-          buf[3] = wxT('\0');
-          return wxString(buf);
+            // A:junk --> A:. (since A:.\junk Not A:\junk)
+            buf[2] = wxT('.');
+            buf[3] = wxT('\0');
+            return wxString(buf);

         }
 #endif
     }
         }
 #endif
     }

-
-  return wxString(wxT(""));
+    return wxString(wxT(""));

 }
 
 // Utility for converting delimiters in DOS filenames to UNIX style
 }
 
 // Utility for converting delimiters in DOS filenames to UNIX style


@@ -846,7 +855,11 @@ wxString wxMacFSSpec2MacFilename( const FSSpec *spec )
     if ( length > 0 && (*myPath)[length-1] ==':' )
         (*myPath)[length-1] = 0 ;
 
     if ( length > 0 && (*myPath)[length-1] ==':' )
         (*myPath)[length-1] = 0 ;
 

-    wxString result(     (char*) *myPath ) ;
+#ifdef __DARWIN__
+    wxString result( wxMac2UnixFilename((char*) *myPath) ) ;
+#else
+    wxString result( (char*) *myPath ) ;
+#endif

     ::HUnlock( myPath ) ;
     ::DisposeHandle( myPath ) ;
     return result ;
     ::HUnlock( myPath ) ;
     ::DisposeHandle( myPath ) ;
     return result ;


@@ -854,7 +867,12 @@ wxString wxMacFSSpec2MacFilename( const FSSpec *spec )
 
 void wxMacFilename2FSSpec( const char *path , FSSpec *spec )
 {
 
 void wxMacFilename2FSSpec( const char *path , FSSpec *spec )
 {

-    FSpLocationFromFullPath( strlen(path ) , path , spec ) ;
+#ifdef __DARWIN__
+    const char *s = wxUnix2MacFilename(path);
+    FSpLocationFromFullPath( strlen(s) , s , spec ) ;
+#else
+    FSpLocationFromFullPath( strlen(path) , path , spec ) ;
+#endif

 }
 
 static char sMacFileNameConversion[ 1000 ] ;
 }
 
 static char sMacFileNameConversion[ 1000 ] ;


@@ -934,7 +952,8 @@ void wxUnixFilename2FSSpec( const char *path , FSSpec *spec )
     wxMacFilename2FSSpec( var , spec ) ;
 }
 
     wxMacFilename2FSSpec( var , spec ) ;
 }
 

-#endif
+#endif // __WXMAC__
+

 void
 wxDos2UnixFilename (char *s)
 {
 void
 wxDos2UnixFilename (char *s)
 {


@@ -1278,7 +1297,7 @@ bool wxGetTempFileName(const wxString& prefix, wxString& buf)
 
 // Get first file name matching given wild card.
 
 
 // Get first file name matching given wild card.
 

-#ifdef __UNIX__
+#if defined(__UNIX__) && !defined(__WXMAC__)

 
 // Get first file name matching given wild card.
 // Flags are reserved for future use.
 
 // Get first file name matching given wild card.
 // Flags are reserved for future use.


@@ -1429,18 +1448,25 @@ struct MacDirectoryIterator
 static int g_iter_flags ;
 
 static MacDirectoryIterator g_iter ;
 static int g_iter_flags ;
 
 static MacDirectoryIterator g_iter ;

+wxString g_iter_spec ;

 
 wxString wxFindFirstFile(const wxChar *spec, int flags)
 {
     wxString result;
 
 
 wxString wxFindFirstFile(const wxChar *spec, int flags)
 {
     wxString result;
 

+    g_iter_spec = spec ;
+    g_iter_spec.MakeUpper() ;

     g_iter_flags = flags; /* MATTHEW: [5] Remember flags */
 
     // Find path only so we can concatenate found file onto path
     wxString path(wxPathOnly(spec));
     g_iter_flags = flags; /* MATTHEW: [5] Remember flags */
 
     // Find path only so we can concatenate found file onto path
     wxString path(wxPathOnly(spec));

+#ifdef __DARWIN__
+    // TODO:check whether is necessary/correct

     if ( !path.IsEmpty() )
     if ( !path.IsEmpty() )

-        result << path << wxT('\\');
-
+        result << path << wxT('/');
+#else
+    result = path ;
+#endif

     FSSpec fsspec ;
 
     wxMacFilename2FSSpec( result , &fsspec ) ;
     FSSpec fsspec ;
 
     wxMacFilename2FSSpec( result , &fsspec ) ;


@@ -1461,37 +1487,44 @@ wxString wxFindNextFile()
     wxString result;
 
     short err = noErr ;
     wxString result;
 
     short err = noErr ;

-
-    while ( err == noErr )
+    wxString name ;
+    
+    while(1)

     {
     {

-        g_iter.m_index++ ;
-        g_iter.m_CPB.dirInfo.ioFDirIndex = g_iter.m_index;
-        g_iter.m_CPB.dirInfo.ioDrDirID = g_iter.m_dirId;    /* we need to do this every time */
-        err = PBGetCatInfoSync((CInfoPBPtr)&g_iter.m_CPB);
-        if ( err != noErr )
-            break ;
+      while ( err == noErr )
+      {
+          g_iter.m_index++ ;
+          g_iter.m_CPB.dirInfo.ioFDirIndex = g_iter.m_index;
+          g_iter.m_CPB.dirInfo.ioDrDirID = g_iter.m_dirId;    /* we need to do this every time */
+          err = PBGetCatInfoSync((CInfoPBPtr)&g_iter.m_CPB);
+          if ( err != noErr )
+              break ;

 
 

-        if ( ( g_iter.m_CPB.dirInfo.ioFlAttrib & ioDirMask) != 0 && (g_iter_flags & wxDIR) ) //  we have a directory
-            break ;
+          if ( ( g_iter.m_CPB.dirInfo.ioFlAttrib & ioDirMask) != 0 && (g_iter_flags & wxDIR) ) //  we have a directory
+              break ;

 
 

-        if ( ( g_iter.m_CPB.dirInfo.ioFlAttrib & ioDirMask) == 0 && !(g_iter_flags & wxFILE ) )
-            continue ;
+          if ( ( g_iter.m_CPB.dirInfo.ioFlAttrib & ioDirMask) == 0 && !(g_iter_flags & wxFILE ) )
+              continue ;

 
 

-        // hit !
-        break ;
-    }
-    if ( err != noErr )
-    {
-        return wxEmptyString ;
-    }
-    FSSpec spec ;
+          // hit !
+          break ;
+      }
+      if ( err != noErr )
+      {
+          return wxEmptyString ;
+      }
+      FSSpec spec ;

 
 

-    FSMakeFSSpecCompat(g_iter.m_CPB.hFileInfo.ioVRefNum,
-                                   g_iter.m_dirId,
-                                   g_iter.m_name,
-                                   &spec) ;
+      FSMakeFSSpecCompat(g_iter.m_CPB.hFileInfo.ioVRefNum,
+                                     g_iter.m_dirId,
+                                     g_iter.m_name,
+                                     &spec) ;

 
 

-    return wxMacFSSpec2MacFilename( &spec ) ;
+      wxString name = wxMacFSSpec2MacFilename( &spec ) ;
+      if ( g_iter_spec.Right(4)==(":*.*") || g_iter_spec.Right(2)==(":*") || name.Upper().Matches(g_iter_spec) )
+        return name ;
+    }
+    return wxEmptyString ;

 }
 
 #elif defined(__WXMSW__)
 }
 
 #elif defined(__WXMSW__)


@@ -1712,7 +1745,7 @@ wxChar *wxGetWorkingDirectory(wxChar *buf, int sz)
   char *cbuf = new char[sz+1];
 #ifdef _MSC_VER
   if (_getcwd(cbuf, sz) == NULL) {
   char *cbuf = new char[sz+1];
 #ifdef _MSC_VER
   if (_getcwd(cbuf, sz) == NULL) {

-#elif defined(__WXMAC__)
+#elif defined(__WXMAC__) && !defined(__DARWIN__)

     enum
     {
         SFSaveDisk = 0x214, CurDirStore = 0x398
     enum
     {
         SFSaveDisk = 0x214, CurDirStore = 0x398


@@ -1730,7 +1763,7 @@ wxChar *wxGetWorkingDirectory(wxChar *buf, int sz)
 #else // wxUnicode
 #ifdef _MSC_VER
   if (_getcwd(buf, sz) == NULL) {
 #else // wxUnicode
 #ifdef _MSC_VER
   if (_getcwd(buf, sz) == NULL) {

-#elif defined(__WXMAC__) && !defined(__UNIX__)
+#elif defined(__WXMAC__) && !defined(__DARWIN__)

     FSSpec cwdSpec ;
     FCBPBRec pb;
     OSErr error;
     FSSpec cwdSpec ;
     FCBPBRec pb;
     OSErr error;


@@ -1748,7 +1781,7 @@ wxChar *wxGetWorkingDirectory(wxChar *buf, int sz)
         wxString res = wxMacFSSpec2MacFilename( &cwdSpec ) ;
 
         strcpy( buf , res ) ;
         wxString res = wxMacFSSpec2MacFilename( &cwdSpec ) ;
 
         strcpy( buf , res ) ;

-        buf[res.length()-1]=0 ;
+        buf[res.length()]=0 ;

     }
     else
         buf[0] = 0 ;
     }
     else
         buf[0] = 0 ;