Let wxCommandEvent's copy constr copy its string via .c_str() as otherwise ::Clone...

[wxWidgets.git] / include / wx / cocoa / choice.h

diff --git a/include/wx/cocoa/choice.h b/include/wx/cocoa/choice.h
index ae177c71da1c970838e797dab9caf4e8f91131f0..9d7f6539ed6ec2b59c37cf6d977c95096c5c00c7 100644 (file)
--- a/include/wx/cocoa/choice.h
+++ b/include/wx/cocoa/choice.h
@@ -15,12 +15,12 @@
 //#include "wx/cocoa/NSPopUpButton.h"
 #include "wx/cocoa/NSMenu.h"
 
 //#include "wx/cocoa/NSPopUpButton.h"
 #include "wx/cocoa/NSMenu.h"
 

-class WXDLLIMPEXP_BASE wxSortedArrayString;
+class WXDLLIMPEXP_FWD_BASE wxSortedArrayString;

 
 // ========================================================================
 // wxChoice
 // ========================================================================
 
 // ========================================================================
 // wxChoice
 // ========================================================================

-class WXDLLEXPORT wxChoice: public wxChoiceBase /*, protected wxCocoaNSPopUpButton */, protected wxCocoaNSMenu
+class WXDLLIMPEXP_CORE wxChoice: public wxChoiceBase /*, protected wxCocoaNSPopUpButton */, protected wxCocoaNSMenu

 {
     DECLARE_DYNAMIC_CLASS(wxChoice)
     DECLARE_EVENT_TABLE()
 {
     DECLARE_DYNAMIC_CLASS(wxChoice)
     DECLARE_EVENT_TABLE()


@@ -80,19 +80,18 @@ protected:
 // Implementation
 // ------------------------------------------------------------------------
 public:
 // Implementation
 // ------------------------------------------------------------------------
 public:

-    virtual void Clear();
-    virtual void Delete(unsigned int n);
+    virtual void DoClear();

     virtual unsigned int GetCount() const;
     virtual wxString GetString(unsigned int) const;
     virtual void SetString(unsigned int pos, const wxString&);
     virtual int FindString(const wxString& s, bool bCase = false) const;
     virtual int GetSelection() const;
     virtual unsigned int GetCount() const;
     virtual wxString GetString(unsigned int) const;
     virtual void SetString(unsigned int pos, const wxString&);
     virtual int FindString(const wxString& s, bool bCase = false) const;
     virtual int GetSelection() const;

-    virtual int DoAppend(const wxString&);
-    virtual int DoInsert(const wxString&, unsigned int pos);
+    virtual int DoInsertItems(const wxArrayStringsAdapter& items,
+                              unsigned int pos,
+                              void **clientData, wxClientDataType type);
+    virtual void DoDeleteOneItem(unsigned int pos);

     virtual void DoSetItemClientData(unsigned int, void*);
     virtual void* DoGetItemClientData(unsigned int) const;
     virtual void DoSetItemClientData(unsigned int, void*);
     virtual void* DoGetItemClientData(unsigned int) const;

-    virtual void DoSetItemClientObject(unsigned int, wxClientData*);
-    virtual wxClientData* DoGetItemClientObject(unsigned int) const;

     virtual void SetSelection(int pos);
 protected:
     wxSortedArrayString *m_sortedStrings;
     virtual void SetSelection(int pos);
 protected:
     wxSortedArrayString *m_sortedStrings;