X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/065722d7b13d2dde15f536591f80567c489c561a..98af9c738332c9a24475ad19efbfabe2b152c429:/src/univ/listbox.cpp diff --git a/src/univ/listbox.cpp b/src/univ/listbox.cpp index 65c41bc9df..58917edc04 100644 --- a/src/univ/listbox.cpp +++ b/src/univ/listbox.cpp @@ -17,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ - #pragma implementation "univlistbox.h" -#endif - #include "wx/wxprec.h" #ifdef __BORLANDC__ @@ -49,8 +45,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl) BEGIN_EVENT_TABLE(wxListBox, wxListBoxBase) EVT_SIZE(wxListBox::OnSize) - - EVT_IDLE(wxListBox::OnIdle) END_EVENT_TABLE() // ---------------------------------------------------------------------------- @@ -65,11 +59,12 @@ void wxListBox::Init() m_maxWidth = 0; m_scrollRangeY = 0; m_maxWidthItem = -1; + m_strings = NULL; // 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; @@ -78,7 +73,37 @@ void wxListBox::Init() 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) + :wxScrollHelper(this) +{ + 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, @@ -101,13 +126,17 @@ bool wxListBox::Create(wxWindow *parent, if ( !(style & (wxLB_MULTIPLE | wxLB_EXTENDED)) ) style |= wxLB_SINGLE; - if ( !wxControl::Create(parent, id, pos, size, style | wxVSCROLL , wxDefaultValidator, name) ) - return FALSE; +#if wxUSE_TWO_WINDOWS + style |= wxVSCROLL|wxHSCROLL; + if ((style & wxBORDER_MASK) == 0) + style |= wxBORDER_SUNKEN; +#endif - SetWindow(this); + if ( !wxControl::Create(parent, id, pos, size, style, + validator, name) ) + return false; - if ( style & wxLB_SORT ) - m_strings = wxArrayString(TRUE /* auto sort */); + m_strings = new wxArrayString; Set(n, choices); @@ -115,23 +144,54 @@ bool wxListBox::Create(wxWindow *parent, CreateInputHandler(wxINP_HANDLER_LISTBOX); - return TRUE; + return true; } wxListBox::~wxListBox() { + // call this just to free the client data -- and avoid leaking memory + DoClear(); + + delete m_strings; + + m_strings = NULL; } // ---------------------------------------------------------------------------- // adding/inserting strings // ---------------------------------------------------------------------------- +int wxCMPFUNC_CONV wxListBoxSortNoCase(wxString* s1, wxString* s2) +{ + return s1->CmpNoCase(*s2); +} + +int wxListBox::DoAppendOnly(const wxString& item) +{ + size_t 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; +} + int wxListBox::DoAppend(const wxString& item) { - size_t index = m_strings.Add(item); + size_t index = DoAppendOnly( item ); + m_itemsClientData.Insert(NULL, index); - m_updateScrollbarY = TRUE; + m_updateScrollbarY = true; if ( HasHorzScrollbar() ) { @@ -142,7 +202,7 @@ int wxListBox::DoAppend(const wxString& item) { m_maxWidth = width; m_maxWidthItem = index; - m_updateScrollbarX = TRUE; + m_updateScrollbarX = true; } } @@ -160,12 +220,12 @@ void wxListBox::DoInsertItems(const wxArrayString& items, int pos) size_t count = items.GetCount(); for ( size_t n = 0; n < count; n++ ) { - m_strings.Insert(items[n], pos + n); + m_strings->Insert(items[n], pos + n); m_itemsClientData.Insert(NULL, pos + n); } // 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 @@ -185,27 +245,33 @@ void wxListBox::DoSetItems(const wxArrayString& items, void **clientData) if ( !count ) return; - m_strings.Alloc(count); + m_strings->Alloc(count); + m_itemsClientData.Alloc(count); for ( size_t n = 0; n < count; n++ ) { - size_t index = 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 @@ -213,7 +279,7 @@ void wxListBox::SetString(int n, const wxString& s) { 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 ) @@ -221,10 +287,6 @@ void wxListBox::SetString(int n, const wxString& s) RefreshHorzScrollbar(); } } - else // no horz scrollbar - { - m_strings[n] = s; - } RefreshItem(n); } @@ -235,7 +297,7 @@ void wxListBox::SetString(int n, const wxString& s) void wxListBox::DoClear() { - m_strings.Clear(); + m_strings->Clear(); if ( HasClientObjectData() ) { @@ -256,7 +318,7 @@ void wxListBox::Clear() { DoClear(); - m_updateScrollbarY = TRUE; + m_updateScrollbarY = true; RefreshHorzScrollbar(); @@ -265,13 +327,14 @@ void wxListBox::Clear() void wxListBox::Delete(int n) { - wxCHECK_RET( n < GetCount(), _T("invalid index in wxListBox::Delete") ); + wxCHECK_RET( n >= 0 && n < GetCount(), + _T("invalid index in wxListBox::Delete") ); // do it before removing the index as otherwise the last item will not be // refreshed (as GetCount() will be decremented) RefreshFromItemToEnd(n); - m_strings.RemoveAt(n); + m_strings->RemoveAt(n); if ( HasClientObjectData() ) { @@ -316,7 +379,7 @@ void wxListBox::Delete(int n) } // 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 ) @@ -353,7 +416,7 @@ wxClientData* wxListBox::DoGetItemClientObject(int n) const // selection // ---------------------------------------------------------------------------- -void wxListBox::SetSelection(int n, bool select) +void wxListBox::DoSetSelection(int n, bool select) { if ( select ) { @@ -503,7 +566,7 @@ void wxListBox::RefreshAll() void wxListBox::RefreshHorzScrollbar() { m_maxWidth = 0; // recalculate it - m_updateScrollbarX = TRUE; + m_updateScrollbarX = true; } void wxListBox::UpdateScrollbars() @@ -527,7 +590,7 @@ void wxListBox::UpdateScrollbars() else // never show it { charWidth = maxWidth = 0; - showScrollbarX = FALSE; + showScrollbarX = false; } // what should be the scrollbar range now? @@ -587,25 +650,25 @@ void wxListBox::UpdateItems() m_updateFrom, m_updateFrom + m_updateCount - 1, rect.GetTop(), rect.GetBottom()); - Refresh(TRUE, &rect); + Refresh(true, &rect); } } -void wxListBox::OnIdle(wxIdleEvent& event) +void wxListBox::OnInternalIdle() { if ( m_updateScrollbarY || m_updateScrollbarX ) { UpdateScrollbars(); m_updateScrollbarX = - m_updateScrollbarY = FALSE; + m_updateScrollbarY = false; } if ( m_currentChanged ) { DoEnsureVisible(m_current); - m_currentChanged = FALSE; + m_currentChanged = false; } if ( m_updateCount ) @@ -614,8 +677,7 @@ void wxListBox::OnIdle(wxIdleEvent& event) m_updateCount = 0; } - - event.Skip(); + wxListBoxBase::OnInternalIdle(); } // ---------------------------------------------------------------------------- @@ -645,7 +707,7 @@ void wxListBox::DoDraw(wxControlRenderer *renderer) wxCoord lineHeight = GetLineHeight(); size_t itemFirst = yTop / lineHeight, itemLast = (yBottom + lineHeight - 1) / lineHeight, - itemMax = m_strings.GetCount(); + itemMax = m_strings->GetCount(); if ( itemFirst >= itemMax ) return; @@ -673,13 +735,13 @@ void wxListBox::DoDrawRange(wxControlRenderer *renderer, bool wxListBox::SetFont(const wxFont& font) { if ( !wxControl::SetFont(font) ) - return FALSE; + return false; CalcItemsPerPage(); RefreshAll(); - return TRUE; + return true; } void wxListBox::CalcItemsPerPage() @@ -714,10 +776,10 @@ wxCoord wxListBox::GetMaxWidth() const { wxListBox *self = wxConstCast(this, wxListBox); wxCoord width; - size_t count = m_strings.GetCount(); + 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; @@ -736,7 +798,7 @@ void wxListBox::OnSize(wxSizeEvent& event) // the scrollbars might [dis]appear m_updateScrollbarX = - m_updateScrollbarY = TRUE; + m_updateScrollbarY = true; event.Skip(); } @@ -763,7 +825,7 @@ void wxListBox::DoSetSize(int x, int y, height = ((height - hBorders + hLine - 1) / hLine)*hLine + hBorders; } - wxListBoxBase::DoSetSize(x, y, width, height); + wxListBoxBase::DoSetSize(x, y, width, height, sizeFlags); } wxSize wxListBox::DoGetBestClientSize() const @@ -771,11 +833,11 @@ wxSize wxListBox::DoGetBestClientSize() const wxCoord width = 0, height = 0; - size_t count = m_strings.GetCount(); + size_t count = m_strings->GetCount(); 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; @@ -825,7 +887,7 @@ bool wxListBox::SendEvent(wxEventType type, int item) event.SetString(GetString(item)); } - event.m_commandInt = item; + event.SetInt(item); return GetEventHandler()->ProcessEvent(event); } @@ -841,7 +903,7 @@ void wxListBox::SetCurrentItem(int n) if ( m_current != -1 ) { - m_currentChanged = TRUE; + m_currentChanged = true; RefreshItem(m_current); } @@ -855,7 +917,7 @@ bool wxListBox::FindItem(const wxString& prefix, bool strictlyAfter) 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 @@ -883,7 +945,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); @@ -896,12 +958,12 @@ bool wxListBox::FindItem(const wxString& prefix, bool strictlyAfter) AnchorSelection(item); } - return TRUE; + return true; } } // nothing found - return FALSE; + return false; } void wxListBox::EnsureVisible(int n) @@ -911,7 +973,7 @@ void wxListBox::EnsureVisible(int n) UpdateScrollbars(); m_updateScrollbarX = - m_updateScrollbarY = FALSE; + m_updateScrollbarY = false; } DoEnsureVisible(n); @@ -1000,7 +1062,7 @@ void wxListBox::ExtendSelection(int itemTo) } } -void wxListBox::Select(bool sel, int item) +void wxListBox::DoSelect(int item, bool sel) { if ( item != -1 ) { @@ -1020,7 +1082,7 @@ void wxListBox::Select(bool sel, int item) void wxListBox::SelectAndNotify(int item) { - Select(TRUE, item); + DoSelect(item); SendEvent(wxEVT_COMMAND_LISTBOX_SELECTED); } @@ -1039,7 +1101,7 @@ void wxListBox::Activate(int item) if ( item != -1 ) { - Select(TRUE, item); + DoSelect(item); SendEvent(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED); } @@ -1082,7 +1144,7 @@ bool wxListBox::PerformAction(const wxControlAction& action, item = m_current; if ( IsSelected(item) ) - Unselect(item); + DoUnselect(item); else SelectAndNotify(item); } @@ -1093,12 +1155,12 @@ bool wxListBox::PerformAction(const wxControlAction& action, if ( strArg.empty() ) SelectAndNotify(item); else - Select(TRUE, item); + DoSelect(item); } else if ( action == wxACTION_LISTBOX_SELECTADD ) - Select(TRUE, item); + DoSelect(item); else if ( action == wxACTION_LISTBOX_UNSELECT ) - Select(FALSE, item); + DoUnselect(item); else if ( action == wxACTION_LISTBOX_MOVEDOWN ) ChangeCurrent(1); else if ( action == wxACTION_LISTBOX_MOVEUP ) @@ -1125,7 +1187,7 @@ bool wxListBox::PerformAction(const wxControlAction& action, else return wxControl::PerformAction(action, numArg, strArg); - return TRUE; + return true; } // ============================================================================ @@ -1139,7 +1201,7 @@ wxStdListboxInputHandler::wxStdListboxInputHandler(wxInputHandler *handler, m_btnCapture = 0; m_toggleOnPressAlways = toggleOnPressAlways; m_actionMouse = wxACTION_NONE; - m_trackMouseOutside = TRUE; + m_trackMouseOutside = true; } int wxStdListboxInputHandler::HitTest(const wxListBox *lbox, @@ -1247,7 +1309,7 @@ wxStdListboxInputHandler::SetupCapture(wxListBox *lbox, } // by default we always do track it - m_trackMouseOutside = TRUE; + m_trackMouseOutside = true; return action; } @@ -1259,7 +1321,7 @@ bool wxStdListboxInputHandler::HandleKey(wxInputConsumer *consumer, // 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; @@ -1302,24 +1364,24 @@ bool wxStdListboxInputHandler::HandleKey(wxInputConsumer *consumer, 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); @@ -1344,7 +1406,7 @@ bool wxStdListboxInputHandler::HandleKey(wxInputConsumer *consumer, //else: nothing to do for multiple selection listboxes } - return TRUE; + return true; } } @@ -1386,11 +1448,11 @@ bool wxStdListboxInputHandler::HandleMouse(wxInputConsumer *consumer, action = wxACTION_LISTBOX_ACTIVATE; } - if ( !!action ) + if ( !action.IsEmpty() ) { lbox->PerformAction(action, item); - return TRUE; + return true; } return wxStdInputHandler::HandleMouse(consumer, event); @@ -1410,7 +1472,7 @@ bool wxStdListboxInputHandler::HandleMouseMove(wxInputConsumer *consumer, // 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); @@ -1421,7 +1483,7 @@ bool wxStdListboxInputHandler::HandleMouseMove(wxInputConsumer *consumer, // events SetupCapture(lbox, event, item); - m_trackMouseOutside = FALSE; + m_trackMouseOutside = false; } if ( IsValidIndex(lbox, item) )