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

Sorting fixes to wxUniv wxCombo/ListBox [part of bug #1040593].

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30652 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2004-11-19 20:38:04 +00:00
parent b8a9578b80
commit e1d6e01c88
3 changed files with 37 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/univ/listbox.cpp
View File

@@ -141,10 +141,7 @@ bool wxListBox::Create(wxWindow *parent,
SetWindow(this);
if ( style & wxLB_SORT )
m_stringsSorted = new wxSortedArrayString;
else
m_strings = new wxArrayString;
m_strings = new wxArrayString;
Set(n, choices);
@@ -160,10 +157,7 @@ wxListBox::~wxListBox()
// call this just to free the client data -- and avoid leaking memory
DoClear();
if ( IsSorted() )
delete m_stringsSorted;
else
delete m_strings;
delete m_strings;
m_strings = NULL;
}
@@ -172,13 +166,20 @@ wxListBox::~wxListBox()
// adding/inserting strings
// ----------------------------------------------------------------------------
int wxListBox::DoAppend(const wxString& item)
int wxCMPFUNC_CONV wxListBoxSortNoCase(wxString* s1, wxString* s2)
{
return s1->CmpNoCase(*s2);
}
int wxListBox::DoAppendOnly(const wxString& item)
{
size_t index;
if ( IsSorted() )
{
index = m_stringsSorted->Add(item);
m_strings->Add(item);
m_strings->Sort(wxListBoxSortNoCase);
index = m_strings->Index(item);
}
else
{
@@ -186,6 +187,13 @@ int wxListBox::DoAppend(const wxString& item)
m_strings->Add(item);
}
return index;
}
int wxListBox::DoAppend(const wxString& item)
{
size_t index = DoAppendOnly( item );
m_itemsClientData.Insert(NULL, index);
m_updateScrollbarY = true;
@@ -243,20 +251,11 @@ void wxListBox::DoSetItems(const wxArrayString& items, void **clientData)
return;
m_strings->Alloc(count);
m_itemsClientData.Alloc(count);
for ( size_t n = 0; n < count; n++ )
{
size_t index;
if ( IsSorted() )
{
index = m_stringsSorted->Add(items[n]);
}
else
{
index = m_strings->GetCount();
m_strings->Add(items[n]);
}
size_t index = DoAppendOnly(items[n]);
m_itemsClientData.Insert(clientData ? clientData[n] : NULL, index);
}
@@ -268,12 +267,16 @@ void wxListBox::DoSetItems(const wxArrayString& items, void **clientData)
void wxListBox::SetString(int n, const wxString& s)
{
wxCHECK_RET( !IsSorted(), _T("can't set string in sorted listbox") );
(*m_strings)[n] = s;
if ( HasHorzScrollbar() )
{
// we need to update m_maxWidth as changing the string may cause the
// horz scrollbar [dis]appear
wxCoord width;
(*m_strings)[n] = s;
GetTextExtent(s, &width, NULL);
// it might have increased if the new string is long
@@ -289,10 +292,6 @@ void wxListBox::SetString(int n, const wxString& s)
RefreshHorzScrollbar();
}
}
else // no horz scrollbar
{
(*m_strings)[n] = s;
}
RefreshItem(n);
}
@@ -785,7 +784,7 @@ wxCoord wxListBox::GetMaxWidth() const
size_t count = m_strings->GetCount();
for ( size_t n = 0; n < count; n++ )
{
GetTextExtent((*m_strings)[n], &width, NULL);
GetTextExtent(this->GetString(n), &width, NULL);
if ( width > m_maxWidth )
{
self->m_maxWidth = width;
@@ -843,7 +842,7 @@ wxSize wxListBox::DoGetBestClientSize() const
for ( size_t n = 0; n < count; n++ )
{
wxCoord w,h;
GetTextExtent((*m_strings)[n], &w, &h);
GetTextExtent(this->GetString(n), &w, &h);
if ( w > width )
width = w;
@@ -951,7 +950,7 @@ bool wxListBox::FindItem(const wxString& prefix, bool strictlyAfter)
// loop over all items in the listbox
for ( int item = first; item != last; item < count - 1 ? item++ : item = 0 )
{
if ( wxStrnicmp((*m_strings)[item], prefix, len) == 0 )
if ( wxStrnicmp(this->GetString(item).c_str(), prefix, len) == 0 )
{
SetCurrentItem(item);