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

Applied [ 1202378 ] Fix display of MSW mediactrl when not using sizers et al.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34238 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2005-05-22 11:02:22 +00:00
parent 56d739aad7
commit 7c4a4505c1
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/msw/mediactrl.cpp
View File

@@ -1323,6 +1323,7 @@ bool wxAMMediaBackend::Load(const wxString& fileName)
m_ctrl->GetParent()->Layout(); m_ctrl->GetParent()->Layout();
m_ctrl->GetParent()->Refresh(); m_ctrl->GetParent()->Refresh();
m_ctrl->GetParent()->Update(); m_ctrl->GetParent()->Update();
m_ctrl->SetSize(m_ctrl->GetSize());
return true; return true;
} }
@@ -1856,6 +1857,7 @@ bool wxMCIMediaBackend::Load(const wxString& fileName)
m_ctrl->GetParent()->Layout(); m_ctrl->GetParent()->Layout();
m_ctrl->GetParent()->Refresh(); m_ctrl->GetParent()->Refresh();
m_ctrl->GetParent()->Update(); m_ctrl->GetParent()->Update();
m_ctrl->SetSize(m_ctrl->GetSize());
return true; return true;
} }
@@ -2063,14 +2065,19 @@ void wxMCIMediaBackend::Move(int WXUNUSED(x), int WXUNUSED(y),
if (m_hNotifyWnd && m_bVideo) if (m_hNotifyWnd && m_bVideo)
{ {
MCI_DGV_RECT_PARMS putParms; //ifdefed MCI_DGV_PUT_PARMS MCI_DGV_RECT_PARMS putParms; //ifdefed MCI_DGV_PUT_PARMS
putParms.rc.top = 0; memset(&putParms, 0, sizeof(MCI_DGV_RECT_PARMS));
putParms.rc.bottom = 0;
putParms.rc.right = w;
putParms.rc.bottom = h; putParms.rc.bottom = h;
putParms.rc.right = w;
wxMCIVERIFY( mciSendCommand(m_hDev, MCI_PUT, //wxStackWalker will crash and burn here on assert
//and mci doesn't like 0 and 0 for some reason (out of range )
//so just don't it in that case
if(w || h)
{
wxMCIVERIFY( mciSendCommand(m_hDev, MCI_PUT,
0x00040000L, //MCI_DGV_PUT_DESTINATION 0x00040000L, //MCI_DGV_PUT_DESTINATION
(DWORD)(LPSTR)&putParms) ); (DWORD)(LPSTR)&putParms) );
}
} }
} }