X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8228b8932abaedadbf9568bb3a1eef3ae25fb2a3..a4f6fe43c33bd7933645d110ad2719871dab043d:/include/wx/motif/listbox.h?ds=sidebyside diff --git a/include/wx/motif/listbox.h b/include/wx/motif/listbox.h index 002c80de52..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 WXDLLEXPORT 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); - ~wxListBox(); - // implementation of wxControlWithItems - virtual size_t GetCount() const; - virtual int DoAppend(const wxString& item); - 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 DoInsertItems(const wxArrayStringsAdapter& items, + unsigned int pos, + void **clientData, wxClientDataType type); virtual int GetSelection() const; - virtual void Delete(int n); + virtual void DoDeleteOneItem(unsigned int n); virtual int FindString(const wxString& s, bool bCase = false) const; - virtual void Clear(); - virtual void SetString(int n, const wxString& s); - virtual wxString GetString(int n) const; + 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, 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; - size_t m_noItems; + unsigned int m_noItems; - // List mapping positions->client data - wxClientDataDictionary m_clientDataDict; private: void SetSelectionPolicy(); };