Rework modal dialog code to not depend on now obsolete wxDIALOG_MODAL flag.

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

diff --git a/contrib/src/animate/animate.cpp b/contrib/src/animate/animate.cpp
index b85d93baeac8397d2e11de319507e1f123be5cd3..2bca70edb856075c2cb96934133ecc83f630b097 100644 (file)
--- a/contrib/src/animate/animate.cpp
+++ b/contrib/src/animate/animate.cpp
@@ -22,11 +22,11 @@
 #include "wx/wfstream.h"
 #include "wx/image.h"
 #include "wx/gifdecod.h"
 #include "wx/wfstream.h"
 #include "wx/image.h"
 #include "wx/gifdecod.h"

-#include "wx/animate/animate.h"

 #include "wx/log.h"
 #include "wx/log.h"

+#include "wx/dcmemory.h"
+#include "wx/animate/animate.h"

 #include "wx/dc.h"
 #include "wx/dcclient.h"
 #include "wx/dc.h"
 #include "wx/dcclient.h"

-#include "wx/dcmemory.h"

 
 /*
  * wxAnimationPlayer
 
 /*
  * wxAnimationPlayer


@@ -69,7 +69,7 @@ void wxAnimationPlayer::SetAnimation(wxAnimationBase* animation, bool destroyAni
 }
 
 // Play
 }
 
 // Play

-bool wxAnimationPlayer::Play(wxWindow& window, const wxPoint& pos, bool looped)
+bool wxAnimationPlayer::Play(wxWindow& window, const wxPoint& pos, bool WXUNUSED(looped))

 {
     m_window = & window;
 
 {
     m_window = & window;
 


@@ -109,7 +109,6 @@ bool wxAnimationPlayer::Build()
         int i;
         for (i = 0; i < n; i++)
         {
         int i;
         for (i = 0; i < n; i++)
         {

-            wxBitmap* bitmap = NULL;

             wxImage* image = GetFrame(i);
             if (image)
             {
             wxImage* image = GetFrame(i);
             if (image)
             {


@@ -120,7 +119,7 @@ bool wxAnimationPlayer::Build()
                 if (GetTransparentColour(transparentColour))
                     image->SetMaskColour(transparentColour.Red(), transparentColour.Green(), transparentColour.Blue());
 
                 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);
                 delete image;
                 if (bitmap)
                     m_frames.Append(bitmap);


@@ -216,7 +215,7 @@ bool wxAnimationPlayer::GetTransparentColour(wxColour& col) const
 }
 
 // Play the frame
 }
 
 // Play the frame

-bool wxAnimationPlayer::PlayFrame(int frame, wxWindow& window, const wxPoint& pos)
+bool wxAnimationPlayer::PlayFrame(int frame, wxWindow& window, const wxPoint& WXUNUSED(pos))

 {
     wxMemoryDC dc;
     dc.SelectObject(m_backingStore);
 {
     wxMemoryDC dc;
     dc.SelectObject(m_backingStore);


@@ -293,13 +292,13 @@ bool wxAnimationPlayer::PlayFrame()
 // Clear the wxImage cache
 void wxAnimationPlayer::ClearCache()
 {
 // Clear the wxImage cache
 void wxAnimationPlayer::ClearCache()
 {

-    wxNode* node = m_frames.GetFirst();
+    wxList::compatibility_iterator node = m_frames.GetFirst();

     while (node)
     {
     while (node)
     {

-        wxNode* next = node->GetNext();
+        wxList::compatibility_iterator next = node->GetNext();

         wxBitmap* bitmap = (wxBitmap*) node->GetData();
         delete bitmap;
         wxBitmap* bitmap = (wxBitmap*) node->GetData();
         delete bitmap;

-        delete node;
+        m_frames.Erase(node);

         node = next;
     }
 }
         node = next;
     }
 }


@@ -370,7 +369,7 @@ void wxAnimationPlayer::DrawFrame(int frame, wxDC& dc, const wxPoint& pos)
 {
     wxASSERT_MSG( (m_animation != NULL), _T("Animation not present in wxAnimationPlayer"));
     wxASSERT_MSG( (m_frames.GetCount() != 0), _T("Animation cache not present in wxAnimationPlayer"));
 {
     wxASSERT_MSG( (m_animation != NULL), _T("Animation not present in wxAnimationPlayer"));
     wxASSERT_MSG( (m_frames.GetCount() != 0), _T("Animation cache not present in wxAnimationPlayer"));

-    wxASSERT_MSG( (m_frames.Item(frame) != (wxNode*) NULL), _T("Image not present in wxAnimationPlayer::DrawFrame"));
+    wxASSERT_MSG( !!m_frames.Item(frame), _T("Image not present in wxAnimationPlayer::DrawFrame"));

 
     wxBitmap* bitmap = (wxBitmap*) m_frames.Item(frame)->GetData() ;
 
 
     wxBitmap* bitmap = (wxBitmap*) m_frames.Item(frame)->GetData() ;
 


@@ -647,7 +646,7 @@ void wxAnimationCtrlBase::FitToAnimation()
     SetClientSize(sz);
 }
 
     SetClientSize(sz);
 }
 

-void wxAnimationCtrlBase::OnPaint(wxPaintEvent& event)
+void wxAnimationCtrlBase::OnPaint(wxPaintEvent& WXUNUSED(event))

 {
     wxPaintDC dc(this);
 
 {
     wxPaintDC dc(this);