fix unused variable warning when wxUSE_PALETTE==0

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

diff --git a/src/msw/ole/access.cpp b/src/msw/ole/access.cpp
index 47cbf00934b55af419047acdf46c66a6d713d308..9aff3c6c183c5d1b2721b974bb3e2fe689e870f4 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


@@ -302,8 +298,8 @@ public:
 
 // Obsolete
 
 
 // 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
 


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


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


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


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

+#if wxUSE_VARIANT

     wxLogTrace(wxT("access"), wxT("get_accSelection"));
     wxASSERT (m_pAccessible != NULL);
     if (!m_pAccessible)
     wxLogTrace(wxT("access"), wxT("get_accSelection"));
     wxASSERT (m_pAccessible != NULL);
     if (!m_pAccessible)


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


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

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