adding OnLaunched

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

diff --git a/src/common/file.cpp b/src/common/file.cpp
index f9badf53953e01b49bf63101b2c546f9515fe950..d6b4620e7dbb2bc319e336df30fad3fbb7c6017d 100644 (file)
--- a/src/common/file.cpp
+++ b/src/common/file.cpp
@@ -302,7 +302,7 @@ bool wxFile::ReadAll(wxString *str, const wxMBConv& conv)
     char* p = buf.data();
     for ( ;; )
     {
     char* p = buf.data();
     for ( ;; )
     {

-        static const unsigned READSIZE = 4096;
+        static const ssize_t READSIZE = 4096;

 
         ssize_t nread = Read(p, length > READSIZE ? READSIZE : length);
         if ( nread == wxInvalidOffset )
 
         ssize_t nread = Read(p, length > READSIZE ? READSIZE : length);
         if ( nread == wxInvalidOffset )


@@ -511,10 +511,6 @@ bool wxFile::Eof() const
     {
         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 if ( iRc != 1 )
-    {
-        wxFAIL_MSG(wxT("invalid eof() return value."));
-    }

 
     return true;
 }
 
     return true;
 }