Applied patch [ 1385822 ] fixed stdpaths get folder path on WinCE

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

diff --git a/src/msw/ole/activex.cpp b/src/msw/ole/activex.cpp
index 41c5756c1d6f319871f945a24189b03162410d1f..991e7c9870807927bb545978563f8e760a409085 100644 (file)
--- a/src/msw/ole/activex.cpp
+++ b/src/msw/ole/activex.cpp
@@ -24,7 +24,7 @@
 #endif
 
 #include "wx/dcclient.h"
-#include "wx/geometry.h"
+#include "wx/math.h"
 #include "wx/msw/ole/activex.h"
 
 
@@ -438,7 +438,9 @@ public:
     HRESULT STDMETHODCALLTYPE LockContainer(BOOL){return S_OK;}
     //********************IOleItemContainer***************************
     HRESULT STDMETHODCALLTYPE
-    #ifdef _UNICODE
+    #if defined(__WXWINCE__)
+    GetObject
+    #elif defined(_UNICODE)
     GetObjectW
     #else
     GetObjectA
@@ -709,7 +711,10 @@ void wxActiveXContainer::CreateActiveX(REFIID iid, IUnknown* pUnk)
         ::SetActiveWindow(m_oleObjectHWND);
         ::ShowWindow(m_oleObjectHWND, SW_SHOW);
 
-        this->AssociateHandle(m_oleObjectHWND);
+        {
+            wxLogNull  noLog;
+            this->AssociateHandle(m_oleObjectHWND);
+        }
         this->Reparent(m_realparent);
 
         wxWindow* pWnd = m_realparent;
@@ -800,7 +805,11 @@ void wxActiveXContainer::OnPaint(wxPaintEvent& WXUNUSED(event))
         posRect.right = w;
         posRect.bottom = h;
 
+#if defined(_WIN32_WCE) && _WIN32_WCE < 400
+        ::InvalidateRect(m_oleObjectHWND, NULL, false);
+#else
         ::RedrawWindow(m_oleObjectHWND, NULL, NULL, RDW_INTERNALPAINT);
+#endif
         RECTL *prcBounds = (RECTL *) &posRect;
         m_viewObject->Draw(DVASPECT_CONTENT, -1, NULL, NULL, NULL,
             (HDC)dc.GetHDC(), prcBounds, NULL, NULL, 0);