X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/12028905135250524409f1e7b9bfa9c55e5ce16b..63e7198ba8304880bc279e0e99f1ed7b49e35d96:/include/wx/univ/listbox.h?ds=sidebyside diff --git a/include/wx/univ/listbox.h b/include/wx/univ/listbox.h index 6f00f1d6c2..b5c6cc2c21 100644 --- a/include/wx/univ/listbox.h +++ b/include/wx/univ/listbox.h @@ -18,6 +18,7 @@ #include "wx/scrolwin.h" // for wxScrollHelper #include "wx/dynarray.h" +#include "wx/arrstr.h" // ---------------------------------------------------------------------------- // the actions supported by this control @@ -85,11 +86,11 @@ public: virtual void Clear(); virtual void Delete(int n); - virtual int GetCount() const { return (int)m_strings.GetCount(); } - virtual wxString GetString(int n) const { return m_strings[n]; } + virtual int GetCount() const { return (int)m_strings->GetCount(); } + virtual wxString GetString(int n) const { return (*m_strings)[n]; } virtual void SetString(int n, const wxString& s); virtual int FindString(const wxString& s) const - { return m_strings.Index(s); } + { return IsSorted() ? m_stringsSorted->Index(s) : m_strings->Index(s); } virtual bool IsSelected(int n) const { return m_selections.Index(n) != wxNOT_FOUND; } @@ -166,11 +167,9 @@ public: long numArg = 0l, const wxString& strArg = wxEmptyString); - // let wxColourScheme choose the right colours for us - virtual bool IsContainerWindow() const { return TRUE; } - // idle processing virtual void OnInternalIdle(); + protected: // geometry virtual wxSize DoGetBestClientSize() const; @@ -223,8 +222,14 @@ protected: void UpdateItems(); // the array containing all items (it is sorted if the listbox has - // wxLB_SORT style) - wxArrayString m_strings; + // wxLB_SORT style). Note the evil trick: the pointers share the + // same location, hence we use m_strings when we don't care if the + // array is sorted or not, m_stringsSorted when we do + union + { + wxArrayString* m_strings; + wxSortedArrayString* m_stringsSorted; + }; // this array contains the indices of the selected items (for the single // selection listboxes only the first element of it is used and contains