Fixed some compile errors (MSVC++ 6) and some very strange link errors when

[wxWidgets.git] / include / wx / gifdecod.h

diff --git a/include/wx/gifdecod.h b/include/wx/gifdecod.h
index 30fa11cfedbe7c4168ab2a29b96c8f0b10be0176..9c3d14fc9c06493316d31df55b9425b8b4fe0ed2 100644 (file)
--- a/include/wx/gifdecod.h
+++ b/include/wx/gifdecod.h
@@ -2,9 +2,9 @@
 // Name:        gifdecod.h
 // Purpose:     wxGIFDecoder, GIF reader for wxImage and wxAnimation
 // Author:      Guillermo Rodriguez Garcia <guille@iies.es>
-// Version:     3.0
-// Last rev:    1999/08/10
-// Copyright:   (c) Guillermo Rodriguez Garcia
+// Version:     3.02
+// CVS-ID:      $Id$
+// Copyright:   (c) 1999 Guillermo Rodriguez Garcia
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -17,7 +17,8 @@
 
 #include "wx/setup.h"
 
-#if wxUSE_STREAMS
+#if wxUSE_STREAMS && wxUSE_GIF
+
 #include "wx/stream.h"
 #include "wx/image.h"
 
@@ -29,7 +30,7 @@ typedef struct _IMAGEN
     unsigned int left;              /* x coord (in logical screen) */
     unsigned int top;               /* y coord (in logical screen) */
     int transparent;                /* transparent color (-1 = none) */
-    int disposal;                   /* disposal method */
+    int disposal;                   /* disposal method (-1 = unspecified) */
     long delay;                     /* delay in ms (-1 = unused) */
     unsigned char *p;               /* bitmap */
     unsigned char *pal;             /* palette */
@@ -46,9 +47,8 @@ typedef struct _IMAGEN
 
 /* error codes */
 #define E_OK            0           /* everything was OK */
-#define E_ARCHIVO       -1          /* error opening file */
-#define E_FORMATO       -2          /* error in gif header */
-#define E_MEMORIA       -3          /* error allocating memory */
+#define E_FORMATO       1           /* error in gif header */
+#define E_MEMORIA       2           /* error allocating memory */
 
 
 class wxGIFDecoder
@@ -82,6 +82,7 @@ public:
     // constructor, destructor, etc.
     wxGIFDecoder(wxInputStream *s, bool anim = FALSE);
     ~wxGIFDecoder();
+    bool CanRead();
     int ReadGIF();
     void Destroy();
 
@@ -116,6 +117,6 @@ public:
 };
 
 
-#endif  // wxUSE_STREAM
+#endif  // wxUSE_STREAM && wxUSE_GIF
 #endif  // _WX_GIFDECOD_H