// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "access.h"
#endif
#include "wx/log.h"
#include "wx/access.h"
-#include <windows.h>
+#include "wx/msw/wrapwin.h"
// for some compilers, the entire ole2.h must be included, not only oleauto.h
#if wxUSE_NORLANDER_HEADERS || defined(__WATCOMC__)
#include <oleauto.h>
#include <oleacc.h>
+#include <winable.h>
#include "wx/msw/ole/oleutils.h"
{
public:
wxIEnumVARIANT(const wxVariant& variant);
- ~wxIEnumVARIANT() { }
+ virtual ~wxIEnumVARIANT() { }
DECLARE_IUNKNOWN_METHODS;
// Call Release if this is non-NULL.
IAccessible* GetChildStdAccessible(int id);
+ // Gets the IAccessible interface for the given child or object.
+ // Call Release if this is non-NULL.
+ IAccessible* GetChildAccessible(int id);
+
private:
wxAccessible *m_pAccessible; // pointer to C++ class we belong to
STDMETHODIMP wxIAccessible::accHitTest(long xLeft, long yLeft, VARIANT* pVarID)
{
- wxLogDebug("accHitTest");
+ wxLogTrace(wxT("access"), wxT("accHitTest"));
wxASSERT (m_pAccessible != NULL);
if (!m_pAccessible)
return E_FAIL;
// Use standard interface instead.
IAccessible* stdInterface = (IAccessible*)m_pAccessible->GetIAccessibleStd();
if (!stdInterface)
- return E_FAIL;
+ return E_NOTIMPL;
else
return stdInterface->accHitTest(xLeft, yLeft, pVarID);
}
{
wxIAccessible* childIA = childObject->GetIAccessible();
if (!childIA)
- return E_FAIL;
+ return E_NOTIMPL;
if (childIA->QueryInterface(IID_IDispatch, (LPVOID*) & pVarID->pdispVal) != S_OK)
return E_FAIL;
pVarID->vt = VT_DISPATCH;
-// pVarID->pdispVal->AddRef();
return S_OK;
}
}
return S_FALSE;
}
- return E_FAIL;
+ #if 0
+ // all cases above already cause some return action so below line
+ // is unreachable and cause unnecessary warning
+ return E_NOTIMPL;
+ #endif
}
// Retrieves the specified object's current screen location. All visual objects must
STDMETHODIMP wxIAccessible::accLocation ( long* pxLeft, long* pyTop, long* pcxWidth, long* pcyHeight, VARIANT varID)
{
- wxLogDebug("accLocation");
+ wxLogTrace(wxT("access"), wxT("accLocation"));
wxASSERT (m_pAccessible != NULL);
if (!m_pAccessible)
return E_FAIL;
if (status == wxACC_NOT_IMPLEMENTED)
{
- // Use standard interface instead.
- IAccessible* stdInterface = (IAccessible*)m_pAccessible->GetIAccessibleStd();
- if (!stdInterface)
- return E_FAIL;
- else
- return stdInterface->accLocation(pxLeft, pyTop, pcxWidth, pcyHeight, varID);
+ // Try to use child object directly.
+ if (varID.lVal > 0)
+ {
+ IAccessible* childAccessible = GetChildAccessible(varID.lVal);
+ if (childAccessible)
+ {
+ varID.lVal = 0;
+ HRESULT hResult = childAccessible->accLocation(pxLeft, pyTop, pcxWidth, pcyHeight, varID);
+ childAccessible->Release();
+ return hResult;
+ }
+ else if (m_pAccessible->GetIAccessibleStd())
+ return ((IAccessible*) m_pAccessible->GetIAccessibleStd())->accLocation(pxLeft, pyTop, pcxWidth, pcyHeight, varID);
+ }
+ else if (m_pAccessible->GetIAccessibleStd())
+ return ((IAccessible*) m_pAccessible->GetIAccessibleStd())->accLocation(pxLeft, pyTop, pcxWidth, pcyHeight, varID);
}
else
{
return S_OK;
}
- return E_FAIL;
+ return E_NOTIMPL;
}
// Traverses to another user interface element within a container and retrieves the object.
wxASSERT (m_pAccessible != NULL);
if (!m_pAccessible)
return E_FAIL;
- wxLogDebug(wxString(wxT("accNavigate for ")) + m_pAccessible->GetWindow()->GetClassInfo()->GetClassName());
-
- if ((varStart.vt != VT_I4 && varStart.vt != VT_EMPTY) || varStart.vt < 0)
+ wxLogTrace(wxT("access"), wxString(wxT("accNavigate for ")) + m_pAccessible->GetWindow()->GetClassInfo()->GetClassName());
+
+ if ((varStart.vt != VT_I4 && varStart.vt != VT_EMPTY)
+ #if 0
+ // according to MSDN and sources varStart.vt is unsigned
+ // so below line cause warning "Condition is always false"
+ || varStart.vt < 0
+ #endif
+ )
{
- wxLogDebug("Invalid arg for accNavigate");
+ wxLogTrace(wxT("access"), wxT("Invalid arg for accNavigate"));
return E_INVALIDARG;
}
break;
default:
{
- wxLogDebug(wxT("Unknown NAVDIR symbol"));
+ wxLogTrace(wxT("access"), wxT("Unknown NAVDIR symbol"));
break;
}
}
- wxLogDebug(navStr);
+ wxLogTrace(wxT("access"), navStr);
wxAccStatus status = m_pAccessible->Navigate(navDirWX, varStart.lVal, & elementId,
& elementObject);
if (status == wxACC_FAIL)
{
- wxLogDebug("wxAccessible::Navigate failed");
+ wxLogTrace(wxT("access"), wxT("wxAccessible::Navigate failed"));
return E_FAIL;
}
if (status == wxACC_FALSE)
{
- wxLogDebug("wxAccessible::Navigate found no object in this direction");
+ wxLogTrace(wxT("access"), wxT("wxAccessible::Navigate found no object in this direction"));
return S_FALSE;
}
if (status == wxACC_NOT_IMPLEMENTED)
{
- wxLogDebug("Navigate not implemented");
+ wxLogTrace(wxT("access"), wxT("Navigate not implemented"));
- // Use standard interface instead.
- IAccessible* stdInterface = (IAccessible*)m_pAccessible->GetIAccessibleStd();
- if (!stdInterface)
- return E_FAIL;
- else
- return stdInterface->accNavigate ( navDir, varStart, pVarEnd);
+ // Try to use child object directly.
+ if (varStart.vt == VT_I4 && varStart.lVal > 0)
+ {
+ IAccessible* childAccessible = GetChildAccessible(varStart.lVal);
+ if (childAccessible)
+ {
+ varStart.lVal = 0;
+ HRESULT hResult = childAccessible->accNavigate(navDir, varStart, pVarEnd);
+ childAccessible->Release();
+ return hResult;
+ }
+ else if (m_pAccessible->GetIAccessibleStd())
+ return ((IAccessible*) m_pAccessible->GetIAccessibleStd())->accNavigate(navDir, varStart, pVarEnd);
+ }
+ else if (m_pAccessible->GetIAccessibleStd())
+ return ((IAccessible*) m_pAccessible->GetIAccessibleStd())->accNavigate(navDir, varStart, pVarEnd);
}
else
{
if (elementObject)
{
- wxLogDebug("Getting wxIAccessible and calling QueryInterface for Navigate");
+ wxLogTrace(wxT("access"), wxT("Getting wxIAccessible and calling QueryInterface for Navigate"));
wxIAccessible* objectIA = elementObject->GetIAccessible();
if (!objectIA)
{
- wxLogDebug("No wxIAccessible");
+ wxLogTrace(wxT("access"), wxT("No wxIAccessible"));
return E_FAIL;
}
HRESULT hResult = objectIA->QueryInterface(IID_IDispatch, (LPVOID*) & pVarEnd->pdispVal);
if (hResult != S_OK)
{
- wxLogDebug("QueryInterface failed");
+ wxLogTrace(wxT("access"), wxT("QueryInterface failed"));
return E_FAIL;
}
- wxLogDebug("Called QueryInterface for Navigate");
+ wxLogTrace(wxT("access"), wxT("Called QueryInterface for Navigate"));
pVarEnd->vt = VT_DISPATCH;
-// pVarEnd->pdispVal->AddRef();
return S_OK;
}
else if (elementId > 0)
{
- wxLogDebug("Returning element id from Navigate");
+ wxLogTrace(wxT("access"), wxT("Returning element id from Navigate"));
pVarEnd->vt = VT_I4;
pVarEnd->lVal = elementId;
return S_OK;
}
else
{
- wxLogDebug("No object in accNavigate");
+ wxLogTrace(wxT("access"), wxT("No object in accNavigate"));
pVarEnd->vt = VT_EMPTY;
return S_FALSE;
}
}
- wxLogDebug("Failing Navigate");
- return E_FAIL;
+ wxLogTrace(wxT("access"), wxT("Failing Navigate"));
+ return E_NOTIMPL;
}
// Retrieves the address of an IDispatch interface for the specified child.
STDMETHODIMP wxIAccessible::get_accChild ( VARIANT varChildID, IDispatch** ppDispChild)
{
- wxLogDebug("get_accChild");
+ wxLogTrace(wxT("access"), wxT("get_accChild"));
wxASSERT (m_pAccessible != NULL);
if (!m_pAccessible)
return E_FAIL;
if (varChildID.vt != VT_I4)
{
- wxLogDebug("Invalid arg for get_accChild");
+ wxLogTrace(wxT("access"), wxT("Invalid arg for get_accChild"));
return E_INVALIDARG;
}
wxAccStatus status = m_pAccessible->GetChild(varChildID.lVal, & child);
if (status == wxACC_FAIL)
{
- wxLogDebug("GetChild failed");
+ wxLogTrace(wxT("access"), wxT("GetChild failed"));
return E_FAIL;
}
// Use standard interface instead.
IAccessible* stdInterface = (IAccessible*)m_pAccessible->GetIAccessibleStd();
if (!stdInterface)
- return E_FAIL;
+ return E_NOTIMPL;
else
{
- wxLogDebug("Using standard interface for get_accChild");
+ wxLogTrace(wxT("access"), wxT("Using standard interface for get_accChild"));
return stdInterface->get_accChild (varChildID, ppDispChild);
}
}
{
wxIAccessible* objectIA = child->GetIAccessible();
if (!objectIA)
- return E_FAIL;
+ return E_NOTIMPL;
if (objectIA->QueryInterface(IID_IDispatch, (LPVOID*) ppDispChild) != S_OK)
{
- wxLogDebug("QueryInterface failed in get_accChild");
+ wxLogTrace(wxT("access"), wxT("QueryInterface failed in get_accChild"));
return E_FAIL;
}
-// (*ppDispChild)->AddRef();
return S_OK;
}
else
{
- wxLogDebug("Not an accessible object");
+ wxLogTrace(wxT("access"), wxT("Not an accessible object"));
return S_FALSE; // Indicates it's not an accessible object
}
}
- return E_FAIL;
+ #if 0
+ // all cases above already cause some return action so below line
+ // is unreachable and cause unnecessary warning
+ return E_NOTIMPL;
+ #endif
}
// Retrieves the number of children that belong to this object.
STDMETHODIMP wxIAccessible::get_accChildCount ( long* pCountChildren)
{
- wxLogDebug("get_accChildCount");
+ wxLogTrace(wxT("access"), wxT("get_accChildCount"));
wxASSERT (m_pAccessible != NULL);
if (!m_pAccessible)
return E_FAIL;
// Use standard interface instead.
IAccessible* stdInterface = (IAccessible*)m_pAccessible->GetIAccessibleStd();
if (!stdInterface)
- return E_FAIL;
+ return E_NOTIMPL;
else
{
- wxLogDebug("Using standard interface for get_accChildCount");
+ wxLogTrace(wxT("access"), wxT("Using standard interface for get_accChildCount"));
HRESULT res = stdInterface->get_accChildCount (pCountChildren);
wxString str;
str.Printf(wxT("Number of children was %d"), (int) (*pCountChildren));
- wxLogDebug(str);
+ wxLogTrace(wxT("access"), str);
return res;
}
}
return S_OK;
}
- return E_FAIL;
+ #if 0
+ // all cases above already cause some return action so below line
+ // is unreachable and cause unnecessary warning
+ return E_NOTIMPL;
+ #endif
}
// Retrieves the IDispatch interface of the object's parent.
STDMETHODIMP wxIAccessible::get_accParent ( IDispatch** ppDispParent)
{
- wxLogDebug("get_accParent");
+ wxLogTrace(wxT("access"), wxT("get_accParent"));
wxASSERT (m_pAccessible != NULL);
if (!m_pAccessible)
return E_FAIL;
// it to the standard interface.
if (status == wxACC_NOT_IMPLEMENTED || !parent)
{
- wxLogDebug("Using standard interface to get the parent.");
+ wxLogTrace(wxT("access"), wxT("Using standard interface to get the parent."));
// Use standard interface instead.
IAccessible* stdInterface = (IAccessible*)m_pAccessible->GetIAccessibleStd();
if (!stdInterface)
- return E_FAIL;
+ return E_NOTIMPL;
else
return stdInterface->get_accParent (ppDispParent);
}
if (!objectIA)
return E_FAIL;
- wxLogDebug("About to call QueryInterface");
+ wxLogTrace(wxT("access"), wxT("About to call QueryInterface"));
if (objectIA->QueryInterface(IID_IDispatch, (LPVOID*) ppDispParent) != S_OK)
{
- wxLogDebug("Failed QueryInterface");
+ wxLogTrace(wxT("access"), wxT("Failed QueryInterface"));
return E_FAIL;
}
-// (*ppDispParent)->AddRef();
- wxLogDebug("Returning S_OK for get_accParent");
+ wxLogTrace(wxT("access"), wxT("Returning S_OK for get_accParent"));
return S_OK;
-/*
- wxIAccessible* objectIA = parent->GetIAccessible();
- if (!objectIA)
- return E_FAIL;
- objectIA->AddRef();
- *ppDispParent = objectIA;
- return S_OK;
-*/
}
else
{
// This doesn't seem to be allowed, despite the documentation,
// so we handle it higher up by using the standard interface.
- wxLogDebug("Returning NULL parent because there was none");
+ wxLogTrace(wxT("access"), wxT("Returning NULL parent because there was none"));
*ppDispParent = NULL;
return S_FALSE;
}
}
- return E_FAIL;
+ #if 0
+ // all cases above already cause some return action so below line
+ // is unreachable and cause unnecessary warning
+ return E_NOTIMPL;
+ #endif
}
// Performs the object's default action. Not all objects have a default
STDMETHODIMP wxIAccessible::accDoDefaultAction(VARIANT varID)
{
- wxLogDebug("accDoDefaultAction");
+ wxLogTrace(wxT("access"), wxT("accDoDefaultAction"));
wxASSERT (m_pAccessible != NULL);
if (!m_pAccessible)
return E_FAIL;
if (varID.vt != VT_I4)
{
- wxLogDebug("Invalid arg for accDoDefaultAction");
+ wxLogTrace(wxT("access"), wxT("Invalid arg for accDoDefaultAction"));
return E_INVALIDARG;
}
if (status == wxACC_NOT_IMPLEMENTED)
{
- // Use standard interface instead.
- IAccessible* stdInterface = (IAccessible*)m_pAccessible->GetIAccessibleStd();
- if (!stdInterface)
- return E_FAIL;
- else
- return stdInterface->accDoDefaultAction(varID);
+ // Try to use child object directly.
+ if (varID.lVal > 0)
+ {
+ IAccessible* childAccessible = GetChildAccessible(varID.lVal);
+ if (childAccessible)
+ {
+ varID.lVal = 0;
+ HRESULT hResult = childAccessible->accDoDefaultAction(varID);
+ childAccessible->Release();
+ return hResult;
+ }
+ else if (m_pAccessible->GetIAccessibleStd())
+ return ((IAccessible*) m_pAccessible->GetIAccessibleStd())->accDoDefaultAction(varID);
+ }
+ else if (m_pAccessible->GetIAccessibleStd())
+ return ((IAccessible*) m_pAccessible->GetIAccessibleStd())->accDoDefaultAction(varID);
}
return E_FAIL;
}
STDMETHODIMP wxIAccessible::get_accDefaultAction ( VARIANT varID, BSTR* pszDefaultAction)
{
- wxLogDebug("get_accDefaultAction");
+ wxLogTrace(wxT("access"), wxT("get_accDefaultAction"));
wxASSERT (m_pAccessible != NULL);
if (!m_pAccessible)
return E_FAIL;
if (varID.vt != VT_I4)
{
- wxLogDebug("Invalid arg for get_accDefaultAction");
+ wxLogTrace(wxT("access"), wxT("Invalid arg for get_accDefaultAction"));
return E_INVALIDARG;
}
if (status == wxACC_NOT_IMPLEMENTED)
{
- // Use standard interface instead.
- IAccessible* stdInterface = (IAccessible*)m_pAccessible->GetIAccessibleStd();
- if (!stdInterface)
- return E_FAIL;
- else
- return stdInterface->get_accDefaultAction (varID, pszDefaultAction);
+ // Try to use child object directly.
+ if (varID.lVal > 0)
+ {
+ IAccessible* childAccessible = GetChildAccessible(varID.lVal);
+ if (childAccessible)
+ {
+ varID.lVal = 0;
+ HRESULT hResult = childAccessible->get_accDefaultAction(varID, pszDefaultAction);
+ childAccessible->Release();
+ return hResult;
+ }
+ else if (m_pAccessible->GetIAccessibleStd())
+ return ((IAccessible*) m_pAccessible->GetIAccessibleStd())->get_accDefaultAction(varID, pszDefaultAction);
+ }
+ else if (m_pAccessible->GetIAccessibleStd())
+ return ((IAccessible*) m_pAccessible->GetIAccessibleStd())->get_accDefaultAction(varID, pszDefaultAction);
}
else
{
STDMETHODIMP wxIAccessible::get_accDescription ( VARIANT varID, BSTR* pszDescription)
{
- wxLogDebug("get_accDescription");
+ wxLogTrace(wxT("access"), wxT("get_accDescription"));
wxASSERT (m_pAccessible != NULL);
if (!m_pAccessible)
return E_FAIL;
if (varID.vt != VT_I4)
{
- wxLogDebug("Invalid arg for get_accDescription");
+ wxLogTrace(wxT("access"), wxT("Invalid arg for get_accDescription"));
return E_INVALIDARG;
}
if (status == wxACC_NOT_IMPLEMENTED)
{
- // Use standard interface instead.
- IAccessible* stdInterface = (IAccessible*)m_pAccessible->GetIAccessibleStd();
- if (!stdInterface)
- return E_FAIL;
- else
- return stdInterface->get_accDescription (varID, pszDescription);
+ // Try to use child object directly.
+ if (varID.lVal > 0)
+ {
+ IAccessible* childAccessible = GetChildAccessible(varID.lVal);
+ if (childAccessible)
+ {
+ varID.lVal = 0;
+ HRESULT hResult = childAccessible->get_accDescription(varID, pszDescription);
+ childAccessible->Release();
+ return hResult;
+ }
+ else if (m_pAccessible->GetIAccessibleStd())
+ return ((IAccessible*) m_pAccessible->GetIAccessibleStd())->get_accDescription(varID, pszDescription);
+ }
+ else if (m_pAccessible->GetIAccessibleStd())
+ return ((IAccessible*) m_pAccessible->GetIAccessibleStd())->get_accDescription(varID, pszDescription);
}
else
{
return S_OK;
}
}
- return E_FAIL;
+ return E_NOTIMPL;
}
// Retrieves an object's Help property string.
STDMETHODIMP wxIAccessible::get_accHelp ( VARIANT varID, BSTR* pszHelp)
{
- wxLogDebug("get_accHelp");
+ wxLogTrace(wxT("access"), wxT("get_accHelp"));
wxASSERT (m_pAccessible != NULL);
if (!m_pAccessible)
return E_FAIL;
if (varID.vt != VT_I4)
{
- wxLogDebug("Invalid arg for get_accHelp");
+ wxLogTrace(wxT("access"), wxT("Invalid arg for get_accHelp"));
return E_INVALIDARG;
}
if (status == wxACC_NOT_IMPLEMENTED)
{
- // Use standard interface instead.
- IAccessible* stdInterface = (IAccessible*)m_pAccessible->GetIAccessibleStd();
- if (!stdInterface)
- return E_FAIL;
- else
- return stdInterface->get_accHelp (varID, pszHelp);
+ // Try to use child object directly.
+ if (varID.lVal > 0)
+ {
+ IAccessible* childAccessible = GetChildAccessible(varID.lVal);
+ if (childAccessible)
+ {
+ varID.lVal = 0;
+ HRESULT hResult = childAccessible->get_accHelp(varID, pszHelp);
+ childAccessible->Release();
+ return hResult;
+ }
+ else if (m_pAccessible->GetIAccessibleStd())
+ return ((IAccessible*) m_pAccessible->GetIAccessibleStd())->get_accHelp(varID, pszHelp);
+ }
+ else if (m_pAccessible->GetIAccessibleStd())
+ return ((IAccessible*) m_pAccessible->GetIAccessibleStd())->get_accHelp (varID, pszHelp);
}
else
{
return S_OK;
}
}
- return E_FAIL;
+ return E_NOTIMPL;
}
// Retrieves the full path of the WinHelp file associated with the specified
STDMETHODIMP wxIAccessible::get_accHelpTopic ( BSTR* pszHelpFile, VARIANT varChild, long* pidTopic)
{
- wxLogDebug("get_accHelpTopic");
+ wxLogTrace(wxT("access"), wxT("get_accHelpTopic"));
wxASSERT (m_pAccessible != NULL);
if (!m_pAccessible)
return E_FAIL;
if (varChild.vt != VT_I4)
{
- wxLogDebug("Invalid arg for get_accHelpTopic");
+ wxLogTrace(wxT("access"), wxT("Invalid arg for get_accHelpTopic"));
return E_INVALIDARG;
}
if (status == wxACC_NOT_IMPLEMENTED)
{
- // Use standard interface instead.
- IAccessible* stdInterface = (IAccessible*)m_pAccessible->GetIAccessibleStd();
- if (!stdInterface)
- return E_FAIL;
- else
- return stdInterface->get_accHelpTopic (pszHelpFile, varChild, pidTopic);
+ // Try to use child object directly.
+ if (varChild.lVal > 0)
+ {
+ IAccessible* childAccessible = GetChildAccessible(varChild.lVal);
+ if (childAccessible)
+ {
+ varChild.lVal = 0;
+ HRESULT hResult = childAccessible->get_accHelpTopic(pszHelpFile, varChild, pidTopic);
+ childAccessible->Release();
+ return hResult;
+ }
+ else if (m_pAccessible->GetIAccessibleStd())
+ return ((IAccessible*) m_pAccessible->GetIAccessibleStd())->get_accHelpTopic(pszHelpFile, varChild, pidTopic);
+ }
+ else if (m_pAccessible->GetIAccessibleStd())
+ return ((IAccessible*) m_pAccessible->GetIAccessibleStd())->get_accHelpTopic (pszHelpFile, varChild, pidTopic);
}
- return E_FAIL;
+ return E_NOTIMPL;
}
// Retrieves the specified object's shortcut key or access key, also known as
STDMETHODIMP wxIAccessible::get_accKeyboardShortcut ( VARIANT varID, BSTR* pszKeyboardShortcut)
{
- wxLogDebug("get_accKeyboardShortcut");
+ wxLogTrace(wxT("access"), wxT("get_accKeyboardShortcut"));
*pszKeyboardShortcut = NULL;
wxASSERT (m_pAccessible != NULL);
if (varID.vt != VT_I4)
{
- wxLogDebug("Invalid arg for get_accKeyboardShortcut");
+ wxLogTrace(wxT("access"), wxT("Invalid arg for get_accKeyboardShortcut"));
return E_INVALIDARG;
}
wxString keyboardShortcut;
- wxAccStatus status = m_pAccessible->GetHelpText(varID.lVal, & keyboardShortcut);
+ wxAccStatus status = m_pAccessible->GetKeyboardShortcut(varID.lVal, & keyboardShortcut);
if (status == wxACC_FAIL)
return E_FAIL;
if (status == wxACC_NOT_IMPLEMENTED)
{
- // Use standard interface instead.
- IAccessible* stdInterface = (IAccessible*)m_pAccessible->GetIAccessibleStd();
- if (!stdInterface)
- return E_FAIL;
- else
- return stdInterface->get_accKeyboardShortcut(varID, pszKeyboardShortcut);
+ // Try to use child object directly.
+ if (varID.lVal > 0)
+ {
+ IAccessible* childAccessible = GetChildAccessible(varID.lVal);
+ if (childAccessible)
+ {
+ varID.lVal = 0;
+ HRESULT hResult = childAccessible->get_accKeyboardShortcut(varID, pszKeyboardShortcut);
+ childAccessible->Release();
+ return hResult;
+ }
+ else if (m_pAccessible->GetIAccessibleStd())
+ return ((IAccessible*) m_pAccessible->GetIAccessibleStd())->get_accKeyboardShortcut(varID, pszKeyboardShortcut);
+ }
+ else if (m_pAccessible->GetIAccessibleStd())
+ return ((IAccessible*) m_pAccessible->GetIAccessibleStd())->get_accKeyboardShortcut (varID, pszKeyboardShortcut);
}
else
{
return S_OK;
}
}
- return E_FAIL;
+ return E_NOTIMPL;
}
// Retrieves the name of the specified object.
STDMETHODIMP wxIAccessible::get_accName ( VARIANT varID, BSTR* pszName)
{
- wxLogDebug("get_accName");
+ wxLogTrace(wxT("access"), wxT("get_accName"));
*pszName = NULL;
wxASSERT (m_pAccessible != NULL);
if (varID.vt != VT_I4)
{
- wxLogDebug("Invalid arg for get_accName");
+ wxLogTrace(wxT("access"), wxT("Invalid arg for get_accName"));
return E_INVALIDARG;
}
if (status == wxACC_NOT_IMPLEMENTED)
{
-#if 0
- // Use standard interface instead.
- IAccessible* stdInterface = (IAccessible*)m_pAccessible->GetIAccessibleStd();
- if (!stdInterface)
- return E_FAIL;
- else
- return stdInterface->get_accName (varID, pszName);
-#endif
- // Turn child reference into object reference.
- IAccessible* stdInterface = GetChildStdAccessible(varID.lVal);
- if (stdInterface)
+ // Try to use child object directly.
+ if (varID.lVal > 0)
{
- varID.lVal = 0;
- HRESULT hResult = stdInterface->get_accName(varID, pszName);
- stdInterface->Release();
- return hResult;
+ IAccessible* childAccessible = GetChildAccessible(varID.lVal);
+ if (childAccessible)
+ {
+ varID.lVal = 0;
+ HRESULT hResult = childAccessible->get_accName(varID, pszName);
+ childAccessible->Release();
+ return hResult;
+ }
+ else if (m_pAccessible->GetIAccessibleStd())
+ return ((IAccessible*) m_pAccessible->GetIAccessibleStd())->get_accName(varID, pszName);
}
- else
- return E_FAIL;
+ else if (m_pAccessible->GetIAccessibleStd())
+ return ((IAccessible*) m_pAccessible->GetIAccessibleStd())->get_accName (varID, pszName);
}
else
{
*pszName = basicString.Get();
return S_OK;
}
- return E_FAIL;
+ return E_NOTIMPL;
}
// Retrieves information that describes the role of the specified object.
STDMETHODIMP wxIAccessible::get_accRole ( VARIANT varID, VARIANT* pVarRole)
{
- wxLogDebug("get_accRole");
+ wxLogTrace(wxT("access"), wxT("get_accRole"));
wxASSERT (m_pAccessible != NULL);
if (!m_pAccessible)
return E_FAIL;
if (varID.vt != VT_I4)
{
- wxLogDebug("Invalid arg for get_accRole");
+ wxLogTrace(wxT("access"), wxT("Invalid arg for get_accRole"));
return E_INVALIDARG;
}
if (status == wxACC_NOT_IMPLEMENTED)
{
- // Use standard interface instead.
- IAccessible* stdInterface = (IAccessible*)m_pAccessible->GetIAccessibleStd();
- if (!stdInterface)
- return E_FAIL;
- else
- return stdInterface->get_accRole (varID, pVarRole);
+ // Try to use child object directly.
+ if (varID.lVal > 0)
+ {
+ IAccessible* childAccessible = GetChildAccessible(varID.lVal);
+ if (childAccessible)
+ {
+ varID.lVal = 0;
+ HRESULT hResult = childAccessible->get_accRole(varID, pVarRole);
+ childAccessible->Release();
+ return hResult;
+ }
+ else if (m_pAccessible->GetIAccessibleStd())
+ return ((IAccessible*) m_pAccessible->GetIAccessibleStd())->get_accRole(varID, pVarRole);
+ }
+ else if (m_pAccessible->GetIAccessibleStd())
+ return ((IAccessible*) m_pAccessible->GetIAccessibleStd())->get_accRole (varID, pVarRole);
}
else
{
return S_OK;
}
- return E_FAIL;
+ return E_NOTIMPL;
}
// Retrieves the current state of the specified object.
STDMETHODIMP wxIAccessible::get_accState ( VARIANT varID, VARIANT* pVarState)
{
- wxLogDebug("get_accState");
+ wxLogTrace(wxT("access"), wxT("get_accState"));
wxASSERT (m_pAccessible != NULL);
if (!m_pAccessible)
return E_FAIL;
- if (varID.vt != VT_I4)
+ if (varID.vt != VT_I4 && varID.vt != VT_EMPTY)
{
- wxLogDebug("Invalid arg for get_accState");
+ wxLogTrace(wxT("access"), wxT("Invalid arg for get_accState"));
return E_INVALIDARG;
}
if (status == wxACC_NOT_IMPLEMENTED)
{
- // Use standard interface instead.
- IAccessible* stdInterface = (IAccessible*)m_pAccessible->GetIAccessibleStd();
- if (!stdInterface)
- return E_FAIL;
- else
- return stdInterface->get_accState (varID, pVarState);
+ // Try to use child object directly.
+ if (varID.lVal > 0)
+ {
+ IAccessible* childAccessible = GetChildAccessible(varID.lVal);
+ if (childAccessible)
+ {
+ varID.lVal = 0;
+ HRESULT hResult = childAccessible->get_accState(varID, pVarState);
+ childAccessible->Release();
+ return hResult;
+ }
+ else if (m_pAccessible->GetIAccessibleStd())
+ return ((IAccessible*) m_pAccessible->GetIAccessibleStd())->get_accState(varID, pVarState);
+ }
+ else if (m_pAccessible->GetIAccessibleStd())
+ return ((IAccessible*) m_pAccessible->GetIAccessibleStd())->get_accState (varID, pVarState);
}
else
{
pVarState->vt = VT_I4;
return S_OK;
}
- return E_FAIL;
+ return E_NOTIMPL;
}
// Retrieves the value of the specified object.
STDMETHODIMP wxIAccessible::get_accValue ( VARIANT varID, BSTR* pszValue)
{
- wxLogDebug("get_accValue");
+ wxLogTrace(wxT("access"), wxT("get_accValue"));
wxASSERT (m_pAccessible != NULL);
if (!m_pAccessible)
return E_FAIL;
if (varID.vt != VT_I4)
{
- wxLogDebug("Invalid arg for get_accValue");
+ wxLogTrace(wxT("access"), wxT("Invalid arg for get_accValue"));
return E_INVALIDARG;
}
if (status == wxACC_NOT_IMPLEMENTED)
{
- // Use standard interface instead.
- IAccessible* stdInterface = (IAccessible*)m_pAccessible->GetIAccessibleStd();
- if (!stdInterface)
- return E_FAIL;
- else
- return stdInterface->get_accValue (varID, pszValue);
+ // Try to use child object directly.
+ if (varID.lVal > 0)
+ {
+ IAccessible* childAccessible = GetChildAccessible(varID.lVal);
+ if (childAccessible)
+ {
+ varID.lVal = 0;
+ HRESULT hResult = childAccessible->get_accValue(varID, pszValue);
+ childAccessible->Release();
+ return hResult;
+ }
+ else if (m_pAccessible->GetIAccessibleStd())
+ return ((IAccessible*) m_pAccessible->GetIAccessibleStd())->get_accValue(varID, pszValue);
+ }
+ else if (m_pAccessible->GetIAccessibleStd())
+ return ((IAccessible*) m_pAccessible->GetIAccessibleStd())->get_accValue (varID, pszValue);
}
else
{
* pszValue = basicString.Get();
return S_OK;
}
- return E_FAIL;
+ return E_NOTIMPL;
}
// Modifies the selection or moves the keyboard focus of the
STDMETHODIMP wxIAccessible::accSelect ( long flagsSelect, VARIANT varID )
{
- wxLogDebug("get_accSelect");
+ wxLogTrace(wxT("access"), wxT("get_accSelect"));
wxASSERT (m_pAccessible != NULL);
if (!m_pAccessible)
return E_FAIL;
if (varID.vt != VT_I4 && varID.vt != VT_EMPTY)
{
- wxLogDebug("Invalid arg for accSelect");
+ wxLogTrace(wxT("access"), wxT("Invalid arg for accSelect"));
return E_INVALIDARG;
}
if (status == wxACC_NOT_IMPLEMENTED)
{
- // Use standard interface instead.
- IAccessible* stdInterface = (IAccessible*)m_pAccessible->GetIAccessibleStd();
- if (!stdInterface)
- return E_FAIL;
- else
- return stdInterface->accSelect ( flagsSelect, varID );
+ // Try to use child object directly.
+ if (varID.lVal > 0 && varID.lVal > 0)
+ {
+ IAccessible* childAccessible = GetChildAccessible(varID.lVal);
+ if (childAccessible)
+ {
+ varID.lVal = 0;
+ HRESULT hResult = childAccessible->accSelect(flagsSelect, varID);
+ childAccessible->Release();
+ return hResult;
+ }
+ else if (m_pAccessible->GetIAccessibleStd())
+ return ((IAccessible*) m_pAccessible->GetIAccessibleStd())->accSelect(flagsSelect, varID);
+ }
+ else if (m_pAccessible->GetIAccessibleStd())
+ return ((IAccessible*) m_pAccessible->GetIAccessibleStd())->accSelect(flagsSelect, varID);
}
else
return S_OK;
- return E_FAIL;
+ return E_NOTIMPL;
}
// Retrieves the object that has the keyboard focus. All objects
STDMETHODIMP wxIAccessible::get_accFocus ( VARIANT* pVarID)
{
- wxLogDebug("get_accFocus");
+ wxLogTrace(wxT("access"), wxT("get_accFocus"));
wxASSERT (m_pAccessible != NULL);
if (!m_pAccessible)
return E_FAIL;
// Use standard interface instead.
IAccessible* stdInterface = (IAccessible*)m_pAccessible->GetIAccessibleStd();
if (!stdInterface)
- return E_FAIL;
+ return E_NOTIMPL;
else
return stdInterface->get_accFocus (pVarID);
}
{
wxIAccessible* childIA = childObject->GetIAccessible();
if (!childIA)
- return E_FAIL;
+ return E_NOTIMPL;
if (childIA->QueryInterface(IID_IDispatch, (LPVOID*) & pVarID->pdispVal) != S_OK)
return E_FAIL;
pVarID->vt = VT_DISPATCH;
-// pVarID->pdispVal->AddRef();
return S_OK;
}
}
return S_FALSE;
}
- return E_FAIL;
+ #if 0
+ // all cases above already cause some return action so below line
+ // is unreachable and cause unnecessary warning
+ return E_NOTIMPL;
+ #endif
}
// Retrieves the selected children of this object. All objects
STDMETHODIMP wxIAccessible::get_accSelection ( VARIANT * pVarChildren)
{
- wxLogDebug("get_accSelection");
+ wxLogTrace(wxT("access"), wxT("get_accSelection"));
wxASSERT (m_pAccessible != NULL);
if (!m_pAccessible)
return E_FAIL;
// Use standard interface instead.
IAccessible* stdInterface = (IAccessible*)m_pAccessible->GetIAccessibleStd();
if (!stdInterface)
- return E_FAIL;
+ return E_NOTIMPL;
else
return stdInterface->get_accSelection (pVarChildren);
}
wxAccessible* childObject = (wxAccessible*) selections.GetVoidPtr();
wxIAccessible* childIA = childObject->GetIAccessible();
if (!childIA)
- return E_FAIL;
+ return E_NOTIMPL;
if (childIA->QueryInterface(IID_IDispatch, (LPVOID*) & pVarChildren->pdispVal) != S_OK)
return E_FAIL;
pVarChildren->vt = VT_DISPATCH;
-// pVarChildren->pdispVal->AddRef();
return S_OK;
}
}
}
- return E_FAIL;
+ return E_NOTIMPL;
}
// Get type info
-STDMETHODIMP wxIAccessible::GetTypeInfo(unsigned int typeInfo, LCID lcid, ITypeInfo** ppTypeInfo)
+STDMETHODIMP wxIAccessible::GetTypeInfo(unsigned int WXUNUSED(typeInfo), LCID WXUNUSED(lcid), ITypeInfo** ppTypeInfo)
{
*ppTypeInfo = NULL;
return E_NOTIMPL;
// Get ids of names
-STDMETHODIMP wxIAccessible::GetIDsOfNames(REFIID riid, OLECHAR** names, unsigned int cNames,
- LCID lcid, DISPID* dispId)
+STDMETHODIMP wxIAccessible::GetIDsOfNames(REFIID WXUNUSED(riid), OLECHAR** WXUNUSED(names), unsigned int WXUNUSED(cNames),
+ LCID WXUNUSED(lcid), DISPID* WXUNUSED(dispId))
{
return E_NOTIMPL;
}
// Invoke
-STDMETHODIMP wxIAccessible::Invoke(DISPID dispIdMember, REFIID riid, LCID lcid,
- WORD wFlags, DISPPARAMS *pDispParams,
- VARIANT *pVarResult, EXCEPINFO *pExcepInfo,
- unsigned int *puArgErr )
+STDMETHODIMP wxIAccessible::Invoke(DISPID WXUNUSED(dispIdMember), REFIID WXUNUSED(riid), LCID WXUNUSED(lcid),
+ WORD WXUNUSED(wFlags), DISPPARAMS *WXUNUSED(pDispParams),
+ VARIANT *WXUNUSED(pVarResult), EXCEPINFO *WXUNUSED(pExcepInfo),
+ unsigned int *WXUNUSED(puArgErr) )
{
return E_NOTIMPL;
}
-// Gets the IAccessible interface for the given child or object.
+// Gets the standard IAccessible interface for the given child or object.
// Call Release if this is non-NULL.
IAccessible* wxIAccessible::GetChildStdAccessible(int id)
{
return NULL;
}
+// Gets the IAccessible interface for the given child or object.
+// Call Release if this is non-NULL.
+IAccessible* wxIAccessible::GetChildAccessible(int id)
+{
+ if (id == 0)
+ {
+ IAccessible* obj = this;
+
+ obj->AddRef();
+ return obj;
+ }
+ else
+ {
+ VARIANT var;
+ VariantInit(& var);
+ var.vt = VT_I4;
+ var.lVal = id;
+ IDispatch* pDispatch = NULL;
+ if (S_OK == get_accChild ( var, & pDispatch))
+ {
+ IAccessible* childAccessible = NULL;
+ if (pDispatch->QueryInterface(IID_IAccessible, (LPVOID*) & childAccessible) == S_OK)
+ {
+ pDispatch->Release();
+ return childAccessible;
+ }
+ else
+ {
+ pDispatch->Release();
+ }
+ }
+ }
+ return NULL;
+}
// ----------------------------------------------------------------------------
// wxAccessible implementation
if (GetWindow())
{
-#if 0
- HRESULT retCode = ::CreateStdAccessibleProxy((HWND) GetWindow()->GetHWND(),
- wxT("wxWindowClass"), OBJID_CLIENT, IID_IAccessible, (void**) & m_pIAccessibleStd);
-#else
HRESULT retCode = ::CreateStdAccessibleObject((HWND) GetWindow()->GetHWND(),
OBJID_CLIENT, IID_IAccessible, (void**) & m_pIAccessibleStd);
-#endif
if (retCode == S_OK)
return m_pIAccessibleStd;
else
return NULL;
}
+// Sends an event when something changes in an accessible object.
+void wxAccessible::NotifyEvent(int eventType, wxWindow* window, wxAccObject objectType,
+ int objectId)
+{
+ ::NotifyWinEvent((DWORD) eventType, (HWND) window->GetHWND(),
+ (LONG) objectType, (LONG) objectId);
+}
+
// Utilities
// Convert to Windows role
{
int sel = 0;
- if (sel & wxACC_SEL_TAKEFOCUS)
+ if (wxsel & wxACC_SEL_TAKEFOCUS)
sel |= SELFLAG_TAKEFOCUS;
- if (sel & wxACC_SEL_TAKESELECTION)
+ if (wxsel & wxACC_SEL_TAKESELECTION)
sel |= SELFLAG_TAKESELECTION;
- if (sel & wxACC_SEL_EXTENDSELECTION)
+ if (wxsel & wxACC_SEL_EXTENDSELECTION)
sel |= SELFLAG_EXTENDSELECTION;
- if (sel & wxACC_SEL_ADDSELECTION)
+ if (wxsel & wxACC_SEL_ADDSELECTION)
sel |= SELFLAG_ADDSELECTION;
- if (sel & wxACC_SEL_REMOVESELECTION)
+ if (wxsel & wxACC_SEL_REMOVESELECTION)
sel |= SELFLAG_REMOVESELECTION;
return sel;
}
projects / wxWidgets.git / blobdiff