AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

return NULL from GetVoidPtr() for NULL variants instead of asserting (closes #9873)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58392 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2009-01-25 13:19:44 +00:00
parent 970f6abe1d
commit d099c754b5
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
interface/wx/variant.h
View File

@ -321,6 +321,9 @@ public:
/**
Gets the void pointer value.
Notice that this method can be used for null objects (i.e. those for
which IsNull() returns @true) and will return @NULL for them.
*/
void* GetVoidPtr() const;

6
src/common/variant.cpp
View File

@ -1182,7 +1182,11 @@ void wxVariant::operator= (void* value)
void* wxVariant::GetVoidPtr() const
{
wxASSERT( (GetType() == wxT("void*")) );
// handling this specially is convenient when working with COM, see #9873
if ( IsNull() )
return NULL;
wxASSERT( GetType() == wxT("void*") );
return (void*) ((wxVariantDataVoidPtr*) m_data)->GetValue();
}