documented ConvertStringToArgs

[wxWidgets.git] / include / wx / filefn.h

diff --git a/include/wx/filefn.h b/include/wx/filefn.h
index e81f3b36b042aca6fba6a1ca65f52aa46983ad4b..3e66d0a536b8691a3d984a1169054f0814d6f84a 100644 (file)
--- a/include/wx/filefn.h
+++ b/include/wx/filefn.h
@@ -66,7 +66,8 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
 // ----------------------------------------------------------------------------
 
 // Microsoft compiler loves underscores, feed them to it
 // ----------------------------------------------------------------------------
 
 // Microsoft compiler loves underscores, feed them to it

-#if defined( __VISUALC__ ) || wxCHECK_W32API_VERSION( 0, 5 ) \
+#if defined( __VISUALC__ ) \
+    || ( defined(__MINGW32__) && wxCHECK_W32API_VERSION( 0, 5 ) ) \

     || ( defined(__MWERKS__) && defined(__WXMSW__) )
     // functions
     #define   wxClose      _close
     || ( defined(__MWERKS__) && defined(__WXMSW__) )
     // functions
     #define   wxClose      _close


@@ -171,10 +172,13 @@ WXDLLEXPORT void wxUnix2DosFilename(wxChar *s);
 #ifdef __WXMAC__
 WXDLLEXPORT wxString wxMacFSSpec2MacFilename( const FSSpec *spec ) ;
 WXDLLEXPORT void wxMacFilename2FSSpec( const char *path , FSSpec *spec ) ;
 #ifdef __WXMAC__
 WXDLLEXPORT wxString wxMacFSSpec2MacFilename( const FSSpec *spec ) ;
 WXDLLEXPORT void wxMacFilename2FSSpec( const char *path , FSSpec *spec ) ;

+#  ifndef __DARWIN__
+// Mac file names are POSIX (Unix style) under Darwin, so these are not needed

 WXDLLEXPORT wxString wxMacFSSpec2UnixFilename( const FSSpec *spec ) ;
 WXDLLEXPORT void wxUnixFilename2FSSpec( const char *path , FSSpec *spec ) ;
 WXDLLEXPORT wxString wxMac2UnixFilename( const char *s) ;
 WXDLLEXPORT wxString wxUnix2MacFilename( const char *s);
 WXDLLEXPORT wxString wxMacFSSpec2UnixFilename( const FSSpec *spec ) ;
 WXDLLEXPORT void wxUnixFilename2FSSpec( const char *path , FSSpec *spec ) ;
 WXDLLEXPORT wxString wxMac2UnixFilename( const char *s) ;
 WXDLLEXPORT wxString wxUnix2MacFilename( const char *s);

+#  endif

 #endif
 
 // Strip the extension, in situ
 #endif
 
 // Strip the extension, in situ


@@ -249,12 +253,21 @@ WXDLLEXPORT bool wxMkdir(const wxString& dir, int perm = 0777);
 // Remove directory. Flags reserved for future use.
 WXDLLEXPORT bool wxRmdir(const wxString& dir, int flags = 0);
 
 // Remove directory. Flags reserved for future use.
 WXDLLEXPORT bool wxRmdir(const wxString& dir, int flags = 0);
 

+// ----------------------------------------------------------------------------

 // separators in file names
 // separators in file names

+// ----------------------------------------------------------------------------
+
+// between file name and extension

 #define wxFILE_SEP_EXT        wxT('.')
 #define wxFILE_SEP_EXT        wxT('.')

+
+// between drive/volume name and the path

 #define wxFILE_SEP_DSK        wxT(':')
 #define wxFILE_SEP_DSK        wxT(':')

+
+// between the path components

 #define wxFILE_SEP_PATH_DOS   wxT('\\')
 #define wxFILE_SEP_PATH_UNIX  wxT('/')
 #define wxFILE_SEP_PATH_MAC   wxT(':')
 #define wxFILE_SEP_PATH_DOS   wxT('\\')
 #define wxFILE_SEP_PATH_UNIX  wxT('/')
 #define wxFILE_SEP_PATH_MAC   wxT(':')

+#define wxFILE_SEP_PATH_VMS   wxT('.') // VMS also uses '[' and ']'

 
 // separator in the path list (as in PATH environment variable)
 // there is no PATH variable in Classic Mac OS so just use the
 
 // separator in the path list (as in PATH environment variable)
 // there is no PATH variable in Classic Mac OS so just use the