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 dca249147ad30565e2ee7f441d4a8bc5850a53b8..f185c94c931874c331a2b3e2ed623529ad47bf1d 100644 (file)
--- a/include/wx/dataview.h
+++ b/include/wx/dataview.h
@@ -293,7 +293,6 @@ private:
     wxDataViewItemArray m_hash;
     unsigned int m_lastIndex;
     bool m_ordered;
     wxDataViewItemArray m_hash;
     unsigned int m_lastIndex;
     bool m_ordered;

-    bool m_useHash;

 };
 
 // ---------------------------------------------------------
 };
 
 // ---------------------------------------------------------


@@ -585,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_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
 {
 
 class WXDLLIMPEXP_ADV wxDataViewCtrlBase: public wxControl
 {


@@ -712,7 +712,7 @@ public:
         { return m_expander_column; }
 
     virtual wxDataViewColumn *GetSortingColumn() const = 0;
         { return m_expander_column; }
 
     virtual wxDataViewColumn *GetSortingColumn() const = 0;

-
+    

     void SetIndent( int indent )
         { m_indent = indent ; DoSetIndent(); }
     int GetIndent() const
     void SetIndent( int indent )
         { m_indent = indent ; DoSetIndent(); }
     int GetIndent() const