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

#ifdefs for WIN16

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8317 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2000-09-10 15:16:17 +00:00
parent bd83cb56d2
commit 4204da658a
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/msw/dialog.cpp
View File

@@ -152,9 +152,11 @@ bool wxDialog::Create(wxWindow *parent, wxWindowID id,
WXDWORD extendedStyle = MakeExtendedStyle(m_windowStyle); WXDWORD extendedStyle = MakeExtendedStyle(m_windowStyle);
if (m_windowStyle & wxSTAY_ON_TOP) if (m_windowStyle & wxSTAY_ON_TOP)
extendedStyle |= WS_EX_TOPMOST; 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, // Allows creation of dialogs with & without captions under MSWindows,
// resizeable or not (but a resizeable dialog always has caption - // resizeable or not (but a resizeable dialog always has caption -
// otherwise it would look too strange) // otherwise it would look too strange)

2
src/msw/frame.cpp
View File

@@ -680,8 +680,10 @@ bool wxFrame::MSWCreate(int id, wxWindow *parent, const wxChar *wclass, wxWindow
if (style & wxSTAY_ON_TOP) if (style & wxSTAY_ON_TOP)
extendedStyle |= WS_EX_TOPMOST; extendedStyle |= WS_EX_TOPMOST;
#ifndef __WIN16__
if (m_exStyle & wxFRAME_EX_CONTEXTHELP) if (m_exStyle & wxFRAME_EX_CONTEXTHELP)
extendedStyle |= WS_EX_CONTEXTHELP; extendedStyle |= WS_EX_CONTEXTHELP;
#endif
m_iconized = FALSE; m_iconized = FALSE;
if ( !wxWindow::MSWCreate(id, parent, wclass, wx_win, title, x, y, width, height, if ( !wxWindow::MSWCreate(id, parent, wclass, wx_win, title, x, y, width, height,