somebody added #ifdefed #pragma to disable warnings about // in c source, instead...

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

diff --git a/src/common/imaggif.cpp b/src/common/imaggif.cpp
index c487e75fa688e7dd29f577d0eb8aebbeba22cd47..07a1067ca30469815187d96b1af7466042501b0a 100644 (file)
--- a/src/common/imaggif.cpp
+++ b/src/common/imaggif.cpp
@@ -7,10 +7,9 @@
 // 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".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"


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


@@ -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(_("GIF: Error in image format.")); break;
-                case E_MEMORIA: wxLogError(_("GIF: Couldn't allocate memory.")); break;
-                default:        wxLogError(_("GIF: 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;