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

Applied patch [ 929275 ] [wxOS2] Missing title bars.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@27186 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Neis
2004-05-09 14:38:45 +00:00
parent 197a0e7c21
commit a86f8883b6
1 changed files with 38 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
src/os2/toplevel.cpp
View File

@@ -1,6 +1,6 @@
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// Name: msw/toplevel.cpp // Name: os2/toplevel.cpp
// Purpose: implements wxTopLevelWindow for MSW // Purpose: implements wxTopLevelWindow for OS/2
// Author: Vadim Zeitlin // Author: Vadim Zeitlin
// Modified by: // Modified by:
// Created: 30.12.01 // Created: 30.12.01
@@ -223,48 +223,47 @@ WXDWORD wxTopLevelWindowOS2::OS2GetStyle(
,pdwExflags ,pdwExflags
); );
if (lStyle == wxDEFAULT_FRAME_STYLE) if ((lStyle & wxDEFAULT_FRAME_STYLE) == wxDEFAULT_FRAME_STYLE)
lMsflags |= FCF_SIZEBORDER | FCF_TITLEBAR | FCF_SYSMENU | lMsflags |= FCF_SIZEBORDER | FCF_TITLEBAR | FCF_SYSMENU |
FCF_MINMAX | FCF_TASKLIST; FCF_MINMAX | FCF_TASKLIST;
if ((lStyle & wxCAPTION) == wxCAPTION)
lMsflags |= FCF_TASKLIST;
else else
lMsflags |= FCF_NOMOVEWITHOWNER;
if ((lStyle & wxVSCROLL) == wxVSCROLL)
lMsflags |= FCF_VERTSCROLL;
if ((lStyle & wxHSCROLL) == wxHSCROLL)
lMsflags |= FCF_HORZSCROLL;
if (lStyle & wxMINIMIZE_BOX)
lMsflags |= FCF_MINBUTTON;
if (lStyle & wxMAXIMIZE_BOX)
lMsflags |= FCF_MAXBUTTON;
if (lStyle & wxTHICK_FRAME)
lMsflags |= FCF_DLGBORDER;
if (lStyle & wxSYSTEM_MENU)
lMsflags |= FCF_SYSMENU;
if (lStyle & wxCAPTION)
lMsflags |= FCF_TASKLIST;
if (lStyle & wxCLIP_CHILDREN)
{ {
if ((lStyle & wxCAPTION) == wxCAPTION) // Invalid for frame windows under PM
lMsflags |= FCF_TASKLIST;
else
lMsflags |= FCF_NOMOVEWITHOWNER;
if ((lStyle & wxVSCROLL) == wxVSCROLL)
lMsflags |= FCF_VERTSCROLL;
if ((lStyle & wxHSCROLL) == wxHSCROLL)
lMsflags |= FCF_HORZSCROLL;
if (lStyle & wxMINIMIZE_BOX)
lMsflags |= FCF_MINBUTTON;
if (lStyle & wxMAXIMIZE_BOX)
lMsflags |= FCF_MAXBUTTON;
if (lStyle & wxTHICK_FRAME)
lMsflags |= FCF_DLGBORDER;
if (lStyle & wxSYSTEM_MENU)
lMsflags |= FCF_SYSMENU;
if (lStyle & wxCAPTION)
lMsflags |= FCF_TASKLIST;
if (lStyle & wxCLIP_CHILDREN)
{
// Invalid for frame windows under PM
}
if (lStyle & wxTINY_CAPTION_VERT)
lMsflags |= FCF_TASKLIST;
if (lStyle & wxTINY_CAPTION_HORIZ)
lMsflags |= FCF_TASKLIST;
if ((lStyle & wxTHICK_FRAME) == 0)
lMsflags |= FCF_BORDER;
if (lStyle & wxFRAME_TOOL_WINDOW)
*pdwExflags = kFrameToolWindow;
if (lStyle & wxSTAY_ON_TOP)
lMsflags |= FCF_SYSMODAL;
} }
if (lStyle & wxTINY_CAPTION_VERT)
lMsflags |= FCF_TASKLIST;
if (lStyle & wxTINY_CAPTION_HORIZ)
lMsflags |= FCF_TASKLIST;
if ((lStyle & wxTHICK_FRAME) == 0)
lMsflags |= FCF_BORDER;
if (lStyle & wxFRAME_TOOL_WINDOW)
*pdwExflags = kFrameToolWindow;
if (lStyle & wxSTAY_ON_TOP)
lMsflags |= FCF_SYSMODAL;
return lMsflags; return lMsflags;
} // end of wxTopLevelWindowOS2::OS2GetCreateWindowFlags } // end of wxTopLevelWindowOS2::OS2GetCreateWindowFlags