correction to last commit: don't test unsetenv() return value, it's void under Darwin

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

diff --git a/src/msw/ole/access.cpp b/src/msw/ole/access.cpp
index d545e9bfb5552573f7a7ea6bb69851d18731d8da..b1ddbb9a34fd99441217f2526ac5c4c548160e61 100644 (file)
--- a/src/msw/ole/access.cpp
+++ b/src/msw/ole/access.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     implementation of wxIAccessible and wxAccessible
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     implementation of wxIAccessible and wxAccessible
 // Author:      Julian Smart
 // Modified by:


@@ -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__)


@@ -71,6 +65,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
 // ----------------------------------------------------------------------------


@@ -182,6 +177,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


@@ -199,12 +195,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 +211,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 +249,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 +270,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 +288,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 +318,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


@@ -366,24 +362,24 @@ wxIAccessible::wxIAccessible(wxAccessible *pAccessible)
 }
 
 // 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)
 {
 
 STDMETHODIMP wxIAccessible::accHitTest(long xLeft, long yLeft, VARIANT* pVarID)
 {

-    wxLogTrace(wxT("access"), "accHitTest");
+    wxLogTrace(wxT("access"), wxT("accHitTest"));

     wxASSERT (m_pAccessible != NULL);
     if (!m_pAccessible)
         return E_FAIL;
     wxASSERT (m_pAccessible != NULL);
     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 +389,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 +404,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 +422,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 +431,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)
 {
 
 STDMETHODIMP wxIAccessible::accLocation ( long* pxLeft, long* pyTop, long* pcxWidth, long* pcyHeight, VARIANT varID)
 {

-    wxLogTrace(wxT("access"), "accLocation");
+    wxLogTrace(wxT("access"), wxT("accLocation"));

     wxASSERT (m_pAccessible != NULL);
     if (!m_pAccessible)
         return E_FAIL;
     wxASSERT (m_pAccessible != NULL);
     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.


@@ -491,7 +487,7 @@ STDMETHODIMP wxIAccessible::accNavigate ( long navDir, VARIANT varStart, VARIANT
         return E_FAIL;
     wxLogTrace(wxT("access"), wxString(wxT("accNavigate for ")) + m_pAccessible->GetWindow()->GetClassInfo()->GetClassName());
 
         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"


@@ -499,10 +495,10 @@ STDMETHODIMP wxIAccessible::accNavigate ( long navDir, VARIANT varStart, VARIANT
                                                           #endif
                                                           )
     {
                                                           #endif
                                                           )
     {

-        wxLogTrace(wxT("access"), "Invalid arg for accNavigate");
+        wxLogTrace(wxT("access"), wxT("Invalid arg for accNavigate"));

         return E_INVALIDARG;
     }
         return E_INVALIDARG;
     }

-    
+

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


@@ -558,25 +554,25 @@ 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);
 
     if (status == wxACC_FAIL)
     {
     wxAccStatus status = m_pAccessible->Navigate(navDirWX, varStart.lVal, & elementId,
         & elementObject);
 
     if (status == wxACC_FAIL)
     {

-        wxLogTrace(wxT("access"), "wxAccessible::Navigate failed");
+        wxLogTrace(wxT("access"), wxT("wxAccessible::Navigate failed"));

         return E_FAIL;
     }
         return E_FAIL;
     }

-    
+

     if (status == wxACC_FALSE)
     {
     if (status == wxACC_FALSE)
     {

-        wxLogTrace(wxT("access"), "wxAccessible::Navigate found no object in this direction");
+        wxLogTrace(wxT("access"), wxT("wxAccessible::Navigate found no object in this direction"));

         return S_FALSE;
     }
         return S_FALSE;
     }

-    
+

     if (status == wxACC_NOT_IMPLEMENTED)
     {
     if (status == wxACC_NOT_IMPLEMENTED)
     {

-        wxLogTrace(wxT("access"), "Navigate not implemented");
+        wxLogTrace(wxT("access"), wxT("Navigate not implemented"));

 
         // Try to use child object directly.
         if (varStart.vt == VT_I4 && varStart.lVal > 0)
 
         // Try to use child object directly.
         if (varStart.vt == VT_I4 && varStart.lVal > 0)


@@ -599,57 +595,57 @@ STDMETHODIMP wxIAccessible::accNavigate ( long navDir, VARIANT varStart, VARIANT
     {
         if (elementObject)
         {
     {
         if (elementObject)
         {

-            wxLogTrace(wxT("access"), "Getting wxIAccessible and calling QueryInterface for Navigate");
+            wxLogTrace(wxT("access"), wxT("Getting wxIAccessible and calling QueryInterface for Navigate"));

             wxIAccessible* objectIA = elementObject->GetIAccessible();
             if (!objectIA)
             {
             wxIAccessible* objectIA = elementObject->GetIAccessible();
             if (!objectIA)
             {

-                wxLogTrace(wxT("access"), "No wxIAccessible");
+                wxLogTrace(wxT("access"), wxT("No wxIAccessible"));

                 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)
             {
             if (hResult != S_OK)
             {

-                wxLogTrace(wxT("access"), "QueryInterface failed");
-                   return E_FAIL;
+                wxLogTrace(wxT("access"), wxT("QueryInterface failed"));
+                return E_FAIL;

             }
             }

-            
-            wxLogTrace(wxT("access"), "Called QueryInterface for Navigate");
+
+            wxLogTrace(wxT("access"), wxT("Called QueryInterface for Navigate"));

             pVarEnd->vt = VT_DISPATCH;
             return S_OK;
         }
         else if (elementId > 0)
         {
             pVarEnd->vt = VT_DISPATCH;
             return S_OK;
         }
         else if (elementId > 0)
         {

-            wxLogTrace(wxT("access"), "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
         {
             pVarEnd->vt = VT_I4;
             pVarEnd->lVal = elementId;
             return S_OK;
         }
         else
         {

-            wxLogTrace(wxT("access"), "No object in accNavigate");
+            wxLogTrace(wxT("access"), wxT("No object in accNavigate"));

             pVarEnd->vt = VT_EMPTY;
             return S_FALSE;
         }
     }
 
             pVarEnd->vt = VT_EMPTY;
             return S_FALSE;
         }
     }
 

-    wxLogTrace(wxT("access"), "Failing Navigate");
+    wxLogTrace(wxT("access"), wxT("Failing Navigate"));

     return E_NOTIMPL;
 }
 
 // Retrieves the address of an IDispatch interface for the specified child.
 // All objects must support this property.
     return E_NOTIMPL;
 }
 
 // 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)
 {
 STDMETHODIMP wxIAccessible::get_accChild ( VARIANT varChildID, IDispatch** ppDispChild)
 {

-    wxLogTrace(wxT("access"), "get_accChild");
+    wxLogTrace(wxT("access"), wxT("get_accChild"));

     wxASSERT (m_pAccessible != NULL);
     if (!m_pAccessible)
         return E_FAIL;
     wxASSERT (m_pAccessible != NULL);
     if (!m_pAccessible)
         return E_FAIL;

-    
+

     if (varChildID.vt != VT_I4)
     {
     if (varChildID.vt != VT_I4)
     {

-        wxLogTrace(wxT("access"), "Invalid arg for get_accChild");
+        wxLogTrace(wxT("access"), wxT("Invalid arg for get_accChild"));

         return E_INVALIDARG;
     }
 
         return E_INVALIDARG;
     }
 


@@ -659,16 +655,16 @@ 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);
     if (status == wxACC_FAIL)
     {
     wxAccessible* child = NULL;
 
     wxAccStatus status = m_pAccessible->GetChild(varChildID.lVal, & child);
     if (status == wxACC_FAIL)
     {

-        wxLogTrace(wxT("access"), "GetChild failed");
+        wxLogTrace(wxT("access"), wxT("GetChild failed"));

         return E_FAIL;
     }
         return E_FAIL;
     }

-    
+

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


@@ -677,7 +673,7 @@ STDMETHODIMP wxIAccessible::get_accChild ( VARIANT varChildID, IDispatch** ppDis
             return E_NOTIMPL;
         else
         {
             return E_NOTIMPL;
         else
         {

-            wxLogTrace(wxT("access"), "Using standard interface for get_accChild");
+            wxLogTrace(wxT("access"), wxT("Using standard interface for get_accChild"));

             return stdInterface->get_accChild (varChildID, ppDispChild);
         }
     }
             return stdInterface->get_accChild (varChildID, ppDispChild);
         }
     }


@@ -689,22 +685,22 @@ 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"), "QueryInterface failed in get_accChild");
-                   return E_FAIL;
+                wxLogTrace(wxT("access"), wxT("QueryInterface failed in get_accChild"));
+                return E_FAIL;

             }
             }

-            
+

             return S_OK;
         }
         else
         {
             return S_OK;
         }
         else
         {

-            wxLogTrace(wxT("access"), "Not an accessible object");
+            wxLogTrace(wxT("access"), wxT("Not an accessible object"));

             return S_FALSE; // Indicates it's not an accessible object
         }
     }
 
             return S_FALSE; // Indicates it's not an accessible object
         }
     }
 

-    #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 +709,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)
 {
 STDMETHODIMP wxIAccessible::get_accChildCount ( long* pCountChildren)
 {

-    wxLogTrace(wxT("access"), "get_accChildCount");
+    wxLogTrace(wxT("access"), wxT("get_accChildCount"));

     wxASSERT (m_pAccessible != NULL);
     if (!m_pAccessible)
         return E_FAIL;
     wxASSERT (m_pAccessible != NULL);
     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.


@@ -734,7 +730,7 @@ STDMETHODIMP wxIAccessible::get_accChildCount ( long* pCountChildren)
             return E_NOTIMPL;
         else
         {
             return E_NOTIMPL;
         else
         {

-            wxLogTrace(wxT("access"), "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));
             HRESULT res = stdInterface->get_accChildCount (pCountChildren);
             wxString str;
             str.Printf(wxT("Number of children was %d"), (int) (*pCountChildren));


@@ -748,7 +744,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 +753,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)
 {
 STDMETHODIMP wxIAccessible::get_accParent ( IDispatch** ppDispParent)
 {

-    wxLogTrace(wxT("access"), "get_accParent");
+    wxLogTrace(wxT("access"), wxT("get_accParent"));

     wxASSERT (m_pAccessible != NULL);
     if (!m_pAccessible)
         return E_FAIL;
     wxASSERT (m_pAccessible != NULL);
     if (!m_pAccessible)
         return E_FAIL;

-    
+

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


@@ -772,11 +768,11 @@ STDMETHODIMP wxIAccessible::get_accParent ( IDispatch** ppDispParent)
         return E_FAIL;
 
     // It doesn't seem acceptable to return S_FALSE with a NULL
         return E_FAIL;
 
     // It doesn't seem acceptable to return S_FALSE with a NULL

-    // ppDispParent, so if we have no wxWindows parent, we leave
+    // ppDispParent, so if we have no wxWidgets parent, we leave

     // it to the standard interface.
     if (status == wxACC_NOT_IMPLEMENTED || !parent)
     {
     // it to the standard interface.
     if (status == wxACC_NOT_IMPLEMENTED || !parent)
     {

-        wxLogTrace(wxT("access"), "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)
         // Use standard interface instead.
         IAccessible* stdInterface = (IAccessible*)m_pAccessible->GetIAccessibleStd();
         if (!stdInterface)


@@ -792,27 +788,27 @@ STDMETHODIMP wxIAccessible::get_accParent ( IDispatch** ppDispParent)
             if (!objectIA)
                 return E_FAIL;
 
             if (!objectIA)
                 return E_FAIL;
 

-            wxLogTrace(wxT("access"), "About to call QueryInterface");
-               if (objectIA->QueryInterface(IID_IDispatch, (LPVOID*) ppDispParent) != S_OK)
+            wxLogTrace(wxT("access"), wxT("About to call QueryInterface"));
+            if (objectIA->QueryInterface(IID_IDispatch, (LPVOID*) ppDispParent) != S_OK)

             {
             {

-                wxLogTrace(wxT("access"), "Failed QueryInterface");
-                   return E_FAIL;
+                wxLogTrace(wxT("access"), wxT("Failed QueryInterface"));
+                return E_FAIL;

             }
             }

-            
-            wxLogTrace(wxT("access"), "Returning S_OK for get_accParent");
+
+            wxLogTrace(wxT("access"), wxT("Returning S_OK for get_accParent"));

             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.
             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.

-            wxLogTrace(wxT("access"), "Returning NULL parent because there was none");
+            wxLogTrace(wxT("access"), wxT("Returning NULL parent because there was none"));

             *ppDispParent = NULL;
             return S_FALSE;
         }
     }
 
             *ppDispParent = NULL;
             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;


@@ -821,27 +817,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)
 {
 STDMETHODIMP wxIAccessible::accDoDefaultAction(VARIANT varID)
 {

-    wxLogTrace(wxT("access"), "accDoDefaultAction");
+    wxLogTrace(wxT("access"), wxT("accDoDefaultAction"));

     wxASSERT (m_pAccessible != NULL);
     if (!m_pAccessible)
         return E_FAIL;
     wxASSERT (m_pAccessible != NULL);
     if (!m_pAccessible)
         return E_FAIL;

-    
+

     if (varID.vt != VT_I4)
     {
     if (varID.vt != VT_I4)
     {

-        wxLogTrace(wxT("access"), "Invalid arg for accDoDefaultAction");
+        wxLogTrace(wxT("access"), wxT("Invalid arg for accDoDefaultAction"));

         return E_INVALIDARG;
     }
         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 +862,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)
 {
 STDMETHODIMP wxIAccessible::get_accDefaultAction ( VARIANT varID, BSTR* pszDefaultAction)
 {

-    wxLogTrace(wxT("access"), "get_accDefaultAction");
+    wxLogTrace(wxT("access"), wxT("get_accDefaultAction"));

     wxASSERT (m_pAccessible != NULL);
     if (!m_pAccessible)
         return E_FAIL;
     wxASSERT (m_pAccessible != NULL);
     if (!m_pAccessible)
         return E_FAIL;

-    
+

     if (varID.vt != VT_I4)
     {
     if (varID.vt != VT_I4)
     {

-        wxLogTrace(wxT("access"), "Invalid arg for get_accDefaultAction");
+        wxLogTrace(wxT("access"), wxT("Invalid arg for get_accDefaultAction"));

         return E_INVALIDARG;
     }
         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.


@@ -929,22 +925,22 @@ STDMETHODIMP wxIAccessible::get_accDefaultAction ( VARIANT varID, BSTR* pszDefau
 
 STDMETHODIMP wxIAccessible::get_accDescription ( VARIANT varID, BSTR* pszDescription)
 {
 
 STDMETHODIMP wxIAccessible::get_accDescription ( VARIANT varID, BSTR* pszDescription)
 {

-    wxLogTrace(wxT("access"), "get_accDescription");
+    wxLogTrace(wxT("access"), wxT("get_accDescription"));

     wxASSERT (m_pAccessible != NULL);
     if (!m_pAccessible)
         return E_FAIL;
     wxASSERT (m_pAccessible != NULL);
     if (!m_pAccessible)
         return E_FAIL;

-    
+

     if (varID.vt != VT_I4)
     {
     if (varID.vt != VT_I4)
     {

-        wxLogTrace(wxT("access"), "Invalid arg for get_accDescription");
+        wxLogTrace(wxT("access"), wxT("Invalid arg for get_accDescription"));

         return E_INVALIDARG;
     }
         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 +962,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 +972,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;
 }


@@ -986,22 +982,22 @@ STDMETHODIMP wxIAccessible::get_accDescription ( VARIANT varID, BSTR* pszDescrip
 
 STDMETHODIMP wxIAccessible::get_accHelp ( VARIANT varID, BSTR* pszHelp)
 {
 
 STDMETHODIMP wxIAccessible::get_accHelp ( VARIANT varID, BSTR* pszHelp)
 {

-    wxLogTrace(wxT("access"), "get_accHelp");
+    wxLogTrace(wxT("access"), wxT("get_accHelp"));

     wxASSERT (m_pAccessible != NULL);
     if (!m_pAccessible)
         return E_FAIL;
     wxASSERT (m_pAccessible != NULL);
     if (!m_pAccessible)
         return E_FAIL;

-    
+

     if (varID.vt != VT_I4)
     {
     if (varID.vt != VT_I4)
     {

-        wxLogTrace(wxT("access"), "Invalid arg for get_accHelp");
+        wxLogTrace(wxT("access"), wxT("Invalid arg for get_accHelp"));

         return E_INVALIDARG;
     }
         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 +1019,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 +1029,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;
 }


@@ -1041,26 +1037,26 @@ STDMETHODIMP wxIAccessible::get_accHelp ( VARIANT varID, BSTR* pszHelp)
 // 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.

-// NOTE: not supported by wxWindows at this time. Use
+// NOTE: not supported by wxWidgets at this time. Use

 // GetHelpText instead.
 // GetHelpText instead.

-        
+

 STDMETHODIMP wxIAccessible::get_accHelpTopic ( BSTR* pszHelpFile, VARIANT varChild, long* pidTopic)
 {
 STDMETHODIMP wxIAccessible::get_accHelpTopic ( BSTR* pszHelpFile, VARIANT varChild, long* pidTopic)
 {

-    wxLogTrace(wxT("access"), "get_accHelpTopic");
+    wxLogTrace(wxT("access"), wxT("get_accHelpTopic"));

     wxASSERT (m_pAccessible != NULL);
     if (!m_pAccessible)
         return E_FAIL;
     wxASSERT (m_pAccessible != NULL);
     if (!m_pAccessible)
         return E_FAIL;

-    
+

     if (varChild.vt != VT_I4)
     {
     if (varChild.vt != VT_I4)
     {

-        wxLogTrace(wxT("access"), "Invalid arg for get_accHelpTopic");
+        wxLogTrace(wxT("access"), wxT("Invalid arg for get_accHelpTopic"));

         return E_INVALIDARG;
     }
         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 +1082,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)
 {
 STDMETHODIMP wxIAccessible::get_accKeyboardShortcut ( VARIANT varID, BSTR* pszKeyboardShortcut)
 {

-    wxLogTrace(wxT("access"), "get_accKeyboardShortcut");
+    wxLogTrace(wxT("access"), wxT("get_accKeyboardShortcut"));

     *pszKeyboardShortcut = NULL;
 
     wxASSERT (m_pAccessible != NULL);
     if (!m_pAccessible)
         return E_FAIL;
     *pszKeyboardShortcut = NULL;
 
     wxASSERT (m_pAccessible != NULL);
     if (!m_pAccessible)
         return E_FAIL;

-    
+

     if (varID.vt != VT_I4)
     {
     if (varID.vt != VT_I4)
     {

-        wxLogTrace(wxT("access"), "Invalid arg for get_accKeyboardShortcut");
+        wxLogTrace(wxT("access"), wxT("Invalid arg for get_accKeyboardShortcut"));

         return E_INVALIDARG;
     }
         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 +1124,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,17 +1134,17 @@ 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)
 {
 STDMETHODIMP wxIAccessible::get_accName ( VARIANT varID, BSTR* pszName)
 {

-    wxLogTrace(wxT("access"), "get_accName");
+    wxLogTrace(wxT("access"), wxT("get_accName"));

     *pszName = NULL;
 
     wxASSERT (m_pAccessible != NULL);
     *pszName = NULL;
 
     wxASSERT (m_pAccessible != NULL);


@@ -1157,17 +1153,17 @@ STDMETHODIMP wxIAccessible::get_accName ( VARIANT varID, BSTR* pszName)
 
     if (varID.vt != VT_I4)
     {
 
     if (varID.vt != VT_I4)
     {

-        wxLogTrace(wxT("access"), "Invalid arg for get_accName");
+        wxLogTrace(wxT("access"), wxT("Invalid arg for get_accName"));

         return E_INVALIDARG;
     }
         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.


@@ -1201,26 +1197,26 @@ STDMETHODIMP wxIAccessible::get_accName ( VARIANT varID, BSTR* pszName)
 
 STDMETHODIMP wxIAccessible::get_accRole ( VARIANT varID, VARIANT* pVarRole)
 {
 
 STDMETHODIMP wxIAccessible::get_accRole ( VARIANT varID, VARIANT* pVarRole)
 {

-    wxLogTrace(wxT("access"), "get_accRole");
+    wxLogTrace(wxT("access"), wxT("get_accRole"));

     wxASSERT (m_pAccessible != NULL);
     if (!m_pAccessible)
         return E_FAIL;
     wxASSERT (m_pAccessible != NULL);
     if (!m_pAccessible)
         return E_FAIL;

-    
+

     if (varID.vt != VT_I4)
     {
     if (varID.vt != VT_I4)
     {

-        wxLogTrace(wxT("access"), "Invalid arg for get_accRole");
+        wxLogTrace(wxT("access"), wxT("Invalid arg for get_accRole"));

         return E_INVALIDARG;
     }
         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,26 +1254,26 @@ 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)
 {
 STDMETHODIMP wxIAccessible::get_accState ( VARIANT varID, VARIANT* pVarState)
 {

-    wxLogTrace(wxT("access"), "get_accState");
+    wxLogTrace(wxT("access"), wxT("get_accState"));

     wxASSERT (m_pAccessible != NULL);
     if (!m_pAccessible)
         return E_FAIL;
     wxASSERT (m_pAccessible != NULL);
     if (!m_pAccessible)
         return E_FAIL;

-    
+

     if (varID.vt != VT_I4 && varID.vt != VT_EMPTY)
     {
     if (varID.vt != VT_I4 && varID.vt != VT_EMPTY)
     {

-        wxLogTrace(wxT("access"), "Invalid arg for get_accState");
+        wxLogTrace(wxT("access"), wxT("Invalid arg for get_accState"));

         return E_INVALIDARG;
     }
 
     long wxstate = 0;
         return E_INVALIDARG;
     }
 
     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 +1302,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)
 {
 // Retrieves the value of the specified object.
 // Not all objects have a value.
 
 STDMETHODIMP wxIAccessible::get_accValue ( VARIANT varID, BSTR* pszValue)
 {

-    wxLogTrace(wxT("access"), "get_accValue");
+    wxLogTrace(wxT("access"), wxT("get_accValue"));

     wxASSERT (m_pAccessible != NULL);
     if (!m_pAccessible)
         return E_FAIL;
     wxASSERT (m_pAccessible != NULL);
     if (!m_pAccessible)
         return E_FAIL;

-    
+

     if (varID.vt != VT_I4)
     {
     if (varID.vt != VT_I4)
     {

-        wxLogTrace(wxT("access"), "Invalid arg for get_accValue");
+        wxLogTrace(wxT("access"), wxT("Invalid arg for get_accValue"));

         return E_INVALIDARG;
     }
         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.


@@ -1364,23 +1360,23 @@ STDMETHODIMP wxIAccessible::get_accValue ( VARIANT varID, BSTR* pszValue)
 
 STDMETHODIMP wxIAccessible::accSelect ( long flagsSelect, VARIANT varID )
 {
 
 STDMETHODIMP wxIAccessible::accSelect ( long flagsSelect, VARIANT varID )
 {

-    wxLogTrace(wxT("access"), "get_accSelect");
+    wxLogTrace(wxT("access"), wxT("get_accSelect"));

     wxASSERT (m_pAccessible != NULL);
     if (!m_pAccessible)
         return E_FAIL;
     wxASSERT (m_pAccessible != NULL);
     if (!m_pAccessible)
         return E_FAIL;

-    
+

     if (varID.vt != VT_I4 && varID.vt != VT_EMPTY)
     {
     if (varID.vt != VT_I4 && varID.vt != VT_EMPTY)
     {

-        wxLogTrace(wxT("access"), "Invalid arg for accSelect");
+        wxLogTrace(wxT("access"), wxT("Invalid arg for accSelect"));

         return E_INVALIDARG;
     }
         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 +1404,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)
 {
 STDMETHODIMP wxIAccessible::get_accFocus ( VARIANT* pVarID)
 {

-    wxLogTrace(wxT("access"), "get_accFocus");
+    wxLogTrace(wxT("access"), wxT("get_accFocus"));

     wxASSERT (m_pAccessible != NULL);
     if (!m_pAccessible)
         return E_FAIL;
     wxASSERT (m_pAccessible != NULL);
     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 +1442,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 +1460,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 +1470,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)
 {

-    wxLogTrace(wxT("access"), "get_accSelection");
+#if wxUSE_VARIANT
+    wxLogTrace(wxT("access"), wxT("get_accSelection"));

     wxASSERT (m_pAccessible != NULL);
     if (!m_pAccessible)
         return E_FAIL;
 
     VariantInit(pVarChildren);
     wxASSERT (m_pAccessible != NULL);
     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 +1511,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 +1531,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 +1564,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 +1605,7 @@ IAccessible* wxIAccessible::GetChildStdAccessible(int id)
             else
             {
                 pDispatch->Release();
             else
             {
                 pDispatch->Release();

-            }                                    
+            }

         }
     }
 
         }
     }
 


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

-                        }                        
+                        }

                     }
                 }
                 break;
                     }
                 }
                 break;


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

-            }                                    
+            }

         }
     }
     return NULL;
         }
     }
     return NULL;


@@ -1748,6 +1748,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 +1998,4 @@ wxAccSelectionFlags wxConvertFromWindowsSelFlag(int sel)
 }
 
 
 }
 
 

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