wxMac uses wxStandardPathsCF to mean wxStandardPaths in its wxBase

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

diff --git a/src/common/imaggif.cpp b/src/common/imaggif.cpp
index b2a1cdf79330f3333bdd42159c07d4c3999e6692..9d20c1847a5d1ac9d1a67af801bbfc53400ffb32 100644 (file)
--- a/src/common/imaggif.cpp
+++ b/src/common/imaggif.cpp
@@ -7,7 +7,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "imaggif.h"
 #endif
 
 #pragma implementation "imaggif.h"
 #endif
 


@@ -43,10 +43,10 @@ bool wxGIFHandler::LoadFile(wxImage *image, wxInputStream& stream,
 {
     wxGIFDecoder *decod;
     int error;
 {
     wxGIFDecoder *decod;
     int error;

-    bool ok = TRUE;
+    bool ok = true;

 
 //    image->Destroy();
 
 //    image->Destroy();

-    decod = new wxGIFDecoder(&stream, TRUE);
+    decod = new wxGIFDecoder(&stream, true);

     error = decod->ReadGIF();
 
     if ((error != wxGIF_OK) && (error != wxGIF_TRUNCATED))
     error = decod->ReadGIF();
 
     if ((error != wxGIF_OK) && (error != wxGIF_TRUNCATED))


@@ -67,7 +67,7 @@ bool wxGIFHandler::LoadFile(wxImage *image, wxInputStream& stream,
             }
         }
         delete decod;
             }
         }
         delete decod;

-        return FALSE;
+        return false;

     }
 
     if ((error == wxGIF_TRUNCATED) && verbose)
     }
 
     if ((error == wxGIF_TRUNCATED) && verbose)


@@ -83,7 +83,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.
         // 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)
         {
         // All valid reasons to NOT call GoFrame when index equals 0.
         if (index != 0)
         {


@@ -111,19 +111,13 @@ bool wxGIFHandler::SaveFile( wxImage * WXUNUSED(image),
     if (verbose)
         wxLogDebug(wxT("GIF: the handler is read-only!!"));
 
     if (verbose)
         wxLogDebug(wxT("GIF: the handler is read-only!!"));
 

-    return FALSE;
+    return false;

 }
 
 bool wxGIFHandler::DoCanRead( wxInputStream& stream )
 {
 }
 
 bool wxGIFHandler::DoCanRead( wxInputStream& stream )
 {

-    wxGIFDecoder *decod;
-    bool ok;
-
-    decod = new wxGIFDecoder(&stream);
-    ok = decod->CanRead();
-    delete decod;
-
-    return ok;
+    wxGIFDecoder decod(&stream);
+    return decod.CanRead();

 }
 
 #endif  // wxUSE_STREAMS
 }
 
 #endif  // wxUSE_STREAMS