disable wxGLCanvas for wxMGL and wxDFB which don't support it

[wxWidgets.git] / src / gtk / animate.cpp

diff --git a/src/gtk/animate.cpp b/src/gtk/animate.cpp
index a2e17e22aa537e458199520bad660382cec3a1be..05285756e62ed4d64dffbb6970b664edf436f208 100644 (file)
--- a/src/gtk/animate.cpp
+++ b/src/gtk/animate.cpp
@@ -211,9 +211,9 @@ bool wxAnimationCtrl::Create( wxWindow *parent, wxWindowID id,
     m_parent->DoAddChild( this );
 
     PostCreation(size);
-    SetBestSize(size);
+    SetInitialSize(size);
 
-    if (anim != wxNullAnimation)
+    if (anim.IsOk())
         SetAnimation(anim);
 
     // init the timer used for animation
@@ -320,7 +320,7 @@ void wxAnimationCtrl::Stop()
 
 void wxAnimationCtrl::SetInactiveBitmap(const wxBitmap &bmp)
 {
-    wxAnimationCtrlBase::SetInactiveBitmap(bmp);
+    m_bmpStatic = bmp;
 
     // update the pixbuf associated with m_widget now...
     if (!IsPlaying())
@@ -351,10 +351,17 @@ void wxAnimationCtrl::DisplayStaticImage()
     }
     else
     {
-        // even if not clearly documented, gdk_pixbuf_animation_get_static_image()
-        // always returns the first frame of the animation
-        gtk_image_set_from_pixbuf(GTK_IMAGE(m_widget),
-                                    gdk_pixbuf_animation_get_static_image(m_anim));
+        if (m_anim)
+        {
+            // even if not clearly documented, gdk_pixbuf_animation_get_static_image()
+            // always returns the first frame of the animation
+            gtk_image_set_from_pixbuf(GTK_IMAGE(m_widget),
+                                        gdk_pixbuf_animation_get_static_image(m_anim));
+        }
+        else
+        {
+            ClearToBackgroundColour();
+        }
     }
 }