X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a0fe0a18e5b93b520248ac9fece6e7f08bdf32fe..cbeda384e51acb82e13994cb67ac1714669cae10:/include/wx/motif/choice.h

diff --git a/include/wx/motif/choice.h b/include/wx/motif/choice.h
index a89d1da9f6..0f5ada2308 100644
--- a/include/wx/motif/choice.h
+++ b/include/wx/motif/choice.h
@@ -22,13 +22,13 @@
 #endif
 
 // Choice item
-class WXDLLEXPORT wxChoice: public wxChoiceBase
+class WXDLLIMPEXP_CORE wxChoice: public wxChoiceBase
 {
     DECLARE_DYNAMIC_CLASS(wxChoice)
 
 public:
     wxChoice();
-    ~wxChoice();
+    virtual ~wxChoice();
 
     wxChoice(wxWindow *parent, wxWindowID id,
         const wxPoint& pos = wxDefaultPosition,
@@ -71,18 +71,12 @@ public:
         const wxString& name = wxChoiceNameStr);
 
     // implementation of wxControlWithItems
-    virtual int GetCount() const;
-    virtual int DoAppend(const wxString& item);
-    virtual int DoInsert(const wxString& item, int pos);
-    virtual void DoSetItemClientData(int n, void* clientData);
-    virtual void* DoGetItemClientData(int n) const;
-    virtual void DoSetItemClientObject(int n, wxClientData* clientData);
-    virtual wxClientData* DoGetItemClientObject(int n) const;
+    virtual unsigned int GetCount() const;
     virtual int GetSelection() const;
-    virtual void Delete(int n);
-    virtual void Clear();
-    virtual void SetString(int n, const wxString& s);
-    virtual wxString GetString(int n) const;
+    virtual void DoDeleteOneItem(unsigned int n);
+    virtual void DoClear();
+    virtual void SetString(unsigned int n, const wxString& s);
+    virtual wxString GetString(unsigned int n) const;
 
     // implementation of wxChoiceBase
     virtual void SetSelection(int n);
@@ -105,25 +99,27 @@ public:
 
     // implementation, for wxChoiceCallback
     const wxWidgetArray& GetWidgets() const { return m_widgetArray; }
-    const wxStringList&  GetStrings() const { return m_stringList; }
+    const wxArrayString&  GetStrings() const { return m_stringArray; }
 protected:
     // minimum size for the text ctrl
     wxSize GetItemsSize() const;
     // common part of all contructors
     void Init();
 
-    size_t        m_noStrings;
     WXWidget      m_menuWidget;
     WXWidget      m_buttonWidget;
     wxWidgetArray m_widgetArray;
     WXWidget      m_formWidget;
-    wxStringList  m_stringList;
-    wxClientDataDictionary m_clientDataDict;
+    wxArrayString m_stringArray;
 
     virtual void DoSetSize(int x, int y,
         int width, int height,
         int sizeFlags = wxSIZE_AUTO);
+
+    // implementation of wxControlWithItems
+    virtual int DoInsertItems(const wxArrayStringsAdapter& items,
+                              unsigned int pos,
+                              void **clientData, wxClientDataType type);
 };
 
-#endif
-// _WX_CHOICE_H_
+#endif // _WX_CHOICE_H_