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

Consistent naming of e.g. wxUSE_CTRL

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1565 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1999-02-02 12:37:14 +00:00
parent 0e1399b392
commit 1f11220943
38 changed files with 202 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/msw/window.cpp
View File

@@ -3584,7 +3584,7 @@ WXDWORD wxWindow::Determine3DEffects(WXDWORD defaultBorderStyle, bool *want3D)
// 5) If this isn't a Win95 app, and we are using CTL3D, remove border
// effects from extended style
#if CTL3D
#if wxUSE_CTL3D
if ( *want3D )
nativeBorder = FALSE;
#endif
@@ -3594,7 +3594,7 @@ WXDWORD wxWindow::Determine3DEffects(WXDWORD defaultBorderStyle, bool *want3D)
// If we want 3D, but haven't specified a border here,
// apply the default border style specified.
// TODO what about non-Win95 WIN32? Does it have borders?
#if defined(__WIN95__) && !CTL3D
#if defined(__WIN95__) && !wxUSE_CTL3D
if (defaultBorderStyle && (*want3D) && ! ((m_windowStyle & wxDOUBLE_BORDER) || (m_windowStyle & wxRAISED_BORDER) ||
(m_windowStyle & wxSTATIC_BORDER) || (m_windowStyle & wxSIMPLE_BORDER) ))
exStyle |= defaultBorderStyle; // WS_EX_CLIENTEDGE ;