corrected off by 1 error in cMB2WC() call (thanks valgrind)

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

diff --git a/src/gtk/animate.cpp b/src/gtk/animate.cpp
index 7b3b798c00ae796e492ca4d4122cb1bb44d8e93b..8786f1fde980b47493a532f1aa04fbc3bc2f5353 100644 (file)
--- a/src/gtk/animate.cpp
+++ b/src/gtk/animate.cpp
@@ -59,6 +59,13 @@ wxAnimation::wxAnimation(const wxAnimation& that)
         g_object_ref(m_pixbuf);
 }
 
         g_object_ref(m_pixbuf);
 }
 

+wxAnimation::wxAnimation(GdkPixbufAnimation *p)
+{
+    m_pixbuf = p;
+    if ( m_pixbuf )
+        g_object_ref(m_pixbuf);
+}
+

 wxAnimation& wxAnimation::operator=(const wxAnimation& that)
 {
     if (this != &that)
 wxAnimation& wxAnimation::operator=(const wxAnimation& that)
 {
     if (this != &that)


@@ -75,8 +82,7 @@ wxAnimation& wxAnimation::operator=(const wxAnimation& that)
 bool wxAnimation::LoadFile(const wxString &name, wxAnimationType WXUNUSED(type))
 {
     UnRef();
 bool wxAnimation::LoadFile(const wxString &name, wxAnimationType WXUNUSED(type))
 {
     UnRef();

-    m_pixbuf = gdk_pixbuf_animation_new_from_file(
-        wxConvFileName->cWX2MB(name), NULL);
+    m_pixbuf = gdk_pixbuf_animation_new_from_file(name.fn_str(), NULL);

     return IsOk();
 }
 
     return IsOk();
 }
 


@@ -143,7 +149,7 @@ bool wxAnimation::Load(wxInputStream &stream, wxAnimationType type)
     return true;
 }
 
     return true;
 }
 

-wxImage wxAnimation::GetFrame(size_t i) const
+wxImage wxAnimation::GetFrame(unsigned int WXUNUSED(frame)) const

 {
     return wxNullImage;
 }
 {
     return wxNullImage;
 }


@@ -192,9 +198,6 @@ bool wxAnimationCtrl::Create( wxWindow *parent, wxWindowID id,
                               long style,
                               const wxString& name)
 {
                               long style,
                               const wxString& name)
 {

-    m_needParent = true;
-    m_acceptsFocus = true;
-

     if (!PreCreation( parent, pos, size ) ||
         !base_type::CreateBase(parent, id, pos, size, style & wxWINDOW_STYLE_MASK,
                                wxDefaultValidator, name))
     if (!PreCreation( parent, pos, size ) ||
         !base_type::CreateBase(parent, id, pos, size, style & wxWINDOW_STYLE_MASK,
                                wxDefaultValidator, name))


@@ -206,7 +209,7 @@ bool wxAnimationCtrl::Create( wxWindow *parent, wxWindowID id,
     SetWindowStyle(style);
 
     m_widget = gtk_image_new();
     SetWindowStyle(style);
 
     m_widget = gtk_image_new();

-    gtk_widget_show( GTK_WIDGET(m_widget) );
+    gtk_widget_show(m_widget);

 
     m_parent->DoAddChild( this );
 
 
     m_parent->DoAddChild( this );
 


@@ -271,7 +274,7 @@ void wxAnimationCtrl::FitToAnimation()
         h = gdk_pixbuf_animation_get_height(m_anim);
 
     // update our size to fit animation
         h = gdk_pixbuf_animation_get_height(m_anim);
 
     // update our size to fit animation

-        SetSize(w, h);
+    SetSize(w, h);

 }
 
 void wxAnimationCtrl::ResetAnim()
 }
 
 void wxAnimationCtrl::ResetAnim()


@@ -318,35 +321,29 @@ void wxAnimationCtrl::Stop()
     DisplayStaticImage();
 }
 
     DisplayStaticImage();
 }
 

-void wxAnimationCtrl::SetInactiveBitmap(const wxBitmap &bmp)
-{
-    wxAnimationCtrlBase::SetInactiveBitmap(bmp);
-
-    // update the pixbuf associated with m_widget now...
-    if (!IsPlaying())
-        DisplayStaticImage();
-}
-

 void wxAnimationCtrl::DisplayStaticImage()
 {
     wxASSERT(!IsPlaying());
 
 void wxAnimationCtrl::DisplayStaticImage()
 {
     wxASSERT(!IsPlaying());
 

-    if (m_bmpStatic.IsOk())
+    // m_bmpStaticReal will be updated only if necessary...
+    UpdateStaticImage();
+
+    if (m_bmpStaticReal.IsOk())

     {
         // show inactive bitmap
         GdkBitmap *mask = (GdkBitmap *) NULL;
     {
         // show inactive bitmap
         GdkBitmap *mask = (GdkBitmap *) NULL;

-        if (m_bmpStatic.GetMask())
-            mask = m_bmpStatic.GetMask()->GetBitmap();
+        if (m_bmpStaticReal.GetMask())
+            mask = m_bmpStaticReal.GetMask()->GetBitmap();

 
 

-        if (m_bmpStatic.HasPixbuf())
+        if (m_bmpStaticReal.HasPixbuf())

         {
             gtk_image_set_from_pixbuf(GTK_IMAGE(m_widget),
         {
             gtk_image_set_from_pixbuf(GTK_IMAGE(m_widget),

-                                        m_bmpStatic.GetPixbuf());
+                                      m_bmpStaticReal.GetPixbuf());

         }
         else
         {
             gtk_image_set_from_pixmap(GTK_IMAGE(m_widget),
         }
         else
         {
             gtk_image_set_from_pixmap(GTK_IMAGE(m_widget),

-                                        m_bmpStatic.GetPixmap(), mask);
+                                      m_bmpStaticReal.GetPixmap(), mask);

         }
     }
     else
         }
     }
     else


@@ -408,7 +405,13 @@ bool wxAnimationCtrl::SetBackgroundColour( const wxColour &colour )
     // Thus we clear the GtkImage contents to the background colour...
     if (!wxControl::SetBackgroundColour(colour))
         return false;
     // Thus we clear the GtkImage contents to the background colour...
     if (!wxControl::SetBackgroundColour(colour))
         return false;

-    ClearToBackgroundColour();
+
+    // if not playing the change must take place immediately but
+    // remember that the inactive bitmap has higher priority over the background
+    // colour; DisplayStaticImage() will handle that
+    if ( !IsPlaying() )
+        DisplayStaticImage();
+

     return true;
 }
 
     return true;
 }