Cast for argument to delete[] - VC6 doesn't want to delete a const pointer

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

diff --git a/include/wx/dataview.h b/include/wx/dataview.h
index c2db8eef481b92cdb03a362f16c24ddabfe1b502..f185c94c931874c331a2b3e2ed623529ad47bf1d 100644 (file)
--- a/include/wx/dataview.h
+++ b/include/wx/dataview.h
@@ -23,6 +23,7 @@
 #include "wx/dynarray.h"
 #include "wx/icon.h"
 #include "wx/imaglist.h"
+#include "wx/weakref.h"
 
 class WXDLLIMPEXP_FWD_CORE wxDataFormat;
 
@@ -292,7 +293,6 @@ private:
     wxDataViewItemArray m_hash;
     unsigned int m_lastIndex;
     bool m_ordered;
-    bool m_useHash;
 };
 
 // ---------------------------------------------------------
@@ -413,6 +413,7 @@ public:
     wxDataViewRendererBase( const wxString &varianttype,
                             wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
                             int alignment = wxDVR_DEFAULT_ALIGNMENT );
+    ~wxDataViewRendererBase();
 
     virtual bool Validate( wxVariant& WXUNUSED(value) )
         { return true; }
@@ -456,7 +457,7 @@ public:
 protected:
     wxString                m_variantType;
     wxDataViewColumn       *m_owner;
-    wxControl              *m_editorCtrl;
+    wxWeakRef<wxControl>    m_editorCtrl;
     wxDataViewItem          m_item; // for m_editorCtrl
 
     // internal utility:
@@ -583,6 +584,7 @@ protected:
 #define wxDV_VERT_RULES              0x0008     // light vertical rules between columns
 
 #define wxDV_ROW_LINES               0x0010     // alternating colour in rows
+#define wxDV_VARIABLE_LINE_HEIGHT    0x0020     // variable line height
 
 class WXDLLIMPEXP_ADV wxDataViewCtrlBase: public wxControl
 {
@@ -710,7 +712,7 @@ public:
         { return m_expander_column; }
 
     virtual wxDataViewColumn *GetSortingColumn() const = 0;
-
+    
     void SetIndent( int indent )
         { m_indent = indent ; DoSetIndent(); }
     int GetIndent() const