check that the version of __sync_sub_and_fetch that returns a value is supported...

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

diff --git a/src/gtk/animate.cpp b/src/gtk/animate.cpp
index ce570452ea06e2a71c4a33475e141619c05ab3e4..f9190b6c0567bdfc2c552af21b0e225e0ead4e10 100644 (file)
--- a/src/gtk/animate.cpp
+++ b/src/gtk/animate.cpp
@@ -30,10 +30,10 @@
 // ============================================================================
 
 void gdk_pixbuf_area_updated(GdkPixbufLoader *loader,
 // ============================================================================
 
 void gdk_pixbuf_area_updated(GdkPixbufLoader *loader,

-                             gint             x,
-                             gint             y,
-                             gint             width,
-                             gint             height,
+                             gint             WXUNUSED(x),
+                             gint             WXUNUSED(y),
+                             gint             WXUNUSED(width),
+                             gint             WXUNUSED(height),

                              wxAnimation      *anim)
 {
     if (anim && anim->GetPixbuf() == NULL)
                              wxAnimation      *anim)
 {
     if (anim && anim->GetPixbuf() == NULL)


@@ -82,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();
 }
 


@@ -150,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;
 }


@@ -199,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))


@@ -213,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 );
 


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

-void wxAnimationCtrl::SetInactiveBitmap(const wxBitmap &bmp)
-{
-    m_bmpStatic = 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


@@ -430,7 +420,7 @@ bool wxAnimationCtrl::SetBackgroundColour( const wxColour &colour )
 // wxAnimationCtrl - event handlers
 //-----------------------------------------------------------------------------
 
 // wxAnimationCtrl - event handlers
 //-----------------------------------------------------------------------------
 

-void wxAnimationCtrl::OnTimer(wxTimerEvent &ev)
+void wxAnimationCtrl::OnTimer(wxTimerEvent& WXUNUSED(ev))

 {
     wxASSERT(m_iter != NULL);
 
 {
     wxASSERT(m_iter != NULL);