OutputDebugStringW95 removed - it's really unnecessary - and the references to

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

diff --git a/include/wx/filefn.h b/include/wx/filefn.h
index b0565fdbbf944076d8450d50adf8d1a3cecadbd3..c2e21609ad751ac8c43a31cadcd6f7dcc2a43fdd 100644 (file)
--- a/include/wx/filefn.h
+++ b/include/wx/filefn.h
@@ -84,9 +84,12 @@ WXDLLEXPORT void wxUnix2DosFilename(wxChar *s);
 #define Unix2DosFilename wxUnix2DosFilename
 
 #ifdef __WXMAC__
 #define Unix2DosFilename wxUnix2DosFilename
 
 #ifdef __WXMAC__

-  WXDLLEXPORT void wxMacPathToFSSpec( const wxChar *path , FSSpec *spec ) ;
-  WXDLLEXPORT void wxMac2UnixFilename(wxChar *s);
-  WXDLLEXPORT void wxUnix2MacFilename(wxChar *s);
+  WXDLLEXPORT wxString wxMacFSSpec2MacFilename( const FSSpec *spec ) ;
+  WXDLLEXPORT wxString wxMacFSSpec2UnixFilename( const FSSpec *spec ) ; 
+  WXDLLEXPORT void wxUnixFilename2FSSpec( const char *path , FSSpec *spec ) ;
+  WXDLLEXPORT void wxMacFilename2FSSpec( const char *path , FSSpec *spec ) ;
+  WXDLLEXPORT wxString wxMac2UnixFilename( const char *s) ;
+  WXDLLEXPORT wxString wxUnix2MacFilename( const char *s);

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


@@ -159,15 +162,15 @@ WXDLLEXPORT bool wxMkdir(const wxString& dir, int perm = 0777);
 WXDLLEXPORT bool wxRmdir(const wxString& dir, int flags = 0);
 
 // separators in file names
 WXDLLEXPORT bool wxRmdir(const wxString& dir, int flags = 0);
 
 // separators in file names

-#define wxFILE_SEP_EXT        T('.')
-#define wxFILE_SEP_DSK        T(':')
-#define wxFILE_SEP_PATH_DOS   T('\\')
-#define wxFILE_SEP_PATH_UNIX  T('/')
+#define wxFILE_SEP_EXT        wxT('.')
+#define wxFILE_SEP_DSK        wxT(':')
+#define wxFILE_SEP_PATH_DOS   wxT('\\')
+#define wxFILE_SEP_PATH_UNIX  wxT('/')

 
 // separator in the path list (as in PATH environment variable)
 // NB: these are strings and not characters on purpose!
 
 // separator in the path list (as in PATH environment variable)
 // NB: these are strings and not characters on purpose!

-#define wxPATH_SEP_DOS        T(";")
-#define wxPATH_SEP_UNIX       T(":")
+#define wxPATH_SEP_DOS        wxT(";")
+#define wxPATH_SEP_UNIX       wxT(":")

 
 // platform independent versions
 #ifdef  __UNIX__
 
 // platform independent versions
 #ifdef  __UNIX__