WinCE build fix according to eVC3 and eVC4 SDKs.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36027 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/msw/ole/activex.h b/include/wx/msw/ole/activex.h
index 0c9477e8fed9b04c3ae04ca1bb7bd063e1eb613d..f2668e6be9e27ced418e8a4a72b1647f7490a488 100644 (file)
--- a/include/wx/msw/ole/activex.h
+++ b/include/wx/msw/ole/activex.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        wx/activex.h
+// Name:        wx/msw/ole/activex.h

 // Purpose:     wxActiveXContainer class
 // Author:      Ryan Norton <wxprojects@comcast.net>
 // Modified by:
 // Purpose:     wxActiveXContainer class
 // Author:      Ryan Norton <wxprojects@comcast.net>
 // Modified by:


@@ -48,7 +48,11 @@
 //---------------------------------------------------------------------------
 #include <oleidl.h>
 #include <olectl.h>
 //---------------------------------------------------------------------------
 #include <oleidl.h>
 #include <olectl.h>

+
+#if !defined(__WXWINCE__) || defined(__WINCE_STANDARDSDK__)

 #include <exdisp.h>
 #include <exdisp.h>

+#endif
+

 #include <docobj.h>
 
 //
 #include <docobj.h>
 
 //


@@ -182,4 +186,3 @@ protected:
 };
 
 #endif // _WX_MSW_OLE_ACTIVEXCONTAINER_H_
 };
 
 #endif // _WX_MSW_OLE_ACTIVEXCONTAINER_H_

-