Don't use mnemonic for Cancel button under MSW.

[wxWidgets.git] / src / common / file.cpp

diff --git a/src/common/file.cpp b/src/common/file.cpp
index d4514c569303252294aa3f7f734e84a24dac3d73..1063e452936cb0572a86d8785f7745d5785f27ec 100644 (file)
--- a/src/common/file.cpp
+++ b/src/common/file.cpp
@@ -342,15 +342,15 @@ bool wxFile::Flush()
 // seek
 wxFileOffset wxFile::Seek(wxFileOffset ofs, wxSeekMode mode)
 {
 // seek
 wxFileOffset wxFile::Seek(wxFileOffset ofs, wxSeekMode mode)
 {

-    wxASSERT_MSG( IsOpened(), _T("can't seek on closed file") );
+    wxASSERT_MSG( IsOpened(), wxT("can't seek on closed file") );

     wxCHECK_MSG( ofs != wxInvalidOffset || mode != wxFromStart,
                  wxInvalidOffset,
     wxCHECK_MSG( ofs != wxInvalidOffset || mode != wxFromStart,
                  wxInvalidOffset,

-                 _T("invalid absolute file offset") );
+                 wxT("invalid absolute file offset") );

 
     int origin;
     switch ( mode ) {
         default:
 
     int origin;
     switch ( mode ) {
         default:

-            wxFAIL_MSG(_T("unknown seek origin"));
+            wxFAIL_MSG(wxT("unknown seek origin"));

 
         case wxFromStart:
             origin = SEEK_SET;
 
         case wxFromStart:
             origin = SEEK_SET;


@@ -450,14 +450,17 @@ bool wxFile::Eof() const
     iRc = wxEof(m_fd);
 #endif // Windows/Unix
 
     iRc = wxEof(m_fd);
 #endif // Windows/Unix
 

-    if ( iRc == 1)
-        {}
-    else if ( iRc == 0 )
+    if ( iRc == 0 )

         return false;
         return false;

-    else if ( iRc == wxInvalidOffset )
+
+    if ( iRc == wxInvalidOffset )
+    {

         wxLogSysError(_("can't determine if the end of file is reached on descriptor %d"), m_fd);
         wxLogSysError(_("can't determine if the end of file is reached on descriptor %d"), m_fd);

-    else
-        wxFAIL_MSG(_T("invalid eof() return value."));
+    }
+    else if ( iRc != 1 )
+    {
+        wxFAIL_MSG(wxT("invalid eof() return value."));
+    }

 
     return true;
 }
 
     return true;
 }