Added wxAny::HasSameType()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64624 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -787,14 +787,24 @@ public:
|
|||||||
|
|
||||||
@remarks You cannot reliably test whether two wxAnys are of
|
@remarks You cannot reliably test whether two wxAnys are of
|
||||||
same value type by simply comparing return values
|
same value type by simply comparing return values
|
||||||
of wxAny::GetType(). Instead use
|
of wxAny::GetType(). Instead, use wxAny::HasSameType().
|
||||||
wxAnyValueType::CheckType<T>() template function.
|
|
||||||
|
@see HasSameType()
|
||||||
*/
|
*/
|
||||||
const wxAnyValueType* GetType() const
|
const wxAnyValueType* GetType() const
|
||||||
{
|
{
|
||||||
return m_type;
|
return m_type;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
Returns @true if this and another wxAny have the same
|
||||||
|
value type.
|
||||||
|
*/
|
||||||
|
bool HasSameType(const wxAny& other) const
|
||||||
|
{
|
||||||
|
return GetType()->IsSameType(other.GetType());
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
Tests if wxAny is null (that is, whether there is data).
|
Tests if wxAny is null (that is, whether there is data).
|
||||||
*/
|
*/
|
||||||
|
@@ -140,12 +140,19 @@ public:
|
|||||||
Returns the value type as wxAnyValueType instance.
|
Returns the value type as wxAnyValueType instance.
|
||||||
|
|
||||||
@remarks You cannot reliably test whether two wxAnys are of
|
@remarks You cannot reliably test whether two wxAnys are of
|
||||||
same value type by simply comparing return values
|
same value type by simply comparing return values
|
||||||
of wxAny::GetType(). Instead use
|
of wxAny::GetType(). Instead, use wxAny::HasSameType().
|
||||||
wxAnyValueType::CheckType<T>() template function.
|
|
||||||
|
@see HasSameType()
|
||||||
*/
|
*/
|
||||||
const wxAnyValueType* GetType() const;
|
const wxAnyValueType* GetType() const;
|
||||||
|
|
||||||
|
/**
|
||||||
|
Returns @true if this and another wxAny have the same
|
||||||
|
value type.
|
||||||
|
*/
|
||||||
|
bool HasSameType(const wxAny& other) const;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
Tests if wxAny is null (that is, whether there is data).
|
Tests if wxAny is null (that is, whether there is data).
|
||||||
*/
|
*/
|
||||||
|
@@ -178,6 +178,10 @@ void wxAnyTestCase::CheckType()
|
|||||||
CPPUNIT_ASSERT(wxANY_CHECK_TYPE(m_anyWcharString2, const wchar_t*));
|
CPPUNIT_ASSERT(wxANY_CHECK_TYPE(m_anyWcharString2, const wchar_t*));
|
||||||
CPPUNIT_ASSERT(!wxANY_CHECK_TYPE(m_anyWcharString2, wxString));
|
CPPUNIT_ASSERT(!wxANY_CHECK_TYPE(m_anyWcharString2, wxString));
|
||||||
CPPUNIT_ASSERT(!wxANY_CHECK_TYPE(m_anyWcharString2, const char*));
|
CPPUNIT_ASSERT(!wxANY_CHECK_TYPE(m_anyWcharString2, const char*));
|
||||||
|
|
||||||
|
// HasSameType()
|
||||||
|
CPPUNIT_ASSERT( m_anyWcharString1.HasSameType(m_anyWcharString2) );
|
||||||
|
CPPUNIT_ASSERT( !m_anyWcharString1.HasSameType(m_anyBool1) );
|
||||||
}
|
}
|
||||||
|
|
||||||
void wxAnyTestCase::Equality()
|
void wxAnyTestCase::Equality()
|
||||||
|
Reference in New Issue
Block a user