Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename wxGetFileType to wxGetFileKind

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31974 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Michael Wetherell
2005-02-12 21:53:51 +00:00
parent 9e8e867ff9
commit 0912690b65
16 changed files with 91 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/ffile.h
View File

@@ -97,7 +97,7 @@ public:
// get the file name
const wxString& GetName() const { return m_name; }
// type such as disk or pipe
wxFileTypeEnum GetFileType() const { return wxGetFileType(m_fp); }
wxFileKind GetKind() const { return wxGetFileKind(m_fp); }
// dtor closes the file if opened
~wxFFile() { Close(); }

2
include/wx/file.h
View File

@@ -126,7 +126,7 @@ public:
// has an error occured?
bool Error() const { return m_error; }
// type such as disk or pipe
wxFileTypeEnum GetFileType() const { return wxGetFileType(m_fd); }
wxFileKind GetKind() const { return wxGetFileKind(m_fd); }
// dtor closes the file if opened
~wxFile() { Close(); }

14
include/wx/filefn.h
View File

@@ -122,12 +122,12 @@ enum wxSeekMode
wxFromEnd
};
enum wxFileTypeEnum
enum wxFileKind
{
wxFILE_TYPE_UNKNOWN,
wxFILE_TYPE_DISK, // a file supporting seeking to arbitrary offsets
wxFILE_TYPE_TERMINAL, // a tty
wxFILE_TYPE_PIPE // a pipe
wxFILE_KIND_UNKNOWN,
wxFILE_KIND_DISK, // a file supporting seeking to arbitrary offsets
wxFILE_KIND_TERMINAL, // a tty
wxFILE_KIND_PIPE // a pipe
};
// ----------------------------------------------------------------------------
@@ -464,8 +464,8 @@ WXDLLIMPEXP_BASE bool wxMkdir(const wxString& dir, int perm = 0777);
WXDLLIMPEXP_BASE bool wxRmdir(const wxString& dir, int flags = 0);
// Return the type of an open file
WXDLLIMPEXP_BASE wxFileTypeEnum wxGetFileType(int fd);
inline wxFileTypeEnum wxGetFileType(FILE *fp) { return wxGetFileType(fileno(fp)); }
WXDLLIMPEXP_BASE wxFileKind wxGetFileKind(int fd);
inline wxFileKind wxGetFileKind (FILE *fp) { return wxGetFileKind(fileno(fp)); }
// compatibility defines, don't use in new code
#define wxDirExists wxPathExists

8
include/wx/wfstream.h
View File

@@ -41,7 +41,7 @@ public:
wxFileOffset GetLength() const;
bool Ok() const { return m_file->IsOpened(); }
bool IsSeekable() const { return m_file->GetFileType() == wxFILE_TYPE_DISK; }
bool IsSeekable() const { return m_file->GetKind() == wxFILE_KIND_DISK; }
protected:
wxFileInputStream();
@@ -70,7 +70,7 @@ public:
wxFileOffset GetLength() const;
bool Ok() const { return m_file->IsOpened(); }
bool IsSeekable() const { return m_file->GetFileType() == wxFILE_TYPE_DISK; }
bool IsSeekable() const { return m_file->GetKind() == wxFILE_KIND_DISK; }
protected:
wxFileOutputStream();
@@ -111,7 +111,7 @@ public:
wxFileOffset GetLength() const;
bool Ok() const { return m_file->IsOpened(); }
bool IsSeekable() const { return m_file->GetFileType() == wxFILE_TYPE_DISK; }
bool IsSeekable() const { return m_file->GetKind() == wxFILE_KIND_DISK; }
protected:
wxFFileInputStream();
@@ -140,7 +140,7 @@ public:
wxFileOffset GetLength() const;
bool Ok() const { return m_file->IsOpened(); }
bool IsSeekable() const { return m_file->GetFileType() == wxFILE_TYPE_DISK; }
bool IsSeekable() const { return m_file->GetKind() == wxFILE_KIND_DISK; }
protected:
wxFFileOutputStream();