X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5eedcd5eee0c114f457e7549020b1b0e203ca2f0..66c2bf7b1d9326fb650acfaae22ec50528cfbf7c:/include/wx/variant.h diff --git a/include/wx/variant.h b/include/wx/variant.h index e24fe8fffc..39adc729b9 100644 --- a/include/wx/variant.h +++ b/include/wx/variant.h @@ -4,7 +4,6 @@ // Author: Julian Smart // Modified by: // Created: 10/09/98 -// RCS-ID: $Id$ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -462,9 +461,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 +569,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;