X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/70f9d2bef3aa1e7268723b57ca952eea72f24d74..38ececd4c399ade4c47ca424eb72dbbd5dda528e:/include/wx/generic/animate.h diff --git a/include/wx/generic/animate.h b/include/wx/generic/animate.h index 7a140b3b96..818daf890c 100644 --- a/include/wx/generic/animate.h +++ b/include/wx/generic/animate.h @@ -4,7 +4,6 @@ // Author: Julian Smart and Guillermo Rodriguez Garcia // Modified by: Francesco Montorsi // Created: 13/8/99 -// RCS-ID: $Id$ // Copyright: (c) Julian Smart and Guillermo Rodriguez Garcia // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -23,6 +22,7 @@ WX_DECLARE_LIST_WITH_DECL(wxAnimationDecoder, wxAnimationDecoderList, class WXDL class WXDLLIMPEXP_ADV wxAnimation : public wxAnimationBase { public: + wxAnimation() {} wxAnimation(const wxString &name, wxAnimationType type = wxANIMATION_TYPE_ANY) { LoadFile(name, type); } @@ -71,12 +71,12 @@ class WXDLLIMPEXP_ADV wxAnimationCtrl: public wxAnimationCtrlBase public: wxAnimationCtrl() { Init(); } wxAnimationCtrl(wxWindow *parent, - wxWindowID id, - const wxAnimation& anim = wxNullAnimation, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxAC_DEFAULT_STYLE, - const wxString& name = wxAnimationCtrlNameStr) + wxWindowID id, + const wxAnimation& anim = wxNullAnimation, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = wxAC_DEFAULT_STYLE, + const wxString& name = wxAnimationCtrlNameStr) { Init(); @@ -96,6 +96,7 @@ public: public: virtual bool LoadFile(const wxString& filename, wxAnimationType type = wxANIMATION_TYPE_ANY); + virtual bool Load(wxInputStream& stream, wxAnimationType type = wxANIMATION_TYPE_ANY); virtual void Stop(); virtual bool Play()