Fixed MDIS_ALLCHILDSTYLES bug (WS_VISIBLE needed to be added to child frame style)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10569 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -695,7 +695,7 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent,
|
|||||||
else
|
else
|
||||||
mcs.cy = CW_USEDEFAULT;
|
mcs.cy = CW_USEDEFAULT;
|
||||||
|
|
||||||
DWORD msflags = WS_OVERLAPPED | WS_CLIPCHILDREN | WS_THICKFRAME;
|
DWORD msflags = WS_OVERLAPPED | WS_CLIPCHILDREN | WS_THICKFRAME | WS_VISIBLE ;
|
||||||
if (style & wxMINIMIZE_BOX)
|
if (style & wxMINIMIZE_BOX)
|
||||||
msflags |= WS_MINIMIZEBOX;
|
msflags |= WS_MINIMIZEBOX;
|
||||||
if (style & wxMAXIMIZE_BOX)
|
if (style & wxMAXIMIZE_BOX)
|
||||||
@@ -1146,12 +1146,7 @@ bool wxMDIClientWindow::CreateClient(wxMDIParentFrame *parent, long style)
|
|||||||
ccs.hWindowMenu = (HMENU) parent->GetWindowMenu()->GetHMenu();
|
ccs.hWindowMenu = (HMENU) parent->GetWindowMenu()->GetHMenu();
|
||||||
ccs.idFirstChild = wxFIRST_MDI_CHILD;
|
ccs.idFirstChild = wxFIRST_MDI_CHILD;
|
||||||
|
|
||||||
// Note from JACS: please don't restore MDIS_ALLCHILDSTYLES
|
DWORD msStyle = MDIS_ALLCHILDSTYLES | WS_VISIBLE | WS_CHILD |
|
||||||
// without verifying that the OGL Studio sample works. Currently,
|
|
||||||
// it doesn't, with this style. We have to track it down, but
|
|
||||||
// I'd rather Studio (and maybe apps like it) didn't completely
|
|
||||||
// break.
|
|
||||||
DWORD msStyle = /* MDIS_ALLCHILDSTYLES | */ WS_VISIBLE | WS_CHILD |
|
|
||||||
WS_CLIPCHILDREN | WS_CLIPSIBLINGS;
|
WS_CLIPCHILDREN | WS_CLIPSIBLINGS;
|
||||||
|
|
||||||
if ( style & wxHSCROLL )
|
if ( style & wxHSCROLL )
|
||||||
|
Reference in New Issue
Block a user