X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b5dbe15d0bacde245539f54c4d97af6b4696f01f..e78c1d7855d1fefcdbff0e093e21e5cf101ca604:/include/wx/animate.h diff --git a/include/wx/animate.h b/include/wx/animate.h index 7722660469..97321c5994 100644 --- a/include/wx/animate.h +++ b/include/wx/animate.h @@ -31,7 +31,7 @@ extern WXDLLIMPEXP_DATA_ADV(const wxChar) wxAnimationCtrlNameStr[]; // wxAnimationBase // ---------------------------------------------------------------------------- -class WXDLLIMPEXP_ADV wxAnimationBase : public wxGDIObject +class WXDLLIMPEXP_ADV wxAnimationBase : public wxObject { public: wxAnimationBase() {} @@ -65,7 +65,7 @@ protected: // default style does not include wxAC_NO_AUTORESIZE, that is, the control // auto-resizes by default to fit the new animation when SetAnimation() is called -#define wxAC_DEFAULT_STYLE (wxNO_BORDER) +#define wxAC_DEFAULT_STYLE (wxBORDER_NONE) class WXDLLIMPEXP_ADV wxAnimationCtrlBase : public wxControl { @@ -75,6 +75,8 @@ public: // public API virtual bool LoadFile(const wxString& filename, wxAnimationType type = wxANIMATION_TYPE_ANY) = 0; + virtual bool Load(wxInputStream& stream, + wxAnimationType type = wxANIMATION_TYPE_ANY) = 0; virtual void SetAnimation(const wxAnimation &anim) = 0; virtual wxAnimation GetAnimation() const = 0;