X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b5dbe15d0bacde245539f54c4d97af6b4696f01f..e2cb366f612460ba70fb12560c112fef2d8389dd:/include/wx/motif/listbox.h?ds=sidebyside

diff --git a/include/wx/motif/listbox.h b/include/wx/motif/listbox.h
index 29faf7d6dc..6a7f3bb513 100644
--- a/include/wx/motif/listbox.h
+++ b/include/wx/motif/listbox.h
@@ -16,10 +16,10 @@
 #include "wx/clntdata.h"
 
 // forward decl for GetSelections()
-class WXDLLIMPEXP_FWD_CORE wxArrayInt;
+class WXDLLIMPEXP_FWD_BASE wxArrayInt;
 
 // List box item
-class WXDLLEXPORT wxListBox: public wxListBoxBase
+class WXDLLIMPEXP_CORE wxListBox: public wxListBoxBase
 {
     DECLARE_DYNAMIC_CLASS(wxListBox)
 
@@ -63,26 +63,20 @@ public:
         const wxValidator& validator = wxDefaultValidator,
         const wxString& name = wxListBoxNameStr);
 
-    virtual ~wxListBox();
-
     // implementation of wxControlWithItems
     virtual unsigned int GetCount() const;
-    virtual int DoAppend(const wxString& item);
-    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;
+    virtual int DoInsertItems(const wxArrayStringsAdapter& items,
+                              unsigned int pos,
+                              void **clientData, wxClientDataType type);
     virtual int GetSelection() const;
-    virtual void Delete(unsigned int n);
+    virtual void DoDeleteOneItem(unsigned int n);
     virtual int FindString(const wxString& s, bool bCase = false) const;
-    virtual void Clear();
+    virtual void DoClear();
     virtual void SetString(unsigned int n, const wxString& s);
     virtual wxString GetString(unsigned int n) const;
 
     // implementation of wxListBoxbase
     virtual void DoSetSelection(int n, bool select);
-    virtual void DoInsertItems(const wxArrayString& items, unsigned int pos);
-    virtual void DoSetItems(const wxArrayString& items, void **clientData);
     virtual void DoSetFirstItem(int n);
     virtual int GetSelections(wxArrayInt& aSelections) const;
     virtual bool IsSelected(int n) const;
@@ -96,15 +90,13 @@ public:
     WXWidget GetTopWidget() const;
 
 #if wxUSE_CHECKLISTBOX
-    virtual void DoToggleItem(int WXUNUSED(item), int WXUNUSED(x)) {};
+    virtual void DoToggleItem(int WXUNUSED(item), int WXUNUSED(x)) {}
 #endif
 protected:
     virtual wxSize DoGetBestSize() const;
 
     unsigned int m_noItems;
 
-    // List mapping positions->client data
-    wxClientDataDictionary m_clientDataDict;
 private:
     void SetSelectionPolicy();
 };