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

remove WXWIN_COMPATIBILITY_2_6, add WXWIN_COMPATIBILITY_3_0

Browse Source 
closes #15792

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75532 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2014-01-04 20:07:33 +00:00
parent 61728d5d54
commit 967a94c91a
140 changed files with 291 additions and 1561 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
include/wx/generic/sashwin.h
View File

@@ -40,15 +40,9 @@ class WXDLLIMPEXP_ADV wxSashEdge
public:
wxSashEdge()
{ m_show = false;
#if WXWIN_COMPATIBILITY_2_6
m_border = false;
#endif
m_margin = 0; }
bool m_show; // Is the sash showing?
#if WXWIN_COMPATIBILITY_2_6
bool m_border; // Do we draw a border?
#endif
int m_margin; // The margin size
};
@@ -97,16 +91,6 @@ public:
// Get whether there's a sash in this position
bool GetSashVisible(wxSashEdgePosition edge) const { return m_sashes[edge].m_show; }
#if WXWIN_COMPATIBILITY_2_6
// Set whether there's a border in this position
// This value is unused in wxSashWindow.
void SetSashBorder(wxSashEdgePosition edge, bool border) { m_sashes[edge].m_border = border; }
// Get whether there's a border in this position
// This value is unused in wxSashWindow.
bool HasBorder(wxSashEdgePosition edge) const { return m_sashes[edge].m_border; }
#endif
// Get border size
int GetEdgeMargin(wxSashEdgePosition edge) const { return m_sashes[edge].m_margin; }