diff --git a/include/wx/textfile.h b/include/wx/textfile.h index 50be56b827..64fefebc96 100644 --- a/include/wx/textfile.h +++ b/include/wx/textfile.h @@ -36,7 +36,7 @@ protected: // implement the base class pure virtuals virtual bool OnExists() const wxOVERRIDE; virtual bool OnOpen(const wxString &strBufferName, - wxTextBufferOpenMode OpenMode) wxOVERRIDE; + wxTextBufferOpenMode openMode) wxOVERRIDE; virtual bool OnClose() wxOVERRIDE; virtual bool OnRead(const wxMBConv& conv) wxOVERRIDE; virtual bool OnWrite(wxTextFileType typeNew, const wxMBConv& conv) wxOVERRIDE; diff --git a/src/common/textfile.cpp b/src/common/textfile.cpp index ee90f138d4..f1c16b16f8 100644 --- a/src/common/textfile.cpp +++ b/src/common/textfile.cpp @@ -56,26 +56,26 @@ bool wxTextFile::OnExists() const } -bool wxTextFile::OnOpen(const wxString &strBufferName, wxTextBufferOpenMode OpenMode) +bool wxTextFile::OnOpen(const wxString &strBufferName, wxTextBufferOpenMode openMode) { - wxFile::OpenMode FileOpenMode; + wxFile::OpenMode fileOpenMode; - switch ( OpenMode ) + switch ( openMode ) { default: wxFAIL_MSG( wxT("unknown open mode in wxTextFile::Open") ); wxFALLTHROUGH; case ReadAccess : - FileOpenMode = wxFile::read; + fileOpenMode = wxFile::read; break; case WriteAccess : - FileOpenMode = wxFile::write; + fileOpenMode = wxFile::write; break; } - return m_file.Open(strBufferName, FileOpenMode); + return m_file.Open(strBufferName, fileOpenMode); }