silenced Watcom warning when deleting const pointer

[wxWidgets.git] / include / wx / splitter.h

diff --git a/include/wx/splitter.h b/include/wx/splitter.h
index 82a2b79878ff9cff0d508cd96c2a9883d302bc5c..ae14d386a6024e41e2ac695c95b114e44ddb0b80 100644 (file)
--- a/include/wx/splitter.h
+++ b/include/wx/splitter.h
@@ -1,3 +1,14 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/splitter.h
+// Purpose:     Base header for wxSplitterWindow
+// Author:      Julian Smart
+// Modified by:
+// Created:
+// RCS-ID:      $Id$
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows Licence
+/////////////////////////////////////////////////////////////////////////////
+

 #ifndef _WX_SPLITTER_H_BASE_
 #define _WX_SPLITTER_H_BASE_
 
 #ifndef _WX_SPLITTER_H_BASE_
 #define _WX_SPLITTER_H_BASE_
 


@@ -7,19 +18,22 @@
 // wxSplitterWindow flags
 // ----------------------------------------------------------------------------
 
 // wxSplitterWindow flags
 // ----------------------------------------------------------------------------
 

+#define wxSP_NOBORDER         0x0000

 #define wxSP_NOSASH           0x0010
 #define wxSP_PERMIT_UNSPLIT   0x0040
 #define wxSP_LIVE_UPDATE      0x0080
 #define wxSP_NOSASH           0x0010
 #define wxSP_PERMIT_UNSPLIT   0x0040
 #define wxSP_LIVE_UPDATE      0x0080

-
-// obsolete styles, don't do anything
-#define wxSP_BORDER           0
-#define wxSP_NOBORDER         0
-#define wxSP_SASH_AQUA        0
-#define wxSP_3DSASH           0
-#define wxSP_3DBORDER         0
-#define wxSP_FULLSASH         0
+#define wxSP_3DSASH           0x0100
+#define wxSP_3DBORDER         0x0200
+#define wxSP_NO_XP_THEME      0x0400
+#define wxSP_BORDER           wxSP_3DBORDER

 #define wxSP_3D               (wxSP_3DBORDER | wxSP_3DSASH)
 
 #define wxSP_3D               (wxSP_3DBORDER | wxSP_3DSASH)
 

+#if WXWIN_COMPATIBILITY_2_6
+    // obsolete styles, don't do anything
+    #define wxSP_SASH_AQUA        0
+    #define wxSP_FULLSASH         0
+#endif // WXWIN_COMPATIBILITY_2_6
+

 BEGIN_DECLARE_EVENT_TYPES()
     DECLARE_EVENT_TYPE(wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED, 850)
     DECLARE_EVENT_TYPE(wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING, 851)
 BEGIN_DECLARE_EVENT_TYPES()
     DECLARE_EVENT_TYPE(wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED, 850)
     DECLARE_EVENT_TYPE(wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING, 851)