Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use wxUSE_* flags for new animation code.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41866 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-10-10 08:16:34 +00:00
parent 967acfb5cd
commit d18868bb9b
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/anidecod.h
View File

@@ -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/stream.h"
#include "wx/image.h" #include "wx/image.h"
@@ -72,6 +72,6 @@ private:
}; };
#endif // wxUSE_STREAM && wxUSE_GIF #endif // wxUSE_STREAM && wxUSE_ICO_CUR
#endif // _WX_ANIDECOD_H
#endif // _WX_ANIDECOD_H

4
src/common/anidecod.cpp
View File

@@ -14,7 +14,7 @@
#pragma hdrstop #pragma hdrstop
#endif #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

4
src/generic/animateg.cpp
View File

@@ -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()