m_border and accessors not used

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37353 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/latex/wx/sashwin.tex b/docs/latex/wx/sashwin.tex
index bff4b340e32c915638359d66a811f90443ac2b70..2dea05e9b67e4fb405fe0676d0c94cdc0373ff85 100644 (file)
--- a/docs/latex/wx/sashwin.tex
+++ b/docs/latex/wx/sashwin.tex
@@ -140,6 +140,7 @@ Gets the minimum window size in the y direction.
 \constfunc{bool}{HasBorder}{\param{wxSashEdgePosition }{edge}}
 
 Returns true if the sash has a border, false otherwise.
+This function is obsolete since the sash border property is unused.
 
 \wxheading{Parameters}
 
@@ -194,6 +195,7 @@ Call this function to make a sash visible or invisible on a particular edge.
 \func{void}{SetSashBorder}{\param{wxSashEdgePosition }{edge}, \param{bool}{ hasBorder}}
 
 Call this function to give the sash a border, or remove the border.
+This function is obsolete since the sash border property is unused.
 
 \wxheading{Parameters}
 

diff --git a/include/wx/generic/sashwin.h b/include/wx/generic/sashwin.h
index 53bc2f4664086d505ecc5156216a3bc1a5feb71d..f223891efa6e0e1c0b51dd2a2339d561171a5a63 100644 (file)
--- a/include/wx/generic/sashwin.h
+++ b/include/wx/generic/sashwin.h
@@ -39,10 +39,17 @@ enum wxSashEdgePosition {
 class WXDLLIMPEXP_ADV wxSashEdge
 {
 public:
-    wxSashEdge() { m_show = false; m_border = false; m_margin = 0; }
+    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
 };
 
@@ -91,11 +98,15 @@ 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; }