Applied patch [ 879998 ] Warning free animate contrib

ABX

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25614 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/contrib/include/wx/animate/animate.h b/contrib/include/wx/animate/animate.h
index 7ef1d57957d833f775b1fa541a56848a0d0c7c49..e58a5d3896116f7f3b016ae20eb09313acb8f234 100644 (file)
--- a/contrib/include/wx/animate/animate.h
+++ b/contrib/include/wx/animate/animate.h
@@ -214,7 +214,7 @@ public:
 
 //// Operations
 
-    virtual bool LoadFile(const wxString& filename) { return FALSE; }
+    virtual bool LoadFile(const wxString& WXUNUSED(filename)) { return FALSE; }
 };
 
 /* wxGIFAnimation

diff --git a/contrib/src/animate/animate.cpp b/contrib/src/animate/animate.cpp
index a334227ce1aea41bd52ce94b1ba75ffd45e9510c..a0fd35de33bd8098b5e200a1dae1c9437fc643ac 100644 (file)
--- a/contrib/src/animate/animate.cpp
+++ b/contrib/src/animate/animate.cpp
@@ -109,7 +109,6 @@ bool wxAnimationPlayer::Build()
         int i;
         for (i = 0; i < n; i++)
         {
-            wxBitmap* bitmap = NULL;
             wxImage* image = GetFrame(i);
             if (image)
             {
@@ -120,7 +119,7 @@ bool wxAnimationPlayer::Build()
                 if (GetTransparentColour(transparentColour))
                     image->SetMaskColour(transparentColour.Red(), transparentColour.Green(), transparentColour.Blue());
 
-                bitmap = new wxBitmap(* image);
+                wxBitmap* bitmap = new wxBitmap(* image);
                 delete image;
                 if (bitmap)
                     m_frames.Append(bitmap);