Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build fixes for wxUSE_STL==1

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50349 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-11-30 14:16:11 +00:00
parent 888dde65f4
commit 6f34862c6a
2 changed files with 57 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
include/wx/univ/listbox.h
View File

@@ -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; }
@@ -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