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

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

diff --git a/include/wx/mac/carbon/choice.h b/include/wx/mac/carbon/choice.h
index aa7fd46ac3b1320863fd63137c56899b31c0158d..c73a831069994e1b4bb0ab4e4159efab9fb9c371 100644 (file)
--- a/include/wx/mac/carbon/choice.h
+++ b/include/wx/mac/carbon/choice.h
@@ -17,12 +17,12 @@
 #include  "wx/dynarray.h"
 #include  "wx/arrstr.h"
 
-WXDLLEXPORT_DATA(extern const wxChar) wxChoiceNameStr[];
+WXDLLIMPEXP_DATA_CORE(extern const char) wxChoiceNameStr[];
 
 WX_DEFINE_ARRAY( char * , wxChoiceDataArray ) ;
 
 // Choice item
-class WXDLLEXPORT wxChoice: public wxChoiceBase
+class WXDLLIMPEXP_CORE wxChoice: public wxChoiceBase
 {
     DECLARE_DYNAMIC_CLASS(wxChoice)
 
@@ -69,13 +69,9 @@ public:
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxChoiceNameStr);
 
-    virtual void Delete(unsigned int n);
-    virtual void Clear();
-
     virtual unsigned int GetCount() const ;
     virtual int GetSelection() const ;
     virtual void SetSelection(int n);
-    int GetCurrentSelection() const { return GetSelection(); }
 
     virtual int FindString(const wxString& s, bool bCase = false) const;
     virtual wxString GetString(unsigned int n) const ;
@@ -83,18 +79,16 @@ public:
     virtual wxInt32 MacControlHit( WXEVENTHANDLERREF handler , WXEVENTREF event ) ;
 
 protected:
+    virtual void DoDeleteOneItem(unsigned int n);
+    virtual void DoClear();
+
     virtual wxSize DoGetBestSize() const ;
-    virtual int DoAppend(const wxString& item);
-    virtual int DoInsert(const wxString& item, unsigned int pos);
+    virtual int DoInsertItems(const wxArrayStringsAdapter& items,
+                              unsigned int pos,
+                              void **clientData, wxClientDataType type);
 
     virtual void DoSetItemClientData(unsigned int n, void* clientData);
     virtual void* DoGetItemClientData(unsigned int n) const;
-    virtual void DoSetItemClientObject(unsigned int n, wxClientData* clientData);
-    virtual wxClientData* DoGetItemClientObject(unsigned int n) const;
-
-    // free all memory we have (used by Clear() and dtor)
-    // prevent collision with some BSD definitions of macro Free()
-    void FreeData();
 
     wxArrayString m_strings;
     wxChoiceDataArray m_datas ;