Fix compilation for some wxMSW configurations.

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

diff --git a/src/msw/ole/access.cpp b/src/msw/ole/access.cpp
index 54dd8da8ea8e51c30d5f8fde14ee017fde1fda59..32dab02e82f0e960c49c05022c784f7d4722a02c 100644 (file)
--- a/src/msw/ole/access.cpp
+++ b/src/msw/ole/access.cpp
@@ -1,12 +1,12 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        msw/ole/access.cpp
+// Name:        src/msw/ole/access.cpp

 // Purpose:     implementation of wxIAccessible and wxAccessible
 // Author:      Julian Smart
 // Modified by:
 // Created:     2003-02-12
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Julian Smart
 // Purpose:     implementation of wxIAccessible and wxAccessible
 // Author:      Julian Smart
 // Modified by:
 // Created:     2003-02-12
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Julian Smart

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -17,28 +17,22 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-  #pragma implementation "access.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #if defined(__BORLANDC__)
   #pragma hdrstop
 #endif
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #if defined(__BORLANDC__)
   #pragma hdrstop
 #endif

-#ifndef WX_PRECOMP
-#include "wx/window.h"
-#endif
-
-#include "wx/setup.h"

 
 #if wxUSE_OLE && wxUSE_ACCESSIBILITY
 
 
 #if wxUSE_OLE && wxUSE_ACCESSIBILITY
 

-#include "wx/log.h"

 #include "wx/access.h"
 
 #include "wx/access.h"
 

-#include "wx/msw/wrapwin.h"
+#ifndef WX_PRECOMP
+    #include "wx/msw/wrapwin.h"
+    #include "wx/window.h"
+    #include "wx/log.h"
+#endif

 
 // for some compilers, the entire ole2.h must be included, not only oleauto.h
 #if wxUSE_NORLANDER_HEADERS || defined(__WATCOMC__)
 
 // for some compilers, the entire ole2.h must be included, not only oleauto.h
 #if wxUSE_NORLANDER_HEADERS || defined(__WATCOMC__)


@@ -47,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"
 


@@ -71,6 +64,7 @@ int wxConvertToWindowsSelFlag(wxAccSelectionFlags sel);
 // Convert from Windows selection flag
 wxAccSelectionFlags wxConvertFromWindowsSelFlag(int sel);
 
 // Convert from Windows selection flag
 wxAccSelectionFlags wxConvertFromWindowsSelFlag(int sel);
 

+#if wxUSE_VARIANT

 // ----------------------------------------------------------------------------
 // wxIEnumVARIANT interface implementation
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxIEnumVARIANT interface implementation
 // ----------------------------------------------------------------------------


@@ -93,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);

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


@@ -182,6 +176,7 @@ STDMETHODIMP wxIEnumVARIANT::Clone(IEnumVARIANT **ppenum)
     return S_OK;
 }
 
     return S_OK;
 }
 

+#endif // wxUSE_VARIANT

 
 // ----------------------------------------------------------------------------
 // wxIAccessible implementation of IAccessible interface
 
 // ----------------------------------------------------------------------------
 // wxIAccessible implementation of IAccessible interface


@@ -192,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


@@ -199,12 +197,12 @@ public:
 // Navigation and Hierarchy
 
         // Retrieves the child element or child object at a given point on the screen.
 // Navigation and Hierarchy
 
         // Retrieves the child element or child object at a given point on the screen.

-        // All visual objects support this method; sound objects do not support it.    
+        // All visual objects support this method; sound objects do not support it.

 
     STDMETHODIMP accHitTest(long xLeft, long yLeft, VARIANT* pVarID);
 
         // Retrieves the specified object's current screen location. All visual objects must
 
     STDMETHODIMP accHitTest(long xLeft, long yLeft, VARIANT* pVarID);
 
         // Retrieves the specified object's current screen location. All visual objects must

-        // support this method; sound objects do not support it.    
+        // support this method; sound objects do not support it.

 
     STDMETHODIMP accLocation ( long* pxLeft, long* pyTop, long* pcxWidth, long* pcyHeight, VARIANT varID);
 
 
     STDMETHODIMP accLocation ( long* pxLeft, long* pyTop, long* pcxWidth, long* pcyHeight, VARIANT varID);
 


@@ -215,29 +213,29 @@ public:
 
         // Retrieves the address of an IDispatch interface for the specified child.
         // All objects must support this property.
 
         // Retrieves the address of an IDispatch interface for the specified child.
         // All objects must support this property.

-    
+

     STDMETHODIMP get_accChild ( VARIANT varChildID, IDispatch** ppDispChild);
 
         // Retrieves the number of children that belong to this object.
         // All objects must support this property.
     STDMETHODIMP get_accChild ( VARIANT varChildID, IDispatch** ppDispChild);
 
         // Retrieves the number of children that belong to this object.
         // All objects must support this property.

-    
+

     STDMETHODIMP get_accChildCount ( long* pCountChildren);
 
         // Retrieves the IDispatch interface of the object's parent.
         // All objects support this property.
     STDMETHODIMP get_accChildCount ( long* pCountChildren);
 
         // Retrieves the IDispatch interface of the object's parent.
         // All objects support this property.

-    
+

     STDMETHODIMP get_accParent ( IDispatch** ppDispParent);
 
 // Descriptive Properties and Methods
 
         // Performs the object's default action. Not all objects have a default
         // action.
     STDMETHODIMP get_accParent ( IDispatch** ppDispParent);
 
 // Descriptive Properties and Methods
 
         // Performs the object's default action. Not all objects have a default
         // action.

-    
+

     STDMETHODIMP accDoDefaultAction(VARIANT varID);
 
         // Retrieves a string that describes the object's default action.
         // Not all objects have a default action.
     STDMETHODIMP accDoDefaultAction(VARIANT varID);
 
         // Retrieves a string that describes the object's default action.
         // Not all objects have a default action.

-    
+

     STDMETHODIMP get_accDefaultAction ( VARIANT varID, BSTR* pszDefaultAction);
 
         // Retrieves a string that describes the visual appearance of the specified object.
     STDMETHODIMP get_accDefaultAction ( VARIANT varID, BSTR* pszDefaultAction);
 
         // Retrieves a string that describes the visual appearance of the specified object.


@@ -253,18 +251,18 @@ public:
         // Retrieves the full path of the WinHelp file associated with the specified
         // object and the identifier of the appropriate topic within that file.
         // Not all objects support this property.
         // Retrieves the full path of the WinHelp file associated with the specified
         // object and the identifier of the appropriate topic within that file.
         // Not all objects support this property.

-        
+

     STDMETHODIMP get_accHelpTopic ( BSTR* pszHelpFile, VARIANT varChild, long* pidTopic);
 
         // Retrieves the specified object's shortcut key or access key, also known as
         // the mnemonic. All objects that have a shortcut key or access key support
         // this property.
     STDMETHODIMP get_accHelpTopic ( BSTR* pszHelpFile, VARIANT varChild, long* pidTopic);
 
         // Retrieves the specified object's shortcut key or access key, also known as
         // the mnemonic. All objects that have a shortcut key or access key support
         // this property.

-        
+

     STDMETHODIMP get_accKeyboardShortcut ( VARIANT varID, BSTR* pszKeyboardShortcut);
 
         // Retrieves the name of the specified object.
         // All objects support this property.
     STDMETHODIMP get_accKeyboardShortcut ( VARIANT varID, BSTR* pszKeyboardShortcut);
 
         // Retrieves the name of the specified object.
         // All objects support this property.

-    
+

     STDMETHODIMP get_accName ( VARIANT varID, BSTR* pszName);
 
         // Retrieves information that describes the role of the specified object.
     STDMETHODIMP get_accName ( VARIANT varID, BSTR* pszName);
 
         // Retrieves information that describes the role of the specified object.


@@ -274,9 +272,9 @@ public:
 
         // Retrieves the current state of the specified object.
         // All objects support this property.
 
         // Retrieves the current state of the specified object.
         // All objects support this property.

-    
+

     STDMETHODIMP get_accState ( VARIANT varID, VARIANT* pVarState);
     STDMETHODIMP get_accState ( VARIANT varID, VARIANT* pVarState);

-    
+

         // Retrieves the value of the specified object.
         // Not all objects have a value.
 
         // Retrieves the value of the specified object.
         // Not all objects have a value.
 


@@ -292,18 +290,18 @@ public:
 
         // Retrieves the object that has the keyboard focus. All objects
         // that receive the keyboard focus must support this property.
 
         // Retrieves the object that has the keyboard focus. All objects
         // that receive the keyboard focus must support this property.

-        
+

     STDMETHODIMP get_accFocus ( VARIANT* pVarID);
 
         // Retrieves the selected children of this object. All objects
         // selected must support this property.
     STDMETHODIMP get_accFocus ( VARIANT* pVarID);
 
         // Retrieves the selected children of this object. All objects
         // selected must support this property.

-        
+

     STDMETHODIMP get_accSelection ( VARIANT * pVarChildren);
 
 // Obsolete
 
     STDMETHODIMP get_accSelection ( VARIANT * pVarChildren);
 
 // Obsolete
 

-    STDMETHODIMP put_accName(VARIANT varChild, BSTR szName) { return E_FAIL; }
-    STDMETHODIMP put_accValue(VARIANT varChild, BSTR szName) { return E_FAIL; }
+    STDMETHODIMP put_accName(VARIANT WXUNUSED(varChild), BSTR WXUNUSED(szName)) { return E_FAIL; }
+    STDMETHODIMP put_accValue(VARIANT WXUNUSED(varChild), BSTR WXUNUSED(szName)) { return E_FAIL; }

 
 // IDispatch
 
 
 // IDispatch
 


@@ -322,9 +320,9 @@ public:
 
         // Invoke
 
 
         // Invoke
 

-    STDMETHODIMP Invoke(DISPID dispIdMember, REFIID riid, LCID lcid, 
-                        WORD wFlags, DISPPARAMS *pDispParams, 
-                        VARIANT *pVarResult, EXCEPINFO *pExcepInfo, 
+    STDMETHODIMP Invoke(DISPID dispIdMember, REFIID riid, LCID lcid,
+                        WORD wFlags, DISPPARAMS *pDispParams,
+                        VARIANT *pVarResult, EXCEPINFO *pExcepInfo,

                         unsigned int *puArgErr );
 
 // Helpers
                         unsigned int *puArgErr );
 
 // Helpers


@@ -339,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);

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


@@ -363,27 +362,36 @@ 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.

-// All visual objects support this method; sound objects do not support it.    
+// All visual objects support this method; sound objects do not support it.

 
 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;

-    
+

     wxAccessible* childObject = NULL;
     int childId = 0;
     VariantInit(pVarID);
     wxAccessible* childObject = NULL;
     int childId = 0;
     VariantInit(pVarID);

-    
+

     wxAccStatus status = m_pAccessible->HitTest(wxPoint(xLeft, yLeft), & childId, & childObject);
     wxAccStatus status = m_pAccessible->HitTest(wxPoint(xLeft, yLeft), & childId, & childObject);

-    
+

     if (status == wxACC_FAIL)
         return E_FAIL;
     if (status == wxACC_FAIL)
         return E_FAIL;

-    
+

     if (status == wxACC_NOT_IMPLEMENTED)
     {
         // Use standard interface instead.
     if (status == wxACC_NOT_IMPLEMENTED)
     {
         // Use standard interface instead.


@@ -393,7 +401,7 @@ STDMETHODIMP wxIAccessible::accHitTest(long xLeft, long yLeft, VARIANT* pVarID)
         else
             return stdInterface->accHitTest(xLeft, yLeft, pVarID);
     }
         else
             return stdInterface->accHitTest(xLeft, yLeft, pVarID);
     }

-    
+

     if (childObject)
     {
         if (childObject == m_pAccessible)
     if (childObject)
     {
         if (childObject == m_pAccessible)


@@ -408,9 +416,9 @@ STDMETHODIMP wxIAccessible::accHitTest(long xLeft, long yLeft, VARIANT* pVarID)
             if (!childIA)
                 return E_NOTIMPL;
 
             if (!childIA)
                 return E_NOTIMPL;
 

-               if (childIA->QueryInterface(IID_IDispatch, (LPVOID*) & pVarID->pdispVal) != S_OK)
-                   return E_FAIL;
-            
+            if (childIA->QueryInterface(IID_IDispatch, (LPVOID*) & pVarID->pdispVal) != S_OK)
+                return E_FAIL;
+

             pVarID->vt = VT_DISPATCH;
             return S_OK;
         }
             pVarID->vt = VT_DISPATCH;
             return S_OK;
         }


@@ -426,8 +434,8 @@ STDMETHODIMP wxIAccessible::accHitTest(long xLeft, long yLeft, VARIANT* pVarID)
         pVarID->vt = VT_EMPTY;
         return S_FALSE;
     }
         pVarID->vt = VT_EMPTY;
         return S_FALSE;
     }

-    
-    #if 0 
+
+    #if 0

     // all cases above already cause some return action so below line
     // is unreachable and cause unnecessary warning
     return E_NOTIMPL;
     // all cases above already cause some return action so below line
     // is unreachable and cause unnecessary warning
     return E_NOTIMPL;


@@ -435,21 +443,21 @@ STDMETHODIMP wxIAccessible::accHitTest(long xLeft, long yLeft, VARIANT* pVarID)
 }
 
 // Retrieves the specified object's current screen location. All visual objects must
 }
 
 // Retrieves the specified object's current screen location. All visual objects must

-// support this method; sound objects do not support it.    
+// support this method; sound objects do not support it.

 
 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;

-    
+

     wxRect rect;
 
     wxAccStatus status = m_pAccessible->GetLocation(rect, varID.lVal);
     if (status == wxACC_FAIL)
         return E_FAIL;
     wxRect rect;
 
     wxAccStatus status = m_pAccessible->GetLocation(rect, varID.lVal);
     if (status == wxACC_FAIL)
         return E_FAIL;

-    
+

     if (status == wxACC_NOT_IMPLEMENTED)
     {
         // Try to use child object directly.
     if (status == wxACC_NOT_IMPLEMENTED)
     {
         // Try to use child object directly.


@@ -486,12 +494,12 @@ 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());
 

-    if ((varStart.vt != VT_I4 && varStart.vt != VT_EMPTY) 
+    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"
                                                           #if 0
                                                           // according to MSDN and sources varStart.vt is unsigned
                                                           // so below line cause warning "Condition is always false"


@@ -502,7 +510,7 @@ STDMETHODIMP wxIAccessible::accNavigate ( long navDir, VARIANT varStart, VARIANT
         wxLogTrace(wxT("access"), wxT("Invalid arg for accNavigate"));
         return E_INVALIDARG;
     }
         wxLogTrace(wxT("access"), wxT("Invalid arg for accNavigate"));
         return E_INVALIDARG;
     }

-    
+

     wxAccessible* elementObject = NULL;
     int elementId = 0;
     VariantInit(pVarEnd);
     wxAccessible* elementObject = NULL;
     int elementId = 0;
     VariantInit(pVarEnd);


@@ -558,7 +566,7 @@ STDMETHODIMP wxIAccessible::accNavigate ( long navDir, VARIANT varStart, VARIANT
         }
     }
     wxLogTrace(wxT("access"), navStr);
         }
     }
     wxLogTrace(wxT("access"), navStr);

-    
+

     wxAccStatus status = m_pAccessible->Navigate(navDirWX, varStart.lVal, & elementId,
         & elementObject);
 
     wxAccStatus status = m_pAccessible->Navigate(navDirWX, varStart.lVal, & elementId,
         & elementObject);
 


@@ -567,13 +575,13 @@ STDMETHODIMP wxIAccessible::accNavigate ( long navDir, VARIANT varStart, VARIANT
         wxLogTrace(wxT("access"), wxT("wxAccessible::Navigate failed"));
         return E_FAIL;
     }
         wxLogTrace(wxT("access"), wxT("wxAccessible::Navigate failed"));
         return E_FAIL;
     }

-    
+

     if (status == wxACC_FALSE)
     {
         wxLogTrace(wxT("access"), wxT("wxAccessible::Navigate found no object in this direction"));
         return S_FALSE;
     }
     if (status == wxACC_FALSE)
     {
         wxLogTrace(wxT("access"), wxT("wxAccessible::Navigate found no object in this direction"));
         return S_FALSE;
     }

-    
+

     if (status == wxACC_NOT_IMPLEMENTED)
     {
         wxLogTrace(wxT("access"), wxT("Navigate not implemented"));
     if (status == wxACC_NOT_IMPLEMENTED)
     {
         wxLogTrace(wxT("access"), wxT("Navigate not implemented"));


@@ -607,13 +615,13 @@ STDMETHODIMP wxIAccessible::accNavigate ( long navDir, VARIANT varStart, VARIANT
                 return E_FAIL;
             }
 
                 return E_FAIL;
             }
 

-               HRESULT hResult = objectIA->QueryInterface(IID_IDispatch, (LPVOID*) & pVarEnd->pdispVal);
+            HRESULT hResult = objectIA->QueryInterface(IID_IDispatch, (LPVOID*) & pVarEnd->pdispVal);

             if (hResult != S_OK)
             {
                 wxLogTrace(wxT("access"), wxT("QueryInterface failed"));
             if (hResult != S_OK)
             {
                 wxLogTrace(wxT("access"), wxT("QueryInterface failed"));

-                   return E_FAIL;
+                return E_FAIL;

             }
             }

-            
+

             wxLogTrace(wxT("access"), wxT("Called QueryInterface for Navigate"));
             pVarEnd->vt = VT_DISPATCH;
             return S_OK;
             wxLogTrace(wxT("access"), wxT("Called QueryInterface for Navigate"));
             pVarEnd->vt = VT_DISPATCH;
             return S_OK;


@@ -639,14 +647,14 @@ STDMETHODIMP wxIAccessible::accNavigate ( long navDir, VARIANT varStart, VARIANT
 
 // Retrieves the address of an IDispatch interface for the specified child.
 // All objects must support this property.
 
 // Retrieves the address of an IDispatch interface for the specified child.
 // All objects must support this property.

-    
+

 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;

-    
+

     if (varChildID.vt != VT_I4)
     {
         wxLogTrace(wxT("access"), wxT("Invalid arg for get_accChild"));
     if (varChildID.vt != VT_I4)
     {
         wxLogTrace(wxT("access"), wxT("Invalid arg for get_accChild"));


@@ -659,7 +667,7 @@ STDMETHODIMP wxIAccessible::get_accChild ( VARIANT varChildID, IDispatch** ppDis
         AddRef();
         return S_OK;
     }
         AddRef();
         return S_OK;
     }

-    
+

     wxAccessible* child = NULL;
 
     wxAccStatus status = m_pAccessible->GetChild(varChildID.lVal, & child);
     wxAccessible* child = NULL;
 
     wxAccStatus status = m_pAccessible->GetChild(varChildID.lVal, & child);


@@ -668,7 +676,7 @@ STDMETHODIMP wxIAccessible::get_accChild ( VARIANT varChildID, IDispatch** ppDis
         wxLogTrace(wxT("access"), wxT("GetChild failed"));
         return E_FAIL;
     }
         wxLogTrace(wxT("access"), wxT("GetChild failed"));
         return E_FAIL;
     }

-    
+

     if (status == wxACC_NOT_IMPLEMENTED)
     {
         // Use standard interface instead.
     if (status == wxACC_NOT_IMPLEMENTED)
     {
         // Use standard interface instead.


@@ -689,12 +697,12 @@ STDMETHODIMP wxIAccessible::get_accChild ( VARIANT varChildID, IDispatch** ppDis
             if (!objectIA)
                 return E_NOTIMPL;
 
             if (!objectIA)
                 return E_NOTIMPL;
 

-               if (objectIA->QueryInterface(IID_IDispatch, (LPVOID*) ppDispChild) != S_OK)
+            if (objectIA->QueryInterface(IID_IDispatch, (LPVOID*) ppDispChild) != S_OK)

             {
                 wxLogTrace(wxT("access"), wxT("QueryInterface failed in get_accChild"));
             {
                 wxLogTrace(wxT("access"), wxT("QueryInterface failed in get_accChild"));

-                   return E_FAIL;
+                return E_FAIL;

             }
             }

-            
+

             return S_OK;
         }
         else
             return S_OK;
         }
         else


@@ -704,7 +712,7 @@ STDMETHODIMP wxIAccessible::get_accChild ( VARIANT varChildID, IDispatch** ppDis
         }
     }
 
         }
     }
 

-    #if 0 
+    #if 0

     // all cases above already cause some return action so below line
     // is unreachable and cause unnecessary warning
     return E_NOTIMPL;
     // all cases above already cause some return action so below line
     // is unreachable and cause unnecessary warning
     return E_NOTIMPL;


@@ -713,19 +721,19 @@ STDMETHODIMP wxIAccessible::get_accChild ( VARIANT varChildID, IDispatch** ppDis
 
 // Retrieves the number of children that belong to this object.
 // All objects must support this property.
 
 // Retrieves the number of children that belong to this object.
 // All objects must support this property.

-    
+

 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;

-    
+

     int childCount = 0;
     wxAccStatus status = m_pAccessible->GetChildCount(& childCount);
     if (status == wxACC_FAIL)
         return E_FAIL;
     int childCount = 0;
     wxAccStatus status = m_pAccessible->GetChildCount(& childCount);
     if (status == wxACC_FAIL)
         return E_FAIL;

-    
+

     if (status == wxACC_NOT_IMPLEMENTED)
     {
         // Use standard interface instead.
     if (status == wxACC_NOT_IMPLEMENTED)
     {
         // Use standard interface instead.


@@ -748,7 +756,7 @@ STDMETHODIMP wxIAccessible::get_accChildCount ( long* pCountChildren)
         return S_OK;
     }
 
         return S_OK;
     }
 

-    #if 0 
+    #if 0

     // all cases above already cause some return action so below line
     // is unreachable and cause unnecessary warning
     return E_NOTIMPL;
     // all cases above already cause some return action so below line
     // is unreachable and cause unnecessary warning
     return E_NOTIMPL;


@@ -757,14 +765,14 @@ STDMETHODIMP wxIAccessible::get_accChildCount ( long* pCountChildren)
 
 // Retrieves the IDispatch interface of the object's parent.
 // All objects support this property.
 
 // Retrieves the IDispatch interface of the object's parent.
 // All objects support this property.

-    
+

 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;

-    
+

     wxAccessible* parent = NULL;
     wxAccStatus status = m_pAccessible->GetParent(& parent);
 
     wxAccessible* parent = NULL;
     wxAccStatus status = m_pAccessible->GetParent(& parent);
 


@@ -793,12 +801,12 @@ STDMETHODIMP wxIAccessible::get_accParent ( IDispatch** ppDispParent)
                 return E_FAIL;
 
             wxLogTrace(wxT("access"), wxT("About to call QueryInterface"));
                 return E_FAIL;
 
             wxLogTrace(wxT("access"), wxT("About to call QueryInterface"));

-               if (objectIA->QueryInterface(IID_IDispatch, (LPVOID*) ppDispParent) != S_OK)
+            if (objectIA->QueryInterface(IID_IDispatch, (LPVOID*) ppDispParent) != S_OK)

             {
                 wxLogTrace(wxT("access"), wxT("Failed QueryInterface"));
             {
                 wxLogTrace(wxT("access"), wxT("Failed QueryInterface"));

-                   return E_FAIL;
+                return E_FAIL;

             }
             }

-            
+

             wxLogTrace(wxT("access"), wxT("Returning S_OK for get_accParent"));
             return S_OK;
         }
             wxLogTrace(wxT("access"), wxT("Returning S_OK for get_accParent"));
             return S_OK;
         }


@@ -812,7 +820,7 @@ STDMETHODIMP wxIAccessible::get_accParent ( IDispatch** ppDispParent)
         }
     }
 
         }
     }
 

-    #if 0 
+    #if 0

     // all cases above already cause some return action so below line
     // is unreachable and cause unnecessary warning
     return E_NOTIMPL;
     // all cases above already cause some return action so below line
     // is unreachable and cause unnecessary warning
     return E_NOTIMPL;


@@ -821,27 +829,27 @@ STDMETHODIMP wxIAccessible::get_accParent ( IDispatch** ppDispParent)
 
 // Performs the object's default action. Not all objects have a default
 // action.
 
 // Performs the object's default action. Not all objects have a default
 // action.

-    
+

 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;

-    
+

     if (varID.vt != VT_I4)
     {
         wxLogTrace(wxT("access"), wxT("Invalid arg for accDoDefaultAction"));
         return E_INVALIDARG;
     }
     if (varID.vt != VT_I4)
     {
         wxLogTrace(wxT("access"), wxT("Invalid arg for accDoDefaultAction"));
         return E_INVALIDARG;
     }

-    
+

     wxAccStatus status = m_pAccessible->DoDefaultAction(varID.lVal);
     if (status == wxACC_FAIL)
         return E_FAIL;
 
     if (status == wxACC_NOT_SUPPORTED)
         return DISP_E_MEMBERNOTFOUND;
     wxAccStatus status = m_pAccessible->DoDefaultAction(varID.lVal);
     if (status == wxACC_FAIL)
         return E_FAIL;
 
     if (status == wxACC_NOT_SUPPORTED)
         return DISP_E_MEMBERNOTFOUND;

-    
+

     if (status == wxACC_NOT_IMPLEMENTED)
     {
         // Try to use child object directly.
     if (status == wxACC_NOT_IMPLEMENTED)
     {
         // Try to use child object directly.


@@ -866,28 +874,28 @@ STDMETHODIMP wxIAccessible::accDoDefaultAction(VARIANT varID)
 
 // Retrieves a string that describes the object's default action.
 // Not all objects have a default action.
 
 // Retrieves a string that describes the object's default action.
 // Not all objects have a default action.

-    
+

 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;

-    
+

     if (varID.vt != VT_I4)
     {
         wxLogTrace(wxT("access"), wxT("Invalid arg for get_accDefaultAction"));
         return E_INVALIDARG;
     }
     if (varID.vt != VT_I4)
     {
         wxLogTrace(wxT("access"), wxT("Invalid arg for get_accDefaultAction"));
         return E_INVALIDARG;
     }

-    
+

     wxString defaultAction;
     wxAccStatus status = m_pAccessible->GetDefaultAction(varID.lVal, & defaultAction);
     if (status == wxACC_FAIL)
         return E_FAIL;
     wxString defaultAction;
     wxAccStatus status = m_pAccessible->GetDefaultAction(varID.lVal, & defaultAction);
     if (status == wxACC_FAIL)
         return E_FAIL;

-    
+

     if (status == wxACC_NOT_SUPPORTED)
         return DISP_E_MEMBERNOTFOUND;
     if (status == wxACC_NOT_SUPPORTED)
         return DISP_E_MEMBERNOTFOUND;

-    
+

     if (status == wxACC_NOT_IMPLEMENTED)
     {
         // Try to use child object directly.
     if (status == wxACC_NOT_IMPLEMENTED)
     {
         // Try to use child object directly.


@@ -930,21 +938,21 @@ 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;

-    
+

     if (varID.vt != VT_I4)
     {
         wxLogTrace(wxT("access"), wxT("Invalid arg for get_accDescription"));
         return E_INVALIDARG;
     }
     if (varID.vt != VT_I4)
     {
         wxLogTrace(wxT("access"), wxT("Invalid arg for get_accDescription"));
         return E_INVALIDARG;
     }

-    
+

     wxString description;
     wxAccStatus status = m_pAccessible->GetDescription(varID.lVal, & description);
     if (status == wxACC_FAIL)
         return E_FAIL;
     wxString description;
     wxAccStatus status = m_pAccessible->GetDescription(varID.lVal, & description);
     if (status == wxACC_FAIL)
         return E_FAIL;

-    
+

     if (status == wxACC_NOT_IMPLEMENTED)
     {
         // Try to use child object directly.
     if (status == wxACC_NOT_IMPLEMENTED)
     {
         // Try to use child object directly.


@@ -966,7 +974,7 @@ STDMETHODIMP wxIAccessible::get_accDescription ( VARIANT varID, BSTR* pszDescrip
     }
     else
     {
     }
     else
     {

-        if (description.IsEmpty())
+        if (description.empty())

         {
             * pszDescription = NULL;
             return S_FALSE;
         {
             * pszDescription = NULL;
             return S_FALSE;


@@ -976,7 +984,7 @@ STDMETHODIMP wxIAccessible::get_accDescription ( VARIANT varID, BSTR* pszDescrip
             wxBasicString basicString(description);
             * pszDescription = basicString.Get();
             return S_OK;
             wxBasicString basicString(description);
             * pszDescription = basicString.Get();
             return S_OK;

-        }        
+        }

     }
     return E_NOTIMPL;
 }
     }
     return E_NOTIMPL;
 }


@@ -987,21 +995,21 @@ 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;

-    
+

     if (varID.vt != VT_I4)
     {
         wxLogTrace(wxT("access"), wxT("Invalid arg for get_accHelp"));
         return E_INVALIDARG;
     }
     if (varID.vt != VT_I4)
     {
         wxLogTrace(wxT("access"), wxT("Invalid arg for get_accHelp"));
         return E_INVALIDARG;
     }

-    
+

     wxString helpString;
     wxAccStatus status = m_pAccessible->GetHelpText(varID.lVal, & helpString);
     if (status == wxACC_FAIL)
         return E_FAIL;
     wxString helpString;
     wxAccStatus status = m_pAccessible->GetHelpText(varID.lVal, & helpString);
     if (status == wxACC_FAIL)
         return E_FAIL;

-    
+

     if (status == wxACC_NOT_IMPLEMENTED)
     {
         // Try to use child object directly.
     if (status == wxACC_NOT_IMPLEMENTED)
     {
         // Try to use child object directly.


@@ -1023,7 +1031,7 @@ STDMETHODIMP wxIAccessible::get_accHelp ( VARIANT varID, BSTR* pszHelp)
     }
     else
     {
     }
     else
     {

-        if (helpString.IsEmpty())
+        if (helpString.empty())

         {
             * pszHelp = NULL;
             return S_FALSE;
         {
             * pszHelp = NULL;
             return S_FALSE;


@@ -1033,7 +1041,7 @@ STDMETHODIMP wxIAccessible::get_accHelp ( VARIANT varID, BSTR* pszHelp)
             wxBasicString basicString(helpString);
             * pszHelp = basicString.Get();
             return S_OK;
             wxBasicString basicString(helpString);
             * pszHelp = basicString.Get();
             return S_OK;

-        }        
+        }

     }
     return E_NOTIMPL;
 }
     }
     return E_NOTIMPL;
 }


@@ -1043,24 +1051,24 @@ STDMETHODIMP wxIAccessible::get_accHelp ( VARIANT varID, BSTR* pszHelp)
 // Not all objects support this property.
 // NOTE: not supported by wxWidgets at this time. Use
 // GetHelpText instead.
 // Not all objects support this property.
 // NOTE: not supported by wxWidgets at this time. Use
 // GetHelpText instead.

-        
+

 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;

-    
+

     if (varChild.vt != VT_I4)
     {
         wxLogTrace(wxT("access"), wxT("Invalid arg for get_accHelpTopic"));
         return E_INVALIDARG;
     }
     if (varChild.vt != VT_I4)
     {
         wxLogTrace(wxT("access"), wxT("Invalid arg for get_accHelpTopic"));
         return E_INVALIDARG;
     }

-    
+

     wxAccStatus status = wxACC_NOT_IMPLEMENTED;
     if (status == wxACC_FAIL)
         return E_FAIL;
     wxAccStatus status = wxACC_NOT_IMPLEMENTED;
     if (status == wxACC_FAIL)
         return E_FAIL;

-    
+

     if (status == wxACC_NOT_IMPLEMENTED)
     {
         // Try to use child object directly.
     if (status == wxACC_NOT_IMPLEMENTED)
     {
         // Try to use child object directly.


@@ -1086,27 +1094,27 @@ STDMETHODIMP wxIAccessible::get_accHelpTopic ( BSTR* pszHelpFile, VARIANT varChi
 // Retrieves the specified object's shortcut key or access key, also known as
 // the mnemonic. All objects that have a shortcut key or access key support
 // this property.
 // Retrieves the specified object's shortcut key or access key, also known as
 // the mnemonic. All objects that have a shortcut key or access key support
 // this property.

-        
+

 STDMETHODIMP wxIAccessible::get_accKeyboardShortcut ( VARIANT varID, BSTR* pszKeyboardShortcut)
 {
     wxLogTrace(wxT("access"), wxT("get_accKeyboardShortcut"));
     *pszKeyboardShortcut = NULL;
 
 STDMETHODIMP wxIAccessible::get_accKeyboardShortcut ( VARIANT varID, BSTR* pszKeyboardShortcut)
 {
     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;

-    
+

     if (varID.vt != VT_I4)
     {
         wxLogTrace(wxT("access"), wxT("Invalid arg for get_accKeyboardShortcut"));
         return E_INVALIDARG;
     }
     if (varID.vt != VT_I4)
     {
         wxLogTrace(wxT("access"), wxT("Invalid arg for get_accKeyboardShortcut"));
         return E_INVALIDARG;
     }

-    
+

     wxString keyboardShortcut;
     wxAccStatus status = m_pAccessible->GetKeyboardShortcut(varID.lVal, & keyboardShortcut);
     if (status == wxACC_FAIL)
         return E_FAIL;
     wxString keyboardShortcut;
     wxAccStatus status = m_pAccessible->GetKeyboardShortcut(varID.lVal, & keyboardShortcut);
     if (status == wxACC_FAIL)
         return E_FAIL;

-    
+

     if (status == wxACC_NOT_IMPLEMENTED)
     {
         // Try to use child object directly.
     if (status == wxACC_NOT_IMPLEMENTED)
     {
         // Try to use child object directly.


@@ -1128,7 +1136,7 @@ STDMETHODIMP wxIAccessible::get_accKeyboardShortcut ( VARIANT varID, BSTR* pszKe
     }
     else
     {
     }
     else
     {

-        if (keyboardShortcut.IsEmpty())
+        if (keyboardShortcut.empty())

         {
             * pszKeyboardShortcut = NULL;
             return S_FALSE;
         {
             * pszKeyboardShortcut = NULL;
             return S_FALSE;


@@ -1138,20 +1146,20 @@ STDMETHODIMP wxIAccessible::get_accKeyboardShortcut ( VARIANT varID, BSTR* pszKe
             wxBasicString basicString(keyboardShortcut);
             * pszKeyboardShortcut = basicString.Get();
             return S_OK;
             wxBasicString basicString(keyboardShortcut);
             * pszKeyboardShortcut = basicString.Get();
             return S_OK;

-        }        
+        }

     }
     return E_NOTIMPL;
 }
 
 // Retrieves the name of the specified object.
 // All objects support this property.
     }
     return E_NOTIMPL;
 }
 
 // Retrieves the name of the specified object.
 // All objects support this property.

-    
+

 STDMETHODIMP wxIAccessible::get_accName ( VARIANT varID, BSTR* pszName)
 {
     wxLogTrace(wxT("access"), wxT("get_accName"));
     *pszName = NULL;
 
 STDMETHODIMP wxIAccessible::get_accName ( VARIANT varID, BSTR* pszName)
 {
     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;
 


@@ -1160,14 +1168,14 @@ STDMETHODIMP wxIAccessible::get_accName ( VARIANT varID, BSTR* pszName)
         wxLogTrace(wxT("access"), wxT("Invalid arg for get_accName"));
         return E_INVALIDARG;
     }
         wxLogTrace(wxT("access"), wxT("Invalid arg for get_accName"));
         return E_INVALIDARG;
     }

-    
+

     wxString name;
     wxString name;

-    
+

     wxAccStatus status = m_pAccessible->GetName(varID.lVal, & name);
     wxAccStatus status = m_pAccessible->GetName(varID.lVal, & name);

-    
+

     if (status == wxACC_FAIL)
         return E_FAIL;
     if (status == wxACC_FAIL)
         return E_FAIL;

-    
+

     if (status == wxACC_NOT_IMPLEMENTED)
     {
         // Try to use child object directly.
     if (status == wxACC_NOT_IMPLEMENTED)
     {
         // Try to use child object directly.


@@ -1202,25 +1210,25 @@ 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;

-    
+

     if (varID.vt != VT_I4)
     {
         wxLogTrace(wxT("access"), wxT("Invalid arg for get_accRole"));
         return E_INVALIDARG;
     }
     if (varID.vt != VT_I4)
     {
         wxLogTrace(wxT("access"), wxT("Invalid arg for get_accRole"));
         return E_INVALIDARG;
     }

-    
+

     VariantInit(pVarRole);
 
     wxAccRole role = wxROLE_NONE;
     VariantInit(pVarRole);
 
     wxAccRole role = wxROLE_NONE;

-    
+

     wxAccStatus status = m_pAccessible->GetRole(varID.lVal, & role);
     wxAccStatus status = m_pAccessible->GetRole(varID.lVal, & role);

-    
+

     if (status == wxACC_FAIL)
         return E_FAIL;
     if (status == wxACC_FAIL)
         return E_FAIL;

-    
+

     if (status == wxACC_NOT_IMPLEMENTED)
     {
         // Try to use child object directly.
     if (status == wxACC_NOT_IMPLEMENTED)
     {
         // Try to use child object directly.


@@ -1258,14 +1266,14 @@ STDMETHODIMP wxIAccessible::get_accRole ( VARIANT varID, VARIANT* pVarRole)
 
 // Retrieves the current state of the specified object.
 // All objects support this property.
 
 // Retrieves the current state of the specified object.
 // All objects support this property.

-    
+

 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;

-    
+

     if (varID.vt != VT_I4 && varID.vt != VT_EMPTY)
     {
         wxLogTrace(wxT("access"), wxT("Invalid arg for get_accState"));
     if (varID.vt != VT_I4 && varID.vt != VT_EMPTY)
     {
         wxLogTrace(wxT("access"), wxT("Invalid arg for get_accState"));


@@ -1273,11 +1281,11 @@ STDMETHODIMP wxIAccessible::get_accState ( VARIANT varID, VARIANT* pVarState)
     }
 
     long wxstate = 0;
     }
 
     long wxstate = 0;

-    
+

     wxAccStatus status = m_pAccessible->GetState(varID.lVal, & wxstate);
     if (status == wxACC_FAIL)
         return E_FAIL;
     wxAccStatus status = m_pAccessible->GetState(varID.lVal, & wxstate);
     if (status == wxACC_FAIL)
         return E_FAIL;

-    
+

     if (status == wxACC_NOT_IMPLEMENTED)
     {
         // Try to use child object directly.
     if (status == wxACC_NOT_IMPLEMENTED)
     {
         // Try to use child object directly.


@@ -1306,30 +1314,30 @@ STDMETHODIMP wxIAccessible::get_accState ( VARIANT varID, VARIANT* pVarState)
     }
     return E_NOTIMPL;
 }
     }
     return E_NOTIMPL;
 }

-    
+

 // Retrieves the value of the specified object.
 // Not all objects have a value.
 
 STDMETHODIMP wxIAccessible::get_accValue ( VARIANT varID, BSTR* pszValue)
 {
     wxLogTrace(wxT("access"), wxT("get_accValue"));
 // Retrieves the value of the specified object.
 // Not all objects have a value.
 
 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;

-    
+

     if (varID.vt != VT_I4)
     {
         wxLogTrace(wxT("access"), wxT("Invalid arg for get_accValue"));
         return E_INVALIDARG;
     }
     if (varID.vt != VT_I4)
     {
         wxLogTrace(wxT("access"), wxT("Invalid arg for get_accValue"));
         return E_INVALIDARG;
     }

-    
+

     wxString strValue;
     wxString strValue;

-    
+

     wxAccStatus status = m_pAccessible->GetValue(varID.lVal, & strValue);
     wxAccStatus status = m_pAccessible->GetValue(varID.lVal, & strValue);

-    
+

     if (status == wxACC_FAIL)
         return E_FAIL;
     if (status == wxACC_FAIL)
         return E_FAIL;

-    
+

     if (status == wxACC_NOT_IMPLEMENTED)
     {
         // Try to use child object directly.
     if (status == wxACC_NOT_IMPLEMENTED)
     {
         // Try to use child object directly.


@@ -1365,22 +1373,22 @@ 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;

-    
+

     if (varID.vt != VT_I4 && varID.vt != VT_EMPTY)
     {
         wxLogTrace(wxT("access"), wxT("Invalid arg for accSelect"));
         return E_INVALIDARG;
     }
     if (varID.vt != VT_I4 && varID.vt != VT_EMPTY)
     {
         wxLogTrace(wxT("access"), wxT("Invalid arg for accSelect"));
         return E_INVALIDARG;
     }

-    
+

     wxAccSelectionFlags wxsel = wxConvertFromWindowsSelFlag(flagsSelect);
 
     wxAccStatus status = m_pAccessible->Select(varID.lVal, wxsel);
     if (status == wxACC_FAIL)
         return E_FAIL;
     wxAccSelectionFlags wxsel = wxConvertFromWindowsSelFlag(flagsSelect);
 
     wxAccStatus status = m_pAccessible->Select(varID.lVal, wxsel);
     if (status == wxACC_FAIL)
         return E_FAIL;

-    
+

     if (status == wxACC_NOT_IMPLEMENTED)
     {
         // Try to use child object directly.
     if (status == wxACC_NOT_IMPLEMENTED)
     {
         // Try to use child object directly.


@@ -1408,22 +1416,22 @@ STDMETHODIMP wxIAccessible::accSelect ( long flagsSelect, VARIANT varID )
 
 // Retrieves the object that has the keyboard focus. All objects
 // that receive the keyboard focus must support this property.
 
 // Retrieves the object that has the keyboard focus. All objects
 // that receive the keyboard focus must support this property.

-        
+

 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;

-    
+

     wxAccessible* childObject = NULL;
     int childId = 0;
     VariantInit(pVarID);
     wxAccessible* childObject = NULL;
     int childId = 0;
     VariantInit(pVarID);

-    
+

     wxAccStatus status = m_pAccessible->GetFocus(& childId, & childObject);
     if (status == wxACC_FAIL)
         return E_FAIL;
     wxAccStatus status = m_pAccessible->GetFocus(& childId, & childObject);
     if (status == wxACC_FAIL)
         return E_FAIL;

-    
+

     if (status == wxACC_NOT_IMPLEMENTED)
     {
         // Use standard interface instead.
     if (status == wxACC_NOT_IMPLEMENTED)
     {
         // Use standard interface instead.


@@ -1446,9 +1454,9 @@ STDMETHODIMP wxIAccessible::get_accFocus ( VARIANT* pVarID)
             if (!childIA)
                 return E_NOTIMPL;
 
             if (!childIA)
                 return E_NOTIMPL;
 

-               if (childIA->QueryInterface(IID_IDispatch, (LPVOID*) & pVarID->pdispVal) != S_OK)
-                   return E_FAIL;
-            
+            if (childIA->QueryInterface(IID_IDispatch, (LPVOID*) & pVarID->pdispVal) != S_OK)
+                return E_FAIL;
+

             pVarID->vt = VT_DISPATCH;
             return S_OK;
         }
             pVarID->vt = VT_DISPATCH;
             return S_OK;
         }


@@ -1464,8 +1472,8 @@ STDMETHODIMP wxIAccessible::get_accFocus ( VARIANT* pVarID)
         pVarID->vt = VT_EMPTY;
         return S_FALSE;
     }
         pVarID->vt = VT_EMPTY;
         return S_FALSE;
     }

-    
-    #if 0 
+
+    #if 0

     // all cases above already cause some return action so below line
     // is unreachable and cause unnecessary warning
     return E_NOTIMPL;
     // all cases above already cause some return action so below line
     // is unreachable and cause unnecessary warning
     return E_NOTIMPL;


@@ -1474,21 +1482,22 @@ STDMETHODIMP wxIAccessible::get_accFocus ( VARIANT* pVarID)
 
 // Retrieves the selected children of this object. All objects
 // selected must support this property.
 
 // Retrieves the selected children of this object. All objects
 // selected must support this property.

-        
+

 STDMETHODIMP wxIAccessible::get_accSelection ( VARIANT * pVarChildren)
 {
 STDMETHODIMP wxIAccessible::get_accSelection ( VARIANT * pVarChildren)
 {

+#if wxUSE_VARIANT

     wxLogTrace(wxT("access"), wxT("get_accSelection"));
     wxLogTrace(wxT("access"), wxT("get_accSelection"));

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

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

-    
+

     wxVariant selections;
     wxAccStatus status = m_pAccessible->GetSelections(& selections);
     if (status == wxACC_FAIL)
         return E_FAIL;
     wxVariant selections;
     wxAccStatus status = m_pAccessible->GetSelections(& selections);
     if (status == wxACC_FAIL)
         return E_FAIL;

-    
+

     if (status == wxACC_NOT_IMPLEMENTED)
     {
         // Use standard interface instead.
     if (status == wxACC_NOT_IMPLEMENTED)
     {
         // Use standard interface instead.


@@ -1514,9 +1523,9 @@ STDMETHODIMP wxIAccessible::get_accSelection ( VARIANT * pVarChildren)
             if (!childIA)
                 return E_NOTIMPL;
 
             if (!childIA)
                 return E_NOTIMPL;
 

-               if (childIA->QueryInterface(IID_IDispatch, (LPVOID*) & pVarChildren->pdispVal) != S_OK)
-                   return E_FAIL;
-            
+            if (childIA->QueryInterface(IID_IDispatch, (LPVOID*) & pVarChildren->pdispVal) != S_OK)
+                return E_FAIL;
+

             pVarChildren->vt = VT_DISPATCH;
 
             return S_OK;
             pVarChildren->vt = VT_DISPATCH;
 
             return S_OK;


@@ -1534,6 +1543,9 @@ STDMETHODIMP wxIAccessible::get_accSelection ( VARIANT * pVarChildren)
             return S_OK;
         }
     }
             return S_OK;
         }
     }

+#else
+    wxUnusedVar(pVarChildren);
+#endif // wxUSE_VARIANT

 
     return E_NOTIMPL;
 }
 
     return E_NOTIMPL;
 }


@@ -1564,9 +1576,9 @@ STDMETHODIMP wxIAccessible::GetIDsOfNames(REFIID WXUNUSED(riid), OLECHAR** WXUNU
 
 // Invoke
 
 
 // Invoke
 

-STDMETHODIMP wxIAccessible::Invoke(DISPID WXUNUSED(dispIdMember), REFIID WXUNUSED(riid), LCID WXUNUSED(lcid), 
-                        WORD WXUNUSED(wFlags), DISPPARAMS *WXUNUSED(pDispParams), 
-                        VARIANT *WXUNUSED(pVarResult), EXCEPINFO *WXUNUSED(pExcepInfo), 
+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;
                         unsigned int *WXUNUSED(puArgErr) )
 {
     return E_NOTIMPL;


@@ -1605,7 +1617,7 @@ IAccessible* wxIAccessible::GetChildStdAccessible(int id)
             else
             {
                 pDispatch->Release();
             else
             {
                 pDispatch->Release();

-            }                                    
+            }

         }
     }
 
         }
     }
 


@@ -1639,7 +1651,7 @@ IAccessible* wxIAccessible::GetChildStdAccessible(int id)
                         else
                         {
                             var.pdispVal->Release();
                         else
                         {
                             var.pdispVal->Release();

-                        }                        
+                        }

                     }
                 }
                 break;
                     }
                 }
                 break;


@@ -1679,7 +1691,7 @@ IAccessible* wxIAccessible::GetChildAccessible(int id)
             else
             {
                 pDispatch->Release();
             else
             {
                 pDispatch->Release();

-            }                                    
+            }

         }
     }
     return NULL;
         }
     }
     return NULL;


@@ -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:


@@ -1996,4 +2011,4 @@ wxAccSelectionFlags wxConvertFromWindowsSelFlag(int sel)
 }
 
 
 }
 
 

-#endif  //USE_ACCESSIBILITY
+#endif  // wxUSE_OLE && wxUSE_ACCESSIBILITY