X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/14f355c2b5c71fc7c3d680aea366582d2ac60f7b..dd1c16314e09a49b6afdc15fadf001acc75856bd:/src/common/imaggif.cpp

diff --git a/src/common/imaggif.cpp b/src/common/imaggif.cpp
index 3a64963f92..69a0fbb094 100644
--- 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
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#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)
 
@@ -43,10 +38,10 @@ bool wxGIFHandler::LoadFile(wxImage *image, wxInputStream& stream,
 {
     wxGIFDecoder *decod;
     int error;
-    bool ok = TRUE;
+    bool ok = true;
 
 //    image->Destroy();
-    decod = new wxGIFDecoder(&stream, TRUE);
+    decod = new wxGIFDecoder(&stream, true);
     error = decod->ReadGIF();
 
     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)
@@ -83,7 +78,7 @@ bool wxGIFHandler::LoadFile(wxImage *image, wxInputStream& stream,
         // 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)
+        // (It fails if IsAnimation() returns false)
         // All valid reasons to NOT call GoFrame when index equals 0.
         if (index != 0)
         {
@@ -111,7 +106,7 @@ 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 )