Change m_SubControls from wxList to wxArrayLong

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

diff --git a/include/wx/filefn.h b/include/wx/filefn.h
index c2e21609ad751ac8c43a31cadcd6f7dcc2a43fdd..f983b7e93afd25f1eba62e7d50d7dabedfe2c9ce 100644 (file)
--- a/include/wx/filefn.h
+++ b/include/wx/filefn.h
@@ -18,6 +18,8 @@
 
 #include "wx/list.h"
 
 
 #include "wx/list.h"
 

+#include <time.h>
+

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


@@ -39,7 +41,15 @@
     typedef long off_t;
 #endif
 
     typedef long off_t;
 #endif
 

+#if defined(__VISAGECPP__) && __IBMCPP__ >= 400
+//
+// VisualAge C++ V4.0 cannot have any external linkage const decs
+// in headers included by more than one primary source
+//
+extern const off_t wxInvalidOffset;
+#else

 const off_t wxInvalidOffset = (off_t)-1;
 const off_t wxInvalidOffset = (off_t)-1;

+#endif

 
 enum wxSeekMode
 {
 
 enum wxSeekMode
 {


@@ -85,7 +95,7 @@ WXDLLEXPORT void wxUnix2DosFilename(wxChar *s);
 
 #ifdef __WXMAC__
   WXDLLEXPORT wxString wxMacFSSpec2MacFilename( const FSSpec *spec ) ;
 
 #ifdef __WXMAC__
   WXDLLEXPORT wxString wxMacFSSpec2MacFilename( const FSSpec *spec ) ;

-  WXDLLEXPORT wxString wxMacFSSpec2UnixFilename( 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 void wxUnixFilename2FSSpec( const char *path , FSSpec *spec ) ;
   WXDLLEXPORT void wxMacFilename2FSSpec( const char *path , FSSpec *spec ) ;
   WXDLLEXPORT wxString wxMac2UnixFilename( const char *s) ;


@@ -98,9 +108,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


@@ -210,6 +222,9 @@ WXDLLEXPORT bool wxFindFileInPath(wxString *pStr, const wxChar *pszPath, const w
 // On non-Windows platform, probably just return the empty string.
 WXDLLEXPORT wxString wxGetOSDirectory();
 
 // On non-Windows platform, probably just return the empty string.
 WXDLLEXPORT wxString wxGetOSDirectory();
 

+// Get file modification time
+WXDLLEXPORT time_t wxFileModificationTime(const wxString& filename);
+

 // ----------------------------------------------------------------------------
 // classes
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // classes
 // ----------------------------------------------------------------------------