removed platform specific #ifdefs around wxComboBox

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

diff --git a/include/wx/filefn.h b/include/wx/filefn.h
index b7455424ad00917870a6039b84b01725ad89727d..8179b6b75805646643b3d70ab669af08a3b081a5 100644 (file)
--- a/include/wx/filefn.h
+++ b/include/wx/filefn.h
@@ -16,7 +16,7 @@
     #pragma interface "filefn.h"
 #endif
 
     #pragma interface "filefn.h"
 #endif
 

-#include <wx/list.h>
+#include "wx/list.h"

 
 // ----------------------------------------------------------------------------
 // constants
 
 // ----------------------------------------------------------------------------
 // constants


@@ -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


@@ -95,9 +98,11 @@ WXDLLEXPORT void wxStripExtension(wxString& buffer);
 
 // Get a temporary filename, opening and closing the file.
 WXDLLEXPORT wxChar* wxGetTempFileName(const wxString& prefix, wxChar *buf = (wxChar *) NULL);
 
 // Get a temporary filename, opening and closing the file.
 WXDLLEXPORT wxChar* wxGetTempFileName(const wxString& prefix, wxChar *buf = (wxChar *) NULL);

+WXDLLEXPORT bool wxGetTempFileName(const wxString& prefix, wxString& buf);

 
 // Expand file name (~/ and ${OPENWINHOME}/ stuff)
 WXDLLEXPORT wxChar* wxExpandPath(wxChar *dest, const wxChar *path);
 
 // Expand file name (~/ and ${OPENWINHOME}/ stuff)
 WXDLLEXPORT wxChar* wxExpandPath(wxChar *dest, const wxChar *path);

+WXDLLEXPORT bool wxExpandPath(wxString& dest, const wxChar *path);

 
 // Contract w.r.t environment (</usr/openwin/lib, OPENWHOME> -> ${OPENWINHOME}/lib)
 // and make (if under the home tree) relative to home
 
 // Contract w.r.t environment (</usr/openwin/lib, OPENWHOME> -> ${OPENWINHOME}/lib)
 // and make (if under the home tree) relative to home


@@ -159,15 +164,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__