AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

eVC 3.0 doesn't like WS_CAPTION. I imagine that

Browse Source 
eVC 4.0 just ignores it.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26723 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling 2004-04-12 15:37:17 +00:00
parent c1edc08df3
commit e5aa8b8171
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/msw/toplevel.cpp
View File

@ -163,10 +163,11 @@ WXDWORD wxTopLevelWindowMSW::MSWGetStyle(long style, WXDWORD *exflags) const
if (msflags & WS_BORDER) if (msflags & WS_BORDER)
msflags |= WS_OVERLAPPED; msflags |= WS_OVERLAPPED;
} }
// border and caption styles // border and caption styles
if ( style & wxRESIZE_BORDER ) if ( style & wxRESIZE_BORDER )
#ifdef __WXWINCE__ #ifndef WS_THICKFRAME
msflags = msflags; msflags = msflags;
#else #else
msflags |= WS_THICKFRAME; msflags |= WS_THICKFRAME;
@ -179,10 +180,16 @@ WXDWORD wxTopLevelWindowMSW::MSWGetStyle(long style, WXDWORD *exflags) const
msflags |= WS_POPUP; msflags |= WS_POPUP;
if ( style & wxCAPTION ) if ( style & wxCAPTION )
#ifdef __WXWINCE__
msflags = msflags;
#else
msflags |= WS_CAPTION; msflags |= WS_CAPTION;
#endif
else else
msflags |= WS_POPUP; msflags |= WS_POPUP;
return msflags;
// next translate the individual flags // next translate the individual flags
if ( style & wxMINIMIZE_BOX ) if ( style & wxMINIMIZE_BOX )
msflags |= WS_MINIMIZEBOX; msflags |= WS_MINIMIZEBOX;
@ -204,7 +211,7 @@ WXDWORD wxTopLevelWindowMSW::MSWGetStyle(long style, WXDWORD *exflags) const
// Keep this here because it saves recoding this function in wxTinyFrame // Keep this here because it saves recoding this function in wxTinyFrame
if ( style & (wxTINY_CAPTION_VERT | wxTINY_CAPTION_HORIZ) ) if ( style & (wxTINY_CAPTION_VERT | wxTINY_CAPTION_HORIZ) )
msflags |= WS_CAPTION; msflags |= WS_CAPTION;
if ( exflags ) if ( exflags )
{ {
if ( !(GetExtraStyle() & wxTOPLEVEL_EX_DIALOG) ) if ( !(GetExtraStyle() & wxTOPLEVEL_EX_DIALOG) )