Some doc corrections

[wxWidgets.git] / docs / latex / wx / filename.tex

diff --git a/docs/latex/wx/filename.tex b/docs/latex/wx/filename.tex
index 2093b783a0cb070d828d8da7839469b7489106db..d739dcd8dc8aed020b46a4eeae51ea9a58fb0b7a 100644 (file)
--- a/docs/latex/wx/filename.tex
+++ b/docs/latex/wx/filename.tex
@@ -16,7 +16,7 @@ provides the functions to split the file names into components and to recombine
 these components in the full file name which can then be passed to the OS file
 functions (and \helpref{wxWindows functions}{filefunctions} wrapping them).
 Second, it includes the functions for working with the files itself. Note that
 these components in the full file name which can then be passed to the OS file
 functions (and \helpref{wxWindows functions}{filefunctions} wrapping them).
 Second, it includes the functions for working with the files itself. Note that

-to change the file data you should use \helpref{wxFile}{wxfile} class instead,
+to change the file data you should use \helpref{wxFile}{wxfile} class instead.

 wxFileName provides functions for working with the file attributes.
 
 \wxheading{Derived from}
 wxFileName provides functions for working with the file attributes.
 
 \wxheading{Derived from}


@@ -38,40 +38,25 @@ 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_VMS,
-
-    wxPATH_BEOS = wxPATH_UNIX,

     wxPATH_WIN = wxPATH_DOS,
     wxPATH_WIN = wxPATH_DOS,

-    wxPATH_OS2 = wxPATH_DOS
-}
-\end{verbatim}
-
-The kind of normalization to do with the file name: these values can be
-or'd together to perform several operations at once in\rtfsp
-\helpref{Normalize}{wxfilenamenormalize}.
+    wxPATH_OS2 = wxPATH_DOS,
+    wxPATH_VMS,

 
 

-\begin{verbatim}
-enum wxPathNormalize
-{
-    wxPATH_NORM_ENV_VARS = 0x0001,  // replace env vars with their values
-    wxPATH_NORM_DOTS     = 0x0002,  // squeeze all .. and . and prepend cwd
-    wxPATH_NORM_TILDE    = 0x0004,  // Unix only: replace ~ and ~user
-    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_MAX // Not a valid value for specifying path format

 }
 \end{verbatim}
 
 \latexignore{\rtfignore{\wxheading{Function groups}}}
 
 }
 \end{verbatim}
 
 \latexignore{\rtfignore{\wxheading{Function groups}}}
 

+

 \membersection{File name format}
 
 wxFileName currently supports the file names in the Unix, DOS/Windows, Mac OS
 and VMS formats. Although these formats are quite different, wxFileName tries
 \membersection{File name format}
 
 wxFileName currently supports the file names in the Unix, DOS/Windows, Mac OS
 and VMS formats. Although these formats are quite different, wxFileName tries

-to treat them all in the sam generic way. It supposes that all file names
+to treat them all in the same generic way. It supposes that all file names

 consist of the following parts: the volume (also known as drive under Windows
 or device under VMS), the path which is a sequence of directory names separated
 by the \helpref{path separators}{wxfilenamegetpathseparators} and the full
 consist of the following parts: the volume (also known as drive under Windows
 or device under VMS), the path which is a sequence of directory names separated
 by the \helpref{path separators}{wxfilenamegetpathseparators} and the full


@@ -79,7 +64,7 @@ filename itself which, in turn, is composed from the base file name and the
 extension. All of the individual components of the file name may be empty and,
 for example, the volume name is always empty under Unix, but if they are all
 empty simultaneously, the filename object is considered to be in an invalid
 extension. All of the individual components of the file name may be empty and,
 for example, the volume name is always empty under Unix, but if they are all
 empty simultaneously, the filename object is considered to be in an invalid

-state and \helpref{IsOk}{wxfilenameisok} returns {\tt FALSE} for it.
+state and \helpref{IsOk}{wxfilenameisok} returns {\tt false} for it.

 
 File names can be case-sensitive or not, the function\rtfsp
 \helpref{IsCaseSensitive}{wxfilenameiscasesensitive} allows to determine this.
 
 File names can be case-sensitive or not, the function\rtfsp
 \helpref{IsCaseSensitive}{wxfilenameiscasesensitive} allows to determine this.


@@ -87,10 +72,10 @@ File names can be case-sensitive or not, the function\rtfsp
 The rules for determining if the file name is absolute or relative also depends
 on the file name format and the only portable way to answer to this question is
 to use \helpref{IsAbsolute}{wxfilenameisabsolute} method. To ensure that the
 The rules for determining if the file name is absolute or relative also depends
 on the file name format and the only portable way to answer to this question is
 to use \helpref{IsAbsolute}{wxfilenameisabsolute} method. To ensure that the

-filename is absolute you may use \helpref{Normalize}{wxfilenamenormalize}. There
-is also an inverse function \helpref{MakeRelativeTo}{wxfilenamemakerelativeto} 
-which undoes what \helpref{Normalize(wxPATH\_NORM\_DOTS}{wxfilenamenormalize} 
-does.
+filename is absolute you may use \helpref{MakeAbsolute}{wxfilenamemakeabsolute}.
+There is also an inverse function
+\helpref{MakeRelativeTo}{wxfilenamemakerelativeto} which undoes what
+\helpref{Normalize(wxPATH\_NORM\_DOTS)}{wxfilenamenormalize} does.

 
 Other functions returning information about the file format provided by this
 class are \helpref{GetVolumeSeparator}{wxfilenamegetvolumeseparator},\rtfsp
 
 Other functions returning information about the file format provided by this
 class are \helpref{GetVolumeSeparator}{wxfilenamegetvolumeseparator},\rtfsp


@@ -98,10 +83,12 @@ class are \helpref{GetVolumeSeparator}{wxfilenamegetvolumeseparator},\rtfsp
 
 \helpref{IsRelative}{wxfilenameisrelative}
 
 
 \helpref{IsRelative}{wxfilenameisrelative}
 

+

 \membersection{File name construction}
 
 TODO.
 
 \membersection{File name construction}
 
 TODO.
 

+

 \membersection{File tests}
 
 Before doing the other tests you should use \helpref{IsOk}{wxfilenameisok} to
 \membersection{File tests}
 
 Before doing the other tests you should use \helpref{IsOk}{wxfilenameisok} to


@@ -113,6 +100,7 @@ with this name exists.
 File names should be compared using \helpref{SameAs}{wxfilenamesameas} method
 or \helpref{$==$}{wxfilenameoperatorequal}.
 
 File names should be compared using \helpref{SameAs}{wxfilenamesameas} method
 or \helpref{$==$}{wxfilenameoperatorequal}.
 

+

 \membersection{File name components}
 
 These functions allow to examine and modify the directories of the path:
 \membersection{File name components}
 
 These functions allow to examine and modify the directories of the path:


@@ -136,6 +124,7 @@ following functions:
 \helpref{SetName}{wxfilenamesetname}\\
 \helpref{SetVolume}{wxfilenamesetvolume}\\
 
 \helpref{SetName}{wxfilenamesetname}\\
 \helpref{SetVolume}{wxfilenamesetvolume}\\
 

+

 \membersection{Operations}
 
 These methods allow to work with the file creation, access and modification
 \membersection{Operations}
 
 These methods allow to work with the file creation, access and modification


@@ -156,6 +145,7 @@ Other file system operations functions are:
 
 \latexignore{\rtfignore{\wxheading{Members}}}
 
 
 \latexignore{\rtfignore{\wxheading{Members}}}
 

+

 \membersection{wxFileName::wxFileName}\label{wxfilenamewxfilename}
 
 \func{}{wxFileName}{\void}
 \membersection{wxFileName::wxFileName}\label{wxfilenamewxfilename}
 
 \func{}{wxFileName}{\void}


@@ -168,9 +158,9 @@ Copy constructor.
 
 \func{}{wxFileName}{\param{const wxString\& }{fullpath}, \param{wxPathFormat }{format = wxPATH\_NATIVE}}
 
 
 \func{}{wxFileName}{\param{const wxString\& }{fullpath}, \param{wxPathFormat }{format = wxPATH\_NATIVE}}
 

-From a full filename: if it terminates with a '/', a directory path
-is contructed (the name will be empty), otherwise a file name and
-extension are extracted from it
+Constructor taking a full filename. If it terminates with a '/', a directory path
+is constructed (the name will be empty), otherwise a file name and
+extension are extracted from it.

 
 \func{}{wxFileName}{\param{const wxString\& }{path}, \param{const wxString\& }{name}, \param{wxPathFormat }{format = wxPATH\_NATIVE}}
 
 
 \func{}{wxFileName}{\param{const wxString\& }{path}, \param{const wxString\& }{name}, \param{wxPathFormat }{format = wxPATH\_NATIVE}}
 


@@ -178,16 +168,22 @@ Constructor from a directory name and a file name.
 
 \func{}{wxFileName}{\param{const wxString\& }{path}, \param{const wxString\& }{name}, \param{const wxString\& }{ext}, \param{wxPathFormat }{format = wxPATH\_NATIVE}}
 
 
 \func{}{wxFileName}{\param{const wxString\& }{path}, \param{const wxString\& }{name}, \param{const wxString\& }{ext}, \param{wxPathFormat }{format = wxPATH\_NATIVE}}
 

-Constructor from a directory name, base file name and extension
+Constructor from a directory name, base file name and extension.

 
 \func{}{wxFileName}{\param{const wxString\& }{volume}, \param{const wxString\& }{path}, \param{const wxString\& }{name}, \param{const wxString\& }{ext}, \param{wxPathFormat }{format = wxPATH\_NATIVE}}
 
 
 \func{}{wxFileName}{\param{const wxString\& }{volume}, \param{const wxString\& }{path}, \param{const wxString\& }{name}, \param{const wxString\& }{ext}, \param{wxPathFormat }{format = wxPATH\_NATIVE}}
 

-Constructor from a volume name, a directory name, base file name and extension
+Constructor from a volume name, a directory name, base file name and extension.
+

 
 \membersection{wxFileName::AppendDir}\label{wxfilenameappenddir}
 
 \func{void}{AppendDir}{\param{const wxString\& }{dir}}
 
 
 \membersection{wxFileName::AppendDir}\label{wxfilenameappenddir}
 
 \func{void}{AppendDir}{\param{const wxString\& }{dir}}
 

+Appends a directory component to the path. This component should contain a
+single directory name level, i.e. not contain any path or volume separators nor
+should it be empty, otherwise the function does nothing (and generates an
+assert failure in debug build).
+

 
 \membersection{wxFileName::Assign}\label{wxfilenameassign}
 
 
 \membersection{wxFileName::Assign}\label{wxfilenameassign}
 


@@ -201,10 +197,12 @@ Constructor from a volume name, a directory name, base file name and extension
 
 \func{void}{Assign}{\param{const wxString\& }{path}, \param{const wxString\& }{name}, \param{const wxString\& }{ext}, \param{wxPathFormat }{format = wxPATH\_NATIVE}}
 
 
 \func{void}{Assign}{\param{const wxString\& }{path}, \param{const wxString\& }{name}, \param{const wxString\& }{ext}, \param{wxPathFormat }{format = wxPATH\_NATIVE}}
 

+Creates the file name from various combinations of data.
+

 
 \membersection{wxFileName::AssignCwd}\label{wxfilenameassigncwd}
 
 
 \membersection{wxFileName::AssignCwd}\label{wxfilenameassigncwd}
 

-\func{void}{AssignCwd}{\param{const wxString\& }{volume = ""}}
+\func{static void}{AssignCwd}{\param{const wxString\& }{volume = wxEmptyString}}

 
 Makes this object refer to the current working directory on the specified
 volume (or current volume if {\it volume} is empty).
 
 Makes this object refer to the current working directory on the specified
 volume (or current volume if {\it volume} is empty).


@@ -213,18 +211,21 @@ volume (or current volume if {\it volume} is empty).
 
 \helpref{GetCwd}{wxfilenamegetcwd}
 
 
 \helpref{GetCwd}{wxfilenamegetcwd}
 

+

 \membersection{wxFileName::AssignDir}\label{wxfilenameassigndir}
 
 \func{void}{AssignDir}{\param{const wxString\& }{dir}, \param{wxPathFormat }{format = wxPATH\_NATIVE}}
 
 \membersection{wxFileName::AssignDir}\label{wxfilenameassigndir}
 
 \func{void}{AssignDir}{\param{const wxString\& }{dir}, \param{wxPathFormat }{format = wxPATH\_NATIVE}}
 

-Set this file name object to the given directory name. The name and extension
+Sets this file name object to the given directory name. The name and extension

 will be empty.
 
 will be empty.
 

+

 \membersection{wxFileName::AssignHomeDir}\label{wxfilenameassignhomedir}
 
 \func{void}{AssignHomeDir}{\void}
 
 \membersection{wxFileName::AssignHomeDir}\label{wxfilenameassignhomedir}
 
 \func{void}{AssignHomeDir}{\void}
 

-Set this file name object to the home directory.
+Sets this file name object to the home directory.
+

 
 \membersection{wxFileName::AssignTempFileName}\label{wxfilenameassigntempfilename}
 
 
 \membersection{wxFileName::AssignTempFileName}\label{wxfilenameassigntempfilename}
 


@@ -235,12 +236,14 @@ create a temporary file and sets this object to the name of the file. If a
 temporary file couldn't be created, the object is put into the\rtfsp
 \helpref{invalid}{wxfilenameisok} state.
 
 temporary file couldn't be created, the object is put into the\rtfsp
 \helpref{invalid}{wxfilenameisok} state.
 

+

 \membersection{wxFileName::Clear}\label{wxfilenameclear}
 
 \func{void}{Clear}{\void}
 
 Reset all components to default, uninitialized state.
 
 \membersection{wxFileName::Clear}\label{wxfilenameclear}
 
 \func{void}{Clear}{\void}
 
 Reset all components to default, uninitialized state.
 

+

 \membersection{wxFileName::CreateTempFileName}\label{wxfilenamecreatetempfilename}
 
 \func{static wxString}{CreateTempFileName}{\param{const wxString\& }{prefix}, \param{wxFile *}{fileTemp = {\tt NULL}}}
 \membersection{wxFileName::CreateTempFileName}\label{wxfilenamecreatetempfilename}
 
 \func{static wxString}{CreateTempFileName}{\param{const wxString\& }{prefix}, \param{wxFile *}{fileTemp = {\tt NULL}}}


@@ -270,37 +273,53 @@ owner only to minimize the security problems.
 
 The full temporary file name or an empty string on error.
 
 
 The full temporary file name or an empty string on error.
 

+

 \membersection{wxFileName::DirExists}\label{wxfilenamedirexists}
 
 \membersection{wxFileName::DirExists}\label{wxfilenamedirexists}
 

-\func{bool}{DirExists}{\void}
+\constfunc{bool}{DirExists}{\void}
+
+\func{static bool}{DirExists}{\param{const wxString\& }{dir}}

 
 

-\func{bool}{DirExists}{\param{const wxString\& }{dir}}
+Returns {\tt true} if the directory with this name exists.

 
 

-Does the directory with this name exists?

 
 \membersection{wxFileName::DirName}\label{wxfilenamedirname}
 
 
 \membersection{wxFileName::DirName}\label{wxfilenamedirname}
 

-\func{wxFileName}{DirName}{\param{const wxString\& }{dir}}
+\func{static wxFileName}{DirName}{\param{const wxString\& }{dir}, \param{wxPathFormat }{format = wxPATH\_NATIVE}}
+
+Returns the object corresponding to the directory with the given name.
+The {\it dir} parameter may have trailing path separator or not.
+
+

 
 \membersection{wxFileName::FileExists}\label{wxfilenamefileexists}
 
 
 \membersection{wxFileName::FileExists}\label{wxfilenamefileexists}
 

-\func{bool}{FileExists}{\void}
+\constfunc{bool}{FileExists}{\void}
+
+\func{static bool}{FileExists}{\param{const wxString\& }{file}}
+
+Returns {\tt true} if the file with this name exists.
+
+\wxheading{See also}
+
+\helpref{DirExists}{wxfilenamedirexists}

 
 

-\func{bool}{FileExists}{\param{const wxString\& }{file}}

 
 

-Does the file with this name exists?

 
 \membersection{wxFileName::FileName}\label{wxfilenamefilename}
 
 
 \membersection{wxFileName::FileName}\label{wxfilenamefilename}
 

-\func{wxFileName}{FileName}{\param{const wxString\& }{file}}
+\func{static wxFileName}{FileName}{\param{const wxString\& }{file}, \param{wxPathFormat }{format = wxPATH\_NATIVE}}
+
+Returns the file name object corresponding to the given {\it file}. This
+function exists mainly for symmetry with \helpref{DirName}{wxfilenamedirname}.
+

 
 

-static pseudo constructors

 
 \membersection{wxFileName::GetCwd}\label{wxfilenamegetcwd}
 
 
 \membersection{wxFileName::GetCwd}\label{wxfilenamegetcwd}
 

-\func{wxString}{GetCwd}{\param{const wxString\& }{volume = ""}}
+\func{static wxString}{GetCwd}{\param{const wxString\& }{volume = ""}}

 
 

-Retrieve the value of the current working directory on the specified volume. If
+Retrieves the value of the current working directory on the specified volume. If

 the volume is empty, the programs current working directory is returned for the
 current volume.
 
 the volume is empty, the programs current working directory is returned for the
 current volume.
 


@@ -313,44 +332,61 @@ error.
 
 \helpref{AssignCwd}{wxfilenameassigncwd}
 
 
 \helpref{AssignCwd}{wxfilenameassigncwd}
 

+

 \membersection{wxFileName::GetDirCount}\label{wxfilenamegetdircount}
 
 \constfunc{size\_t}{GetDirCount}{\void}
 
 \membersection{wxFileName::GetDirCount}\label{wxfilenamegetdircount}
 
 \constfunc{size\_t}{GetDirCount}{\void}
 

+Returns the number of directories in the file name.
+

 
 \membersection{wxFileName::GetDirs}\label{wxfilenamegetdirs}
 
 \constfunc{const wxArrayString\&}{GetDirs}{\void}
 
 
 \membersection{wxFileName::GetDirs}\label{wxfilenamegetdirs}
 
 \constfunc{const wxArrayString\&}{GetDirs}{\void}
 

+Returns the directories in string array form.
+

 
 \membersection{wxFileName::GetExt}\label{wxfilenamegetext}
 
 \constfunc{wxString}{GetExt}{\void}
 
 
 \membersection{wxFileName::GetExt}\label{wxfilenamegetext}
 
 \constfunc{wxString}{GetExt}{\void}
 

+Returns the file name extension.
+
+
+\membersection{wxFileName::GetForbiddenChars}\label{wxfilenamegetforbiddenchars}
+
+\func{static wxString}{GetForbiddenChars}{\param{wxPathFormat }{format = wxPATH\_NATIVE}}
+
+Returns the characters that can't be used in filenames and directory names for the specified format.
+

 
 \membersection{wxFileName::GetFormat}\label{wxfilenamegetformat}
 
 
 \membersection{wxFileName::GetFormat}\label{wxfilenamegetformat}
 

-\func{wxPathFormat}{GetFormat}{\param{wxPathFormat }{format = wxPATH\_NATIVE}}
+\func{static wxPathFormat}{GetFormat}{\param{wxPathFormat }{format = wxPATH\_NATIVE}}

 
 

-various helpers
-get the canonical path format for this platform
+Returns the canonical path format for this platform.

 
 
 \membersection{wxFileName::GetFullName}\label{wxfilenamegetfullname}
 
 \constfunc{wxString}{GetFullName}{\void}
 
 
 
 \membersection{wxFileName::GetFullName}\label{wxfilenamegetfullname}
 
 \constfunc{wxString}{GetFullName}{\void}
 

+Returns the full name (including extension but excluding directories).
+

 
 \membersection{wxFileName::GetFullPath}\label{wxfilenamegetfullpath}
 
 \constfunc{wxString}{GetFullPath}{\param{wxPathFormat }{format = wxPATH\_NATIVE}}
 
 
 \membersection{wxFileName::GetFullPath}\label{wxfilenamegetfullpath}
 
 \constfunc{wxString}{GetFullPath}{\param{wxPathFormat }{format = wxPATH\_NATIVE}}
 

-add separator Construct full path with name and ext
+Returns the full path with name and extension.

 
 
 \membersection{wxFileName::GetHomeDir}\label{wxfilenamegethomedir}
 
 
 
 \membersection{wxFileName::GetHomeDir}\label{wxfilenamegethomedir}
 

-\func{wxString}{GetHomeDir}{\void}
+\func{static wxString}{GetHomeDir}{\void}
+
+Returns the home directory.

 
 
 \membersection{wxFileName::GetLongPath}\label{wxfilenamegetlongpath}
 
 
 \membersection{wxFileName::GetLongPath}\label{wxfilenamegetlongpath}


@@ -364,35 +400,39 @@ Return the long form of the path (returns identity on non-Windows platforms)
 
 \constfunc{wxDateTime}{GetModificationTime}{\void}
 
 
 \constfunc{wxDateTime}{GetModificationTime}{\void}
 

-convenience wrapper: get just the last mod time of the file
+Returns the last time the file was last modified.

 
 
 \membersection{wxFileName::GetName}\label{wxfilenamegetname}
 
 \constfunc{wxString}{GetName}{\void}
 
 
 
 \membersection{wxFileName::GetName}\label{wxfilenamegetname}
 
 \constfunc{wxString}{GetName}{\void}
 

+Returns the name part of the filename.
+

 
 \membersection{wxFileName::GetPath}\label{wxfilenamegetpath}
 
 
 \membersection{wxFileName::GetPath}\label{wxfilenamegetpath}
 

-\constfunc{wxString}{GetPath}{\param{int }{flags = $0$}, \param{wxPathFormat }{format = wxPATH\_NATIVE}}
+\constfunc{wxString}{GetPath}{\param{int }{flags = {\tt wxPATH\_GET\_VOLUME}}, \param{wxPathFormat }{format = wxPATH\_NATIVE}}

 
 

-Return the path part of the filename (without the name nor extension). The
+Returns the path part of the filename (without the name or extension). The

 possible flags values are:
 
 \twocolwidtha{5cm}
 \begin{twocollist}\itemsep=0pt
 \twocolitem{{\bf wxPATH\_GET\_VOLUME}}{Return the path with the volume (does
 possible flags values are:
 
 \twocolwidtha{5cm}
 \begin{twocollist}\itemsep=0pt
 \twocolitem{{\bf wxPATH\_GET\_VOLUME}}{Return the path with the volume (does

-nothing for the filename formats without volumes)}
+nothing for the filename formats without volumes), otherwise the path without
+volume part is returned.}

 \twocolitem{{\bf wxPATH\_GET\_SEPARATOR}}{Return the path with the trailing
 separator, if this flag is not given there will be no separator at the end of
 the path.}
 \end{twocollist}
 
 \twocolitem{{\bf wxPATH\_GET\_SEPARATOR}}{Return the path with the trailing
 separator, if this flag is not given there will be no separator at the end of
 the path.}
 \end{twocollist}
 

+

 \membersection{wxFileName::GetPathSeparator}\label{wxfilenamegetpathseparator}
 
 \membersection{wxFileName::GetPathSeparator}\label{wxfilenamegetpathseparator}
 

-\func{wxChar}{GetPathSeparator}{\param{wxPathFormat }{format = wxPATH\_NATIVE}}
+\func{static wxChar}{GetPathSeparator}{\param{wxPathFormat }{format = wxPATH\_NATIVE}}

 
 

-Return the usually used path separator for this format. For all formats but 
+Returns the usually used path separator for this format. For all formats but 

 {\tt wxPATH\_DOS} there is only one path separator anyhow, but for DOS there
 are two of them and the native one, i.e. the backslash is returned by this
 method.
 {\tt wxPATH\_DOS} there is only one path separator anyhow, but for DOS there
 are two of them and the native one, i.e. the backslash is returned by this
 method.


@@ -401,38 +441,33 @@ method.
 
 \helpref{GetPathSeparators}{wxfilenamegetpathseparators}
 
 
 \helpref{GetPathSeparators}{wxfilenamegetpathseparators}
 

+

 \membersection{wxFileName::GetPathSeparators}\label{wxfilenamegetpathseparators}
 
 \membersection{wxFileName::GetPathSeparators}\label{wxfilenamegetpathseparators}
 

-\func{wxString}{GetPathSeparators}{\param{wxPathFormat }{format = wxPATH\_NATIVE}}
+\func{static wxString}{GetPathSeparators}{\param{wxPathFormat }{format = wxPATH\_NATIVE}}

 
 

-Get the string containing all the path separators for this format. For all
+Returns the string containing all the path separators for this format. For all

 formats but {\tt wxPATH\_DOS} this string contains only one character but for
 formats but {\tt wxPATH\_DOS} this string contains only one character but for

-DOS and Windows both {\tt '/'} and {\tt '\backslash'} may be used as
+DOS and Windows both {\tt '/'} and {\tt '\textbackslash'} may be used as

 separators.
 
 \wxheading{See also}
 
 \helpref{GetPathSeparator}{wxfilenamegetpathseparator}
 
 separators.
 
 \wxheading{See also}
 
 \helpref{GetPathSeparator}{wxfilenamegetpathseparator}
 

-\membersection{wxFileName::GetPathWithSep}\label{wxfilenamegetpathwithsep}
-
-\constfunc{wxString}{GetPathWithSep}{\param{wxPathFormat }{format = wxPATH\_NATIVE}}
-
-more readable synonym
-

 
 \membersection{wxFileName::GetShortPath}\label{wxfilenamegetshortpath}
 
 \constfunc{wxString}{GetShortPath}{\void}
 
 
 \membersection{wxFileName::GetShortPath}\label{wxfilenamegetshortpath}
 
 \constfunc{wxString}{GetShortPath}{\void}
 

-Return the short form of the path (returns identity on non-Windows platforms)
+Return the short form of the path (returns identity on non-Windows platforms).

 
 
 \membersection{wxFileName::GetTimes}\label{wxfilenamegettimes}
 
 \constfunc{bool}{GetTimes}{\param{wxDateTime* }{dtAccess}, \param{wxDateTime* }{dtMod}, \param{wxDateTime* }{dtCreate}}
 
 
 
 \membersection{wxFileName::GetTimes}\label{wxfilenamegettimes}
 
 \constfunc{bool}{GetTimes}{\param{wxDateTime* }{dtAccess}, \param{wxDateTime* }{dtMod}, \param{wxDateTime* }{dtCreate}}
 

-Return the last access, last modification and creation times. The last access
+Returns the last access, last modification and creation times. The last access

 time is updated whenever the file is read or written (or executed in the case
 of Windows), last modification time is only changed when the file is written
 to. Finally, the creation time is indeed the time when the file was created
 time is updated whenever the file is read or written (or executed in the case
 of Windows), last modification time is only changed when the file is written
 to. Finally, the creation time is indeed the time when the file was created


@@ -440,12 +475,13 @@ under Windows and the inode change time under Unix (as it is impossible to
 retrieve the real file creation time there anyhow) which can also be changed
 by many operations after the file creation.
 
 retrieve the real file creation time there anyhow) which can also be changed
 by many operations after the file creation.
 

-Aany of the pointers may be {\tt NULL} if the corresponding time is not
+Any of the pointers may be {\tt NULL} if the corresponding time is not

 needed.
 
 \wxheading{Return value}
 
 needed.
 
 \wxheading{Return value}
 

-{\tt TRUE} on success, {\tt FALSE} if we failed to retrieve the times.
+{\tt true} on success, {\tt false} if we failed to retrieve the times.
+

 
 \membersection{wxFileName::GetVolume}\label{wxfilenamegetvolume}
 
 
 \membersection{wxFileName::GetVolume}\label{wxfilenamegetvolume}
 


@@ -455,82 +491,109 @@ Returns the string containing the volume for this file name, mepty if it
 doesn't have one or if the file system doesn't support volumes at all (for
 example, Unix).
 
 doesn't have one or if the file system doesn't support volumes at all (for
 example, Unix).
 

+

 \membersection{wxFileName::GetVolumeSeparator}\label{wxfilenamegetvolumeseparator}
 
 \membersection{wxFileName::GetVolumeSeparator}\label{wxfilenamegetvolumeseparator}
 

-\func{wxString}{GetVolumeSeparator}{\param{wxPathFormat }{format = wxPATH\_NATIVE}}
+\func{static wxString}{GetVolumeSeparator}{\param{wxPathFormat }{format = wxPATH\_NATIVE}}

 
 

-get the string separating the volume from the path for this format
+Returns the string separating the volume from the path for this format.

 
 
 \membersection{wxFileName::HasExt}\label{wxfilenamehasext}
 
 \constfunc{bool}{HasExt}{\void}
 
 
 
 \membersection{wxFileName::HasExt}\label{wxfilenamehasext}
 
 \constfunc{bool}{HasExt}{\void}
 

+Returns {\tt true} if an extension is present.
+

 
 \membersection{wxFileName::HasName}\label{wxfilenamehasname}
 
 \constfunc{bool}{HasName}{\void}
 
 
 \membersection{wxFileName::HasName}\label{wxfilenamehasname}
 
 \constfunc{bool}{HasName}{\void}
 

+Returns {\tt true} if a name is present.
+

 
 \membersection{wxFileName::HasVolume}\label{wxfilenamehasvolume}
 
 \constfunc{bool}{HasVolume}{\void}
 
 
 \membersection{wxFileName::HasVolume}\label{wxfilenamehasvolume}
 
 \constfunc{bool}{HasVolume}{\void}
 

+Returns {\tt true} if a volume specifier is present.
+

 
 \membersection{wxFileName::InsertDir}\label{wxfilenameinsertdir}
 
 \func{void}{InsertDir}{\param{int }{before}, \param{const wxString\& }{dir}}
 
 
 \membersection{wxFileName::InsertDir}\label{wxfilenameinsertdir}
 
 \func{void}{InsertDir}{\param{int }{before}, \param{const wxString\& }{dir}}
 

+Inserts a directory component before the zero-based position in the directory
+list. Please see \helpref{AppendDir}{wxfilenameappenddir} for important notes.
+

 
 \membersection{wxFileName::IsAbsolute}\label{wxfilenameisabsolute}
 
 \func{bool}{IsAbsolute}{\param{wxPathFormat }{format = wxPATH\_NATIVE}}
 
 
 \membersection{wxFileName::IsAbsolute}\label{wxfilenameisabsolute}
 
 \func{bool}{IsAbsolute}{\param{wxPathFormat }{format = wxPATH\_NATIVE}}
 

-is this filename absolute?
+Returns {\tt true} if this filename is absolute.

 
 
 \membersection{wxFileName::IsCaseSensitive}\label{wxfilenameiscasesensitive}
 
 
 
 \membersection{wxFileName::IsCaseSensitive}\label{wxfilenameiscasesensitive}
 

-\func{bool}{IsCaseSensitive}{\param{wxPathFormat }{format = wxPATH\_NATIVE}}
+\func{static bool}{IsCaseSensitive}{\param{wxPathFormat }{format = wxPATH\_NATIVE}}

 
 

-Tests
-are the file names of this type cases sensitive?
+Returns {\tt true} if the file names of this type are case-sensitive.

 
 
 \membersection{wxFileName::IsOk}\label{wxfilenameisok}
 
 \constfunc{bool}{IsOk}{\void}
 
 
 
 \membersection{wxFileName::IsOk}\label{wxfilenameisok}
 
 \constfunc{bool}{IsOk}{\void}
 

-Returns {\tt TRUE} if the filename is valid, {\tt FALSE} if it is not
+Returns {\tt true} if the filename is valid, {\tt false} if it is not

 initialized yet. The assignment functions and
 \helpref{Clear}{wxfilenameclear} may reset the object to the uninitialized,
 invalid state (the former only do it on failure).
 
 initialized yet. The assignment functions and
 \helpref{Clear}{wxfilenameclear} may reset the object to the uninitialized,
 invalid state (the former only do it on failure).
 

+

 \membersection{wxFileName::IsPathSeparator}\label{wxfilenameispathseparator}
 
 \membersection{wxFileName::IsPathSeparator}\label{wxfilenameispathseparator}
 

-\func{bool}{IsPathSeparator}{\param{wxChar }{ch}, \param{wxPathFormat }{format = wxPATH\_NATIVE}}
+\func{static bool}{IsPathSeparator}{\param{wxChar }{ch}, \param{wxPathFormat }{format = wxPATH\_NATIVE}}
+
+Returns {\tt true} if the char is a path separator for this format.

 
 

-Returns {\tt TRUE} if the char is a path separator for this format.

 
 \membersection{wxFileName::IsRelative}\label{wxfilenameisrelative}
 
 \func{bool}{IsRelative}{\param{wxPathFormat }{format = wxPATH\_NATIVE}}
 
 
 \membersection{wxFileName::IsRelative}\label{wxfilenameisrelative}
 
 \func{bool}{IsRelative}{\param{wxPathFormat }{format = wxPATH\_NATIVE}}
 

-Returns {\tt TRUE} if this filename is not absolute.
+Returns {\tt true} if this filename is not absolute.
+

 
 \membersection{wxFileName::IsDir}\label{wxfilenameisdir}
 
 \constfunc{bool}{IsDir}{\void}
 
 
 \membersection{wxFileName::IsDir}\label{wxfilenameisdir}
 
 \constfunc{bool}{IsDir}{\void}
 

-Returns {\tt TRUE} if this object represents a directory, {\tt FALSE} otherwise
+Returns {\tt true} if this object represents a directory, {\tt false} otherwise

 (i.e. if it is a file). Note that this method doesn't test whether the
 directory or file really exists, you should use 
 \helpref{DirExists}{wxfilenamedirexists} or 
 \helpref{FileExists}{wxfilenamefileexists} for this.
 
 (i.e. if it is a file). Note that this method doesn't test whether the
 directory or file really exists, you should use 
 \helpref{DirExists}{wxfilenamedirexists} or 
 \helpref{FileExists}{wxfilenamefileexists} for this.
 

+
+\membersection{wxFileName::MakeAbsolute}\label{wxfilenamemakeabsolute}
+
+\func{bool}{MakeAbsolute}{\param{const wxString\& }{cwd = wxEmptyString}, \param{wxPathFormat }{format = wxPATH\_NATIVE}}
+
+Make the file name absolute. This is a shortcut for
+{\tt \helpref{Normalize}{wxfilenamenormalize}(wxPATH\_NORM\_DOTS | wxPATH\_NORM\_ABSOLUTE | wxPATH\_NORM\_TILDE, cwd, format)}.
+
+\wxheading{See also}
+
+\helpref{MakeRelativeTo}{wxfilenamemakerelativeto},
+\helpref{Normalize}{wxfilenamenormalize},
+\helpref{IsAbsolute}{wxfilenameisabsolute}
+
+

 \membersection{wxFileName::MakeRelativeTo}\label{wxfilenamemakerelativeto}
 
 \membersection{wxFileName::MakeRelativeTo}\label{wxfilenamemakerelativeto}
 

-\func{bool}{MakeRelativeTo}{\param{const wxString\& }{pathBase = ""}, \param{wxPathFormat }{format = wxPATH\_NATIVE}}
+\func{bool}{MakeRelativeTo}{\param{const wxString\& }{pathBase = wxEmptyString}, \param{wxPathFormat }{format = wxPATH\_NATIVE}}

 
 This function tries to put this file name in a form relative to {\it pathBase}.
 In other words, it returns the file name which should be used to access this
 
 This function tries to put this file name in a form relative to {\it pathBase}.
 In other words, it returns the file name which should be used to access this


@@ -543,7 +606,7 @@ default}
 
 \wxheading{Return value}
 
 
 \wxheading{Return value}
 

-{\tt TRUE} if the file name has been changed, {\tt FALSE} if we failed to do
+{\tt true} if the file name has been changed, {\tt false} if we failed to do

 anything with it (currently this only happens if the file name is on a volume
 different from the volume specified by {\it pathBase}).
 
 anything with it (currently this only happens if the file name is on a volume
 different from the volume specified by {\it pathBase}).
 


@@ -551,6 +614,7 @@ different from the volume specified by {\it pathBase}).
 
 \helpref{Normalize}{wxfilenamenormalize}
 
 
 \helpref{Normalize}{wxfilenamenormalize}
 

+

 \membersection{wxFileName::Mkdir}\label{wxfilenamemkdir}
 
 \func{bool}{Mkdir}{\param{int }{perm = 0777}, \param{int }{flags = $0$}}
 \membersection{wxFileName::Mkdir}\label{wxfilenamemkdir}
 
 \func{bool}{Mkdir}{\param{int }{perm = 0777}, \param{int }{flags = $0$}}


@@ -567,29 +631,53 @@ if the target directory already exists.}
 
 \wxheading{Return value}
 
 
 \wxheading{Return value}
 

-Returns {\tt TRUE} if the directory was successfully created, {\tt FALSE}
+Returns {\tt true} if the directory was successfully created, {\tt false}

 otherwise.
 
 otherwise.
 

+

 \membersection{wxFileName::Normalize}\label{wxfilenamenormalize}
 
 \func{bool}{Normalize}{\param{int }{flags = wxPATH\_NORM\_ALL}, \param{const wxString\& }{cwd = wxEmptyString}, \param{wxPathFormat }{format = wxPATH\_NATIVE}}
 
 \membersection{wxFileName::Normalize}\label{wxfilenamenormalize}
 
 \func{bool}{Normalize}{\param{int }{flags = wxPATH\_NORM\_ALL}, \param{const wxString\& }{cwd = wxEmptyString}, \param{wxPathFormat }{format = wxPATH\_NATIVE}}
 

-operations on the path
-normalize the path: with the default flags value, the path will be
+Normalize the path. With the default flags value, the path will be

 made absolute, without any ".." and "." and all environment
 made absolute, without any ".." and "." and all environment

-variables will be expanded in it
-this may be done using another (than current) value of cwd
+variables will be expanded in it.
+
+\docparam{flags}{The kind of normalization to do with the file name. It can be
+any or-combination of the following constants:
+\begin{twocollist}
+\twocolitem{{\bf wxPATH\_NORM\_ENV\_VARS}}{replace env vars with their values}
+\twocolitem{{\bf wxPATH\_NORM\_DOTS}}{squeeze all .. and . and prepend cwd}
+\twocolitem{{\bf wxPATH\_NORM\_TILDE}}{Unix only: replace ~ and ~user}
+\twocolitem{{\bf wxPATH\_NORM\_CASE}}{if filesystem is case insensitive, transform to tolower case}
+\twocolitem{{\bf wxPATH\_NORM\_ABSOLUTE}}{make the path absolute}
+\twocolitem{{\bf wxPATH\_NORM\_LONG}}{make the path the long form}
+\twocolitem{{\bf wxPATH\_NORM\_SHORTCUT}}{resolve if it is a shortcut (Windows only)}
+\twocolitem{{\bf wxPATH\_NORM\_ALL}}{all of previous flags except \texttt{wxPATH\_NORM\_CASE}}
+\end{twocollist}
+}
+
+\docparam{cwd}{If not empty, this directory will be used instead of current
+working directory in normalization.}
+
+\docparam{format}{The file name format, native by default.}

 
 
 \membersection{wxFileName::PrependDir}\label{wxfilenameprependdir}
 
 \func{void}{PrependDir}{\param{const wxString\& }{dir}}
 
 
 
 \membersection{wxFileName::PrependDir}\label{wxfilenameprependdir}
 
 \func{void}{PrependDir}{\param{const wxString\& }{dir}}
 

+Prepends a directory to the file path. Please see 
+\helpref{AppendDir}{wxfilenameappenddir} for important notes.
+
+

 
 \membersection{wxFileName::RemoveDir}\label{wxfilenameremovedir}
 
 \func{void}{RemoveDir}{\param{int }{pos}}
 
 
 \membersection{wxFileName::RemoveDir}\label{wxfilenameremovedir}
 
 \func{void}{RemoveDir}{\param{int }{pos}}
 

+Removes a directory name.
+

 
 \membersection{wxFileName::Rmdir}\label{wxfilenamermdir}
 
 
 \membersection{wxFileName::Rmdir}\label{wxfilenamermdir}
 


@@ -597,14 +685,14 @@ this may be done using another (than current) value of cwd
 
 \func{static bool}{Rmdir}{\param{const wxString\& }{dir}}
 
 
 \func{static bool}{Rmdir}{\param{const wxString\& }{dir}}
 

-Deletes the specified directory.
+Deletes the specified directory from the file system.

 
 
 \membersection{wxFileName::SameAs}\label{wxfilenamesameas}
 
 
 
 \membersection{wxFileName::SameAs}\label{wxfilenamesameas}
 

-\func{bool}{SameAs}{\param{const wxFileName\& }{filepath}, \param{wxPathFormat }{format = wxPATH\_NATIVE}}
+\constfunc{bool}{SameAs}{\param{const wxFileName\& }{filepath}, \param{wxPathFormat }{format = wxPATH\_NATIVE}}

 
 

-Compares the filename using the rules of this platform
+Compares the filename using the rules of this platform.

 
 
 \membersection{wxFileName::SetCwd}\label{wxfilenamesetcwd}
 
 
 \membersection{wxFileName::SetCwd}\label{wxfilenamesetcwd}


@@ -613,52 +701,68 @@ Compares the filename using the rules of this platform
 
 \func{static bool}{SetCwd}{\param{const wxString\& }{cwd}}
 
 
 \func{static bool}{SetCwd}{\param{const wxString\& }{cwd}}
 

-change the current working directory
+Changes the current working directory.
+

 
 \membersection{wxFileName::SetExt}\label{wxfilenamesetext}
 
 \func{void}{SetExt}{\param{const wxString\& }{ext}}
 
 
 \membersection{wxFileName::SetExt}\label{wxfilenamesetext}
 
 \func{void}{SetExt}{\param{const wxString\& }{ext}}
 

+Sets the extension of this file name.
+

 
 \membersection{wxFileName::SetFullName}\label{wxfilenamesetfullname}
 
 \func{void}{SetFullName}{\param{const wxString\& }{fullname}}
 
 
 \membersection{wxFileName::SetFullName}\label{wxfilenamesetfullname}
 
 \func{void}{SetFullName}{\param{const wxString\& }{fullname}}
 

-full name is the file name + extension (but without the path)
+The full name is the file name and extension (but without the path).

 
 
 \membersection{wxFileName::SetName}\label{wxfilenamesetname}
 
 \func{void}{SetName}{\param{const wxString\& }{name}}
 
 
 
 \membersection{wxFileName::SetName}\label{wxfilenamesetname}
 
 \func{void}{SetName}{\param{const wxString\& }{name}}
 

+Sets the name.
+

 
 \membersection{wxFileName::SetTimes}\label{wxfilenamesettimes}
 
 \func{bool}{SetTimes}{\param{const wxDateTime* }{dtAccess}, \param{const wxDateTime* }{dtMod}, \param{const wxDateTime* }{dtCreate}}
 
 
 \membersection{wxFileName::SetTimes}\label{wxfilenamesettimes}
 
 \func{bool}{SetTimes}{\param{const wxDateTime* }{dtAccess}, \param{const wxDateTime* }{dtMod}, \param{const wxDateTime* }{dtCreate}}
 

-set the file creation and last access/mod times
-(any of the pointers may be NULL)
+Sets the file creation and last access/modification times (any of the pointers may be NULL).

 
 
 \membersection{wxFileName::SetVolume}\label{wxfilenamesetvolume}
 
 \func{void}{SetVolume}{\param{const wxString\& }{volume}}
 
 
 
 \membersection{wxFileName::SetVolume}\label{wxfilenamesetvolume}
 
 \func{void}{SetVolume}{\param{const wxString\& }{volume}}
 

+Sets the volume specifier.
+

 
 \membersection{wxFileName::SplitPath}\label{wxfilenamesplitpath}
 
 
 \membersection{wxFileName::SplitPath}\label{wxfilenamesplitpath}
 

-\func{void}{SplitPath}{\param{const wxString\& }{fullpath}, \param{wxString* }{volume}, \param{wxString* }{path}, \param{wxString* }{name}, \param{wxString* }{ext}, \param{wxPathFormat }{format = wxPATH\_NATIVE}}
+\func{static void}{SplitPath}{\param{const wxString\& }{fullpath}, \param{wxString* }{volume}, \param{wxString* }{path}, \param{wxString* }{name}, \param{wxString* }{ext}, \param{wxPathFormat }{format = wxPATH\_NATIVE}}

 
 

-\func{void}{SplitPath}{\param{const wxString\& }{fullpath}, \param{wxString* }{path}, \param{wxString* }{name}, \param{wxString* }{ext}, \param{wxPathFormat }{format = wxPATH\_NATIVE}}
+\func{static void}{SplitPath}{\param{const wxString\& }{fullpath}, \param{wxString* }{path}, \param{wxString* }{name}, \param{wxString* }{ext}, \param{wxPathFormat }{format = wxPATH\_NATIVE}}
+
+This function splits a full file name into components: the volume (with the
+first version) path (including the volume in the second version), the base name
+and the extension. Any of the output parameters ({\it volume}, {\it path}, 
+{\it name} or {\it ext}) may be {\tt NULL} if you are not interested in the
+value of a particular component. Also, {\it fullpath} may be empty on entry.
+
+On return, {\it path} contains the file path (without the trailing separator), 
+{\it name} contains the file name and {\it ext} contains the file extension
+without leading dot. All three of them may be empty if the corresponding
+component is. The old contents of the strings pointed to by these parameters
+will be overwritten in any case (if the pointers are not {\tt NULL}).

 
 

-split a fullpath into the volume, path, (base) name and extension
-(all of the pointers can be NULL)

 
 \membersection{wxFileName::Touch}\label{wxfilenametouch}
 
 \func{bool}{Touch}{\void}
 
 
 \membersection{wxFileName::Touch}\label{wxfilenametouch}
 
 \func{bool}{Touch}{\void}
 

-set the access and modification times to the current moment
+Sets the access and modification times to the current moment.

 
 
 \membersection{wxFileName::operator=}\label{wxfilenameoperatorassign}
 
 
 \membersection{wxFileName::operator=}\label{wxfilenameoperatorassign}


@@ -669,11 +773,23 @@ set the access and modification times to the current moment
 
 Assigns the new value to this filename object.
 
 
 Assigns the new value to this filename object.
 

+

 \membersection{wxFileName::operator==}\label{wxfilenameoperatorequal}
 
 \membersection{wxFileName::operator==}\label{wxfilenameoperatorequal}
 

-\func{bool operator}{operator==}{\param{const wxFileName\& }{filename}}
+\constfunc{bool operator}{operator==}{\param{const wxFileName\& }{filename}}
+
+\constfunc{bool operator}{operator==}{\param{const wxString\& }{filename}}
+
+Returns {\tt true} if the filenames are equal. The string {\it filenames} is
+interpreted as a path in the native filename format.
+
+
+\membersection{wxFileName::operator!=}\label{wxfilenameoperatornotequal}
+
+\constfunc{bool operator}{operator!=}{\param{const wxFileName\& }{filename}}

 
 

-\func{bool operator}{operator==}{\param{const wxString\& }{filename}}
+\constfunc{bool operator}{operator!=}{\param{const wxString\& }{filename}}

 
 

-Returns {\tt TRUE} if the filenames are equal for the native file format.
+Returns {\tt true} if the filenames are different. The string {\it filenames}
+is interpreted as a path in the native filename format.