X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/24ee1bef74a8f403ad3df207edd9d656648c4da5..43c42c18d36c703a88b1b7b697bac27fe5608eca:/src/msw/listbox.cpp?ds=sidebyside diff --git a/src/msw/listbox.cpp b/src/msw/listbox.cpp index 52fe4d0c4d..e8191c5a55 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 // ============================================================================ @@ -153,7 +84,6 @@ void wxListBox::Init() { m_noItems = 0; m_updateHorizontalExtent = false; - m_selectedByKeyboard = false; } bool wxListBox::Create(wxWindow *parent, @@ -320,7 +250,7 @@ int wxListBox::FindString(const wxString& s, bool bCase) const if (bCase) return wxItemContainerImmutable::FindString( s, bCase ); - int pos = ListBox_FindStringExact(GetHwnd(), -1, s.wx_str()); + int pos = ListBox_FindStringExact(GetHwnd(), -1, s.t_str()); if (pos == LB_ERR) return wxNOT_FOUND; else @@ -351,7 +281,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 { @@ -371,17 +305,19 @@ bool wxListBox::IsSelected(int N) const void *wxListBox::DoGetItemClientData(unsigned int n) const { - wxCHECK_MSG( IsValid(n), NULL, - wxT("invalid index in wxListBox::GetClientData") ); + LPARAM rc = SendMessage(GetHwnd(), LB_GETITEMDATA, n, 0); + if ( rc == LB_ERR && GetLastError() != ERROR_SUCCESS ) + { + wxLogLastError(wxT("LB_GETITEMDATA")); + + return NULL; + } - return (void *)SendMessage(GetHwnd(), LB_GETITEMDATA, n, 0); + return (void *)rc; } 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")); @@ -536,7 +472,7 @@ void wxListBox::SetString(unsigned int n, const wxString& s) if ( n == (m_noItems - 1) ) newN = -1; - ListBox_InsertString(GetHwnd(), newN, s.wx_str()); + ListBox_InsertString(GetHwnd(), newN, s.t_str()); // restore the client data if ( oldData ) @@ -645,29 +581,24 @@ wxSize wxListBox::DoGetBestClientSize() const bool wxListBox::MSWCommand(WXUINT param, WXWORD WXUNUSED(id)) { wxEventType evtType; - int n = wxNOT_FOUND; if ( param == LBN_SELCHANGE ) { if ( HasMultipleSelection() ) return CalcAndSendEvent(); - evtType = wxEVT_COMMAND_LISTBOX_SELECTED; - - 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 + evtType = wxEVT_LISTBOX; } else if ( param == LBN_DBLCLK ) { - evtType = wxEVT_COMMAND_LISTBOX_DOUBLECLICKED; + // Clicking under the last item in the listbox generates double click + // event for the currently selected item which is rather surprising. + // Avoid the surprise by checking that we do have an item under mouse. + const DWORD pos = ::GetMessagePos(); + const wxPoint pt(GET_X_LPARAM(pos), GET_Y_LPARAM(pos)); + if ( HitTest(ScreenToClient(pt)) == wxNOT_FOUND ) + return false; + + evtType = wxEVT_LISTBOX_DCLICK; } else { @@ -675,14 +606,7 @@ bool wxListBox::MSWCommand(WXUINT param, WXWORD WXUNUSED(id)) return false; } - // 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 ) - { - const DWORD pos = ::GetMessagePos(); - const wxPoint pt(GET_X_LPARAM(pos), GET_Y_LPARAM(pos)); - n = HitTest(ScreenToClient(wxPoint(pt))); - } + const int n = ListBox_GetCurSel(GetHwnd()); // We get events even when mouse is clicked outside of any valid item from // Windows, just ignore them. @@ -699,20 +623,6 @@ bool wxListBox::MSWCommand(WXUINT param, WXWORD WXUNUSED(id)) return SendEvent(evtType, n, true /* selection */); } -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 wxListBoxBase::MSWWindowProc(nMsg, wParam, lParam); -} - // ---------------------------------------------------------------------------- // owner-drawn list boxes support // ----------------------------------------------------------------------------