Use wxUSE_* flags for new animation code.

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

diff --git a/include/wx/anidecod.h b/include/wx/anidecod.h
index 4fe25b6da85c89231fc300574c88db0fc2f93bd0..4375a24f70bacbcb3ba56867bff30708d6fe7bac 100644 (file)
--- a/include/wx/anidecod.h
+++ b/include/wx/anidecod.h
@@ -12,7 +12,7 @@
 
 #include "wx/defs.h"
 
 
 #include "wx/defs.h"
 

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

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


@@ -72,6 +72,6 @@ private:
 };
 
 
 };
 
 

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

 
 

+#endif  // _WX_ANIDECOD_H

diff --git a/src/common/anidecod.cpp b/src/common/anidecod.cpp
index e3b5ba4718755c0981ca4837323485dd1df082dc..7f90c8fdeb2d6d1a8607bea8751d9ff8afb8ea19 100644 (file)
--- a/src/common/anidecod.cpp
+++ b/src/common/anidecod.cpp
@@ -14,7 +14,7 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

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

 
 #include "wx/anidecod.h"
 
 
 #include "wx/anidecod.h"
 


@@ -330,4 +330,4 @@ bool wxANIDecoder::Load( wxInputStream& stream )
     return m_szAnimation != wxDefaultSize;
 }
 
     return m_szAnimation != wxDefaultSize;
 }
 

-#endif // wxUSE_STREAMS && wxUSE_GIF
+#endif // wxUSE_STREAMS && wxUSE_ICO_CUR

diff --git a/src/generic/animateg.cpp b/src/generic/animateg.cpp
index 3495d4a15f008bd2e4f3a6e1bdd9b802d07eabc0..3a84197ddd8359935612f495a5e6a4a5ade527cd 100644 (file)
--- a/src/generic/animateg.cpp
+++ b/src/generic/animateg.cpp
@@ -209,8 +209,12 @@ const wxAnimationDecoder *wxAnimation::FindHandler( wxAnimationType animType )
 
 void wxAnimation::InitStandardHandlers()
 {
 
 void wxAnimation::InitStandardHandlers()
 {

+#if wxUSE_GIF

     AddHandler(new wxGIFDecoder);
     AddHandler(new wxGIFDecoder);

+#endif // wxUSE_GIF
+#if wxUSE_ICO_CUR

     AddHandler(new wxANIDecoder);
     AddHandler(new wxANIDecoder);

+#endif // wxUSE_ICO_CUR

 }
 
 void wxAnimation::CleanUpHandlers()
 }
 
 void wxAnimation::CleanUpHandlers()