renamed start parameter of wxDC::DrawPolyPolygon() to count (patch 882189)

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

diff --git a/src/msw/ole/access.cpp b/src/msw/ole/access.cpp
index 05d2d1c7ad27c345cf8be1cd0f8780ec937a9261..0dfdd300acee482c19fe48bd5656a9ff91e167d5 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__)


@@ -49,7 +49,6 @@
 #include <oleacc.h>
 #include <winable.h>
 
 #include <oleacc.h>
 #include <winable.h>
 

-#include "wx/msw/winundef.h"

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


@@ -371,7 +370,7 @@ wxIAccessible::wxIAccessible(wxAccessible *pAccessible)
 
 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;


@@ -428,7 +427,11 @@ STDMETHODIMP wxIAccessible::accHitTest(long xLeft, long yLeft, VARIANT* pVarID)
         return S_FALSE;
     }
     
         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


@@ -436,7 +439,7 @@ STDMETHODIMP wxIAccessible::accHitTest(long xLeft, long yLeft, VARIANT* pVarID)
 
 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;


@@ -488,9 +491,15 @@ 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) || 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
+                                                          )

     {
     {

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

         return E_INVALIDARG;
     }
     
         return E_INVALIDARG;
     }
     


@@ -555,19 +564,19 @@ STDMETHODIMP wxIAccessible::accNavigate ( long navDir, VARIANT varStart, VARIANT
 
     if (status == wxACC_FAIL)
     {
 
     if (status == wxACC_FAIL)
     {

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

         return E_FAIL;
     }
     
     if (status == wxACC_FALSE)
     {
         return E_FAIL;
     }
     
     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;
     }
     
     if (status == wxACC_NOT_IMPLEMENTED)
     {
         return S_FALSE;
     }
     
     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)


@@ -590,41 +599,41 @@ 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;
             }
 
                HRESULT hResult = objectIA->QueryInterface(IID_IDispatch, (LPVOID*) & pVarEnd->pdispVal);
             if (hResult != S_OK)
             {
                 return E_FAIL;
             }
 
                HRESULT hResult = objectIA->QueryInterface(IID_IDispatch, (LPVOID*) & pVarEnd->pdispVal);
             if (hResult != S_OK)
             {

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

                    return E_FAIL;
             }
             
                    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;
 }
 
     return E_NOTIMPL;
 }
 


@@ -633,14 +642,14 @@ STDMETHODIMP wxIAccessible::accNavigate ( long navDir, VARIANT varStart, VARIANT
     
 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;
     
     if (varChildID.vt != VT_I4)
     {
     wxASSERT (m_pAccessible != NULL);
     if (!m_pAccessible)
         return E_FAIL;
     
     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;
     }
 


@@ -656,7 +665,7 @@ STDMETHODIMP wxIAccessible::get_accChild ( VARIANT varChildID, IDispatch** ppDis
     wxAccStatus status = m_pAccessible->GetChild(varChildID.lVal, & child);
     if (status == wxACC_FAIL)
     {
     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;
     }
     


@@ -668,7 +677,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);
         }
     }


@@ -682,7 +691,7 @@ STDMETHODIMP wxIAccessible::get_accChild ( VARIANT varChildID, IDispatch** ppDis
 
                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");
+                wxLogTrace(wxT("access"), wxT("QueryInterface failed in get_accChild"));

                    return E_FAIL;
             }
             
                    return E_FAIL;
             }
             


@@ -690,12 +699,16 @@ STDMETHODIMP wxIAccessible::get_accChild ( VARIANT varChildID, IDispatch** ppDis
         }
         else
         {
         }
         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 
+    // 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.
 }
 
 // Retrieves the number of children that belong to this object.


@@ -703,7 +716,7 @@ STDMETHODIMP wxIAccessible::get_accChild ( VARIANT varChildID, IDispatch** ppDis
     
 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;


@@ -721,7 +734,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));


@@ -735,7 +748,11 @@ 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.
 }
 
 // Retrieves the IDispatch interface of the object's parent.


@@ -743,7 +760,7 @@ STDMETHODIMP wxIAccessible::get_accChildCount ( long* pCountChildren)
     
 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;


@@ -759,7 +776,7 @@ STDMETHODIMP wxIAccessible::get_accParent ( IDispatch** ppDispParent)
     // 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)


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

-            wxLogTrace(wxT("access"), "About to call QueryInterface");
+            wxLogTrace(wxT("access"), wxT("About to call QueryInterface"));

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

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

                    return E_FAIL;
             }
             
                    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 
+    // 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
 }
 
 // Performs the object's default action. Not all objects have a default


@@ -803,14 +824,14 @@ STDMETHODIMP wxIAccessible::get_accParent ( IDispatch** ppDispParent)
     
 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;
     
     if (varID.vt != VT_I4)
     {
     wxASSERT (m_pAccessible != NULL);
     if (!m_pAccessible)
         return E_FAIL;
     
     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;
     }
     


@@ -848,14 +869,14 @@ STDMETHODIMP wxIAccessible::accDoDefaultAction(VARIANT varID)
     
 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;
     
     if (varID.vt != VT_I4)
     {
     wxASSERT (m_pAccessible != NULL);
     if (!m_pAccessible)
         return E_FAIL;
     
     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;
     }
     


@@ -908,14 +929,14 @@ 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;
     
     if (varID.vt != VT_I4)
     {
     wxASSERT (m_pAccessible != NULL);
     if (!m_pAccessible)
         return E_FAIL;
     
     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;
     }
     


@@ -965,14 +986,14 @@ 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;
     
     if (varID.vt != VT_I4)
     {
     wxASSERT (m_pAccessible != NULL);
     if (!m_pAccessible)
         return E_FAIL;
     
     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;
     }
     


@@ -1025,14 +1046,14 @@ STDMETHODIMP wxIAccessible::get_accHelp ( VARIANT varID, BSTR* pszHelp)
         
 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;
     
     if (varChild.vt != VT_I4)
     {
     wxASSERT (m_pAccessible != NULL);
     if (!m_pAccessible)
         return E_FAIL;
     
     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;
     }
     


@@ -1068,7 +1089,7 @@ STDMETHODIMP wxIAccessible::get_accHelpTopic ( BSTR* pszHelpFile, VARIANT varChi
         
 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);
     *pszKeyboardShortcut = NULL;
 
     wxASSERT (m_pAccessible != NULL);


@@ -1077,7 +1098,7 @@ STDMETHODIMP wxIAccessible::get_accKeyboardShortcut ( VARIANT varID, BSTR* pszKe
     
     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;
     }
     


@@ -1127,7 +1148,7 @@ STDMETHODIMP wxIAccessible::get_accKeyboardShortcut ( VARIANT varID, BSTR* pszKe
     
 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);


@@ -1136,7 +1157,7 @@ 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;
     }
     


@@ -1180,14 +1201,14 @@ 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;
     
     if (varID.vt != VT_I4)
     {
     wxASSERT (m_pAccessible != NULL);
     if (!m_pAccessible)
         return E_FAIL;
     
     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;
     }
     


@@ -1240,14 +1261,14 @@ STDMETHODIMP wxIAccessible::get_accRole ( VARIANT varID, VARIANT* pVarRole)
     
 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;
     
     if (varID.vt != VT_I4 && varID.vt != VT_EMPTY)
     {
     wxASSERT (m_pAccessible != NULL);
     if (!m_pAccessible)
         return E_FAIL;
     
     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;
     }
 
         return E_INVALIDARG;
     }
 


@@ -1291,14 +1312,14 @@ STDMETHODIMP wxIAccessible::get_accState ( VARIANT varID, VARIANT* pVarState)
 
 STDMETHODIMP wxIAccessible::get_accValue ( VARIANT varID, BSTR* pszValue)
 {
 
 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;
     
     if (varID.vt != VT_I4)
     {
     wxASSERT (m_pAccessible != NULL);
     if (!m_pAccessible)
         return E_FAIL;
     
     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;
     }
     


@@ -1343,14 +1364,14 @@ 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;
     
     if (varID.vt != VT_I4 && varID.vt != VT_EMPTY)
     {
     wxASSERT (m_pAccessible != NULL);
     if (!m_pAccessible)
         return E_FAIL;
     
     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;
     }
     


@@ -1390,7 +1411,7 @@ STDMETHODIMP wxIAccessible::accSelect ( long flagsSelect, VARIANT varID )
         
 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;


@@ -1444,7 +1465,11 @@ STDMETHODIMP wxIAccessible::get_accFocus ( VARIANT* pVarID)
         return S_FALSE;
     }
     
         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
 }
 
 // Retrieves the selected children of this object. All objects


@@ -1452,7 +1477,7 @@ STDMETHODIMP wxIAccessible::get_accFocus ( VARIANT* pVarID)
         
 STDMETHODIMP wxIAccessible::get_accSelection ( VARIANT * pVarChildren)
 {
         
 STDMETHODIMP wxIAccessible::get_accSelection ( VARIANT * pVarChildren)
 {

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

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


@@ -1515,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;


@@ -1531,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;
 }


@@ -1939,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;
 }