mirror of
git://source.winehq.org/git/wine.git
synced 2024-10-31 12:19:49 +00:00
MDIchild created when the MDI client has the MDIS_ALLCHILDSTYLES
style, should not be shown at creation nor activated unless the WS_VISIBLE flag is set.
This commit is contained in:
parent
48325f1f18
commit
4f7abc05c2
1 changed files with 25 additions and 10 deletions
|
@ -356,18 +356,33 @@ static HWND32 MDICreateChild( WND *w, MDICLIENTINFO *ci, HWND32 parent,
|
|||
ShowWindow32( hwnd, SW_SHOWMINNOACTIVE );
|
||||
else
|
||||
{
|
||||
SetWindowPos32( hwnd, 0, 0, 0, 0, 0, SWP_SHOWWINDOW | SWP_NOSIZE | SWP_NOMOVE );
|
||||
/* WS_VISIBLE is clear if a) the MDI client has
|
||||
* MDIS_ALLCHILDSTYLES style and 2) the flag is cleared in the
|
||||
* MDICreateStruct. If so the created window is not shown nor
|
||||
* activated.
|
||||
*/
|
||||
int showflag=wnd->dwStyle & WS_VISIBLE;
|
||||
/* clear visible flag, otherwise SetWindoPos32 ignores
|
||||
* the SWP_SHOWWINDOW command.
|
||||
*/
|
||||
wnd->dwStyle &= ~WS_VISIBLE;
|
||||
if(showflag){
|
||||
SetWindowPos32( hwnd, 0, 0, 0, 0, 0, SWP_SHOWWINDOW | SWP_NOSIZE | SWP_NOMOVE );
|
||||
|
||||
/* Set maximized state here in case hwnd didn't receive WM_SIZE
|
||||
* during CreateWindow - bad!
|
||||
*/
|
||||
/* Set maximized state here in case hwnd didn't receive WM_SIZE
|
||||
* during CreateWindow - bad!
|
||||
*/
|
||||
|
||||
if((wnd->dwStyle & WS_MAXIMIZE) && !ci->hwndChildMaximized )
|
||||
{
|
||||
ci->hwndChildMaximized = wnd->hwndSelf;
|
||||
MDI_AugmentFrameMenu( ci, w->parent, hwnd );
|
||||
MDI_UpdateFrameText( w->parent, ci->self, MDI_REPAINTFRAME, NULL );
|
||||
}
|
||||
}else
|
||||
/* needed, harmless ? */
|
||||
SetWindowPos32( hwnd, 0, 0, 0, 0, 0, SWP_NOACTIVATE | SWP_NOSIZE | SWP_NOMOVE );
|
||||
|
||||
if((wnd->dwStyle & WS_MAXIMIZE) && !ci->hwndChildMaximized )
|
||||
{
|
||||
ci->hwndChildMaximized = wnd->hwndSelf;
|
||||
MDI_AugmentFrameMenu( ci, w->parent, hwnd );
|
||||
MDI_UpdateFrameText( w->parent, ci->self, MDI_REPAINTFRAME, NULL );
|
||||
}
|
||||
}
|
||||
TRACE(mdi, "created child - %04x\n",hwnd);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue