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

don't set WS_POPUP for all windows (fix for my last fix)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13628 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-01-18 00:15:58 +00:00
parent d297e8ff2a
commit dfb06c62ff
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/msw/toplevel.cpp
View File

@@ -106,6 +106,10 @@ long wxTopLevelWindowMSW::MSWGetCreateWindowFlags(long *exflags) const
long style = GetWindowStyle(); long style = GetWindowStyle();
// first select the kind of window being created // first select the kind of window being created
//
// note that if we don't set WS_POPUP, Windows assumes WS_OVERLAPPED and
// creates a window with both caption and border, hence we also test it
// below in some other cases
long msflags; long msflags;
if ( style & wxFRAME_TOOL_WINDOW ) if ( style & wxFRAME_TOOL_WINDOW )
msflags = WS_POPUP; msflags = WS_POPUP;
@@ -117,16 +121,13 @@ long wxTopLevelWindowMSW::MSWGetCreateWindowFlags(long *exflags) const
msflags |= WS_THICKFRAME; msflags |= WS_THICKFRAME;
else if ( !(style & wxBORDER_NONE) ) else if ( !(style & wxBORDER_NONE) )
msflags |= WS_BORDER; msflags |= WS_BORDER;
else
msflags |= WS_POPUP;
if ( style & wxCAPTION ) if ( style & wxCAPTION )
msflags |= WS_CAPTION; msflags |= WS_CAPTION;
else
// if we don't set WS_POPUP, Windows assumes WS_OVERLAPPED and creates a
// window with both caption and border
if ( msflags & (WS_CAPTION | WS_BORDER) != WS_CAPTION | WS_BORDER )
{
msflags |= WS_POPUP; msflags |= WS_POPUP;
}
// next translate the individual flags // next translate the individual flags
if ( style & wxMINIMIZE_BOX ) if ( style & wxMINIMIZE_BOX )