Fixed compilation problem.

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

diff --git a/include/wx/filename.h b/include/wx/filename.h
index 38e6645e06ce2a41e76e0214494f7a3b9da38586..d263ddecc2f0bc301db153ad216af1a99be2bdf3 100644 (file)
--- a/include/wx/filename.h
+++ b/include/wx/filename.h
@@ -6,18 +6,19 @@
 // Created:     28.12.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 Robert Roebling
 // Created:     28.12.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 Robert Roebling

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef   _WX_FILENAME_H_
 #define   _WX_FILENAME_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef   _WX_FILENAME_H_
 #define   _WX_FILENAME_H_
 

-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "filename.h"
 #endif
 
 #ifndef WX_PRECOMP
     #include  "wx/string.h"
     #pragma interface "filename.h"
 #endif
 
 #ifndef WX_PRECOMP
     #include  "wx/string.h"

+    #include  "wx/arrstr.h"

 #endif
 
 /*
 #endif
 
 /*


@@ -38,7 +39,7 @@
 #include "wx/filefn.h"
 #include "wx/datetime.h"
 
 #include "wx/filefn.h"
 #include "wx/datetime.h"
 

-class WXDLLEXPORT wxFile;
+class WXDLLIMPEXP_BASE wxFile;

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


@@ -51,13 +52,14 @@ enum wxPathFormat
 {
     wxPATH_NATIVE = 0,      // the path format for the current platform
     wxPATH_UNIX,
 {
     wxPATH_NATIVE = 0,      // the path format for the current platform
     wxPATH_UNIX,

+    wxPATH_BEOS = wxPATH_UNIX,

     wxPATH_MAC,
     wxPATH_DOS,
     wxPATH_MAC,
     wxPATH_DOS,

+    wxPATH_WIN = wxPATH_DOS,
+    wxPATH_OS2 = wxPATH_DOS,

     wxPATH_VMS,
 
     wxPATH_VMS,
 

-    wxPATH_BEOS = wxPATH_UNIX,
-    wxPATH_WIN = wxPATH_DOS,
-    wxPATH_OS2 = wxPATH_DOS
+    wxPATH_MAX // Not a valid value for specifying path format

 };
 
 // the kind of normalization to do with the file name: these values can be
 };
 
 // the kind of normalization to do with the file name: these values can be


@@ -70,7 +72,7 @@ enum wxPathNormalize
     wxPATH_NORM_CASE     = 0x0008,  // if case insensitive => tolower
     wxPATH_NORM_ABSOLUTE = 0x0010,  // make the path absolute
     wxPATH_NORM_LONG =     0x0020,  // make the path the long form
     wxPATH_NORM_CASE     = 0x0008,  // if case insensitive => tolower
     wxPATH_NORM_ABSOLUTE = 0x0010,  // make the path absolute
     wxPATH_NORM_LONG =     0x0020,  // make the path the long form

-    wxPATH_NORM_ALL      = 0x003f
+    wxPATH_NORM_ALL      = 0x003f & ~wxPATH_NORM_CASE

 };
 
 // what exactly should GetPath() return?
 };
 
 // what exactly should GetPath() return?


@@ -90,14 +92,14 @@ enum
 // wxFileName: encapsulates a file path
 // ----------------------------------------------------------------------------
 
 // wxFileName: encapsulates a file path
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxFileName
+class WXDLLIMPEXP_BASE wxFileName

 {
 public:
     // constructors and assignment
 
         // the usual stuff
     wxFileName() { Clear(); }
 {
 public:
     // constructors and assignment
 
         // the usual stuff
     wxFileName() { Clear(); }

-    wxFileName( const wxFileName &filepath ) { Assign(filepath); }
+    wxFileName(const wxFileName& filepath) { Assign(filepath); }

 
         // from a full filename: if it terminates with a '/', a directory path
         // is contructed (the name will be empty), otherwise a file name and
 
         // from a full filename: if it terminates with a '/', a directory path
         // is contructed (the name will be empty), otherwise a file name and


@@ -149,7 +151,7 @@ public:
                 wxPathFormat format = wxPATH_NATIVE)
     {
         // empty volume
                 wxPathFormat format = wxPATH_NATIVE)
     {
         // empty volume

-        Assign(_T(""), path, name, ext, format);
+        Assign(wxEmptyString, path, name, ext, format);

     }
 
     void AssignDir(const wxString& dir, wxPathFormat format = wxPATH_NATIVE);
     }
 
     void AssignDir(const wxString& dir, wxPathFormat format = wxPATH_NATIVE);


@@ -166,26 +168,28 @@ public:
     void Clear();
 
         // static pseudo constructors
     void Clear();
 
         // static pseudo constructors

-    static wxFileName FileName(const wxString& file);
-    static wxFileName DirName(const wxString& dir);
+    static wxFileName FileName(const wxString& file,
+                               wxPathFormat format = wxPATH_NATIVE);
+    static wxFileName DirName(const wxString& dir,
+                              wxPathFormat format = wxPATH_NATIVE);

 
     // file tests
 
         // is the filename valid at all?
 
     // file tests
 
         // is the filename valid at all?

-    bool IsOk() const { return !m_dirs.IsEmpty() || !m_name.IsEmpty(); }
+    bool IsOk() const { return m_dirs.size() != 0 || !m_name.IsEmpty(); }

 
         // does the file with this name exists?
 
         // does the file with this name exists?

-    bool FileExists();
+    bool FileExists() const;

     static bool FileExists( const wxString &file );
 
         // does the directory with this name exists?
     static bool FileExists( const wxString &file );
 
         // does the directory with this name exists?

-    bool DirExists();
+    bool DirExists() const;

     static bool DirExists( const wxString &dir );
 
         // VZ: also need: IsDirWritable(), IsFileExecutable() &c (TODO)
 
     // time functions
     static bool DirExists( const wxString &dir );
 
         // VZ: also need: IsDirWritable(), IsFileExecutable() &c (TODO)
 
     // time functions

-
+#if wxUSE_DATETIME

         // set the file last access/mod and creation times
         // (any of the pointers may be NULL)
     bool SetTimes(const wxDateTime *dtAccess,
         // set the file last access/mod and creation times
         // (any of the pointers may be NULL)
     bool SetTimes(const wxDateTime *dtAccess,


@@ -208,6 +212,7 @@ public:
         (void)GetTimes(NULL, &dtMod, NULL);
         return dtMod;
     }
         (void)GetTimes(NULL, &dtMod, NULL);
         return dtMod;
     }

+#endif // wxUSE_DATETIME

 
 #ifdef __WXMAC__
     bool MacSetTypeAndCreator( wxUint32 type , wxUint32 creator ) ;
 
 #ifdef __WXMAC__
     bool MacSetTypeAndCreator( wxUint32 type , wxUint32 creator ) ;


@@ -242,7 +247,6 @@ public:
                                        wxFile *fileTemp = NULL);
 
     // directory creation and removal.
                                        wxFile *fileTemp = NULL);
 
     // directory creation and removal.

-    // if full is TRUE, will try to make each directory in the path.

     bool Mkdir( int perm = 0777, int flags = 0);
     static bool Mkdir( const wxString &dir, int perm = 0777, int flags = 0 );
 
     bool Mkdir( int perm = 0777, int flags = 0);
     static bool Mkdir( const wxString &dir, int perm = 0777, int flags = 0 );
 


@@ -265,12 +269,19 @@ public:
         //
         // pass an empty string to get a path relative to the working directory
         //
         //
         // pass an empty string to get a path relative to the working directory
         //

-        // returns TRUE if the file name was modified, FALSE if we failed to do
+        // returns true if the file name was modified, false if we failed to do

         // anything with it (happens when the file is on a different volume,
         // for example)
         // anything with it (happens when the file is on a different volume,
         // for example)

-    bool MakeRelativeTo(const wxString& pathBase = _T(""),
+    bool MakeRelativeTo(const wxString& pathBase = wxEmptyString,

                         wxPathFormat format = wxPATH_NATIVE);
 
                         wxPathFormat format = wxPATH_NATIVE);
 

+        // make the path absolute
+        //
+        // this may be done using another (than current) value of cwd
+    bool MakeAbsolute(const wxString& cwd = wxEmptyString,
+                      wxPathFormat format = wxPATH_NATIVE)
+        { return Normalize(wxPATH_NORM_DOTS | wxPATH_NORM_ABSOLUTE |
+                           wxPATH_NORM_TILDE, cwd, format); }

 
     // Comparison
 
 
     // Comparison
 


@@ -300,6 +311,10 @@ public:
     bool IsRelative(wxPathFormat format = wxPATH_NATIVE) const
         { return !IsAbsolute(format); }
 
     bool IsRelative(wxPathFormat format = wxPATH_NATIVE) const
         { return !IsAbsolute(format); }
 

+    // Returns the characters that aren't allowed in filenames
+    // on the specified platform.
+    static wxString GetForbiddenChars(wxPathFormat format = wxPATH_NATIVE);
+

     // Information about path format
 
     // get the string separating the volume from the path for this format,
     // Information about path format
 
     // get the string separating the volume from the path for this format,


@@ -322,7 +337,7 @@ public:
     void PrependDir( const wxString &dir );
     void InsertDir( int before, const wxString &dir );
     void RemoveDir( int pos );
     void PrependDir( const wxString &dir );
     void InsertDir( int before, const wxString &dir );
     void RemoveDir( int pos );

-    size_t GetDirCount() const { return m_dirs.GetCount(); }
+    size_t GetDirCount() const { return m_dirs.size(); }

 
     // Other accessors
     void SetExt( const wxString &ext )          { m_ext = ext; }
 
     // Other accessors
     void SetExt( const wxString &ext )          { m_ext = ext; }


@@ -344,7 +359,8 @@ public:
     const wxArrayString& GetDirs() const        { return m_dirs; }
 
     // flags are combination of wxPATH_GET_XXX flags
     const wxArrayString& GetDirs() const        { return m_dirs; }
 
     // flags are combination of wxPATH_GET_XXX flags

-    wxString GetPath(int flags = 0, wxPathFormat format = wxPATH_NATIVE) const;
+    wxString GetPath(int flags = wxPATH_GET_VOLUME,
+                     wxPathFormat format = wxPATH_NATIVE) const;

 
     // Replace current path with this one
     void SetPath( const wxString &path, wxPathFormat format = wxPATH_NATIVE );
 
     // Replace current path with this one
     void SetPath( const wxString &path, wxPathFormat format = wxPATH_NATIVE );


@@ -386,9 +402,10 @@ public:
     // deprecated methods, don't use any more
     // --------------------------------------
 
     // deprecated methods, don't use any more
     // --------------------------------------
 

+#ifndef __DIGITALMARS__

     wxString GetPath( bool withSep, wxPathFormat format = wxPATH_NATIVE ) const
         { return GetPath(withSep ? wxPATH_GET_SEPARATOR : 0, format); }
     wxString GetPath( bool withSep, wxPathFormat format = wxPATH_NATIVE ) const
         { return GetPath(withSep ? wxPATH_GET_SEPARATOR : 0, format); }

-
+#endif

     wxString GetPathWithSep(wxPathFormat format = wxPATH_NATIVE ) const
         { return GetPath(wxPATH_GET_SEPARATOR, format); }
 
     wxString GetPathWithSep(wxPathFormat format = wxPATH_NATIVE ) const
         { return GetPath(wxPATH_GET_SEPARATOR, format); }
 


@@ -407,9 +424,9 @@ private:
     // that our path is '/', i.e. the root directory
     //
     // we use m_relative to distinguish between these two cases, it will be
     // that our path is '/', i.e. the root directory
     //
     // we use m_relative to distinguish between these two cases, it will be

-    // TRUE in the former and FALSE in the latter
+    // true in the former and false in the latter

     //
     //

-    // NB: the path is not absolute just because m_relative is FALSE, it still
+    // NB: the path is not absolute just because m_relative is false, it still

     //     needs the drive (i.e. volume) in some formats (Windows)
     bool            m_relative;
 };
     //     needs the drive (i.e. volume) in some formats (Windows)
     bool            m_relative;
 };