1. disabled WS_EX_CONTROLPARENT as I don't know how to work around it otherwise
2. corrected assignments to non-const references git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7281 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -2302,16 +2302,19 @@ bool wxWindow::MSWCreate(int id,
|
||||
if ( width > -1 ) width1 = width;
|
||||
if ( height > -1 ) height1 = height;
|
||||
|
||||
// Unfortunately this won't work in WIN16. Unless perhaps
|
||||
// we define WS_EX_CONTROLPARENT ourselves?
|
||||
#ifndef __WIN16__
|
||||
// unfortunately, setting WS_EX_CONTROLPARENT only for some windows in the
|
||||
// hierarchy with several embedded panels (and not all of them) causes the
|
||||
// program to hang during the next call to IsDialogMessage() due to the bug
|
||||
// in this function (at least in Windows NT 4.0, it seems to work ok in
|
||||
// Win2K)
|
||||
#if 0
|
||||
// if we have wxTAB_TRAVERSAL style, we want WS_EX_CONTROLPARENT or
|
||||
// IsDialogMessage() won't work for us
|
||||
if ( GetWindowStyleFlag() & wxTAB_TRAVERSAL )
|
||||
{
|
||||
extendedStyle |= WS_EX_CONTROLPARENT;
|
||||
}
|
||||
#endif
|
||||
#endif // 0
|
||||
|
||||
HWND hParent = (HWND)NULL;
|
||||
if ( parent )
|
||||
|
Reference in New Issue
Block a user