// implementation of wxListBox
// ============================================================================
-IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControlWithItems)
BEGIN_EVENT_TABLE(wxListBox, wxListBoxBase)
EVT_SIZE(wxListBox::OnSize)
m_maxWidth = 0;
m_scrollRangeY = 0;
m_maxWidthItem = -1;
- m_strings = NULL;
+ m_strings.unsorted = NULL;
// no items hence no current item
m_current = -1;
validator, name) )
return false;
- m_strings = new wxArrayString;
+ if ( IsSorted() )
+ m_strings.sorted = new wxSortedArrayString;
+ else
+ m_strings.unsorted = new wxArrayString;
Set(n, choices);
// call this just to free the client data -- and avoid leaking memory
DoClear();
- delete m_strings;
+ if ( IsSorted() )
+ delete m_strings.sorted;
+ else
+ delete m_strings.unsorted;
- m_strings = NULL;
+ m_strings.sorted = NULL;
}
// ----------------------------------------------------------------------------
-// adding/inserting strings
+// accessing strings
// ----------------------------------------------------------------------------
-int wxCMPFUNC_CONV wxListBoxSortNoCase(wxString* s1, wxString* s2)
+unsigned int wxListBox::GetCount() const
{
- return s1->CmpNoCase(*s2);
+ return IsSorted() ? m_strings.sorted->size()
+ : m_strings.unsorted->size();
}
-int wxListBox::DoAppendOnly(const wxString& item)
+wxString wxListBox::GetString(unsigned int n) const
{
- unsigned int index;
-
- if ( IsSorted() )
- {
- m_strings->Add(item);
- m_strings->Sort(wxListBoxSortNoCase);
- index = m_strings->Index(item);
- }
- else
- {
- index = m_strings->GetCount();
- m_strings->Add(item);
- }
-
- return index;
+ return IsSorted() ? m_strings.sorted->Item(n)
+ : m_strings.unsorted->Item(n);
}
-int wxListBox::DoAppend(const wxString& item)
+int wxListBox::FindString(const wxString& s, bool bCase) const
{
- size_t index = DoAppendOnly( item );
+ return IsSorted() ? m_strings.sorted->Index(s, bCase)
+ : m_strings.unsorted->Index(s, bCase);
+}
- m_itemsClientData.Insert(NULL, index);
+// ----------------------------------------------------------------------------
+// adding/inserting strings
+// ----------------------------------------------------------------------------
- m_updateScrollbarY = true;
+int wxListBox::DoInsertItems(const wxArrayStringsAdapter& items,
+ unsigned int pos,
+ void **clientData,
+ wxClientDataType type)
+{
+ int idx = wxNOT_FOUND;
- if ( HasHorzScrollbar() )
+ const unsigned int numItems = items.GetCount();
+ for ( unsigned int i = 0; i < numItems; ++i )
{
- // has the max width increased?
- wxCoord width;
- GetTextExtent(item, &width, NULL);
- if ( width > m_maxWidth )
- {
- m_maxWidth = width;
- m_maxWidthItem = index;
- m_updateScrollbarX = true;
- }
- }
+ const wxString& item = items[i];
+ idx = IsSorted() ? m_strings.sorted->Add(item)
+ : (m_strings.unsorted->Insert(item, pos), pos++);
- RefreshFromItemToEnd(index);
-
- return index;
-}
+ m_itemsClientData.Insert(NULL, idx);
+ AssignNewItemClientData(idx, clientData, i, type);
-void wxListBox::DoInsertItems(const wxArrayString& items, unsigned int pos)
-{
- // the position of the item being added to a sorted listbox can't be
- // specified
- wxCHECK_RET( !IsSorted(), _T("can't insert items into sorted listbox") );
-
- unsigned int count = items.GetCount();
- for ( unsigned int n = 0; n < count; n++ )
- {
- m_strings->Insert(items[n], pos + n);
- m_itemsClientData.Insert(NULL, pos + n);
+ // call the wxCheckListBox hook
+ OnItemInserted(idx);
}
// the number of items has changed so we might have to show the scrollbar
// note that we have to refresh all the items after the ones we inserted,
// not just these items
RefreshFromItemToEnd(pos);
-}
-void wxListBox::DoSetItems(const wxArrayString& items, void **clientData)
-{
- DoClear();
-
- unsigned int count = items.GetCount();
- if ( !count )
- return;
-
- m_strings->Alloc(count);
-
- m_itemsClientData.Alloc(count);
- for ( unsigned int n = 0; n < count; n++ )
- {
- unsigned int index = DoAppendOnly(items[n]);
-
- m_itemsClientData.Insert(clientData ? clientData[n] : NULL, index);
- }
-
- m_updateScrollbarY = true;
-
- RefreshAll();
+ return idx;
}
void wxListBox::SetString(unsigned int n, const wxString& s)
{
wxCHECK_RET( !IsSorted(), _T("can't set string in sorted listbox") );
- (*m_strings)[n] = s;
+ if ( IsSorted() )
+ (*m_strings.sorted)[n] = s;
+ else
+ (*m_strings.unsorted)[n] = s;
if ( HasHorzScrollbar() )
{
void wxListBox::DoClear()
{
- m_strings->Clear();
-
- if ( HasClientObjectData() )
- {
- unsigned int count = m_itemsClientData.GetCount();
- for ( unsigned int n = 0; n < count; n++ )
- {
- delete (wxClientData *) m_itemsClientData[n];
- }
- }
+ if ( IsSorted() )
+ m_strings.sorted->Clear();
+ else
+ m_strings.unsorted->Clear();
m_itemsClientData.Clear();
m_selections.Clear();
m_current = -1;
-}
-
-void wxListBox::Clear()
-{
- DoClear();
m_updateScrollbarY = true;
RefreshAll();
}
-void wxListBox::Delete(unsigned int n)
+void wxListBox::DoDeleteOneItem(unsigned int n)
{
wxCHECK_RET( IsValid(n),
_T("invalid index in wxListBox::Delete") );
// refreshed (as GetCount() will be decremented)
RefreshFromItemToEnd(n);
- m_strings->RemoveAt(n);
-
- if ( HasClientObjectData() )
- {
- delete (wxClientData *)m_itemsClientData[n];
- }
+ if ( IsSorted() )
+ m_strings.sorted->RemoveAt(n);
+ else
+ m_strings.unsorted->RemoveAt(n);
m_itemsClientData.RemoveAt(n);
return m_itemsClientData[n];
}
-void wxListBox::DoSetItemClientObject(unsigned int n, wxClientData* clientData)
-{
- m_itemsClientData[n] = clientData;
-}
-
-wxClientData* wxListBox::DoGetItemClientObject(unsigned int n) const
-{
- return (wxClientData *)m_itemsClientData[n];
-}
-
// ----------------------------------------------------------------------------
// selection
// ----------------------------------------------------------------------------
wxCoord lineHeight = GetLineHeight();
unsigned int itemFirst = yTop / lineHeight,
itemLast = (yBottom + lineHeight - 1) / lineHeight,
- itemMax = m_strings->GetCount();
+ itemMax = GetCount();
if ( itemFirst >= itemMax )
return;
{
wxListBox *self = wxConstCast(this, wxListBox);
wxCoord width;
- unsigned int count = m_strings->GetCount();
+ unsigned int count = GetCount();
for ( unsigned int n = 0; n < count; n++ )
{
GetTextExtent(this->GetString(n), &width, NULL);
wxCoord width = 0,
height = 0;
- unsigned int count = m_strings->GetCount();
+ unsigned int count = GetCount();
for ( unsigned int n = 0; n < count; n++ )
{
wxCoord w,h;
projects / wxWidgets.git / blobdiff