Minor header cleaning.

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

diff --git a/src/msw/ole/access.cpp b/src/msw/ole/access.cpp
index e168dda881f0348644285ab9434b5eb92a9c6b7e..9aff3c6c183c5d1b2721b974bb3e2fe689e870f4 100644 (file)
--- a/src/msw/ole/access.cpp
+++ b/src/msw/ole/access.cpp
@@ -29,12 +29,11 @@
 #include "wx/access.h"
 
 #ifndef WX_PRECOMP
 #include "wx/access.h"
 
 #ifndef WX_PRECOMP

+    #include "wx/msw/wrapwin.h"

     #include "wx/window.h"
     #include "wx/log.h"
 #endif
 
     #include "wx/window.h"
     #include "wx/log.h"
 #endif
 

-#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__)
     #include <ole2.h>
 // for some compilers, the entire ole2.h must be included, not only oleauto.h
 #if wxUSE_NORLANDER_HEADERS || defined(__WATCOMC__)
     #include <ole2.h>


@@ -66,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
 // ----------------------------------------------------------------------------


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


@@ -1472,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)


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