X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d1877f84008c7c5b9391f90a1a37c908618d91c8..07aaf32633ecf18ec3edfbb41793a112914792d0:/src/msw/ole/activex.cpp diff --git a/src/msw/ole/activex.cpp b/src/msw/ole/activex.cpp index b034ab1c11..8baad0bf01 100644 --- a/src/msw/ole/activex.cpp +++ b/src/msw/ole/activex.cpp @@ -1113,8 +1113,11 @@ void wxActiveXContainer::CreateActiveX(REFIID iid, IUnknown* pUnk) if (! (dwMiscStatus & OLEMISC_INVISIBLEATRUNTIME)) { + RECT posRect; + wxCopyRectToRECT(m_realparent->GetClientSize(), posRect); + hret = m_oleObject->DoVerb(OLEIVERB_INPLACEACTIVATE, NULL, - m_clientSite, 0, (HWND)m_realparent->GetHWND(), NULL); + m_clientSite, 0, (HWND)m_realparent->GetHWND(), &posRect); CHECK_HR(hret); if (m_oleInPlaceObject.IsOk()) @@ -1124,9 +1127,6 @@ void wxActiveXContainer::CreateActiveX(REFIID iid, IUnknown* pUnk) ::SetActiveWindow(m_oleObjectHWND); } - RECT posRect; - wxCopyRectToRECT(m_realparent->GetClientSize(), posRect); - if (posRect.right > 0 && posRect.bottom > 0 && m_oleInPlaceObject.IsOk()) { @@ -1269,7 +1269,7 @@ void wxActiveXContainer::OnKillFocus(wxFocusEvent& event) // wxActiveXContainer::MSWTranslateMessage // // Called for every message that needs to be translated. -// Some controls might need more keyboard keys to process (CTRL-C, CTRL-A ect), +// Some controls might need more keyboard keys to process (CTRL-C, CTRL-A etc), // In that case TranslateAccelerator should always be called first. //--------------------------------------------------------------------------- bool wxActiveXContainer::MSWTranslateMessage(WXMSG* pMsg)