#include "wx/wfstream.h"
#include "wx/image.h"
#include "wx/gifdecod.h"
+#include "wx/log.h"
+#include "wx/dcmemory.h"
#include "wx/animate/animate.h"
+#include "wx/dc.h"
+#include "wx/dcclient.h"
/*
* wxAnimationPlayer
}
// 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;
wxRect rect(pos, sz);
SaveBackground(rect);
- if (m_frames.Number() == 0)
+ if (m_frames.GetCount() == 0)
{
if (!Build())
{
- wxLogWarning("wxAnimationPlayer::Play: could not build the image cache.");
+ wxLogWarning(_T("wxAnimationPlayer::Play: could not build the image cache."));
return FALSE;
}
}
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);
}
// 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);
// Draw all intermediate frames that haven't been removed from the
// animation
int i;
- for (i = 0; i < (frame - 1); i++)
+ for (i = 0; i < frame; i++)
{
if ((GetDisposalMethod(i) == wxANIM_DONOTREMOVE) || (GetDisposalMethod(i) == wxANIM_UNSPECIFIED))
{
// Clear the wxImage cache
void wxAnimationPlayer::ClearCache()
{
- wxNode* node = m_frames.First();
+ wxList::compatibility_iterator node = m_frames.GetFirst();
while (node)
{
- wxNode* next = node->Next();
- wxBitmap* bitmap = (wxBitmap*) node->Data();
+ wxList::compatibility_iterator next = node->GetNext();
+ wxBitmap* bitmap = (wxBitmap*) node->GetData();
delete bitmap;
- delete node;
+ m_frames.Erase(node);
node = next;
}
}
// Draw the background colour
void wxAnimationPlayer::DrawBackground(wxDC& dc, const wxPoint& pos, const wxColour& colour)
{
- wxASSERT_MSG( (m_animation != NULL), "Animation not present in wxAnimationPlayer");
- wxASSERT_MSG( (m_frames.Number() != 0), "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"));
// Optimization: if the first frame fills the whole area, and is non-transparent,
// don't bother drawing the background
- wxBitmap* firstBitmap = (wxBitmap*) m_frames.First()->Data() ;
+ wxBitmap* firstBitmap = (wxBitmap*) m_frames.GetFirst()->GetData() ;
wxSize screenSize = GetLogicalScreenSize();
if (!firstBitmap->GetMask() && (firstBitmap->GetWidth() == screenSize.x) && (firstBitmap->GetHeight() == screenSize.y))
{
// Draw this frame
void wxAnimationPlayer::DrawFrame(int frame, wxDC& dc, const wxPoint& pos)
{
- wxASSERT_MSG( (m_animation != NULL), "Animation not present in wxAnimationPlayer");
- wxASSERT_MSG( (m_frames.Number() != 0), "Animation cache not present in wxAnimationPlayer");
- wxASSERT_MSG( (m_frames.Nth(frame) != (wxNode*) NULL), "Image not present in wxAnimationPlayer::DrawFrame");
+ 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), _T("Image not present in wxAnimationPlayer::DrawFrame"));
- wxBitmap* bitmap = (wxBitmap*) m_frames.Nth(frame)->Data() ;
+ wxBitmap* bitmap = (wxBitmap*) m_frames.Item(frame)->GetData() ;
wxRect rect = GetFrameRect(frame);
int wxGIFAnimation::GetFrameCount() const
{
- wxASSERT_MSG( (m_decoder != (wxGIFDecoder*) NULL), "m_decoder must be non-NULL");
+ wxASSERT_MSG( (m_decoder != (wxGIFDecoder*) NULL), _T("m_decoder must be non-NULL"));
return m_decoder->GetNumberOfFrames();
}
wxImage* wxGIFAnimation::GetFrame(int i) const
{
- wxASSERT_MSG( (m_decoder != (wxGIFDecoder*) NULL), "m_decoder must be non-NULL");
+ wxASSERT_MSG( (m_decoder != (wxGIFDecoder*) NULL), _T("m_decoder must be non-NULL"));
- m_decoder->GoFrame(i);
+ m_decoder->GoFrame(i + 1);
wxImage* image = new wxImage;
m_decoder->ConvertToImage(image);
wxAnimationDisposal wxGIFAnimation::GetDisposalMethod(int i) const
{
- wxASSERT_MSG( (m_decoder != (wxGIFDecoder*) NULL), "m_decoder must be non-NULL");
+ wxASSERT_MSG( (m_decoder != (wxGIFDecoder*) NULL), _T("m_decoder must be non-NULL"));
- m_decoder->GoFrame(i);
+ m_decoder->GoFrame(i + 1);
int disposalMethod = m_decoder->GetDisposalMethod();
return (wxAnimationDisposal) disposalMethod;
wxRect wxGIFAnimation::GetFrameRect(int i) const
{
- wxASSERT_MSG( (m_decoder != (wxGIFDecoder*) NULL), "m_decoder must be non-NULL");
+ wxASSERT_MSG( (m_decoder != (wxGIFDecoder*) NULL), _T("m_decoder must be non-NULL"));
- m_decoder->GoFrame(i);
+ m_decoder->GoFrame(i + 1);
wxRect rect(m_decoder->GetLeft(), m_decoder->GetTop(), m_decoder->GetWidth(), m_decoder->GetHeight());
return rect;
int wxGIFAnimation::GetDelay(int i) const
{
- wxASSERT_MSG( (m_decoder != (wxGIFDecoder*) NULL), "m_decoder must be non-NULL");
+ wxASSERT_MSG( (m_decoder != (wxGIFDecoder*) NULL), _T("m_decoder must be non-NULL"));
- m_decoder->GoFrame(i);
+ m_decoder->GoFrame(i + 1);
return m_decoder->GetDelay();
}
wxSize wxGIFAnimation::GetLogicalScreenSize() const
{
- wxASSERT_MSG( (m_decoder != (wxGIFDecoder*) NULL), "m_decoder must be non-NULL");
+ wxASSERT_MSG( (m_decoder != (wxGIFDecoder*) NULL), _T("m_decoder must be non-NULL"));
return wxSize(m_decoder->GetLogicalScreenWidth(), m_decoder->GetLogicalScreenHeight());
}
bool wxGIFAnimation::GetBackgroundColour(wxColour& col) const
{
- wxASSERT_MSG( (m_decoder != (wxGIFDecoder*) NULL), "m_decoder must be non-NULL");
+ wxASSERT_MSG( (m_decoder != (wxGIFDecoder*) NULL), _T("m_decoder must be non-NULL"));
int i = m_decoder->GetBackgroundColour();
if (i == -1)
bool wxGIFAnimation::GetTransparentColour(wxColour& col) const
{
- wxASSERT_MSG( (m_decoder != (wxGIFDecoder*) NULL), "m_decoder must be non-NULL");
+ wxASSERT_MSG( (m_decoder != (wxGIFDecoder*) NULL), _T("m_decoder must be non-NULL"));
int i = m_decoder->GetTransparentColour();
if (i == -1)
SetClientSize(sz);
}
-void wxAnimationCtrlBase::OnPaint(wxPaintEvent& event)
+void wxAnimationCtrlBase::OnPaint(wxPaintEvent& WXUNUSED(event))
{
wxPaintDC dc(this);