Win16 compilation fixes

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

diff --git a/src/common/imaggif.cpp b/src/common/imaggif.cpp
index e9a0fc880a39705c916a5996d1988774535df7e0..07a1067ca30469815187d96b1af7466042501b0a 100644 (file)
--- a/src/common/imaggif.cpp
+++ b/src/common/imaggif.cpp
@@ -7,13 +7,12 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-/*
-  We don't put pragma implement in this file because it is already present in
-  src/common/image.cpp
-*/
+#ifdef __GNUG__
+#pragma implementation "imaggif.h"
+#endif

 
 // 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


@@ -25,14 +24,13 @@
 
 #if wxUSE_GIF
 
 
 #if wxUSE_GIF
 

-#include "wx/image.h"
+#include "wx/imaggif.h"

 #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)
 IMPLEMENT_DYNAMIC_CLASS(wxGIFHandler,wxImageHandler)

-#endif

 
 //-----------------------------------------------------------------------------
 // wxGIFHandler
 
 //-----------------------------------------------------------------------------
 // wxGIFHandler


@@ -40,7 +38,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 +46,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(_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 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;


@@ -74,12 +72,12 @@ bool wxGIFHandler::SaveFile( wxImage * WXUNUSED(image),
                              wxOutputStream& WXUNUSED(stream), bool verbose )
 {
     if (verbose)
                              wxOutputStream& WXUNUSED(stream), bool verbose )
 {
     if (verbose)

-        wxLogDebug(_T("wxGIFHandler is read-only!!"));
+        wxLogDebug(wxT("wxGIFHandler is read-only!!"));

 
     return FALSE;
 }
 
 
     return FALSE;
 }
 

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

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