!__WX_DC_BLIT_FIXED__ case

[wxWidgets.git] / src / generic / animateg.cpp

diff --git a/src/generic/animateg.cpp b/src/generic/animateg.cpp
index 124f394071f3be406db10096cb2e97931887d275..062855d92687b61085f458e093faaeef9cff053d 100644 (file)
--- a/src/generic/animateg.cpp
+++ b/src/generic/animateg.cpp
@@ -32,7 +32,7 @@
 #include "wx/anidecod.h"
 
 #include "wx/listimpl.cpp"
-WX_DEFINE_LIST(wxAnimationDecoderList);
+WX_DEFINE_LIST(wxAnimationDecoderList)
 
 wxAnimationDecoderList wxAnimation::sm_handlers;
 
@@ -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()
@@ -494,10 +498,11 @@ void wxAnimationCtrl::DrawCurrentFrame(wxDC& dc)
 }
 
 void wxAnimationCtrl::DisposeToBackground(wxDC& dc)
-{
-    wxBrush brush(IsUsingWindowBackgroundColour()
+{ 
+    wxColour col = IsUsingWindowBackgroundColour()
                     ? GetBackgroundColour()
-                    : m_animation.GetBackgroundColour());
+                    : m_animation.GetBackgroundColour() ;
+    wxBrush brush(col);
     dc.SetBackground(brush);
     dc.Clear();
 }