// no items hence no current item
m_current = -1;
m_selAnchor = -1;
- m_currentChanged = FALSE;
+ m_currentChanged = false;
// no need to update anything initially
m_updateCount = 0;
m_updateScrollbarX =
m_showScrollbarX =
m_updateScrollbarY =
- m_showScrollbarY = FALSE;
+ m_showScrollbarY = false;
+}
+
+wxListBox::wxListBox(wxWindow *parent,
+ wxWindowID id,
+ const wxPoint &pos,
+ const wxSize &size,
+ const wxArrayString& choices,
+ long style,
+ const wxValidator& validator,
+ const wxString &name)
+{
+ Init();
+
+ Create(parent, id, pos, size, choices, style, validator, name);
+}
+
+bool wxListBox::Create(wxWindow *parent,
+ wxWindowID id,
+ const wxPoint &pos,
+ const wxSize &size,
+ const wxArrayString& choices,
+ long style,
+ const wxValidator& validator,
+ const wxString &name)
+{
+ wxCArrayString chs(choices);
+
+ return Create(parent, id, pos, size, chs.GetCount(), chs.GetStrings(),
+ style, validator, name);
}
bool wxListBox::Create(wxWindow *parent,
style |= wxBORDER_SUNKEN;
#endif
- if ( !wxControl::Create(parent, id, pos, size, style,
+ if ( !wxControl::Create(parent, id, pos, size, style,
validator, name) )
- return FALSE;
+ return false;
SetWindow(this);
- if ( style & wxLB_SORT )
- m_stringsSorted = new wxSortedArrayString;
- else
- m_strings = new wxArrayString;
+ m_strings = new wxArrayString;
Set(n, choices);
CreateInputHandler(wxINP_HANDLER_LISTBOX);
- return TRUE;
+ return true;
}
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;
}
// 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;
+ m_updateScrollbarY = true;
if ( HasHorzScrollbar() )
{
{
m_maxWidth = width;
m_maxWidthItem = index;
- m_updateScrollbarX = TRUE;
+ m_updateScrollbarX = true;
}
}
}
// the number of items has changed so we might have to show the scrollbar
- m_updateScrollbarY = TRUE;
+ m_updateScrollbarY = true;
// the max width also might have changed - just recalculate it instead of
// keeping track of it here, this is probably more efficient for a typical
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);
}
- m_updateScrollbarY = TRUE;
+ m_updateScrollbarY = true;
RefreshAll();
}
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
{
m_maxWidth = width;
m_maxWidthItem = n;
- m_updateScrollbarX = TRUE;
+ m_updateScrollbarX = true;
}
// or also decreased if the old string was the longest one
else if ( n == m_maxWidthItem )
RefreshHorzScrollbar();
}
}
- else // no horz scrollbar
- {
- (*m_strings)[n] = s;
- }
RefreshItem(n);
}
{
DoClear();
- m_updateScrollbarY = TRUE;
+ m_updateScrollbarY = true;
RefreshHorzScrollbar();
}
// the number of items has changed, hence the scrollbar may disappear
- m_updateScrollbarY = TRUE;
+ m_updateScrollbarY = true;
// finally, if the longest item was deleted the scrollbar may disappear
if ( n == m_maxWidthItem )
// selection
// ----------------------------------------------------------------------------
-void wxListBox::SetSelection(int n, bool select)
+void wxListBox::DoSetSelection(int n, bool select)
{
if ( select )
{
void wxListBox::RefreshHorzScrollbar()
{
m_maxWidth = 0; // recalculate it
- m_updateScrollbarX = TRUE;
+ m_updateScrollbarX = true;
}
void wxListBox::UpdateScrollbars()
else // never show it
{
charWidth = maxWidth = 0;
- showScrollbarX = FALSE;
+ showScrollbarX = false;
}
// what should be the scrollbar range now?
m_updateFrom, m_updateFrom + m_updateCount - 1,
rect.GetTop(), rect.GetBottom());
- Refresh(TRUE, &rect);
+ Refresh(true, &rect);
}
}
UpdateScrollbars();
m_updateScrollbarX =
- m_updateScrollbarY = FALSE;
+ m_updateScrollbarY = false;
}
if ( m_currentChanged )
{
DoEnsureVisible(m_current);
- m_currentChanged = FALSE;
+ m_currentChanged = false;
}
if ( m_updateCount )
bool wxListBox::SetFont(const wxFont& font)
{
if ( !wxControl::SetFont(font) )
- return FALSE;
+ return false;
CalcItemsPerPage();
RefreshAll();
- return TRUE;
+ return true;
}
void wxListBox::CalcItemsPerPage()
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;
// the scrollbars might [dis]appear
m_updateScrollbarX =
- m_updateScrollbarY = TRUE;
+ m_updateScrollbarY = true;
event.Skip();
}
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);
}
if ( m_current != -1 )
{
- m_currentChanged = TRUE;
+ m_currentChanged = true;
RefreshItem(m_current);
}
if ( !count )
{
// empty listbox, we can't find anything in it
- return FALSE;
+ return false;
}
// start either from the current item or from the next one if 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);
AnchorSelection(item);
}
- return TRUE;
+ return true;
}
}
// nothing found
- return FALSE;
+ return false;
}
void wxListBox::EnsureVisible(int n)
UpdateScrollbars();
m_updateScrollbarX =
- m_updateScrollbarY = FALSE;
+ m_updateScrollbarY = false;
}
DoEnsureVisible(n);
else
return wxControl::PerformAction(action, numArg, strArg);
- return TRUE;
+ return true;
}
// ============================================================================
m_btnCapture = 0;
m_toggleOnPressAlways = toggleOnPressAlways;
m_actionMouse = wxACTION_NONE;
- m_trackMouseOutside = TRUE;
+ m_trackMouseOutside = true;
}
int wxStdListboxInputHandler::HitTest(const wxListBox *lbox,
}
// by default we always do track it
- m_trackMouseOutside = TRUE;
+ m_trackMouseOutside = true;
return action;
}
// we're only interested in the key press events
if ( pressed && !event.AltDown() )
{
- bool isMoveCmd = TRUE;
+ bool isMoveCmd = true;
int style = consumer->GetInputWindow()->GetWindowStyle();
wxControlAction action;
if ( style & wxLB_MULTIPLE )
{
action = wxACTION_LISTBOX_TOGGLE;
- isMoveCmd = FALSE;
+ isMoveCmd = false;
}
break;
case WXK_RETURN:
action = wxACTION_LISTBOX_ACTIVATE;
- isMoveCmd = FALSE;
+ isMoveCmd = false;
break;
default:
- if ( (keycode < 255) && wxIsalnum(keycode) )
+ if ( (keycode < 255) && wxIsalnum((wxChar)keycode) )
{
action = wxACTION_LISTBOX_FIND;
strArg = (wxChar)keycode;
}
}
- if ( !!action )
+ if ( !action.IsEmpty() )
{
consumer->PerformAction(action, -1, strArg);
//else: nothing to do for multiple selection listboxes
}
- return TRUE;
+ return true;
}
}
action = wxACTION_LISTBOX_ACTIVATE;
}
- if ( !!action )
+ if ( !action.IsEmpty() )
{
lbox->PerformAction(action, item);
- return TRUE;
+ return true;
}
return wxStdInputHandler::HandleMouse(consumer, event);
// when we do it ourselves): in this case we only react to
// the mouse messages when they happen inside the listbox
if ( lbox->HitTest(event.GetPosition()) != wxHT_WINDOW_INSIDE )
- return FALSE;
+ return false;
}
int item = HitTest(lbox, event);
// events
SetupCapture(lbox, event, item);
- m_trackMouseOutside = FALSE;
+ m_trackMouseOutside = false;
}
if ( IsValidIndex(lbox, item) )
projects / wxWidgets.git / blobdiff