#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 8df2875db1cd37c1726361e0a6c0d1d8156e9092..c7b8c547d1ca56001c4fc9d30fa0a45bafe197a1 100644 (file)
--- 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;
     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)
     // 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 7d187c42200e5f0f87ec7f110b5409a6eaf82d59..a76e556e131a259d53d7a47aca843e320496844c 100644 (file)
--- 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;
 
   if (style & wxSTAY_ON_TOP)
     extendedStyle |= WS_EX_TOPMOST;
 

+#ifndef __WIN16__

   if (m_exStyle & wxFRAME_EX_CONTEXTHELP)
     extendedStyle |= WS_EX_CONTEXTHELP;
   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,
 
   m_iconized = FALSE;
   if ( !wxWindow::MSWCreate(id, parent, wclass, wx_win, title, x, y, width, height,