From: Julian Smart Date: Sun, 10 Sep 2000 15:16:17 +0000 (+0000) Subject: #ifdefs for WIN16 X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/4204da658ac4ec4998b790865964a8700c097ca4 #ifdefs for WIN16 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8317 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/msw/dialog.cpp b/src/msw/dialog.cpp index 8df2875db1..c7b8c547d1 100644 --- a/src/msw/dialog.cpp +++ b/src/msw/dialog.cpp @@ -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) diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp index 7d187c4220..a76e556e13 100644 --- a/src/msw/frame.cpp +++ b/src/msw/frame.cpp @@ -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,