X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0ad2a19e42e400028bb28b0cfac7e0ac9636a82b..18867602777b0a4787f24fa94ecf332a7434032f:/src/msw/listbox.cpp diff --git a/src/msw/listbox.cpp b/src/msw/listbox.cpp index e9f8db9e3a..37189a7e65 100644 --- a/src/msw/listbox.cpp +++ b/src/msw/listbox.cpp @@ -32,6 +32,7 @@ #endif #include "wx/msw/private.h" +#include "wx/msw/dc.h" #include @@ -76,6 +77,7 @@ wxBEGIN_FLAGS( wxListBoxStyle ) wxFLAGS_MEMBER(wxLB_HSCROLL) wxFLAGS_MEMBER(wxLB_ALWAYS_SB) wxFLAGS_MEMBER(wxLB_NEEDED_SB) + wxFLAGS_MEMBER(wxLB_NO_SB) wxFLAGS_MEMBER(wxLB_SORT) wxEND_FLAGS( wxListBoxStyle ) @@ -144,7 +146,7 @@ wxOwnerDrawn *wxListBox::CreateLboxItem(size_t WXUNUSED(n)) wxListBox::wxListBox() { m_noItems = 0; - m_selected = 0; + m_updateHorizontalExtent = false; } bool wxListBox::Create(wxWindow *parent, @@ -157,14 +159,14 @@ bool wxListBox::Create(wxWindow *parent, const wxString& name) { m_noItems = 0; - m_selected = 0; + m_updateHorizontalExtent = false; // initialize base class fields if ( !CreateControl(parent, id, pos, size, style, validator, name) ) return false; // create the native control - if ( !MSWCreateControl(_T("LISTBOX"), wxEmptyString, pos, size) ) + if ( !MSWCreateControl(wxT("LISTBOX"), wxEmptyString, pos, size) ) { // control creation failed return false; @@ -176,7 +178,8 @@ bool wxListBox::Create(wxWindow *parent, Append(choices[i]); } - // now we can compute our best size correctly, so do it if necessary + // now we can compute our best size correctly, so do it again + InvalidateBestSize(); SetInitialSize(size); return true; @@ -198,17 +201,13 @@ bool wxListBox::Create(wxWindow *parent, wxListBox::~wxListBox() { - Free(); + Clear(); } WXDWORD wxListBox::MSWGetStyle(long style, WXDWORD *exstyle) const { WXDWORD msStyle = wxControl::MSWGetStyle(style, exstyle); - // always show the vertical scrollbar if necessary -- otherwise it is - // impossible to use the control with the mouse - msStyle |= WS_VSCROLL; - // we always want to get the notifications msStyle |= LBS_NOTIFY; @@ -217,15 +216,23 @@ WXDWORD wxListBox::MSWGetStyle(long style, WXDWORD *exstyle) const msStyle |= LBS_NOINTEGRALHEIGHT; wxASSERT_MSG( !(style & wxLB_MULTIPLE) || !(style & wxLB_EXTENDED), - _T("only one of listbox selection modes can be specified") ); + wxT("only one of listbox selection modes can be specified") ); if ( style & wxLB_MULTIPLE ) msStyle |= LBS_MULTIPLESEL; else if ( style & wxLB_EXTENDED ) msStyle |= LBS_EXTENDEDSEL; - if ( m_windowStyle & wxLB_ALWAYS_SB ) - msStyle |= LBS_DISABLENOSCROLL; + wxASSERT_MSG( !(style & wxLB_ALWAYS_SB) || !(style & wxLB_NO_SB), + wxT( "Conflicting styles wxLB_ALWAYS_SB and wxLB_NO_SB." ) ); + + if ( !(style & wxLB_NO_SB) ) + { + msStyle |= WS_VSCROLL; + if ( style & wxLB_ALWAYS_SB ) + msStyle |= LBS_DISABLENOSCROLL; + } + if ( m_windowStyle & wxLB_HSCROLL ) msStyle |= WS_HSCROLL; if ( m_windowStyle & wxLB_SORT ) @@ -244,6 +251,17 @@ WXDWORD wxListBox::MSWGetStyle(long style, WXDWORD *exstyle) const return msStyle; } +void wxListBox::OnInternalIdle() +{ + wxWindow::OnInternalIdle(); + + if (m_updateHorizontalExtent) + { + SetHorizontalExtent(wxEmptyString); + m_updateHorizontalExtent = false; + } +} + // ---------------------------------------------------------------------------- // implementation of wxListBoxBase methods // ---------------------------------------------------------------------------- @@ -256,91 +274,18 @@ void wxListBox::DoSetFirstItem(int N) SendMessage(GetHwnd(), LB_SETTOPINDEX, (WPARAM)N, (LPARAM)0); } -void wxListBox::Delete(unsigned int n) +void wxListBox::DoDeleteOneItem(unsigned int n) { wxCHECK_RET( IsValid(n), wxT("invalid index in wxListBox::Delete") ); - // for owner drawn objects, the data is used for storing wxOwnerDrawn - // pointers and we shouldn't touch it -#if !wxUSE_OWNER_DRAWN - if ( !(m_windowStyle & wxLB_OWNERDRAW) ) -#endif // !wxUSE_OWNER_DRAWN - if ( HasClientObjectData() ) - { - delete GetClientObject(n); - } - SendMessage(GetHwnd(), LB_DELETESTRING, n, 0); m_noItems--; - SetHorizontalExtent(wxEmptyString); -} - -int wxListBox::DoAppend(const wxString& item) -{ - int index = ListBox_AddString(GetHwnd(), item); - m_noItems++; - -#if wxUSE_OWNER_DRAWN - if ( m_windowStyle & wxLB_OWNERDRAW ) { - wxOwnerDrawn *pNewItem = CreateLboxItem(index); // dummy argument - pNewItem->SetName(item); - m_aItems.Insert(pNewItem, index); - ListBox_SetItemData(GetHwnd(), index, pNewItem); - pNewItem->SetFont(GetFont()); - } -#endif // wxUSE_OWNER_DRAWN - - SetHorizontalExtent(item); + // SetHorizontalExtent(wxEmptyString); can be slow + m_updateHorizontalExtent = true; - return index; -} - -void wxListBox::DoSetItems(const wxArrayString& choices, void** clientData) -{ - // avoid flicker - but don't need to do this for a hidden listbox - bool hideAndShow = IsShown(); - if ( hideAndShow ) - { - ShowWindow(GetHwnd(), SW_HIDE); - } - - ListBox_ResetContent(GetHwnd()); - - m_noItems = choices.GetCount(); - unsigned int i; - for (i = 0; i < m_noItems; i++) - { - ListBox_AddString(GetHwnd(), choices[i]); - if ( clientData ) - { - SetClientData(i, clientData[i]); - } - } - -#if wxUSE_OWNER_DRAWN - if ( m_windowStyle & wxLB_OWNERDRAW ) { - // first delete old items - WX_CLEAR_ARRAY(m_aItems); - - // then create new ones - for ( unsigned int ui = 0; ui < m_noItems; ui++ ) { - wxOwnerDrawn *pNewItem = CreateLboxItem(ui); - pNewItem->SetName(choices[ui]); - m_aItems.Add(pNewItem); - ListBox_SetItemData(GetHwnd(), ui, pNewItem); - } - } -#endif // wxUSE_OWNER_DRAWN - - SetHorizontalExtent(); - - if ( hideAndShow ) - { - // show the listbox back if we hid it - ShowWindow(GetHwnd(), SW_SHOW); - } + UpdateOldSelections(); } int wxListBox::FindString(const wxString& s, bool bCase) const @@ -349,21 +294,23 @@ int wxListBox::FindString(const wxString& s, bool bCase) const if (bCase) return wxItemContainerImmutable::FindString( s, bCase ); - int pos = ListBox_FindStringExact(GetHwnd(), -1, s); + int pos = ListBox_FindStringExact(GetHwnd(), -1, s.wx_str()); if (pos == LB_ERR) return wxNOT_FOUND; else return pos; } -void wxListBox::Clear() +void wxListBox::DoClear() { Free(); ListBox_ResetContent(GetHwnd()); m_noItems = 0; - SetHorizontalExtent(); + m_updateHorizontalExtent = true; + + UpdateOldSelections(); } void wxListBox::Free() @@ -373,15 +320,7 @@ void wxListBox::Free() { WX_CLEAR_ARRAY(m_aItems); } - else #endif // wxUSE_OWNER_DRAWN - if ( HasClientObjectData() ) - { - for ( unsigned int n = 0; n < m_noItems; n++ ) - { - delete GetClientObject(n); - } - } } void wxListBox::DoSetSelection(int N, bool select) @@ -397,6 +336,8 @@ void wxListBox::DoSetSelection(int N, bool select) { SendMessage(GetHwnd(), LB_SETCURSEL, select ? N : -1, 0); } + + UpdateOldSelections(); } bool wxListBox::IsSelected(int N) const @@ -407,11 +348,6 @@ bool wxListBox::IsSelected(int N) const return SendMessage(GetHwnd(), LB_GETSEL, N, 0) == 0 ? false : true; } -wxClientData* wxListBox::DoGetItemClientObject(unsigned int n) const -{ - return (wxClientData *)DoGetItemClientData(n); -} - void *wxListBox::DoGetItemClientData(unsigned int n) const { wxCHECK_MSG( IsValid(n), NULL, @@ -420,27 +356,15 @@ void *wxListBox::DoGetItemClientData(unsigned int n) const return (void *)SendMessage(GetHwnd(), LB_GETITEMDATA, n, 0); } -void wxListBox::DoSetItemClientObject(unsigned int n, wxClientData* clientData) -{ - DoSetItemClientData(n, clientData); -} - void wxListBox::DoSetItemClientData(unsigned int n, void *clientData) { wxCHECK_RET( IsValid(n), wxT("invalid index in wxListBox::SetClientData") ); -#if wxUSE_OWNER_DRAWN - if ( m_windowStyle & wxLB_OWNERDRAW ) - { - // client data must be pointer to wxOwnerDrawn, otherwise we would crash - // in OnMeasure/OnDraw. - wxFAIL_MSG(wxT("Can't use client data with owner-drawn listboxes")); - } -#endif // wxUSE_OWNER_DRAWN - if ( ListBox_SetItemData(GetHwnd(), n, clientData) == LB_ERR ) + { wxLogDebug(wxT("LB_SETITEMDATA failed")); + } } // Return number of selections and an array of selected integers @@ -453,7 +377,7 @@ int wxListBox::GetSelections(wxArrayInt& aSelections) const int countSel = ListBox_GetSelCount(GetHwnd()); if ( countSel == LB_ERR ) { - wxLogDebug(_T("ListBox_GetSelCount failed")); + wxLogDebug(wxT("ListBox_GetSelCount failed")); } else if ( countSel != 0 ) { @@ -511,45 +435,63 @@ wxString wxListBox::GetString(unsigned int n) const return result; } -void -wxListBox::DoInsertItems(const wxArrayString& items, unsigned int pos) +int wxListBox::DoInsertItems(const wxArrayStringsAdapter & items, + unsigned int pos, + void **clientData, + wxClientDataType type) { - wxCHECK_RET( IsValidInsert(pos), - wxT("invalid index in wxListBox::InsertItems") ); + MSWAllocStorage(items, LB_INITSTORAGE); + + const bool append = pos == GetCount(); + + // we must use CB_ADDSTRING when appending as only it works correctly for + // the sorted controls + const unsigned msg = append ? LB_ADDSTRING : LB_INSERTSTRING; - unsigned int nItems = items.GetCount(); - for ( unsigned int i = 0; i < nItems; i++ ) + if ( append ) + pos = 0; + + int n = wxNOT_FOUND; + + const unsigned int numItems = items.GetCount(); + for ( unsigned int i = 0; i < numItems; i++ ) { - int idx = ListBox_InsertString(GetHwnd(), i + pos, items[i]); + n = MSWInsertOrAppendItem(pos, items[i], msg); + if ( n == wxNOT_FOUND ) + return n; + + if ( !append ) + pos++; + + ++m_noItems; #if wxUSE_OWNER_DRAWN - if ( m_windowStyle & wxLB_OWNERDRAW ) + if ( HasFlag(wxLB_OWNERDRAW) ) { - wxOwnerDrawn *pNewItem = CreateLboxItem(idx); + wxOwnerDrawn *pNewItem = CreateLboxItem(n); pNewItem->SetName(items[i]); pNewItem->SetFont(GetFont()); - m_aItems.Insert(pNewItem, idx); - - ListBox_SetItemData(GetHwnd(), idx, pNewItem); + m_aItems.Insert(pNewItem, n); } -#else - wxUnusedVar(idx); #endif // wxUSE_OWNER_DRAWN + AssignNewItemClientData(n, clientData, i, type); } - m_noItems += nItems; + m_updateHorizontalExtent = true; - SetHorizontalExtent(); + UpdateOldSelections(); + + return n; } int wxListBox::DoListHitTest(const wxPoint& point) const { - LRESULT lRes = ::SendMessage(GetHwnd(), LB_ITEMFROMPOINT, - 0L, MAKELONG(point.x, point.y)); + LRESULT lRes = ::SendMessage(GetHwnd(), LB_ITEMFROMPOINT, + 0, MAKELPARAM(point.x, point.y)); // non zero high-order word means that this item is outside of the client // area, IOW the point is outside of the listbox - return HIWORD(lRes) ? wxNOT_FOUND : lRes; + return HIWORD(lRes) ? wxNOT_FOUND : LOWORD(lRes); } void wxListBox::SetString(unsigned int n, const wxString& s) @@ -562,9 +504,9 @@ void wxListBox::SetString(unsigned int n, const wxString& s) void *oldData = NULL; wxClientData *oldObjData = NULL; - if ( m_clientDataItemsType == wxClientData_Void ) + if ( HasClientUntypedData() ) oldData = GetClientData(n); - else if ( m_clientDataItemsType == wxClientData_Object ) + else if ( HasClientObjectData() ) oldObjData = GetClientObject(n); // delete and recreate it @@ -574,7 +516,7 @@ void wxListBox::SetString(unsigned int n, const wxString& s) if ( n == (m_noItems - 1) ) newN = -1; - ListBox_InsertString(GetHwnd(), newN, s); + ListBox_InsertString(GetHwnd(), newN, s.wx_str()); // restore the client data if ( oldData ) @@ -587,9 +529,6 @@ void wxListBox::SetString(unsigned int n, const wxString& s) { // update item's text m_aItems[n]->SetName(s); - - // reassign the item's data - ListBox_SetItemData(GetHwnd(), n, m_aItems[n]); } #endif //USE_OWNER_DRAWN @@ -597,7 +536,7 @@ void wxListBox::SetString(unsigned int n, const wxString& s) if ( wasSelected ) Select(n); - SetHorizontalExtent(); + m_updateHorizontalExtent = true; } unsigned int wxListBox::GetCount() const @@ -658,7 +597,7 @@ void wxListBox::SetHorizontalExtent(const wxString& s) //else: it shouldn't change } -wxSize wxListBox::DoGetBestSize() const +wxSize wxListBox::DoGetBestClientSize() const { // find the widest string int wLine; @@ -677,22 +616,17 @@ wxSize wxListBox::DoGetBestSize() const wListbox = 100; // the listbox should be slightly larger than the widest string - int cx, cy; - wxGetCharSize(GetHWND(), &cx, &cy, GetFont()); - - wListbox += 3*cx; + wListbox += 3*GetCharWidth(); - // Add room for the scrollbar + // add room for the scrollbar wListbox += wxSystemSettings::GetMetric(wxSYS_VSCROLL_X); // don't make the listbox too tall (limit height to 10 items) but don't // make it too small neither - int hListbox = EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy)* + int hListbox = SendMessage(GetHwnd(), LB_GETITEMHEIGHT, 0, 0)* wxMin(wxMax(m_noItems, 3), 10); - wxSize best(wListbox, hListbox); - CacheBestSize(best); - return best; + return wxSize(wListbox, hListbox); } // ---------------------------------------------------------------------------- @@ -701,14 +635,25 @@ wxSize wxListBox::DoGetBestSize() const bool wxListBox::MSWCommand(WXUINT param, WXWORD WXUNUSED(id)) { + if ((param == LBN_SELCHANGE) && HasMultipleSelection()) + { + CalcAndSendEvent(); + return true; + } + wxEventType evtType; + int n; if ( param == LBN_SELCHANGE ) { evtType = wxEVT_COMMAND_LISTBOX_SELECTED; + n = SendMessage(GetHwnd(), LB_GETCARETINDEX, 0, 0); + + // NB: conveniently enough, LB_ERR is the same as wxNOT_FOUND } else if ( param == LBN_DBLCLK ) { evtType = wxEVT_COMMAND_LISTBOX_DOUBLECLICKED; + n = HitTest(ScreenToClient(wxGetMousePosition())); } else { @@ -716,25 +661,22 @@ bool wxListBox::MSWCommand(WXUINT param, WXWORD WXUNUSED(id)) return false; } - wxCommandEvent event(evtType, m_windowId); - event.SetEventObject( this ); - // retrieve the affected item - int n = SendMessage(GetHwnd(), LB_GETCARETINDEX, 0, 0); - if ( n != LB_ERR ) - { - if ( HasClientObjectData() ) - event.SetClientObject( GetClientObject(n) ); - else if ( HasClientUntypedData() ) - event.SetClientData( GetClientData(n) ); + if ( n == wxNOT_FOUND ) + return false; - event.SetString(GetString(n)); - event.SetExtraLong( HasMultipleSelection() ? IsSelected(n) : true ); - } + wxCommandEvent event(evtType, m_windowId); + event.SetEventObject(this); + + if ( HasClientObjectData() ) + event.SetClientObject( GetClientObject(n) ); + else if ( HasClientUntypedData() ) + event.SetClientData( GetClientData(n) ); + event.SetString(GetString(n)); event.SetInt(n); - return GetEventHandler()->ProcessEvent(event); + return HandleWindowEvent(event); } // ---------------------------------------------------------------------------- @@ -792,24 +734,16 @@ bool wxListBox::MSWOnDraw(WXDRAWITEMSTRUCT *item) wxCHECK( ((m_windowStyle & wxLB_OWNERDRAW) == wxLB_OWNERDRAW), false ); DRAWITEMSTRUCT *pStruct = (DRAWITEMSTRUCT *)item; - UINT itemID = pStruct->itemID; // the item may be -1 for an empty listbox - if ( itemID == (UINT)-1 ) + if ( pStruct->itemID == (UINT)-1 ) return false; - long data = ListBox_GetItemData(GetHwnd(), pStruct->itemID); - - wxCHECK( data && (data != LB_ERR), false ); - - wxListBoxItem *pItem = (wxListBoxItem *)data; + wxListBoxItem *pItem = (wxListBoxItem *)m_aItems[pStruct->itemID]; wxDCTemp dc((WXHDC)pStruct->hDC); - wxPoint pt1(pStruct->rcItem.left, pStruct->rcItem.top); - wxPoint pt2(pStruct->rcItem.right, pStruct->rcItem.bottom); - wxRect rect(pt1, pt2); - return pItem->OnDrawItem(dc, rect, + return pItem->OnDrawItem(dc, wxRectFromRECT(pStruct->rcItem), (wxOwnerDrawn::wxODAction)pStruct->itemAction, (wxOwnerDrawn::wxODStatus)pStruct->itemState); }