X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5eedcd5eee0c114f457e7549020b1b0e203ca2f0..d642db66a5efc82d374b813022c72ba88bc50839:/include/wx/variant.h?ds=sidebyside diff --git a/include/wx/variant.h b/include/wx/variant.h index e24fe8fffc..318a483144 100644 --- a/include/wx/variant.h +++ b/include/wx/variant.h @@ -462,9 +462,6 @@ wxVariantData* CLASSNAME::VariantDataFactory(const wxAny& any) \ } \ REGISTER_WXANY_CONVERSION(T, CLASSNAME) -// This is needed for wxVariantList conversion -WX_DECLARE_LIST_WITH_DECL(wxAny, wxAnyList, class WXDLLIMPEXP_BASE); - #else // if !wxUSE_ANY #define DECLARE_WXANY_CONVERSION() @@ -573,7 +570,11 @@ bool classname##VariantData::Eq(wxVariantData& data) const \ var.GetWxObjectPtr() : NULL)); // Replacement for using wxDynamicCast on a wxVariantData object -#define wxDynamicCastVariantData(data, classname) dynamic_cast(data) +#ifndef wxNO_RTTI + #define wxDynamicCastVariantData(data, classname) dynamic_cast(data) +#endif + +#define wxStaticCastVariantData(data, classname) static_cast(data) extern wxVariant WXDLLIMPEXP_BASE wxNullVariant;