X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/53a2db124c633f80bdb16336084262037d879a2c..2903e6998a46a0b3504da30e21a9c28b344680ae:/include/wx/listbox.h diff --git a/include/wx/listbox.h b/include/wx/listbox.h index e77d2b3ab8..50d409c189 100644 --- a/include/wx/listbox.h +++ b/include/wx/listbox.h @@ -94,11 +94,10 @@ public: // 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 ); -#endif // WXWIN_COMPATIBILITY_2_6 + // For generating events in multiple and extended mode + wxArrayInt m_oldSelections; + void UpdateOldSelections(); + void CalcAndSendEvent(); protected: virtual void DoSetFirstItem(int n) = 0; @@ -113,10 +112,6 @@ 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 // ---------------------------------------------------------------------------- @@ -132,7 +127,7 @@ private: #elif defined(__WXGTK__) #include "wx/gtk1/listbox.h" #elif defined(__WXMAC__) - #include "wx/mac/listbox.h" + #include "wx/osx/listbox.h" #elif defined(__WXPM__) #include "wx/os2/listbox.h" #elif defined(__WXCOCOA__)