Fix wxAny for VC6 by removing 'wxAny& operator=(const wxVariant &variant)' for it. This will break some cases of implicit wxVariant->wxAny conversion (for VC6).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64022 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -201,7 +201,13 @@ bool wxConvertAnyToVariant(const wxAny& any, wxVariant* variant)
|
||||
{
|
||||
// Check if wxAny wrapped wxVariantData*
|
||||
if ( !any.GetAs(&data) )
|
||||
{
|
||||
// Ok, one last chance: while unlikely, it is possible that the
|
||||
// wxAny actually contains wxVariant.
|
||||
if ( wxANY_CHECK_TYPE(any, wxVariant) )
|
||||
*variant = wxANY_AS(any, wxVariant);
|
||||
return false;
|
||||
}
|
||||
|
||||
// Wrapper's GetValue() does not increase reference
|
||||
// count, se have to do it before the data gets passed
|
||||
|
Reference in New Issue
Block a user