diff --git a/include/wx/animate.h b/include/wx/animate.h index ed051910a7..2f595ae03b 100644 --- a/include/wx/animate.h +++ b/include/wx/animate.h @@ -69,8 +69,8 @@ protected: class WXDLLIMPEXP_CORE wxAnimation : public wxObject { public: - wxAnimation(wxAnimationImplType implType = wxANIMATION_IMPL_TYPE_NATIVE); - wxAnimation(const wxString &name, wxAnimationType type = wxANIMATION_TYPE_ANY, + explicit wxAnimation(wxAnimationImplType implType = wxANIMATION_IMPL_TYPE_NATIVE); + explicit wxAnimation(const wxString &name, wxAnimationType type = wxANIMATION_TYPE_ANY, wxAnimationImplType implType = wxANIMATION_IMPL_TYPE_NATIVE); wxAnimation(const wxAnimation& other); @@ -173,13 +173,6 @@ private: : wxGenericAnimationCtrl(parent, id, anim, pos, size, style, name) {} - bool Create(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) - { return wxGenericAnimationCtrl::Create(parent, id, anim, pos, size, style, name); } static wxAnimationImpl* CreateAnimationImpl(wxAnimationImplType WXUNUSED(implType)) { diff --git a/include/wx/gtk/animate.h b/include/wx/gtk/animate.h index b54fd58ce4..9d06947ddf 100644 --- a/include/wx/gtk/animate.h +++ b/include/wx/gtk/animate.h @@ -30,7 +30,6 @@ public: : m_pixbuf(NULL) {} ~wxAnimationGTKImpl() { UnRef(); } - // wxAnimation& operator= (const wxAnimation&); virtual wxAnimationImplType GetImplType() wxOVERRIDE { return wxANIMATION_IMPL_TYPE_NATIVE; } diff --git a/interface/wx/animate.h b/interface/wx/animate.h index df6002fc27..a64dcfe469 100644 --- a/interface/wx/animate.h +++ b/interface/wx/animate.h @@ -452,7 +452,7 @@ public: @class wxAnimation The @c wxAnimation class handles the interface between the animation - control and the deails of the animation image or data. + control and the details of the animation image or data. @stdobjects ::wxNullAnimation @@ -488,4 +488,3 @@ public: An empty animation object. */ wxAnimation wxNullAnimation; - diff --git a/src/gtk/animate.cpp b/src/gtk/animate.cpp index 9f957e91c1..71d3911948 100644 --- a/src/gtk/animate.cpp +++ b/src/gtk/animate.cpp @@ -450,7 +450,8 @@ void wxAnimationCtrl::OnTimer(wxTimerEvent& WXUNUSED(ev)) // static wxAnimationImpl* wxAnimationCtrl::CreateAnimationImpl(wxAnimationImplType implType) { - switch (implType) { + switch (implType) + { case wxANIMATION_IMPL_TYPE_GENERIC: return new wxAnimationGenericImpl(); @@ -463,7 +464,7 @@ wxAnimationImpl* wxAnimationCtrl::CreateAnimationImpl(wxAnimationImplType implTy } -// helpers to safely access wxAnimationGenericImpl methods +// helpers to safely access wxAnimationGTKImpl methods #define ANIMATION (static_cast(m_animation.GetImpl())) GdkPixbufAnimation* wxAnimationCtrl::animation_GetPixbuf() const