Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use wxWindow::GetClientSize() instead of ::GetClientRect() in wxActiveXContainer::CreateActiveX()

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58086 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-01-13 22:53:49 +00:00
parent f742eaafee
commit 0641c71271
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/msw/ole/activex.cpp
View File

@@ -1017,9 +1017,6 @@ void wxActiveXContainer::CreateActiveX(REFIID iid, IUnknown* pUnk)
m_oleObject->SetClientSite(m_clientSite); m_oleObject->SetClientSite(m_clientSite);
RECT posRect;
::GetClientRect((HWND)m_realparent->GetHWND(), &posRect);
m_oleObjectHWND = 0; m_oleObjectHWND = 0;
if (m_oleInPlaceObject.Ok()) if (m_oleInPlaceObject.Ok())
@@ -1032,9 +1029,14 @@ void wxActiveXContainer::CreateActiveX(REFIID iid, IUnknown* pUnk)
if (! (dwMiscStatus & OLEMISC_INVISIBLEATRUNTIME)) if (! (dwMiscStatus & OLEMISC_INVISIBLEATRUNTIME))
{ {
RECT posRect;
wxCopyRectToRECT(m_realparent->GetClientSize(), posRect);
if (posRect.right > 0 && posRect.bottom > 0 && if (posRect.right > 0 && posRect.bottom > 0 &&
m_oleInPlaceObject.Ok()) m_oleInPlaceObject.Ok())
{
m_oleInPlaceObject->SetObjectRects(&posRect, &posRect); m_oleInPlaceObject->SetObjectRects(&posRect, &posRect);
}
hret = m_oleObject->DoVerb(OLEIVERB_INPLACEACTIVATE, NULL, hret = m_oleObject->DoVerb(OLEIVERB_INPLACEACTIVATE, NULL,
m_clientSite, 0, (HWND)m_realparent->GetHWND(), &posRect); m_clientSite, 0, (HWND)m_realparent->GetHWND(), &posRect);