From 1bf48dfe29fdcdc5b8cc052a838872b2c976a84a Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 5 Apr 2020 17:01:37 +0200 Subject: [PATCH] Remove wxAnimationCtrlBase from wxRTTI This is consistent with the other wxFooBase classes which are not part of it, as they're considered implementation details and not parts of the API. --- include/wx/animate.h | 3 --- src/common/animatecmn.cpp | 3 +-- src/gtk/animate.cpp | 3 ++- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/include/wx/animate.h b/include/wx/animate.h index a2a03a463c..18f2dbdd71 100644 --- a/include/wx/animate.h +++ b/include/wx/animate.h @@ -153,9 +153,6 @@ protected: // called by SetInactiveBitmap virtual void DisplayStaticImage() = 0; - -private: - wxDECLARE_ABSTRACT_CLASS(wxAnimationCtrlBase); }; diff --git a/src/common/animatecmn.cpp b/src/common/animatecmn.cpp index 4bbc7c75b3..8fbb1da46d 100644 --- a/src/common/animatecmn.cpp +++ b/src/common/animatecmn.cpp @@ -38,11 +38,10 @@ const char wxAnimationCtrlNameStr[] = "animationctrl"; wxAnimation wxNullAnimation; wxIMPLEMENT_DYNAMIC_CLASS(wxAnimation, wxObject); -wxIMPLEMENT_ABSTRACT_CLASS(wxAnimationCtrlBase, wxControl); #if !defined(wxHAS_NATIVE_ANIMATIONCTRL) // In this case the "native" ctrl is the generic ctrl. See wx/animate.h - wxIMPLEMENT_CLASS(wxAnimationCtrl, wxGenericAnimationCtrl); + wxIMPLEMENT_CLASS(wxAnimationCtrl, wxControl); #endif #include "wx/listimpl.cpp" diff --git a/src/gtk/animate.cpp b/src/gtk/animate.cpp index d6322d2a76..6ec9a18e1a 100644 --- a/src/gtk/animate.cpp +++ b/src/gtk/animate.cpp @@ -180,7 +180,8 @@ void wxAnimationGTKImpl::SetPixbuf(GdkPixbufAnimation* p) // wxAnimationCtrl //----------------------------------------------------------------------------- -wxIMPLEMENT_DYNAMIC_CLASS(wxAnimationCtrl, wxAnimationCtrlBase); +wxIMPLEMENT_DYNAMIC_CLASS(wxAnimationCtrl, wxControl); + wxBEGIN_EVENT_TABLE(wxAnimationCtrl, wxAnimationCtrlBase) EVT_TIMER(wxID_ANY, wxAnimationCtrl::OnTimer) wxEND_EVENT_TABLE()