Removed wxClearVariant() and wxReleaseVariant().

Replaced them with standard VariantInit() and VariantClear() functions
respectively. They appear to be just reimplementations of these.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63044 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2010-01-03 18:29:02 +00:00
parent a2fd865b0d
commit 1fbfbfb0bf
2 changed files with 5 additions and 101 deletions

View File

@@ -54,8 +54,6 @@
#include "wx/datetime.h"
#endif // wxUSE_DATETIME
extern void wxClearVariant(VARIANTARG *pvarg) ;
extern void wxReleaseVariant(VARIANTARG *pvarg) ;
// static void ShowException(LPOLESTR szMember, HRESULT hr, EXCEPINFO *pexcep, unsigned int uiArgErr);
#if wxUSE_OLE_AUTOMATION
@@ -103,7 +101,7 @@ bool wxAutomationObject::Invoke(const wxString& member, int action,
}
VARIANTARG vReturn;
wxClearVariant(& vReturn);
VariantInit(& vReturn);
VARIANTARG* vReturnPtr = & vReturn;
@@ -194,7 +192,7 @@ bool wxAutomationObject::Invoke(const wxString& member, int action,
delete[] dispIds;
for (i = 0; i < noArgs; i++)
wxReleaseVariant(& oleArgs[i]) ;
VariantClear(& oleArgs[i]) ;
delete[] oleArgs;
if (FAILED(hr))
@@ -208,7 +206,7 @@ bool wxAutomationObject::Invoke(const wxString& member, int action,
SysFreeString(excep.bstrHelpFile);
if (vReturnPtr)
wxReleaseVariant(vReturnPtr);
VariantClear(vReturnPtr);
return false;
}
else
@@ -222,7 +220,7 @@ bool wxAutomationObject::Invoke(const wxString& member, int action,
{
vReturn.pdispVal = NULL;
}
wxReleaseVariant(& vReturn);
VariantClear(& vReturn);
}
}
return true;