X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/aa6d970619f8dd5aa0d157953ad431acfde89963..6842d18650b487249b4ae29d0d7e17231b24cde8:/src/common/imaggif.cpp?ds=inline diff --git a/src/common/imaggif.cpp b/src/common/imaggif.cpp index 55348602d1..b15fff887e 100644 --- a/src/common/imaggif.cpp +++ b/src/common/imaggif.cpp @@ -13,7 +13,7 @@ */ // For compilers that support precompilation, includes "wx.h". -#include +#include "wx/wxprec.h" #ifdef __BORLANDC__ # pragma hdrstop @@ -23,7 +23,7 @@ # include "wx/defs.h" #endif -#if wxUSE_LIBGIF +#if wxUSE_GIF #include "wx/image.h" #include "wx/gifdecod.h" @@ -34,12 +34,12 @@ IMPLEMENT_DYNAMIC_CLASS(wxGIFHandler,wxImageHandler) #endif -#if wxUSE_STREAMS - //----------------------------------------------------------------------------- // wxGIFHandler //----------------------------------------------------------------------------- +#if wxUSE_STREAMS + bool wxGIFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose ) { wxGIFDecoder *decod; @@ -49,14 +49,14 @@ bool wxGIFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose decod = new wxGIFDecoder(&stream, TRUE); if ((error = decod->ReadGIF()) != E_OK) - { + { if (verbose) { switch (error) { - case E_FORMATO: wxLogError(_T("wxGIFHandler: error in image format")); break; - case E_MEMORIA: wxLogError(_T("wxGIFHandler: couldn't allocate memory")); break; - default: wxLogError(_T("wxGIFHandler: unknown error !!!")); + case E_FORMATO: wxLogError(wxT("wxGIFHandler: error in image format")); break; + case E_MEMORIA: wxLogError(wxT("wxGIFHandler: couldn't allocate memory")); break; + default: wxLogError(wxT("wxGIFHandler: unknown error !!!")); } } delete decod; @@ -74,12 +74,12 @@ bool wxGIFHandler::SaveFile( wxImage * WXUNUSED(image), wxOutputStream& WXUNUSED(stream), bool verbose ) { if (verbose) - wxLogDebug(_T("wxGIFHandler is read-only!!")); + wxLogDebug(wxT("wxGIFHandler is read-only!!")); return FALSE; } -bool wxGIFHandler::CanRead( wxInputStream& stream ) +bool wxGIFHandler::DoCanRead( wxInputStream& stream ) { wxGIFDecoder *decod; bool ok; @@ -91,8 +91,6 @@ bool wxGIFHandler::CanRead( wxInputStream& stream ) return ok; } -#endif - // wxUSE_STREAMS +#endif // wxUSE_STREAMS -#endif - // wxUSE_GIF +#endif // wxUSE_GIF