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

fix for wxFrame parent which somehow wasn't committed yesterday

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11898 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-10-08 22:25:46 +00:00
parent 45eb524957
commit 18a1f588e7
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/msw/window.cpp
View File

@@ -2745,7 +2745,7 @@ bool wxWindowMSW::MSWCreate(const wxChar *wclass,
} }
else // !popup else // !popup
{ {
if ( (isChild || (style & WS_POPUPWINDOW)) && parent ) if ( (isChild || HasFlag(wxFRAME_TOOL_WINDOW)) && parent )
{ {
// this is either a normal child window or a top level window with // this is either a normal child window or a top level window with
// wxFRAME_TOOL_WINDOW style (see below) // wxFRAME_TOOL_WINDOW style (see below)
@@ -2758,8 +2758,7 @@ bool wxWindowMSW::MSWCreate(const wxChar *wclass,
// style: we should use NULL parent HWND for it or it would be // style: we should use NULL parent HWND for it or it would be
// always on top of its parent which is not what we usually want // always on top of its parent which is not what we usually want
// (in fact, we only want it for frames with the special // (in fact, we only want it for frames with the special
// wxFRAME_TOOL_WINDOW style translated into WS_POPUPWINDOW we test // wxFRAME_TOOL_WINDOW as above)
// against above)
hParent = NULL; hParent = NULL;
} }