Fixed bug [ 1195479 ] RedrawWindow() incompatible with eVC3

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

diff --git a/src/msw/ole/access.cpp b/src/msw/ole/access.cpp
index ea77e722d886145d0afeae376ffedf7c06448c33..47cbf00934b55af419047acdf46c66a6d713d308 100644 (file)
--- a/src/msw/ole/access.cpp
+++ b/src/msw/ole/access.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

   #pragma implementation "access.h"
 #endif
 
   #pragma implementation "access.h"
 #endif
 


@@ -38,7 +38,7 @@
 #include "wx/log.h"
 #include "wx/access.h"
 
 #include "wx/log.h"
 #include "wx/access.h"
 

-#include <windows.h>
+#include "wx/msw/wrapwin.h"

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


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


@@ -78,7 +79,7 @@ class wxIEnumVARIANT : public IEnumVARIANT
 {
 public:
     wxIEnumVARIANT(const wxVariant& variant);
 {
 public:
     wxIEnumVARIANT(const wxVariant& variant);

-    ~wxIEnumVARIANT() { }
+    virtual ~wxIEnumVARIANT() { }

 
     DECLARE_IUNKNOWN_METHODS;
 
 
     DECLARE_IUNKNOWN_METHODS;
 


@@ -198,12 +199,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);
 


@@ -214,29 +215,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.


@@ -252,18 +253,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.


@@ -273,9 +274,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.
 


@@ -291,12 +292,12 @@ 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


@@ -321,9 +322,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


@@ -365,24 +366,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)
 {

-    wxLogDebug("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.


@@ -392,7 +393,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)


@@ -407,9 +408,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;
         }


@@ -425,26 +426,30 @@ 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
+    // all cases above already cause some return action so below line
+    // is unreachable and cause unnecessary warning

     return E_NOTIMPL;
     return E_NOTIMPL;

+    #endif

 }
 
 // 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)
 {

-    wxLogDebug("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.


@@ -484,14 +489,20 @@ STDMETHODIMP wxIAccessible::accNavigate ( long navDir, VARIANT varStart, VARIANT
     wxASSERT (m_pAccessible != NULL);
     if (!m_pAccessible)
         return E_FAIL;
     wxASSERT (m_pAccessible != NULL);
     if (!m_pAccessible)
         return E_FAIL;

-    wxLogDebug(wxString(wxT("accNavigate for ")) + m_pAccessible->GetWindow()->GetClassInfo()->GetClassName());
+    wxLogTrace(wxT("access"), wxString(wxT("accNavigate for ")) + m_pAccessible->GetWindow()->GetClassInfo()->GetClassName());

 
 

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

     {
     {

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

         return E_INVALIDARG;
     }
         return E_INVALIDARG;
     }

-    
+

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


@@ -542,30 +553,30 @@ STDMETHODIMP wxIAccessible::accNavigate ( long navDir, VARIANT varStart, VARIANT
         break;
     default:
         {
         break;
     default:
         {

-            wxLogDebug(wxT("Unknown NAVDIR symbol"));
+            wxLogTrace(wxT("access"), wxT("Unknown NAVDIR symbol"));

             break;
         }
     }
             break;
         }
     }

-    wxLogDebug(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)
     {

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

         return E_FAIL;
     }
         return E_FAIL;
     }

-    
+

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

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

         return S_FALSE;
     }
         return S_FALSE;
     }

-    
+

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

-        wxLogDebug("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)


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

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

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

-                wxLogDebug("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)
             {

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

             }
             }

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

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

-            wxLogDebug("Returning element id from Navigate");
+            wxLogTrace(wxT("access"), wxT("Returning element id from Navigate"));

             pVarEnd->vt = VT_I4;
             pVarEnd->lVal = elementId;
             return S_OK;
         }
         else
         {
             pVarEnd->vt = VT_I4;
             pVarEnd->lVal = elementId;
             return S_OK;
         }
         else
         {

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

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

-    wxLogDebug("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)
 {

-    wxLogDebug("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)
     {

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

         return E_INVALIDARG;
     }
 
         return E_INVALIDARG;
     }
 


@@ -648,16 +659,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)
     {

-        wxLogDebug("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.


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

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

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


@@ -678,39 +689,43 @@ 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)

             {
             {

-                wxLogDebug("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
         {

-            wxLogDebug("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
+    // all cases above already cause some return action so below line
+    // is unreachable and cause unnecessary warning

     return E_NOTIMPL;
     return E_NOTIMPL;

+    #endif

 }
 
 // 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)
 {

-    wxLogDebug("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.


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

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

             HRESULT res = stdInterface->get_accChildCount (pCountChildren);
             wxString str;
             str.Printf(wxT("Number of children was %d"), (int) (*pCountChildren));
             HRESULT res = stdInterface->get_accChildCount (pCountChildren);
             wxString str;
             str.Printf(wxT("Number of children was %d"), (int) (*pCountChildren));

-            wxLogDebug(str);
+            wxLogTrace(wxT("access"), str);

             return res;
         }
     }
             return res;
         }
     }


@@ -733,19 +748,23 @@ STDMETHODIMP wxIAccessible::get_accChildCount ( long* pCountChildren)
         return S_OK;
     }
 
         return S_OK;
     }
 

+    #if 0
+    // all cases above already cause some return action so below line
+    // is unreachable and cause unnecessary warning

     return E_NOTIMPL;
     return E_NOTIMPL;

+    #endif

 }
 
 // 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)
 {

-    wxLogDebug("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);
 


@@ -753,11 +772,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)
     {

-        wxLogDebug("Using standard interface to get the parent.");
+        wxLogTrace(wxT("access"), wxT("Using standard interface to get the parent."));

         // Use standard interface instead.
         IAccessible* stdInterface = (IAccessible*)m_pAccessible->GetIAccessibleStd();
         if (!stdInterface)
         // Use standard interface instead.
         IAccessible* stdInterface = (IAccessible*)m_pAccessible->GetIAccessibleStd();
         if (!stdInterface)


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

-            wxLogDebug("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)

             {
             {

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

             }
             }

-            
-            wxLogDebug("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.

-            wxLogDebug("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
+    // all cases above already cause some return action so below line
+    // is unreachable and cause unnecessary warning

     return E_NOTIMPL;
     return E_NOTIMPL;

+    #endif

 }
 
 // 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)
 {

-    wxLogDebug("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)
     {

-        wxLogDebug("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.


@@ -843,28 +866,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)
 {

-    wxLogDebug("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)
     {

-        wxLogDebug("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.


@@ -906,22 +929,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)
 {

-    wxLogDebug("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)
     {

-        wxLogDebug("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.


@@ -953,7 +976,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;
 }


@@ -963,22 +986,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)
 {

-    wxLogDebug("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)
     {

-        wxLogDebug("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.


@@ -1010,7 +1033,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;
 }


@@ -1018,26 +1041,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)
 {

-    wxLogDebug("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)
     {

-        wxLogDebug("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.


@@ -1063,27 +1086,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)
 {

-    wxLogDebug("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)
     {

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

         return E_INVALIDARG;
     }
         return E_INVALIDARG;
     }

-    
+

     wxString keyboardShortcut;
     wxString keyboardShortcut;

-    wxAccStatus status = m_pAccessible->GetHelpText(varID.lVal, & keyboardShortcut);
+    wxAccStatus status = m_pAccessible->GetKeyboardShortcut(varID.lVal, & keyboardShortcut);

     if (status == wxACC_FAIL)
         return E_FAIL;
     if (status == wxACC_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.


@@ -1115,17 +1138,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)
 {

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

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


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

-        wxLogDebug("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.


@@ -1178,26 +1201,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)
 {

-    wxLogDebug("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)
     {

-        wxLogDebug("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.


@@ -1235,26 +1258,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)
 {

-    wxLogDebug("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)
     {

-        wxLogDebug("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.


@@ -1283,30 +1306,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)
 {

-    wxLogDebug("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)
     {

-        wxLogDebug("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.


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

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

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

-        wxLogDebug("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.


@@ -1385,22 +1408,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)
 {

-    wxLogDebug("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.


@@ -1423,9 +1446,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;
         }


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

-    
+
+    #if 0
+    // all cases above already cause some return action so below line
+    // is unreachable and cause unnecessary warning

     return E_NOTIMPL;
     return E_NOTIMPL;

+    #endif

 }
 
 // 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)
 {

-    wxLogDebug("get_accSelection");
+    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.


@@ -1487,9 +1514,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;


@@ -1513,7 +1540,7 @@ STDMETHODIMP wxIAccessible::get_accSelection ( VARIANT * pVarChildren)
 
 // Get type info
 
 
 // Get type info
 

-STDMETHODIMP wxIAccessible::GetTypeInfo(unsigned int typeInfo, LCID lcid, ITypeInfo** ppTypeInfo)
+STDMETHODIMP wxIAccessible::GetTypeInfo(unsigned int WXUNUSED(typeInfo), LCID WXUNUSED(lcid), ITypeInfo** ppTypeInfo)

 {
     *ppTypeInfo = NULL;
     return E_NOTIMPL;
 {
     *ppTypeInfo = NULL;
     return E_NOTIMPL;


@@ -1529,18 +1556,18 @@ STDMETHODIMP wxIAccessible::GetTypeInfoCount(unsigned int* typeInfoCount)
 
 // Get ids of names
 
 
 // Get ids of names
 

-STDMETHODIMP wxIAccessible::GetIDsOfNames(REFIID riid, OLECHAR** names, unsigned int cNames,
-        LCID lcid, DISPID* dispId)
+STDMETHODIMP wxIAccessible::GetIDsOfNames(REFIID WXUNUSED(riid), OLECHAR** WXUNUSED(names), unsigned int WXUNUSED(cNames),
+        LCID WXUNUSED(lcid), DISPID* WXUNUSED(dispId))

 {
     return E_NOTIMPL;
 }
 
 // Invoke
 
 {
     return E_NOTIMPL;
 }
 
 // Invoke
 

-STDMETHODIMP wxIAccessible::Invoke(DISPID dispIdMember, REFIID riid, LCID lcid, 
-                        WORD wFlags, DISPPARAMS *pDispParams, 
-                        VARIANT *pVarResult, EXCEPINFO *pExcepInfo, 
-                        unsigned int *puArgErr )
+STDMETHODIMP wxIAccessible::Invoke(DISPID WXUNUSED(dispIdMember), REFIID WXUNUSED(riid), LCID WXUNUSED(lcid),
+                        WORD WXUNUSED(wFlags), DISPPARAMS *WXUNUSED(pDispParams),
+                        VARIANT *WXUNUSED(pVarResult), EXCEPINFO *WXUNUSED(pExcepInfo),
+                        unsigned int *WXUNUSED(puArgErr) )

 {
     return E_NOTIMPL;
 }
 {
     return E_NOTIMPL;
 }


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

-            }                                    
+            }

         }
     }
 
         }
     }
 


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

-                        }                        
+                        }

                     }
                 }
                 break;
                     }
                 }
                 break;


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

-            }                                    
+            }

         }
     }
     return NULL;
         }
     }
     return NULL;


@@ -1937,15 +1964,15 @@ int wxConvertToWindowsSelFlag(wxAccSelectionFlags wxsel)
 {
     int sel = 0;
 
 {
     int sel = 0;
 

-    if (sel & wxACC_SEL_TAKEFOCUS)
+    if (wxsel & wxACC_SEL_TAKEFOCUS)

         sel |= SELFLAG_TAKEFOCUS;
         sel |= SELFLAG_TAKEFOCUS;

-    if (sel & wxACC_SEL_TAKESELECTION)
+    if (wxsel & wxACC_SEL_TAKESELECTION)

         sel |= SELFLAG_TAKESELECTION;
         sel |= SELFLAG_TAKESELECTION;

-    if (sel & wxACC_SEL_EXTENDSELECTION)
+    if (wxsel & wxACC_SEL_EXTENDSELECTION)

         sel |= SELFLAG_EXTENDSELECTION;
         sel |= SELFLAG_EXTENDSELECTION;

-    if (sel & wxACC_SEL_ADDSELECTION)
+    if (wxsel & wxACC_SEL_ADDSELECTION)

         sel |= SELFLAG_ADDSELECTION;
         sel |= SELFLAG_ADDSELECTION;

-    if (sel & wxACC_SEL_REMOVESELECTION)
+    if (wxsel & wxACC_SEL_REMOVESELECTION)

         sel |= SELFLAG_REMOVESELECTION;
     return sel;
 }
         sel |= SELFLAG_REMOVESELECTION;
     return sel;
 }