1. added a brief overview of Unicode support

[wxWidgets.git] / include / wx / generic / sashwin.h

diff --git a/include/wx/generic/sashwin.h b/include/wx/generic/sashwin.h
index c1023929a28da2563c19a3f882a0cc982c11853b..847a4054a53e8e04364b0841b91208670959a290 100644 (file)
--- a/include/wx/generic/sashwin.h
+++ b/include/wx/generic/sashwin.h
@@ -8,7 +8,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows license
+// Licence:     wxWindows license

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_SASHWIN_H_G_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_SASHWIN_H_G_


@@ -18,6 +18,8 @@
 #pragma interface "sashwin.h"
 #endif
 
 #pragma interface "sashwin.h"
 #endif
 

+#if wxUSE_SASH
+

 #include "wx/defs.h"
 #include "wx/window.h"
 #include "wx/string.h"
 #include "wx/defs.h"
 #include "wx/window.h"
 #include "wx/string.h"


@@ -74,23 +76,23 @@ public:
 
     // Normal constructor
     wxSashWindow(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition,
 
     // Normal constructor
     wxSashWindow(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition,

-        const wxSize& size = wxDefaultSize, long style = wxSW_3D|wxCLIP_CHILDREN, const wxString& name = "splitter");
+        const wxSize& size = wxDefaultSize, long style = wxSW_3D|wxCLIP_CHILDREN, const wxString& name = "sashWindow");

     ~wxSashWindow();
 
     // Set whether there's a sash in this position
     void SetSashVisible(wxSashEdgePosition edge, bool sash);
 
     // Get whether there's a sash in this position
     ~wxSashWindow();
 
     // Set whether there's a sash in this position
     void SetSashVisible(wxSashEdgePosition edge, bool sash);
 
     // Get whether there's a sash in this position

-    inline bool GetSashVisible(wxSashEdgePosition edge) { return m_sashes[edge].m_show; }
+    inline bool GetSashVisible(wxSashEdgePosition edge) const { return m_sashes[edge].m_show; }

 
     // Set whether there's a border in this position
     inline void SetSashBorder(wxSashEdgePosition edge, bool border) { m_sashes[edge].m_border = border; }
 
     // Get whether there's a border in this position
 
     // Set whether there's a border in this position
     inline void SetSashBorder(wxSashEdgePosition edge, bool border) { m_sashes[edge].m_border = border; }
 
     // Get whether there's a border in this position

-    inline bool HasBorder(wxSashEdgePosition edge) { return m_sashes[edge].m_border; }
+    inline bool HasBorder(wxSashEdgePosition edge) const { return m_sashes[edge].m_border; }

 
     // Get border size
 
     // Get border size

-    inline int GetEdgeMargin(wxSashEdgePosition edge) { return m_sashes[edge].m_margin; }
+    inline int GetEdgeMargin(wxSashEdgePosition edge) const { return m_sashes[edge].m_margin; }

 
     // Sets the default sash border size
     inline void SetDefaultBorderSize(int width) { m_borderSize = width; }
 
     // Sets the default sash border size
     inline void SetDefaultBorderSize(int width) { m_borderSize = width; }


@@ -210,5 +212,7 @@ typedef void (wxEvtHandler::*wxSashEventFunction)(wxSashEvent&);
 #define EVT_SASH_DRAGGED(id, fn) { wxEVT_SASH_DRAGGED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxSashEventFunction) & fn, NULL },
 #define EVT_SASH_DRAGGED_RANGE(id1, id2, fn) { wxEVT_SASH_DRAGGED, id1, id2, (wxObjectEventFunction) (wxEventFunction) (wxSashEventFunction) & fn, NULL },
 
 #define EVT_SASH_DRAGGED(id, fn) { wxEVT_SASH_DRAGGED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxSashEventFunction) & fn, NULL },
 #define EVT_SASH_DRAGGED_RANGE(id1, id2, fn) { wxEVT_SASH_DRAGGED, id1, id2, (wxObjectEventFunction) (wxEventFunction) (wxSashEventFunction) & fn, NULL },
 

+#endif // wxUSE_SASH
+

 #endif
   // _WX_SASHWIN_H_G_
 #endif
   // _WX_SASHWIN_H_G_