Use wxUSE_* flags for new animation code.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41866 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
967acfb5cd
commit
d18868bb9b
@ -12,7 +12,7 @@
|
||||
|
||||
#include "wx/defs.h"
|
||||
|
||||
#if wxUSE_STREAMS && wxUSE_GIF
|
||||
#if wxUSE_STREAMS && wxUSE_ICO_CUR
|
||||
|
||||
#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
|
||||
|
@ -14,7 +14,7 @@
|
||||
#pragma hdrstop
|
||||
#endif
|
||||
|
||||
#if wxUSE_STREAMS && wxUSE_GIF
|
||||
#if wxUSE_STREAMS && wxUSE_ICO_CUR
|
||||
|
||||
#include "wx/anidecod.h"
|
||||
|
||||
@ -330,4 +330,4 @@ bool wxANIDecoder::Load( wxInputStream& stream )
|
||||
return m_szAnimation != wxDefaultSize;
|
||||
}
|
||||
|
||||
#endif // wxUSE_STREAMS && wxUSE_GIF
|
||||
#endif // wxUSE_STREAMS && wxUSE_ICO_CUR
|
||||
|
@ -209,8 +209,12 @@ const wxAnimationDecoder *wxAnimation::FindHandler( wxAnimationType animType )
|
||||
|
||||
void wxAnimation::InitStandardHandlers()
|
||||
{
|
||||
#if wxUSE_GIF
|
||||
AddHandler(new wxGIFDecoder);
|
||||
#endif // wxUSE_GIF
|
||||
#if wxUSE_ICO_CUR
|
||||
AddHandler(new wxANIDecoder);
|
||||
#endif // wxUSE_ICO_CUR
|
||||
}
|
||||
|
||||
void wxAnimation::CleanUpHandlers()
|
||||
|
Loading…
Reference in New Issue
Block a user