Use the data scheme to load resources in the WebKitGTK+ implementation, rather than...

[wxWidgets.git] / src / msw / ole / access.cpp

diff --git a/src/msw/ole/access.cpp b/src/msw/ole/access.cpp
index 9aff3c6c183c5d1b2721b974bb3e2fe689e870f4..32dab02e82f0e960c49c05022c784f7d4722a02c 100644 (file)
--- a/src/msw/ole/access.cpp
+++ b/src/msw/ole/access.cpp
@@ -41,7 +41,6 @@
 
 #include <oleauto.h>
 #include <oleacc.h>
 
 #include <oleauto.h>
 #include <oleacc.h>

-#include <winable.h>

 
 #include "wx/msw/ole/oleutils.h"
 
 
 #include "wx/msw/ole/oleutils.h"
 


@@ -88,7 +87,7 @@ private:
     wxVariant m_variant;  // List of further variants
     int       m_nCurrent; // Current enum position
 
     wxVariant m_variant;  // List of further variants
     int       m_nCurrent; // Current enum position
 

-    DECLARE_NO_COPY_CLASS(wxIEnumVARIANT)
+    wxDECLARE_NO_COPY_CLASS(wxIEnumVARIANT);

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -188,6 +187,9 @@ class wxIAccessible : public IAccessible
 public:
     wxIAccessible(wxAccessible *pAccessible);
 
 public:
     wxIAccessible(wxAccessible *pAccessible);
 

+    // Called to indicate object should prepare to be deleted.
+    void Quiesce();
+

     DECLARE_IUNKNOWN_METHODS;
 
 // IAccessible
     DECLARE_IUNKNOWN_METHODS;
 
 // IAccessible


@@ -335,8 +337,9 @@ public:
 
 private:
     wxAccessible *m_pAccessible;      // pointer to C++ class we belong to
 
 private:
     wxAccessible *m_pAccessible;      // pointer to C++ class we belong to

+    bool m_bQuiescing;                // Object is to be deleted

 
 

-    DECLARE_NO_COPY_CLASS(wxIAccessible)
+    wxDECLARE_NO_COPY_CLASS(wxIAccessible);

 };
 
 // ============================================================================
 };
 
 // ============================================================================


@@ -359,6 +362,15 @@ wxIAccessible::wxIAccessible(wxAccessible *pAccessible)
     wxASSERT( pAccessible != NULL );
 
     m_pAccessible = pAccessible;
     wxASSERT( pAccessible != NULL );
 
     m_pAccessible = pAccessible;

+    m_bQuiescing = false;
+}
+
+// Called to indicate object should prepare to be deleted.
+
+void wxIAccessible::Quiesce()
+{
+    m_bQuiescing = true;
+    m_pAccessible = NULL;

 }
 
 // Retrieves the child element or child object at a given point on the screen.
 }
 
 // Retrieves the child element or child object at a given point on the screen.


@@ -367,7 +379,7 @@ wxIAccessible::wxIAccessible(wxAccessible *pAccessible)
 STDMETHODIMP wxIAccessible::accHitTest(long xLeft, long yLeft, VARIANT* pVarID)
 {
     wxLogTrace(wxT("access"), wxT("accHitTest"));
 STDMETHODIMP wxIAccessible::accHitTest(long xLeft, long yLeft, VARIANT* pVarID)
 {
     wxLogTrace(wxT("access"), wxT("accHitTest"));

-    wxASSERT (m_pAccessible != NULL);
+    wxASSERT( ( m_pAccessible != NULL ) || ( m_bQuiescing == true ) );

     if (!m_pAccessible)
         return E_FAIL;
 
     if (!m_pAccessible)
         return E_FAIL;
 


@@ -436,7 +448,7 @@ STDMETHODIMP wxIAccessible::accHitTest(long xLeft, long yLeft, VARIANT* pVarID)
 STDMETHODIMP wxIAccessible::accLocation ( long* pxLeft, long* pyTop, long* pcxWidth, long* pcyHeight, VARIANT varID)
 {
     wxLogTrace(wxT("access"), wxT("accLocation"));
 STDMETHODIMP wxIAccessible::accLocation ( long* pxLeft, long* pyTop, long* pcxWidth, long* pcyHeight, VARIANT varID)
 {
     wxLogTrace(wxT("access"), wxT("accLocation"));

-    wxASSERT (m_pAccessible != NULL);
+    wxASSERT( ( m_pAccessible != NULL ) || ( m_bQuiescing == true ) );

     if (!m_pAccessible)
         return E_FAIL;
 
     if (!m_pAccessible)
         return E_FAIL;
 


@@ -482,7 +494,7 @@ STDMETHODIMP wxIAccessible::accLocation ( long* pxLeft, long* pyTop, long* pcxWi
 
 STDMETHODIMP wxIAccessible::accNavigate ( long navDir, VARIANT varStart, VARIANT* pVarEnd)
 {
 
 STDMETHODIMP wxIAccessible::accNavigate ( long navDir, VARIANT varStart, VARIANT* pVarEnd)
 {

-    wxASSERT (m_pAccessible != NULL);
+    wxASSERT( ( m_pAccessible != NULL ) || ( m_bQuiescing == true ) );

     if (!m_pAccessible)
         return E_FAIL;
     wxLogTrace(wxT("access"), wxString(wxT("accNavigate for ")) + m_pAccessible->GetWindow()->GetClassInfo()->GetClassName());
     if (!m_pAccessible)
         return E_FAIL;
     wxLogTrace(wxT("access"), wxString(wxT("accNavigate for ")) + m_pAccessible->GetWindow()->GetClassInfo()->GetClassName());


@@ -639,7 +651,7 @@ STDMETHODIMP wxIAccessible::accNavigate ( long navDir, VARIANT varStart, VARIANT
 STDMETHODIMP wxIAccessible::get_accChild ( VARIANT varChildID, IDispatch** ppDispChild)
 {
     wxLogTrace(wxT("access"), wxT("get_accChild"));
 STDMETHODIMP wxIAccessible::get_accChild ( VARIANT varChildID, IDispatch** ppDispChild)
 {
     wxLogTrace(wxT("access"), wxT("get_accChild"));

-    wxASSERT (m_pAccessible != NULL);
+    wxASSERT( ( m_pAccessible != NULL ) || ( m_bQuiescing == true ) );

     if (!m_pAccessible)
         return E_FAIL;
 
     if (!m_pAccessible)
         return E_FAIL;
 


@@ -713,7 +725,7 @@ STDMETHODIMP wxIAccessible::get_accChild ( VARIANT varChildID, IDispatch** ppDis
 STDMETHODIMP wxIAccessible::get_accChildCount ( long* pCountChildren)
 {
     wxLogTrace(wxT("access"), wxT("get_accChildCount"));
 STDMETHODIMP wxIAccessible::get_accChildCount ( long* pCountChildren)
 {
     wxLogTrace(wxT("access"), wxT("get_accChildCount"));

-    wxASSERT (m_pAccessible != NULL);
+    wxASSERT( ( m_pAccessible != NULL ) || ( m_bQuiescing == true ) );

     if (!m_pAccessible)
         return E_FAIL;
 
     if (!m_pAccessible)
         return E_FAIL;
 


@@ -757,7 +769,7 @@ STDMETHODIMP wxIAccessible::get_accChildCount ( long* pCountChildren)
 STDMETHODIMP wxIAccessible::get_accParent ( IDispatch** ppDispParent)
 {
     wxLogTrace(wxT("access"), wxT("get_accParent"));
 STDMETHODIMP wxIAccessible::get_accParent ( IDispatch** ppDispParent)
 {
     wxLogTrace(wxT("access"), wxT("get_accParent"));

-    wxASSERT (m_pAccessible != NULL);
+    wxASSERT( ( m_pAccessible != NULL ) || ( m_bQuiescing == true ) );

     if (!m_pAccessible)
         return E_FAIL;
 
     if (!m_pAccessible)
         return E_FAIL;
 


@@ -821,7 +833,7 @@ STDMETHODIMP wxIAccessible::get_accParent ( IDispatch** ppDispParent)
 STDMETHODIMP wxIAccessible::accDoDefaultAction(VARIANT varID)
 {
     wxLogTrace(wxT("access"), wxT("accDoDefaultAction"));
 STDMETHODIMP wxIAccessible::accDoDefaultAction(VARIANT varID)
 {
     wxLogTrace(wxT("access"), wxT("accDoDefaultAction"));

-    wxASSERT (m_pAccessible != NULL);
+    wxASSERT( ( m_pAccessible != NULL ) || ( m_bQuiescing == true ) );

     if (!m_pAccessible)
         return E_FAIL;
 
     if (!m_pAccessible)
         return E_FAIL;
 


@@ -866,7 +878,7 @@ STDMETHODIMP wxIAccessible::accDoDefaultAction(VARIANT varID)
 STDMETHODIMP wxIAccessible::get_accDefaultAction ( VARIANT varID, BSTR* pszDefaultAction)
 {
     wxLogTrace(wxT("access"), wxT("get_accDefaultAction"));
 STDMETHODIMP wxIAccessible::get_accDefaultAction ( VARIANT varID, BSTR* pszDefaultAction)
 {
     wxLogTrace(wxT("access"), wxT("get_accDefaultAction"));

-    wxASSERT (m_pAccessible != NULL);
+    wxASSERT( ( m_pAccessible != NULL ) || ( m_bQuiescing == true ) );

     if (!m_pAccessible)
         return E_FAIL;
 
     if (!m_pAccessible)
         return E_FAIL;
 


@@ -926,7 +938,7 @@ STDMETHODIMP wxIAccessible::get_accDefaultAction ( VARIANT varID, BSTR* pszDefau
 STDMETHODIMP wxIAccessible::get_accDescription ( VARIANT varID, BSTR* pszDescription)
 {
     wxLogTrace(wxT("access"), wxT("get_accDescription"));
 STDMETHODIMP wxIAccessible::get_accDescription ( VARIANT varID, BSTR* pszDescription)
 {
     wxLogTrace(wxT("access"), wxT("get_accDescription"));

-    wxASSERT (m_pAccessible != NULL);
+    wxASSERT( ( m_pAccessible != NULL ) || ( m_bQuiescing == true ) );

     if (!m_pAccessible)
         return E_FAIL;
 
     if (!m_pAccessible)
         return E_FAIL;
 


@@ -983,7 +995,7 @@ STDMETHODIMP wxIAccessible::get_accDescription ( VARIANT varID, BSTR* pszDescrip
 STDMETHODIMP wxIAccessible::get_accHelp ( VARIANT varID, BSTR* pszHelp)
 {
     wxLogTrace(wxT("access"), wxT("get_accHelp"));
 STDMETHODIMP wxIAccessible::get_accHelp ( VARIANT varID, BSTR* pszHelp)
 {
     wxLogTrace(wxT("access"), wxT("get_accHelp"));

-    wxASSERT (m_pAccessible != NULL);
+    wxASSERT( ( m_pAccessible != NULL ) || ( m_bQuiescing == true ) );

     if (!m_pAccessible)
         return E_FAIL;
 
     if (!m_pAccessible)
         return E_FAIL;
 


@@ -1043,7 +1055,7 @@ STDMETHODIMP wxIAccessible::get_accHelp ( VARIANT varID, BSTR* pszHelp)
 STDMETHODIMP wxIAccessible::get_accHelpTopic ( BSTR* pszHelpFile, VARIANT varChild, long* pidTopic)
 {
     wxLogTrace(wxT("access"), wxT("get_accHelpTopic"));
 STDMETHODIMP wxIAccessible::get_accHelpTopic ( BSTR* pszHelpFile, VARIANT varChild, long* pidTopic)
 {
     wxLogTrace(wxT("access"), wxT("get_accHelpTopic"));

-    wxASSERT (m_pAccessible != NULL);
+    wxASSERT( ( m_pAccessible != NULL ) || ( m_bQuiescing == true ) );

     if (!m_pAccessible)
         return E_FAIL;
 
     if (!m_pAccessible)
         return E_FAIL;
 


@@ -1088,7 +1100,7 @@ STDMETHODIMP wxIAccessible::get_accKeyboardShortcut ( VARIANT varID, BSTR* pszKe
     wxLogTrace(wxT("access"), wxT("get_accKeyboardShortcut"));
     *pszKeyboardShortcut = NULL;
 
     wxLogTrace(wxT("access"), wxT("get_accKeyboardShortcut"));
     *pszKeyboardShortcut = NULL;
 

-    wxASSERT (m_pAccessible != NULL);
+    wxASSERT( ( m_pAccessible != NULL ) || ( m_bQuiescing == true ) );

     if (!m_pAccessible)
         return E_FAIL;
 
     if (!m_pAccessible)
         return E_FAIL;
 


@@ -1147,7 +1159,7 @@ STDMETHODIMP wxIAccessible::get_accName ( VARIANT varID, BSTR* pszName)
     wxLogTrace(wxT("access"), wxT("get_accName"));
     *pszName = NULL;
 
     wxLogTrace(wxT("access"), wxT("get_accName"));
     *pszName = NULL;
 

-    wxASSERT (m_pAccessible != NULL);
+    wxASSERT( ( m_pAccessible != NULL ) || ( m_bQuiescing == true ) );

     if (!m_pAccessible)
         return E_FAIL;
 
     if (!m_pAccessible)
         return E_FAIL;
 


@@ -1198,7 +1210,7 @@ STDMETHODIMP wxIAccessible::get_accName ( VARIANT varID, BSTR* pszName)
 STDMETHODIMP wxIAccessible::get_accRole ( VARIANT varID, VARIANT* pVarRole)
 {
     wxLogTrace(wxT("access"), wxT("get_accRole"));
 STDMETHODIMP wxIAccessible::get_accRole ( VARIANT varID, VARIANT* pVarRole)
 {
     wxLogTrace(wxT("access"), wxT("get_accRole"));

-    wxASSERT (m_pAccessible != NULL);
+    wxASSERT( ( m_pAccessible != NULL ) || ( m_bQuiescing == true ) );

     if (!m_pAccessible)
         return E_FAIL;
 
     if (!m_pAccessible)
         return E_FAIL;
 


@@ -1258,7 +1270,7 @@ STDMETHODIMP wxIAccessible::get_accRole ( VARIANT varID, VARIANT* pVarRole)
 STDMETHODIMP wxIAccessible::get_accState ( VARIANT varID, VARIANT* pVarState)
 {
     wxLogTrace(wxT("access"), wxT("get_accState"));
 STDMETHODIMP wxIAccessible::get_accState ( VARIANT varID, VARIANT* pVarState)
 {
     wxLogTrace(wxT("access"), wxT("get_accState"));

-    wxASSERT (m_pAccessible != NULL);
+    wxASSERT( ( m_pAccessible != NULL ) || ( m_bQuiescing == true ) );

     if (!m_pAccessible)
         return E_FAIL;
 
     if (!m_pAccessible)
         return E_FAIL;
 


@@ -1309,7 +1321,7 @@ STDMETHODIMP wxIAccessible::get_accState ( VARIANT varID, VARIANT* pVarState)
 STDMETHODIMP wxIAccessible::get_accValue ( VARIANT varID, BSTR* pszValue)
 {
     wxLogTrace(wxT("access"), wxT("get_accValue"));
 STDMETHODIMP wxIAccessible::get_accValue ( VARIANT varID, BSTR* pszValue)
 {
     wxLogTrace(wxT("access"), wxT("get_accValue"));

-    wxASSERT (m_pAccessible != NULL);
+    wxASSERT( ( m_pAccessible != NULL ) || ( m_bQuiescing == true ) );

     if (!m_pAccessible)
         return E_FAIL;
 
     if (!m_pAccessible)
         return E_FAIL;
 


@@ -1361,7 +1373,7 @@ STDMETHODIMP wxIAccessible::get_accValue ( VARIANT varID, BSTR* pszValue)
 STDMETHODIMP wxIAccessible::accSelect ( long flagsSelect, VARIANT varID )
 {
     wxLogTrace(wxT("access"), wxT("get_accSelect"));
 STDMETHODIMP wxIAccessible::accSelect ( long flagsSelect, VARIANT varID )
 {
     wxLogTrace(wxT("access"), wxT("get_accSelect"));

-    wxASSERT (m_pAccessible != NULL);
+    wxASSERT( ( m_pAccessible != NULL ) || ( m_bQuiescing == true ) );

     if (!m_pAccessible)
         return E_FAIL;
 
     if (!m_pAccessible)
         return E_FAIL;
 


@@ -1408,7 +1420,7 @@ STDMETHODIMP wxIAccessible::accSelect ( long flagsSelect, VARIANT varID )
 STDMETHODIMP wxIAccessible::get_accFocus ( VARIANT* pVarID)
 {
     wxLogTrace(wxT("access"), wxT("get_accFocus"));
 STDMETHODIMP wxIAccessible::get_accFocus ( VARIANT* pVarID)
 {
     wxLogTrace(wxT("access"), wxT("get_accFocus"));

-    wxASSERT (m_pAccessible != NULL);
+    wxASSERT( ( m_pAccessible != NULL ) || ( m_bQuiescing == true ) );

     if (!m_pAccessible)
         return E_FAIL;
 
     if (!m_pAccessible)
         return E_FAIL;
 


@@ -1475,7 +1487,7 @@ STDMETHODIMP wxIAccessible::get_accSelection ( VARIANT * pVarChildren)
 {
 #if wxUSE_VARIANT
     wxLogTrace(wxT("access"), wxT("get_accSelection"));
 {
 #if wxUSE_VARIANT
     wxLogTrace(wxT("access"), wxT("get_accSelection"));

-    wxASSERT (m_pAccessible != NULL);
+    wxASSERT( ( m_pAccessible != NULL ) || ( m_bQuiescing == true ) );

     if (!m_pAccessible)
         return E_FAIL;
 
     if (!m_pAccessible)
         return E_FAIL;
 


@@ -1707,6 +1719,7 @@ wxAccessible::wxAccessible(wxWindow* win)
 
 wxAccessible::~wxAccessible()
 {
 
 wxAccessible::~wxAccessible()
 {

+    m_pIAccessible->Quiesce();

     m_pIAccessible->Release();
     if (m_pIAccessibleStd)
         ((IAccessible*)m_pIAccessibleStd)->Release();
     m_pIAccessible->Release();
     if (m_pIAccessibleStd)
         ((IAccessible*)m_pIAccessibleStd)->Release();


@@ -1748,6 +1761,8 @@ int wxConvertToWindowsRole(wxAccRole wxrole)
 {
     switch (wxrole)
     {
 {
     switch (wxrole)
     {

+    case wxROLE_NONE:
+        return 0;

     case wxROLE_SYSTEM_ALERT:
         return ROLE_SYSTEM_ALERT;
     case wxROLE_SYSTEM_ANIMATION:
     case wxROLE_SYSTEM_ALERT:
         return ROLE_SYSTEM_ALERT;
     case wxROLE_SYSTEM_ANIMATION: