SCROLLWIN instead of SCROLL again

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

diff --git a/include/wx/generic/sashwin.h b/include/wx/generic/sashwin.h
index 1b1d8e0e7e6cac314fda31cbd728fcbbb104cfba..d1dfdbfefb8c129b77cbd1b72bb0392b57163700 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"


@@ -52,7 +54,9 @@ public:
  * wxSashWindow flags
  */
 
  * wxSashWindow flags
  */
 

-#define wxSW_3D             0x0004
+#define wxSW_NOBORDER         0x0000
+#define wxSW_3D               0x0010
+#define wxSW_BORDER           0x0020

 
 /*
  * wxSashWindow allows any of its edges to have a sash which can be dragged
 
 /*
  * wxSashWindow allows any of its edges to have a sash which can be dragged


@@ -210,5 +214,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_