#include "wx/wfstream.h"
#include "wx/image.h"
#include "wx/gifdecod.h"
-#include "wx/animate/animate.h"
#include "wx/log.h"
+#include "wx/dcmemory.h"
+#include "wx/animate/animate.h"
#include "wx/dc.h"
#include "wx/dcclient.h"
-#include "wx/dcmemory.h"
/*
* wxAnimationPlayer
int i;
for (i = 0; i < n; i++)
{
- wxBitmap* bitmap = NULL;
wxImage* image = GetFrame(i);
if (image)
{
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);
// 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;
}
}
{
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() ;