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

Use wxVariant::IsType() function to check the type of variant values

Browse Source 
Since there is a dedicated function to check the type of variant then there is not necessary to call wxVariant::GetType() and perform explicit comparisons of returned strings.
This commit is contained in:
Artur Wieczorek 2016-09-29 23:46:27 +02:00
parent ac96d3949b
commit 243db82c28
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/msw/ole/access.cpp
View File

@ -113,7 +113,7 @@ STDMETHODIMP wxIEnumVARIANT::Next(ULONG celt,
return S_FALSE; return S_FALSE;
} }
if (m_variant.GetType() != wxT("list")) if ( !m_variant.IsType(wxS("list")) )
return S_FALSE; return S_FALSE;
if ( m_nCurrent < (int) m_variant.GetList().GetCount() ) { if ( m_nCurrent < (int) m_variant.GetList().GetCount() ) {
@ -137,7 +137,7 @@ STDMETHODIMP wxIEnumVARIANT::Skip(ULONG celt)
{ {
wxLogTrace(wxTRACE_OleCalls, wxT("wxIEnumVARIANT::Skip")); wxLogTrace(wxTRACE_OleCalls, wxT("wxIEnumVARIANT::Skip"));
if (m_variant.GetType() != wxT("list")) if ( !m_variant.IsType(wxS("list")) )
return S_FALSE; return S_FALSE;
m_nCurrent += celt; m_nCurrent += celt;
@ -1509,14 +1509,14 @@ STDMETHODIMP wxIAccessible::get_accSelection ( VARIANT * pVarChildren)
return S_OK; return S_OK;
} }
else if (selections.GetType() == wxT("long")) else if ( selections.IsType(wxS("long")) )
{ {
pVarChildren->vt = VT_I4; pVarChildren->vt = VT_I4;
pVarChildren->lVal = selections.GetLong(); pVarChildren->lVal = selections.GetLong();
return S_OK; return S_OK;
} }
else if (selections.GetType() == wxT("void*")) else if ( selections.IsType(wxS("void*")) )
{ {
wxAccessible* childObject = (wxAccessible*) selections.GetVoidPtr(); wxAccessible* childObject = (wxAccessible*) selections.GetVoidPtr();
wxIAccessible* childIA = childObject->GetIAccessible(); wxIAccessible* childIA = childObject->GetIAccessible();
@ -1530,7 +1530,7 @@ STDMETHODIMP wxIAccessible::get_accSelection ( VARIANT * pVarChildren)
return S_OK; return S_OK;
} }
else if (selections.GetType() == wxT("list")) else if ( selections.IsType(wxS("list")) )
{ {
wxASSERT_MSG( selections.GetCount() > 1, wxASSERT_MSG( selections.GetCount() > 1,
wxS("Multiple child objects should be selected") ); wxS("Multiple child objects should be selected") );