X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a236aa2058ccf3d36e9cafc20fa7375080c4be50..a01ada0599acdc11497850c4c8e846d3f237bf91:/include/wx/univ/listbox.h

diff --git a/include/wx/univ/listbox.h b/include/wx/univ/listbox.h
index a5ef8d0d87..f70d98abc9 100644
--- a/include/wx/univ/listbox.h
+++ b/include/wx/univ/listbox.h
@@ -48,7 +48,7 @@
 // wxListBox: a list of selectable items
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxListBox : public wxListBoxBase, public wxScrollHelper
+class WXDLLIMPEXP_CORE wxListBox : public wxListBoxBase, public wxScrollHelper
 {
 public:
     // ctors and such
@@ -99,13 +99,10 @@ public:
     virtual void DoClear();
     virtual void DoDeleteOneItem(unsigned int n);
 
-    virtual unsigned int GetCount() const
-        { return (unsigned int)m_strings->GetCount(); }
-    virtual wxString GetString(unsigned int n) const
-        { return m_strings->Item(n); }
+    virtual unsigned int GetCount() const;
+    virtual wxString GetString(unsigned int n) const;
     virtual void SetString(unsigned int n, const wxString& s);
-    virtual int FindString(const wxString& s, bool bCase = false) const
-        { return m_strings->Index(s, bCase); }
+    virtual int FindString(const wxString& s, bool bCase = false) const;
 
     virtual bool IsSelected(int n) const
         { return m_selections.Index(n) != wxNOT_FOUND; }
@@ -121,7 +118,7 @@ protected:
                               wxClientDataType type);
 
     // universal wxComboBox implementation internally uses wxListBox
-    friend class WXDLLEXPORT wxComboBox;
+    friend class WXDLLIMPEXP_FWD_CORE wxComboBox;
 
     virtual void DoSetFirstItem(int n);
 
@@ -249,7 +246,11 @@ protected:
 
     // the array containing all items (it is sorted if the listbox has
     // wxLB_SORT style)
-    wxArrayString* m_strings;
+    union
+    {
+        wxArrayString *unsorted;
+        wxSortedArrayString *sorted;
+    } m_strings;
 
     // this array contains the indices of the selected items (for the single
     // selection listboxes only the first element of it is used and contains