X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cd2a4e161dbf48d53aedafb27cc6563b454486bc..31d7fc0f9cb3f5913ecd4a039a816487a6753a93:/contrib/src/animate/animate.cpp?ds=sidebyside diff --git a/contrib/src/animate/animate.cpp b/contrib/src/animate/animate.cpp index a334227ce1..2bca70edb8 100644 --- 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); @@ -293,13 +292,13 @@ bool wxAnimationPlayer::PlayFrame() // Clear the wxImage cache void wxAnimationPlayer::ClearCache() { - wxNode* node = m_frames.GetFirst(); + wxList::compatibility_iterator node = m_frames.GetFirst(); while (node) { - wxNode* next = node->GetNext(); + wxList::compatibility_iterator next = node->GetNext(); wxBitmap* bitmap = (wxBitmap*) node->GetData(); delete bitmap; - delete node; + m_frames.Erase(node); 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_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() ;