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

fixed frame border styles (allow creating a friend with a simple or without border, allow frames without captions)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13624 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-01-17 23:51:49 +00:00
parent 6157794cc3
commit 0e08299321
1 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/msw/toplevel.cpp
View File

@@ -104,17 +104,26 @@ void wxTopLevelWindowMSW::Init()
long wxTopLevelWindowMSW::MSWGetCreateWindowFlags(long *exflags) const long wxTopLevelWindowMSW::MSWGetCreateWindowFlags(long *exflags) const
{ {
long style = GetWindowStyle(); long style = GetWindowStyle();
long msflags = 0;
// first select the kind of window being created // first select the kind of window being created
if ( style & wxCAPTION ) long msflags;
{ if ( style & wxFRAME_TOOL_WINDOW )
if ( style & wxFRAME_TOOL_WINDOW ) msflags = WS_POPUP;
msflags |= WS_POPUPWINDOW;
else
msflags |= WS_OVERLAPPED;
}
else else
msflags = WS_OVERLAPPED;
// border and caption styles
if ( style & wxRESIZE_BORDER )
msflags |= WS_THICKFRAME;
else if ( !(style & wxBORDER_NONE) )
msflags |= WS_BORDER;
if ( style & wxCAPTION )
msflags |= WS_CAPTION;
// 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;
} }
@@ -124,16 +133,13 @@ long wxTopLevelWindowMSW::MSWGetCreateWindowFlags(long *exflags) const
msflags |= WS_MINIMIZEBOX; msflags |= WS_MINIMIZEBOX;
if ( style & wxMAXIMIZE_BOX ) if ( style & wxMAXIMIZE_BOX )
msflags |= WS_MAXIMIZEBOX; msflags |= WS_MAXIMIZEBOX;
if ( style & wxTHICK_FRAME )
msflags |= WS_THICKFRAME;
if ( style & wxSYSTEM_MENU ) if ( style & wxSYSTEM_MENU )
msflags |= WS_SYSMENU; msflags |= WS_SYSMENU;
if ( style & wxMINIMIZE ) if ( style & wxMINIMIZE )
msflags |= WS_MINIMIZE; msflags |= WS_MINIMIZE;
if ( style & wxMAXIMIZE ) if ( style & wxMAXIMIZE )
msflags |= WS_MAXIMIZE; msflags |= WS_MAXIMIZE;
if ( style & wxCAPTION )
msflags |= WS_CAPTION;
if ( style & wxCLIP_CHILDREN ) if ( style & wxCLIP_CHILDREN )
msflags |= WS_CLIPCHILDREN; msflags |= WS_CLIPCHILDREN;