X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/aa61d3525370a9b9fa8c797d9b7f89d96994db5f..333e57d578e9e0fb6555452b5a53698ffd85ee69:/include/wx/listbox.h diff --git a/include/wx/listbox.h b/include/wx/listbox.h index 219eccff38..01604e47f6 100644 --- a/include/wx/listbox.h +++ b/include/wx/listbox.h @@ -23,8 +23,8 @@ #include "wx/ctrlsub.h" // base class // forward declarations are enough here -class WXDLLIMPEXP_BASE wxArrayInt; -class WXDLLIMPEXP_BASE wxArrayString; +class WXDLLIMPEXP_FWD_BASE wxArrayInt; +class WXDLLIMPEXP_FWD_BASE wxArrayString; // ---------------------------------------------------------------------------- // global data @@ -42,22 +42,10 @@ public: wxListBoxBase() { } virtual ~wxListBoxBase(); - // all generic methods are in wxControlWithItems, except for the following - // ones which are not yet implemented by wxChoice/wxComboBox - void Insert(const wxString& item, unsigned int pos) - { DoInsert(item, pos); } - void Insert(const wxString& item, unsigned int pos, void *clientData) - { DoInsert(item, pos); SetClientData(pos, clientData); } - void Insert(const wxString& item, unsigned int pos, wxClientData *clientData) - { DoInsert(item, pos); SetClientObject(pos, clientData); } - - void InsertItems(unsigned int nItems, const wxString *items, unsigned int pos); + void InsertItems(unsigned int nItems, const wxString *items, unsigned int pos) + { Insert(nItems, items, pos); } void InsertItems(const wxArrayString& items, unsigned int pos) - { DoInsertItems(items, pos); } - - void Set(int n, const wxString* items, void **clientData = NULL); - void Set(const wxArrayString& items, void **clientData = NULL) - { DoSetItems(items, clientData); } + { Insert(items, pos); } // multiple selection logic virtual bool IsSelected(int n) const = 0; @@ -96,30 +84,23 @@ public: (m_windowStyle & wxLB_EXTENDED); } - // return true if this listbox is sorted - bool IsSorted() const { return (m_windowStyle & wxLB_SORT) != 0; } + // override wxItemContainer::IsSorted + virtual bool IsSorted() const { return HasFlag( wxLB_SORT ); } // emulate selecting or deselecting the item event.GetInt() (depending on // event.GetExtraLong()) void Command(wxCommandEvent& event); - // compatibility - these functions are deprecated, use the new ones - // instead - bool Selected(int n) const { return IsSelected(n); } - // returns the item number at a point or wxNOT_FOUND int HitTest(const wxPoint& point) const { return DoListHitTest(point); } -protected: - // NB: due to wxGTK implementation details, DoInsert() is implemented - // using DoInsertItems() and not the other way round - virtual int DoInsert(const wxString& item, unsigned int pos) - { InsertItems(1, &item, pos); return pos; } - - // to be implemented in derived classes - virtual void DoInsertItems(const wxArrayString& items, unsigned int pos) = 0; - virtual void DoSetItems(const wxArrayString& items, void **clientData) = 0; +#if WXWIN_COMPATIBILITY_2_6 + // compatibility - these functions are deprecated, use the new ones + // instead + wxDEPRECATED( bool Selected(int n) const ); +#endif // WXWIN_COMPATIBILITY_2_6 +protected: virtual void DoSetFirstItem(int n) = 0; virtual void DoSetSelection(int n, bool select) = 0; @@ -128,10 +109,14 @@ protected: virtual int DoListHitTest(const wxPoint& WXUNUSED(point)) const { return wxNOT_FOUND; } - +private: DECLARE_NO_COPY_CLASS(wxListBoxBase) }; +#if WXWIN_COMPATIBILITY_2_6 + inline bool wxListBoxBase::Selected(int n) const { return IsSelected(n); } +#endif // WXWIN_COMPATIBILITY_2_6 + // ---------------------------------------------------------------------------- // include the platform-specific class declaration // ----------------------------------------------------------------------------