Do not use Tooltips if they are disabled

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

diff --git a/src/common/imaggif.cpp b/src/common/imaggif.cpp
index b2a1cdf79330f3333bdd42159c07d4c3999e6692..7b241bd6e19ac143aa056601b4d0b91803db9286 100644 (file)
--- a/src/common/imaggif.cpp
+++ b/src/common/imaggif.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        imaggif.cpp
+// Name:        src/common/imaggif.cpp
 // Purpose:     wxGIFHandler
 // Author:      Vaclav Slavik & Guillermo Rodriguez Garcia
 // RCS-ID:      $Id$
@@ -7,28 +7,23 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "imaggif.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#  pragma hdrstop
+    #pragma hdrstop
 #endif
 
+#if wxUSE_IMAGE && wxUSE_GIF
+
 #ifndef WX_PRECOMP
-#  include "wx/defs.h"
+    #include "wx/intl.h"
+    #include "wx/log.h"
 #endif
 
-#if wxUSE_IMAGE && wxUSE_GIF
-
 #include "wx/imaggif.h"
 #include "wx/gifdecod.h"
 #include "wx/wfstream.h"
-#include "wx/log.h"
-#include "wx/intl.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxGIFHandler,wxImageHandler)
 
@@ -42,12 +37,12 @@ bool wxGIFHandler::LoadFile(wxImage *image, wxInputStream& stream,
                             bool verbose, int index)
 {
     wxGIFDecoder *decod;
-    int error;
-    bool ok = TRUE;
+    wxGIFErrorCode error;
+    bool ok = true;
 
 //    image->Destroy();
-    decod = new wxGIFDecoder(&stream, TRUE);
-    error = decod->ReadGIF();
+    decod = new wxGIFDecoder();
+    error = decod->LoadGIF(stream);
 
     if ((error != wxGIF_OK) && (error != wxGIF_TRUNCATED))
     {
@@ -67,7 +62,7 @@ bool wxGIFHandler::LoadFile(wxImage *image, wxInputStream& stream,
             }
         }
         delete decod;
-        return FALSE;
+        return false;
     }
 
     if ((error == wxGIF_TRUNCATED) && verbose)
@@ -76,24 +71,9 @@ bool wxGIFHandler::LoadFile(wxImage *image, wxInputStream& stream,
         /* go on; image data is OK */
     }
 
-    if (index != -1)
-    {
-        // We're already on index = 0 by default. So no need
-        // to call GoFrame(0) then. On top of that GoFrame doesn't
-        // accept an index of 0. (Instead GoFirstFrame() should be used)
-        // Also if the gif image has only one frame, calling GoFrame(0)
-        // fails because GoFrame() only works with gif animations.
-        // (It fails if IsAnimation() returns FALSE)
-        // All valid reasons to NOT call GoFrame when index equals 0.
-        if (index != 0)
-        {
-            ok = decod->GoFrame(index);
-        }
-    }
-
     if (ok)
     {
-        ok = decod->ConvertToImage(image);
+        ok = decod->ConvertToImage(index != -1 ? (size_t)index : 0, image);
     }
     else
     {
@@ -111,19 +91,23 @@ bool wxGIFHandler::SaveFile( wxImage * WXUNUSED(image),
     if (verbose)
         wxLogDebug(wxT("GIF: the handler is read-only!!"));
 
-    return FALSE;
+    return false;
 }
 
 bool wxGIFHandler::DoCanRead( wxInputStream& stream )
 {
-    wxGIFDecoder *decod;
-    bool ok;
+    wxGIFDecoder decod;
+    return decod.CanRead(stream);
+}
 
-    decod = new wxGIFDecoder(&stream);
-    ok = decod->CanRead();
-    delete decod;
+int wxGIFHandler::GetImageCount( wxInputStream& stream )
+{
+    wxGIFDecoder decod;
+    wxGIFErrorCode error = decod.LoadGIF(stream);
+    if ( (error != wxGIF_OK) && (error != wxGIF_TRUNCATED) )
+        return -1;
 
-    return ok;
+    return decod.GetFrameCount();
 }
 
 #endif  // wxUSE_STREAMS