X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/40ff126ac4ff57ab4aa22a5c7c7ce621479e8739..df18cc7aa1afdbe74d4b8e398d12ef34d1e78b5c:/include/wx/listbox.h diff --git a/include/wx/listbox.h b/include/wx/listbox.h index c3bab9220b..fb219e1ba5 100644 --- a/include/wx/listbox.h +++ b/include/wx/listbox.h @@ -45,11 +45,11 @@ public: // 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); } + { /* return*/ wxControlWithItems::Insert(item,pos); } void Insert(const wxString& item, unsigned int pos, void *clientData) - { DoInsert(item, pos); SetClientData(pos, clientData); } + { /* return*/ wxControlWithItems::Insert(item,pos,clientData); } void Insert(const wxString& item, unsigned int pos, wxClientData *clientData) - { DoInsert(item, pos); SetClientObject(pos, clientData); } + { /* return*/ wxControlWithItems::Insert(item,pos,clientData); } void InsertItems(unsigned int nItems, const wxString *items, unsigned int pos); void InsertItems(const wxArrayString& items, unsigned int pos) @@ -103,13 +103,13 @@ public: // event.GetExtraLong()) void Command(wxCommandEvent& event); + // returns the item number at a point or wxNOT_FOUND + int HitTest(const wxPoint& point) const { return DoListHitTest(point); } + #if WXWIN_COMPATIBILITY_2_6 // compatibility - these functions are deprecated, use the new ones // instead wxDEPRECATED( bool Selected(int n) const ); - - // returns the item number at a point or wxNOT_FOUND - wxDEPRECATED( int HitTest(const wxPoint& point) const ); #endif // WXWIN_COMPATIBILITY_2_6 protected: @@ -136,7 +136,6 @@ protected: #if WXWIN_COMPATIBILITY_2_6 inline bool wxListBoxBase::Selected(int n) const { return IsSelected(n); } - inline int wxListBoxBase::HitTest(const wxPoint& point) const { return DoListHitTest(point); } #endif // WXWIN_COMPATIBILITY_2_6 // ----------------------------------------------------------------------------