diff --git a/interface/wx/ffile.h b/interface/wx/ffile.h index 869aed9a22..43d94f1ed1 100644 --- a/interface/wx/ffile.h +++ b/interface/wx/ffile.h @@ -7,31 +7,6 @@ ///////////////////////////////////////////////////////////////////////////// - -/** - Values used for both wxFile and wxFFile. - - @todo make the value names uppercase -*/ -enum wxSeekMode -{ - wxFromStart, - wxFromCurrent, - wxFromEnd -}; - -/** - See wxFFile::GetKind(). -*/ -enum wxFileKind -{ - wxFILE_KIND_UNKNOWN, - wxFILE_KIND_DISK, /**< A file supporting seeking to arbitrary offsets. */ - wxFILE_KIND_TERMINAL, /**< A terminal. */ - wxFILE_KIND_PIPE /**< A pipe. */ -}; - - /** @class wxFFile diff --git a/interface/wx/filefn.h b/interface/wx/filefn.h index 18fd7def0d..f2c9551b4f 100644 --- a/interface/wx/filefn.h +++ b/interface/wx/filefn.h @@ -479,9 +479,25 @@ wxString wxFindNextFile(); */ wxString wxFindFirstFile(const wxString& spec, int flags = 0); +/** + Parameter indicating how file offset should be interpreted. + + This is used by wxFFile::Seek() and wxFile::Seek(). + + @header{wx/filefn.h} +*/ +enum wxSeekMode +{ + wxFromStart, ///< Seek from the file beginning. + wxFromCurrent, ///< Seek from the current position. + wxFromEnd ///< Seek from end of the file. +}; + /** File kind enumerations returned from wxGetFileKind(). + Also used by wxFFile::GetKind() and wxFile::GetKind(). + @header{wx/filefn.h} */ enum wxFileKind