X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e10092956ff2f45fde27c3865e7a123af1aba731..b404a8f3b072129c107c6d9a5e0f6f53cd34807b:/src/msw/listbox.cpp diff --git a/src/msw/listbox.cpp b/src/msw/listbox.cpp index 78d76fdfab..69565096f7 100644 --- a/src/msw/listbox.cpp +++ b/src/msw/listbox.cpp @@ -40,75 +40,6 @@ #include "wx/ownerdrw.h" #endif -#if wxUSE_EXTENDED_RTTI -WX_DEFINE_FLAGS( wxListBoxStyle ) - -wxBEGIN_FLAGS( wxListBoxStyle ) - // new style border flags, we put them first to - // use them for streaming out - wxFLAGS_MEMBER(wxBORDER_SIMPLE) - wxFLAGS_MEMBER(wxBORDER_SUNKEN) - wxFLAGS_MEMBER(wxBORDER_DOUBLE) - wxFLAGS_MEMBER(wxBORDER_RAISED) - wxFLAGS_MEMBER(wxBORDER_STATIC) - wxFLAGS_MEMBER(wxBORDER_NONE) - - // old style border flags - wxFLAGS_MEMBER(wxSIMPLE_BORDER) - wxFLAGS_MEMBER(wxSUNKEN_BORDER) - wxFLAGS_MEMBER(wxDOUBLE_BORDER) - wxFLAGS_MEMBER(wxRAISED_BORDER) - wxFLAGS_MEMBER(wxSTATIC_BORDER) - wxFLAGS_MEMBER(wxBORDER) - - // standard window styles - wxFLAGS_MEMBER(wxTAB_TRAVERSAL) - wxFLAGS_MEMBER(wxCLIP_CHILDREN) - wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW) - wxFLAGS_MEMBER(wxWANTS_CHARS) - wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE) - wxFLAGS_MEMBER(wxALWAYS_SHOW_SB ) - wxFLAGS_MEMBER(wxVSCROLL) - wxFLAGS_MEMBER(wxHSCROLL) - - wxFLAGS_MEMBER(wxLB_SINGLE) - wxFLAGS_MEMBER(wxLB_MULTIPLE) - wxFLAGS_MEMBER(wxLB_EXTENDED) - 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 ) - -IMPLEMENT_DYNAMIC_CLASS_XTI(wxListBox, wxControlWithItems,"wx/listbox.h") - -wxBEGIN_PROPERTIES_TABLE(wxListBox) - wxEVENT_PROPERTY( Select , wxEVT_COMMAND_LISTBOX_SELECTED , wxCommandEvent ) - wxEVENT_PROPERTY( DoubleClick , wxEVT_COMMAND_LISTBOX_DOUBLECLICKED , wxCommandEvent ) - - wxPROPERTY( Font , wxFont , SetFont , GetFont , EMPTY_MACROVALUE, 0 /*flags*/ , wxT("Helpstring") , wxT("group")) - wxPROPERTY_COLLECTION( Choices , wxArrayString , wxString , AppendString , GetStrings, 0 /*flags*/ , wxT("Helpstring") , wxT("group") ) - wxPROPERTY( Selection ,int, SetSelection, GetSelection, EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group") ) - wxPROPERTY_FLAGS( WindowStyle , wxListBoxStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style -wxEND_PROPERTIES_TABLE() - -wxBEGIN_HANDLERS_TABLE(wxListBox) -wxEND_HANDLERS_TABLE() - -wxCONSTRUCTOR_4( wxListBox , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size ) -#else -IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControlWithItems) -#endif - -/* -TODO PROPERTIES - selection - content - item -*/ - // ============================================================================ // list box item declaration and implementation // ============================================================================ @@ -149,11 +80,11 @@ wxOwnerDrawn *wxListBox::CreateLboxItem(size_t WXUNUSED(n)) // creation // ---------------------------------------------------------------------------- -// Listbox item -wxListBox::wxListBox() +void wxListBox::Init() { m_noItems = 0; m_updateHorizontalExtent = false; + m_selectedByKeyboard = false; } bool wxListBox::Create(wxWindow *parent, @@ -165,9 +96,6 @@ bool wxListBox::Create(wxWindow *parent, const wxValidator& validator, const wxString& name) { - m_noItems = 0; - m_updateHorizontalExtent = false; - // initialize base class fields if ( !CreateControl(parent, id, pos, size, style, validator, name) ) return false; @@ -186,7 +114,6 @@ bool wxListBox::Create(wxWindow *parent, } // now we can compute our best size correctly, so do it again - InvalidateBestSize(); SetInitialSize(size); return true; @@ -269,6 +196,22 @@ void wxListBox::OnInternalIdle() } } +void wxListBox::MSWOnItemsChanged() +{ + // we need to do two things when items change: update their max horizontal + // extent so that horizontal scrollbar could be shown or hidden as + // appropriate and also invlaidate the best size + // + // updating the max extent is slow (it's an O(N) operation) and so we defer + // it until the idle time but the best size should be invalidated + // immediately doing it in idle time is too late -- layout using incorrect + // old best size will have been already done by then + + m_updateHorizontalExtent = true; + + InvalidateBestSize(); +} + // ---------------------------------------------------------------------------- // implementation of wxListBoxBase methods // ---------------------------------------------------------------------------- @@ -297,8 +240,7 @@ void wxListBox::DoDeleteOneItem(unsigned int n) SendMessage(GetHwnd(), LB_DELETESTRING, n, 0); m_noItems--; - // SetHorizontalExtent(wxEmptyString); can be slow - m_updateHorizontalExtent = true; + MSWOnItemsChanged(); UpdateOldSelections(); } @@ -328,7 +270,7 @@ void wxListBox::DoClear() ListBox_ResetContent(GetHwnd()); m_noItems = 0; - m_updateHorizontalExtent = true; + MSWOnItemsChanged(); UpdateOldSelections(); } @@ -340,7 +282,11 @@ void wxListBox::DoSetSelection(int N, bool select) if ( HasMultipleSelection() ) { - SendMessage(GetHwnd(), LB_SETSEL, select, N); + // Setting selection to -1 should deselect everything. + const bool deselectAll = N == wxNOT_FOUND; + SendMessage(GetHwnd(), LB_SETSEL, + deselectAll ? FALSE : select, + deselectAll ? -1 : N); } else { @@ -360,17 +306,11 @@ bool wxListBox::IsSelected(int N) const void *wxListBox::DoGetItemClientData(unsigned int n) const { - wxCHECK_MSG( IsValid(n), NULL, - wxT("invalid index in wxListBox::GetClientData") ); - return (void *)SendMessage(GetHwnd(), LB_GETITEMDATA, n, 0); } void wxListBox::DoSetItemClientData(unsigned int n, void *clientData) { - wxCHECK_RET( IsValid(n), - wxT("invalid index in wxListBox::SetClientData") ); - if ( ListBox_SetItemData(GetHwnd(), n, clientData) == LB_ERR ) { wxLogDebug(wxT("LB_SETITEMDATA failed")); @@ -486,7 +426,7 @@ int wxListBox::DoInsertItems(const wxArrayStringsAdapter & items, AssignNewItemClientData(n, clientData, i, type); } - m_updateHorizontalExtent = true; + MSWOnItemsChanged(); UpdateOldSelections(); @@ -537,7 +477,7 @@ void wxListBox::SetString(unsigned int n, const wxString& s) if ( wasSelected ) Select(n); - m_updateHorizontalExtent = true; + MSWOnItemsChanged(); } unsigned int wxListBox::GetCount() const @@ -551,9 +491,6 @@ unsigned int wxListBox::GetCount() const void wxListBox::SetHorizontalExtent(const wxString& s) { - // in any case, our best size could have changed - InvalidateBestSize(); - // the rest is only necessary if we want a horizontal scrollbar if ( !HasFlag(wxHSCROLL) ) return; @@ -636,25 +573,30 @@ wxSize wxListBox::DoGetBestClientSize() const bool wxListBox::MSWCommand(WXUINT param, WXWORD WXUNUSED(id)) { - if ((param == LBN_SELCHANGE) && HasMultipleSelection()) - { - CalcAndSendEvent(); - return true; - } - wxEventType evtType; - int n; + int n = wxNOT_FOUND; if ( param == LBN_SELCHANGE ) { + if ( HasMultipleSelection() ) + return CalcAndSendEvent(); + evtType = wxEVT_COMMAND_LISTBOX_SELECTED; - n = SendMessage(GetHwnd(), LB_GETCARETINDEX, 0, 0); - // NB: conveniently enough, LB_ERR is the same as wxNOT_FOUND + if ( m_selectedByKeyboard ) + { + // We shouldn't use the mouse position to find the item as mouse + // can be anywhere, ask the listbox itself. Notice that this can't + // be used when the item is selected using the mouse however as + // LB_GETCARETINDEX will always return a valid item, even if the + // mouse is clicked below all the items, which is why we find the + // item ourselves below in this case. + n = SendMessage(GetHwnd(), LB_GETCARETINDEX, 0, 0); + } + //else: n will be determined below from the mouse position } else if ( param == LBN_DBLCLK ) { evtType = wxEVT_COMMAND_LISTBOX_DOUBLECLICKED; - n = HitTest(ScreenToClient(wxGetMousePosition())); } else { @@ -662,22 +604,42 @@ bool wxListBox::MSWCommand(WXUINT param, WXWORD WXUNUSED(id)) return false; } - // retrieve the affected item + // Find the item position if it was a mouse-generated selection event or a + // double click event (which is always generated using the mouse) if ( n == wxNOT_FOUND ) - return false; + { + const DWORD pos = ::GetMessagePos(); + const wxPoint pt(GET_X_LPARAM(pos), GET_Y_LPARAM(pos)); + n = HitTest(ScreenToClient(wxPoint(pt))); + } + + // We get events even when mouse is clicked outside of any valid item from + // Windows, just ignore them. + if ( n == wxNOT_FOUND ) + return false; - wxCommandEvent event(evtType, m_windowId); - event.SetEventObject(this); + if ( param == LBN_SELCHANGE ) + { + if ( !DoChangeSingleSelection(n) ) + return false; + } - if ( HasClientObjectData() ) - event.SetClientObject( GetClientObject(n) ); - else if ( HasClientUntypedData() ) - event.SetClientData( GetClientData(n) ); + // Do generate an event otherwise. + return SendEvent(evtType, n, true /* selection */); +} - event.SetString(GetString(n)); - event.SetInt(n); +WXLRESULT +wxListBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) +{ + // Remember whether there was a keyboard or mouse event before + // LBN_SELCHANGE: this allows us to correctly determine the item affected + // by it in MSWCommand() above in any case. + if ( WM_KEYFIRST <= nMsg && nMsg <= WM_KEYLAST ) + m_selectedByKeyboard = true; + else if ( WM_MOUSEFIRST <= nMsg && nMsg <= WM_MOUSELAST ) + m_selectedByKeyboard = false; - return HandleWindowEvent(event); + return wxListBoxBase::MSWWindowProc(nMsg, wParam, lParam); } // ----------------------------------------------------------------------------