Added wxOutputStream::PutC()

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

diff --git a/src/common/imaggif.cpp b/src/common/imaggif.cpp
index d2d5ef4bd9e42542a9808b9b8590ab45b9792593..76d8c725940702b99f9627b9aa0d19ca1d49bd63 100644 (file)
--- a/src/common/imaggif.cpp
+++ b/src/common/imaggif.cpp
@@ -13,7 +13,7 @@
 */
 
 // For compilers that support precompilation, includes "wx.h".
 */
 
 // For compilers that support precompilation, includes "wx.h".

-#include <wx/wxprec.h>
+#include "wx/wxprec.h"

 
 #ifdef __BORLANDC__
 #  pragma hdrstop
 
 #ifdef __BORLANDC__
 #  pragma hdrstop


@@ -29,6 +29,7 @@
 #include "wx/gifdecod.h"
 #include "wx/wfstream.h"
 #include "wx/log.h"
 #include "wx/gifdecod.h"
 #include "wx/wfstream.h"
 #include "wx/log.h"

+#include "wx/intl.h"

 
 #if !USE_SHARED_LIBRARIES
 IMPLEMENT_DYNAMIC_CLASS(wxGIFHandler,wxImageHandler)
 
 #if !USE_SHARED_LIBRARIES
 IMPLEMENT_DYNAMIC_CLASS(wxGIFHandler,wxImageHandler)


@@ -40,7 +41,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxGIFHandler,wxImageHandler)
 
 #if wxUSE_STREAMS
 
 
 #if wxUSE_STREAMS
 

-bool wxGIFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose )
+bool wxGIFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose, int WXUNUSED(index) )

 {
     wxGIFDecoder *decod;
     int error;
 {
     wxGIFDecoder *decod;
     int error;


@@ -48,15 +49,15 @@ bool wxGIFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose
 
     decod = new wxGIFDecoder(&stream, TRUE);
 
 
     decod = new wxGIFDecoder(&stream, TRUE);
 

-    if ((error = decod->ReadGIF()) != E_OK)
-    {   
+    if ((error = decod->ReadGIF()) != wxGIF_OK)
+    {

         if (verbose)
         {
             switch (error)
             {
         if (verbose)
         {
             switch (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 !!!"));
+                case wxGIF_INVFORMAT: wxLogError(_("wxGIFHandler: error in GIF image format")); break;
+                case wxGIF_MEMERR:    wxLogError(_("wxGIFHandler: couldn't allocate enough memory")); break;
+                default:              wxLogError(_("wxGIFHandler: unknown error !!!"));

             }
         }
         delete decod;
             }
         }
         delete decod;


@@ -79,7 +80,7 @@ bool wxGIFHandler::SaveFile( wxImage * WXUNUSED(image),
     return FALSE;
 }
 
     return FALSE;
 }
 

-bool wxGIFHandler::CanRead( wxInputStream& stream )
+bool wxGIFHandler::DoCanRead( wxInputStream& stream )

 {
     wxGIFDecoder *decod;
     bool ok;
 {
     wxGIFDecoder *decod;
     bool ok;