*** empty log message ***

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3599 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/gifdecod.h b/include/wx/gifdecod.h
index 35e073fdc898490f05a1c2ab2e302c18f5751acb..9c3d14fc9c06493316d31df55b9425b8b4fe0ed2 100644 (file)
--- a/include/wx/gifdecod.h
+++ b/include/wx/gifdecod.h
@@ -3,8 +3,8 @@
 // Purpose:     wxGIFDecoder, GIF reader for wxImage and wxAnimation
 // Author:      Guillermo Rodriguez Garcia <guille@iies.es>
 // Version:     3.02
 // Purpose:     wxGIFDecoder, GIF reader for wxImage and wxAnimation
 // Author:      Guillermo Rodriguez Garcia <guille@iies.es>
 // Version:     3.02

-// Last rev:    1999/08/18
-// Copyright:   (c) Guillermo Rodriguez Garcia
+// CVS-ID:      $Id$
+// Copyright:   (c) 1999 Guillermo Rodriguez Garcia

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -17,7 +17,8 @@
 
 #include "wx/setup.h"
 
 
 #include "wx/setup.h"
 

-#if wxUSE_STREAMS
+#if wxUSE_STREAMS && wxUSE_GIF
+

 #include "wx/stream.h"
 #include "wx/image.h"
 
 #include "wx/stream.h"
 #include "wx/image.h"
 


@@ -46,9 +47,8 @@ typedef struct _IMAGEN
 
 /* error codes */
 #define E_OK            0           /* everything was OK */
 
 /* 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
 
 
 class wxGIFDecoder


@@ -117,6 +117,6 @@ public:
 };
 
 
 };
 
 

-#endif  // wxUSE_STREAM
+#endif  // wxUSE_STREAM && wxUSE_GIF

 #endif  // _WX_GIFDECOD_H
 
 #endif  // _WX_GIFDECOD_H
 

diff --git a/include/wx/image.h b/include/wx/image.h
index 4f2ae49885db9d6465d73b6c1d7192d1a7601ffa..9c503f0a5584c02740ec44996a8e39c83d27e6f8 100644 (file)
--- a/include/wx/image.h
+++ b/include/wx/image.h
@@ -174,7 +174,8 @@ private:
 // wxGIFHandler
 //-----------------------------------------------------------------------------
 
 // wxGIFHandler
 //-----------------------------------------------------------------------------
 

-#if wxUSE_LIBGIF
+#if wxUSE_GIF
+

 class WXDLLEXPORT wxGIFHandler : public wxImageHandler
 {
   DECLARE_DYNAMIC_CLASS(wxGIFHandler)
 class WXDLLEXPORT wxGIFHandler : public wxImageHandler
 {
   DECLARE_DYNAMIC_CLASS(wxGIFHandler)