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

[wxWidgets.git] / include / wx / mac / carbon / listctrl.h

diff --git a/include/wx/mac/carbon/listctrl.h b/include/wx/mac/carbon/listctrl.h
index 03376614adb2a986b6a1d3c712f8b21fc36b316c..c2aad6d74fc7711b3a069314f621b59e4158d0cc 100644 (file)
--- a/include/wx/mac/carbon/listctrl.h
+++ b/include/wx/mac/carbon/listctrl.h
@@ -24,7 +24,7 @@ class wxListCtrlRenameTimer;
 
 WX_DECLARE_EXPORTED_LIST(wxListItem, wxColumnList);
 
-class WXDLLEXPORT wxListCtrl: public wxControl
+class WXDLLIMPEXP_CORE wxListCtrl: public wxControl
 {
   DECLARE_DYNAMIC_CLASS(wxListCtrl)
  public:
@@ -122,7 +122,8 @@ class WXDLLEXPORT wxListCtrl: public wxControl
   long GetItemData(long item) const ;
 
   // Sets the item data
-  bool SetItemData(long item, long data) ;
+  bool SetItemPtrData(long item, wxUIntPtr data);
+  bool SetItemData(long item, long data) { return SetItemPtrData(item, data); }
 
   // Gets the item rectangle
   bool GetItemRect(long item, wxRect& rect, int code = wxLIST_RECT_BOUNDS) const ;
@@ -360,6 +361,14 @@ class WXDLLEXPORT wxListCtrl: public wxControl
   void MacSetDrawingContext(void* context) { m_cgContext = context; }
   void* MacGetDrawingContext() { return m_cgContext; }
 
+  virtual wxVisualAttributes GetDefaultAttributes() const
+  {
+      return GetClassDefaultAttributes(GetWindowVariant());
+  }
+
+  static wxVisualAttributes
+  GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
+
 protected:
 
   // protected overrides needed for pimpl approach
@@ -405,6 +414,8 @@ protected:
   int               m_count; // for virtual lists, store item count
 
 private:
+  int CalcColumnAutoWidth(int col) const;
+
   DECLARE_EVENT_TABLE()
 };