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

1. some fixes for wxSortedArrayString

Browse Source 
2. wxChoice understands wxCB_SORT under GTK


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4135 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-10-22 13:12:04 +00:00
parent 90bc25c7c9
commit e01c8145b1
6 changed files with 169 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/common/string.cpp
View File

@@ -1844,7 +1844,7 @@ int wxArrayString::Index(const wxChar *sz, bool bCase, bool bFromEnd) const
}
// add item at the end
void wxArrayString::Add(const wxString& str)
size_t wxArrayString::Add(const wxString& str)
{
if ( m_autoSort ) {
// insert the string at the correct position to keep the array sorted
@@ -1869,6 +1869,8 @@ void wxArrayString::Add(const wxString& str)
wxASSERT_MSG( lo == hi, wxT("binary search broken") );
Insert(str, lo);
return (size_t)lo;
}
else {
wxASSERT( str.GetStringData()->IsValid() );
@@ -1879,7 +1881,9 @@ void wxArrayString::Add(const wxString& str)
str.GetStringData()->Lock();
// just append
m_pItems[m_nCount++] = (wxChar *)str.c_str();
m_pItems[m_nCount] = (wxChar *)str.c_str(); // const_cast
return m_nCount++;
}
}
@@ -1888,8 +1892,6 @@ void wxArrayString::Insert(const wxString& str, size_t nIndex)
{
wxASSERT( str.GetStringData()->IsValid() );
wxCHECK_RET( !m_autoSort, wxT("can't use this method with sorted arrays") );
wxCHECK_RET( nIndex <= m_nCount, wxT("bad index in wxArrayString::Insert") );
Grow();