/////////////////////////////////////////////////////////////////////////////
-// Name: univ/listbox.cpp
+// Name: src/univ/listbox.cpp
// Purpose: wxListBox implementation
// Author: Vadim Zeitlin
// Modified by:
// headers
// ----------------------------------------------------------------------------
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #pragma implementation "univlistbox.h"
-#endif
-
#include "wx/wxprec.h"
#ifdef __BORLANDC__
long style,
const wxValidator& validator,
const wxString &name)
+ :wxScrollHelper(this)
{
Init();
validator, name) )
return false;
- SetWindow(this);
-
- if ( style & wxLB_SORT )
- m_stringsSorted = new wxSortedArrayString;
- else
- m_strings = new wxArrayString;
+ m_strings = new wxArrayString;
Set(n, choices);
// 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;
}
// 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
{
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;
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);
}
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
RefreshHorzScrollbar();
}
}
- else // no horz scrollbar
- {
- (*m_strings)[n] = s;
- }
RefreshItem(n);
}
void wxListBox::Delete(int n)
{
- wxCHECK_RET( n >= 0 && n < GetCount(),
+ wxCHECK_RET( IsValid(n),
_T("invalid index in wxListBox::Delete") );
// do it before removing the index as otherwise the last item will not be
// selection
// ----------------------------------------------------------------------------
-void wxListBox::SetSelection(int n, bool select)
+void wxListBox::DoSetSelection(int n, bool select)
{
if ( select )
{
int wxListBox::GetSelection() const
{
- wxCHECK_MSG( !HasMultipleSelection(), -1,
+ wxCHECK_MSG( !HasMultipleSelection(), wxNOT_FOUND,
_T("use wxListBox::GetSelections for ths listbox") );
- return m_selections.IsEmpty() ? -1 : m_selections[0];
+ return m_selections.IsEmpty() ? wxNOT_FOUND : m_selections[0];
}
int wxCMPFUNC_CONV wxCompareInts(int *n, int *m)
wxSize size = GetClientSize();
// is our height enough to show all items?
- int nLines = GetCount();
+ size_t nLines = GetCount();
wxCoord lineHeight = GetLineHeight();
- bool showScrollbarY = nLines*lineHeight > size.y;
+ bool showScrollbarY = (int)nLines*lineHeight > size.y;
// check the width too if required
wxCoord charWidth, maxWidth;
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;
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;
event.SetString(GetString(item));
}
- event.m_commandInt = item;
+ event.SetInt(item);
return GetEventHandler()->ProcessEvent(event);
}
bool wxListBox::FindItem(const wxString& prefix, bool strictlyAfter)
{
- int count = GetCount();
- if ( !count )
+ size_t count = GetCount();
+ if ( count==0 )
{
// empty listbox, we can't find anything in it
return false;
{
// the following line will set first correctly to 0 if there is no
// selection (m_current == -1)
- first = m_current == count - 1 ? 0 : m_current + 1;
+ first = m_current == (int)(count - 1) ? 0 : m_current + 1;
}
else // start with the current
{
int last = first == 0 ? count - 1 : first - 1;
// if this is not true we'd never exit from the loop below!
- wxASSERT_MSG( first < count && last < count, _T("logic error") );
+ wxASSERT_MSG( first < (int)count && last < (int)count, _T("logic error") );
// precompute it outside the loop
size_t len = prefix.length();
// loop over all items in the listbox
- for ( int item = first; item != last; item < count - 1 ? item++ : item = 0 )
+ for ( int item = first; item != (int)last; item < (int)(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);
SetSelection(n);
}
- int count = GetCount();
- for ( ; n < count; n++ )
+ size_t count = GetCount();
+ for ( ; n < (int)count; n++ )
{
Deselect(n);
}
// mouse is above the first item
item = 0;
}
- else if ( item >= lbox->GetCount() )
+ else if ( (size_t)item >= lbox->GetCount() )
{
// mouse is below the last item
item = lbox->GetCount() - 1;
bool wxStdListboxInputHandler::IsValidIndex(const wxListBox *lbox, int item)
{
- return item >= 0 && item < lbox->GetCount();
+ return item >= 0 && (size_t)item < lbox->GetCount();
}
wxControlAction
projects / wxWidgets.git / blobdiff