controls can now be put in the toolbars (MSW only so far, preliminary version)

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

diff --git a/src/common/imaggif.cpp b/src/common/imaggif.cpp
index c15f3bfc58332c1bcf6c01ad30059703f3077039..b15fff887ec0a9dea92fc30f59dadbaa9a9b2c93 100644 (file)
--- a/src/common/imaggif.cpp
+++ b/src/common/imaggif.cpp
@@ -1,9 +1,9 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        imaggif.cpp
 // Purpose:     wxGIFHandler
-// Author:      Vaclav Slavik
-//              Based on wxGIFDecoder by Guillermo Rodriguez Garcia
+// Author:      Vaclav Slavik & Guillermo Rodriguez Garcia
 // RCS-ID:      $Id$
+// Copyright:   (c) 1999 Vaclav Slavik & Guillermo Rodriguez Garcia
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -13,7 +13,7 @@
 */
 
 // For compilers that support precompilation, includes "wx.h".
-#include <wx/wxprec.h>
+#include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #  pragma hdrstop
@@ -23,30 +23,42 @@
 #  include "wx/defs.h"
 #endif
 
+#if wxUSE_GIF
+
 #include "wx/image.h"
 #include "wx/gifdecod.h"
 #include "wx/wfstream.h"
-#include "wx/module.h"
 #include "wx/log.h"
 
+#if !USE_SHARED_LIBRARIES
 IMPLEMENT_DYNAMIC_CLASS(wxGIFHandler,wxImageHandler)
-
-#if wxUSE_STREAMS
+#endif
 
 //-----------------------------------------------------------------------------
 // wxGIFHandler
 //-----------------------------------------------------------------------------
 
-bool wxGIFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool WXUNUSED(verbose) )
+#if wxUSE_STREAMS
+
+bool wxGIFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose )
 {
     wxGIFDecoder *decod;
+    int error;
     bool ok;
 
     decod = new wxGIFDecoder(&stream, TRUE);
-    
-    if (decod->ReadGIF() != E_OK)
+
+    if ((error = decod->ReadGIF()) != E_OK)
     {
-        wxLogDebug(_T("Error reading GIF"));
+        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 !!!"));
+            }
+        }
         delete decod;
         return FALSE;
     }
@@ -61,11 +73,13 @@ bool wxGIFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool WXUNUSE
 bool wxGIFHandler::SaveFile( wxImage * WXUNUSED(image),
                              wxOutputStream& WXUNUSED(stream), bool verbose )
 {
-    if (verbose) wxLogDebug(_T("wxGIFHandler is read-only!!"));
+    if (verbose)
+        wxLogDebug(wxT("wxGIFHandler is read-only!!"));
+
     return FALSE;
 }
 
-bool wxGIFHandler::CanRead( wxInputStream& stream )
+bool wxGIFHandler::DoCanRead( wxInputStream& stream )
 {
     wxGIFDecoder *decod;
     bool ok;
@@ -77,4 +91,6 @@ bool wxGIFHandler::CanRead( wxInputStream& stream )
     return ok;
 }
 
-#endif
+#endif  // wxUSE_STREAMS
+
+#endif  // wxUSE_GIF