X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/281448385a8d62a7efc64ca29e5803958e55eb69..a4f6fe43c33bd7933645d110ad2719871dab043d:/include/wx/variant.h diff --git a/include/wx/variant.h b/include/wx/variant.h index f3b1aca1ad..318a483144 100644 --- a/include/wx/variant.h +++ b/include/wx/variant.h @@ -362,6 +362,24 @@ public: #if wxUSE_LONGLONG bool Convert(wxLongLong* value) const; bool Convert(wxULongLong* value) const; + #ifdef wxLongLong_t + bool Convert(wxLongLong_t* value) const + { + wxLongLong temp; + if ( !Convert(&temp) ) + return false; + *value = temp.GetValue(); + return true; + } + bool Convert(wxULongLong_t* value) const + { + wxULongLong temp; + if ( !Convert(&temp) ) + return false; + *value = temp.GetValue(); + return true; + } + #endif // wxLongLong_t #endif // wxUSE_LONGLONG // Attributes @@ -444,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() @@ -555,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;