#ifdefs for WIN16
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8317 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
bd83cb56d2
commit
4204da658a
@ -152,9 +152,11 @@ bool wxDialog::Create(wxWindow *parent, wxWindowID id,
|
||||
WXDWORD extendedStyle = MakeExtendedStyle(m_windowStyle);
|
||||
if (m_windowStyle & wxSTAY_ON_TOP)
|
||||
extendedStyle |= WS_EX_TOPMOST;
|
||||
if (m_exStyle & wxFRAME_EX_CONTEXTHELP)
|
||||
extendedStyle |= WS_EX_CONTEXTHELP;
|
||||
|
||||
#ifndef __WIN16__
|
||||
if (m_exStyle & wxDIALOG_EX_CONTEXTHELP)
|
||||
extendedStyle |= WS_EX_CONTEXTHELP;
|
||||
#endif
|
||||
// Allows creation of dialogs with & without captions under MSWindows,
|
||||
// resizeable or not (but a resizeable dialog always has caption -
|
||||
// otherwise it would look too strange)
|
||||
|
@ -680,8 +680,10 @@ bool wxFrame::MSWCreate(int id, wxWindow *parent, const wxChar *wclass, wxWindow
|
||||
if (style & wxSTAY_ON_TOP)
|
||||
extendedStyle |= WS_EX_TOPMOST;
|
||||
|
||||
#ifndef __WIN16__
|
||||
if (m_exStyle & wxFRAME_EX_CONTEXTHELP)
|
||||
extendedStyle |= WS_EX_CONTEXTHELP;
|
||||
#endif
|
||||
|
||||
m_iconized = FALSE;
|
||||
if ( !wxWindow::MSWCreate(id, parent, wclass, wx_win, title, x, y, width, height,
|
||||
|
Loading…
Reference in New Issue
Block a user