solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Define wxHAS_NATIVE_ANIMATIONCTRL

Browse source 
This allows to easily test for the native control existence and also
whether wxGenericAnimationCtrl is really different from wxAnimationCtrl.

It also allows to avoid explicit check for wxGTK in common code.
This commit is contained in:
Vadim Zeitlin 2020-04-05 16:32:45 +02:00
parent 6f2a5937f5
commit d0371d75f7
3 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
docs/doxygen/mainpages/const_cpp.h
View file

@ -185,6 +185,7 @@ Currently the following symbols exist:
decide whether some function should be overloaded for both
<code>long</code> and <code>long long</code> types.}
@itemdef{wxHAS_MULTIPLE_FILEDLG_FILTERS, Defined if wxFileDialog supports multiple ('|'-separated) filters.}
@itemdef{wxHAS_NATIVE_ANIMATIONCTRL, Defined if native wxAnimationCtrl class is being used (this symbol only exists in wxWidgets 3.1.4 and later).}
@itemdef{wxHAS_NATIVE_DATAVIEWCTRL, Defined if native wxDataViewCtrl class is being used (this symbol only exists in wxWidgets 3.1.4 and later).}
@itemdef{wxHAS_NATIVE_WINDOW, Defined if wxNativeWindow class is available.}
@itemdef{wxHAS_NULLPTR_T, Defined if the currently used compiler supports C++11 @c nullptr.}

2
include/wx/animate.h
View file

@ -167,6 +167,8 @@ private:
#if defined(__WXGTK20__)
#include "wx/gtk/animate.h"
#define wxHAS_NATIVE_ANIMATIONCTRL
#else
class WXDLLIMPEXP_ADV wxAnimationCtrl : public wxGenericAnimationCtrl
{

2
src/common/animatecmn.cpp
View file

@ -40,7 +40,7 @@ wxAnimation wxNullAnimation;
wxIMPLEMENT_DYNAMIC_CLASS(wxAnimation, wxObject);
wxIMPLEMENT_ABSTRACT_CLASS(wxAnimationCtrlBase, wxControl);
#if !defined(__WXGTK20__)
#if !defined(wxHAS_NATIVE_ANIMATIONCTRL)
// In this case the "native" ctrl is the generic ctrl. See wx/animate.h
wxIMPLEMENT_CLASS(wxAnimationCtrl, wxGenericAnimationCtrl);
#endif