X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ce7efe2d0f056042d86cc581a7ee3af694b1fd6b..5fa150e233fa449ee270ac26ecf074f5c40acb1e:/src/common/anidecod.cpp diff --git a/src/common/anidecod.cpp b/src/common/anidecod.cpp index 76d2f9c0ba..7f90c8fdeb 100644 --- a/src/common/anidecod.cpp +++ b/src/common/anidecod.cpp @@ -14,7 +14,9 @@ #pragma hdrstop #endif -#if wxUSE_STREAMS && wxUSE_GIF +#if wxUSE_STREAMS && wxUSE_ICO_CUR + +#include "wx/anidecod.h" #ifndef WX_PRECOMP #include "wx/palette.h" @@ -22,13 +24,10 @@ #include #include -#include "wx/anidecod.h" // static wxCURHandler wxANIDecoder::sm_handler; - - //--------------------------------------------------------------------------- // wxANIFrameInfo //--------------------------------------------------------------------------- @@ -43,13 +42,11 @@ public: int m_imageIndex; }; -#include // this is a magic incantation which must be done! -WX_DEFINE_OBJARRAY(wxImageArray); - -#include // this is a magic incantation which must be done! -WX_DEFINE_OBJARRAY(wxANIFrameInfoArray); - +#include "wx/arrimpl.cpp" // this is a magic incantation which must be done! +WX_DEFINE_OBJARRAY(wxImageArray) +#include "wx/arrimpl.cpp" // this is a magic incantation which must be done! +WX_DEFINE_OBJARRAY(wxANIFrameInfoArray) //--------------------------------------------------------------------------- @@ -330,7 +327,7 @@ bool wxANIDecoder::Load( wxInputStream& stream ) m_szAnimation.GetHeight() == 0) m_szAnimation = wxSize(m_images[0].GetWidth(), m_images[0].GetHeight()); - return m_szAnimation!=wxDefaultSize; + return m_szAnimation != wxDefaultSize; } -#endif // wxUSE_STREAMS && wxUSE_GIF +#endif // wxUSE_STREAMS && wxUSE_ICO_CUR