X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8f0ff178513f59471bfce85cf6d7a78f4f4818ab..c1d8296a78d1f630952fc5395e4072c8a654b8ef:/src/common/zstream.cpp?ds=sidebyside diff --git a/src/common/zstream.cpp b/src/common/zstream.cpp index 7afa0548ff..bea30dce41 100644 --- a/src/common/zstream.cpp +++ b/src/common/zstream.cpp @@ -9,10 +9,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "zstream.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -56,7 +52,7 @@ wxZlibInputStream::wxZlibInputStream(wxInputStream& stream, int flags) m_pos = 0; #if WXWIN_COMPATIBILITY_2_4 - // treat compatibilty mode as auto + // treat compatibility mode as auto m_24compatibilty = flags == wxZLIB_24COMPATIBLE; if (m_24compatibilty) flags = wxZLIB_AUTO; @@ -162,7 +158,7 @@ size_t wxZlibInputStream::OnSysRead(void *buffer, size_t size) default: wxString msg(m_inflate->msg, *wxConvCurrent); if (!msg) - msg.Format(_("zlib error %d"), err); + msg = wxString::Format(_("zlib error %d"), err); wxLogError(_("Can't read from inflate stream: %s"), msg.c_str()); m_lasterror = wxSTREAM_READ_ERROR; } @@ -312,7 +308,7 @@ size_t wxZlibOutputStream::OnSysWrite(const void *buffer, size_t size) m_lasterror = wxSTREAM_WRITE_ERROR; wxString msg(m_deflate->msg, *wxConvCurrent); if (!msg) - msg.Format(_("zlib error %d"), err); + msg = wxString::Format(_("zlib error %d"), err); wxLogError(_("Can't write to deflate stream: %s"), msg.c_str()); }