Warning fixes.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30697 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/ftp.cpp b/src/common/ftp.cpp
index 0a470ca93f1ba41d2f087c4a0362500e76c0b11a..013495c741c9f9a0451eea8ddc19f6654fea70b7 100644 (file)
--- a/src/common/ftp.cpp
+++ b/src/common/ftp.cpp
@@ -348,7 +348,7 @@ char wxFTP::GetResult()
     }
 
     // if we got here we must have a non empty code string
     }
 
     // if we got here we must have a non empty code string

-    return code[0u];
+    return (char)code[0u];

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -824,7 +824,7 @@ bool wxFTP::GetList(wxArrayString& files,
     //        - Windows : like "dir" command
     //        - others  : ?
     wxString line(details ? _T("LIST") : _T("NLST"));
     //        - Windows : like "dir" command
     //        - others  : ?
     wxString line(details ? _T("LIST") : _T("NLST"));

-    if ( !wildcard.IsEmpty() )
+    if ( !wildcard.empty() )

     {
         line << _T(' ') << wildcard;
     }
     {
         line << _T(' ') << wildcard;
     }

diff --git a/src/common/wfstream.cpp b/src/common/wfstream.cpp
index 59d89d127ec6e766d306d426e2fde6806665b0a1..d89d5bfb6420b796bf9a271d5239bd9f1d21e1a2 100644 (file)
--- a/src/common/wfstream.cpp
+++ b/src/common/wfstream.cpp
@@ -253,7 +253,8 @@ wxFileOffset wxFFileInputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode)
 #ifdef __VMS
 #pragma message disable intsignchange
 #endif
 #ifdef __VMS
 #pragma message disable intsignchange
 #endif

-   return ( m_file->Seek(pos, mode) ? (wxFileOffset)m_file->Tell() : wxInvalidOffset );
+    wxASSERT_MSG( pos >= 0 && pos <= LONG_MAX, _T("no huge wxFFile support") );
+    return ( m_file->Seek((long)pos, mode) ? (wxFileOffset)m_file->Tell() : wxInvalidOffset );

 #ifdef __VMS
 #pragma message enable intsignchange
 #endif
 #ifdef __VMS
 #pragma message enable intsignchange
 #endif


@@ -333,7 +334,8 @@ wxFileOffset wxFFileOutputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode)
 #ifdef __VMS
 #pragma message disable intsignchange
 #endif
 #ifdef __VMS
 #pragma message disable intsignchange
 #endif

-    return ( m_file->Seek(pos, mode) ? (wxFileOffset)m_file->Tell() : wxInvalidOffset );
+    wxASSERT_MSG( pos >= 0 && pos <= LONG_MAX, _T("no huge wxFFile support") );
+    return ( m_file->Seek((long)pos, mode) ? (wxFileOffset)m_file->Tell() : wxInvalidOffset );

 #ifdef __VMS
 #pragma message enable intsignchange
 #endif
 #ifdef __VMS
 #pragma message enable intsignchange
 #endif