projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
corrected the previous warning fix so that it doesn't break the code
[wxWidgets.git]
/
src
/
os2
/
toplevel.cpp
diff --git
a/src/os2/toplevel.cpp
b/src/os2/toplevel.cpp
index a24707edd14ef969fbf0546382764d2cae97e7b8..a77cb0a375a231ec79ffdd007bae7d0b7275f28d 100644
(file)
--- a/
src/os2/toplevel.cpp
+++ b/
src/os2/toplevel.cpp
@@
-112,22
+112,24
@@
void wxTopLevelWindowOS2::Init()
memset(&m_vSwpClient, 0, sizeof(SWP));
} // end of wxTopLevelWindowIOS2::Init
memset(&m_vSwpClient, 0, sizeof(SWP));
} // end of wxTopLevelWindowIOS2::Init
-long wxTopLevelWindowOS2::OS2GetCreateWindowFlags(
- long* plExflags
+WXDWORD wxTopLevelWindowOS2::OS2GetStyle(
+ long lStyle
+, WXDWORD* pdwExflags
) const
{
) const
{
- long lStyle = GetWindowStyle();
- long lMsflags = 0;
+ long lMsflags = wxWindow::OS2GetStyle( (lStyle & ~wxBORDER_MASK) | wxBORDER_NONE
+ ,pdwExflags
+ );
if (lStyle == wxDEFAULT_FRAME_STYLE)
if (lStyle == wxDEFAULT_FRAME_STYLE)
- lMsflags = FCF_SIZEBORDER | FCF_TITLEBAR | FCF_SYSMENU |
-
FCF_MINMAX | FCF_TASKLIST;
+ lMsflags
|
= FCF_SIZEBORDER | FCF_TITLEBAR | FCF_SYSMENU |
+ FCF_MINMAX | FCF_TASKLIST;
else
{
if ((lStyle & wxCAPTION) == wxCAPTION)
else
{
if ((lStyle & wxCAPTION) == wxCAPTION)
- lMsflags = FCF_TASKLIST;
+ lMsflags
|
= FCF_TASKLIST;
else
else
- lMsflags = FCF_NOMOVEWITHOWNER;
+ lMsflags
|
= FCF_NOMOVEWITHOWNER;
if ((lStyle & wxVSCROLL) == wxVSCROLL)
lMsflags |= FCF_VERTSCROLL;
if ((lStyle & wxVSCROLL) == wxVSCROLL)
lMsflags |= FCF_VERTSCROLL;
@@
-156,7
+158,7
@@
long wxTopLevelWindowOS2::OS2GetCreateWindowFlags(
if ((lStyle & wxTHICK_FRAME) == 0)
lMsflags |= FCF_BORDER;
if (lStyle & wxFRAME_TOOL_WINDOW)
if ((lStyle & wxTHICK_FRAME) == 0)
lMsflags |= FCF_BORDER;
if (lStyle & wxFRAME_TOOL_WINDOW)
- *p
l
Exflags = kFrameToolWindow;
+ *p
dw
Exflags = kFrameToolWindow;
if (lStyle & wxSTAY_ON_TOP)
lMsflags |= FCF_SYSMODAL;
if (lStyle & wxSTAY_ON_TOP)
lMsflags |= FCF_SYSMODAL;
@@
-303,8
+305,8
@@
bool wxTopLevelWindowOS2::CreateFrame(
, const wxSize& rSize
)
{
, const wxSize& rSize
)
{
-
long
lExflags;
-
long
lFlags = OS2GetCreateWindowFlags(&lExflags);
+
WXDWORD
lExflags;
+
WXDWORD
lFlags = OS2GetCreateWindowFlags(&lExflags);
long lStyle = GetWindowStyleFlag();
int nX = rPos.x;
int nY = rPos.y;
long lStyle = GetWindowStyleFlag();
int nX = rPos.x;
int nY = rPos.y;