X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/316bba0c7207ceff140d0d8271962ad7c001ba8a..739c5499fcab1c165b8dd0591c9fd9e2329b3cf9:/src/msw/listbox.cpp?ds=sidebyside diff --git a/src/msw/listbox.cpp b/src/msw/listbox.cpp index d36f5ab109..9f9720f39a 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,8 +80,7 @@ wxOwnerDrawn *wxListBox::CreateLboxItem(size_t WXUNUSED(n)) // creation // ---------------------------------------------------------------------------- -// Listbox item -wxListBox::wxListBox() +void wxListBox::Init() { m_noItems = 0; m_updateHorizontalExtent = false; @@ -165,9 +95,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; @@ -323,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 @@ -354,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 { @@ -374,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")); @@ -539,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 ) @@ -647,25 +580,25 @@ wxSize wxListBox::DoGetBestClientSize() 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); + if ( HasMultipleSelection() ) + return CalcAndSendEvent(); - // NB: conveniently enough, LB_ERR is the same as wxNOT_FOUND + evtType = wxEVT_COMMAND_LISTBOX_SELECTED; } else if ( param == LBN_DBLCLK ) { + // 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_COMMAND_LISTBOX_DOUBLECLICKED; - n = HitTest(ScreenToClient(wxGetMousePosition())); } else { @@ -673,22 +606,21 @@ bool wxListBox::MSWCommand(WXUINT param, WXWORD WXUNUSED(id)) return false; } - // retrieve the affected item - if ( n == wxNOT_FOUND ) - return false; - - wxCommandEvent event(evtType, m_windowId); - event.SetEventObject(this); + const int n = ListBox_GetCurSel(GetHwnd()); - if ( HasClientObjectData() ) - event.SetClientObject( GetClientObject(n) ); - else if ( HasClientUntypedData() ) - event.SetClientData( GetClientData(n) ); + // We get events even when mouse is clicked outside of any valid item from + // Windows, just ignore them. + if ( n == wxNOT_FOUND ) + return false; - event.SetString(GetString(n)); - event.SetInt(n); + if ( param == LBN_SELCHANGE ) + { + if ( !DoChangeSingleSelection(n) ) + return false; + } - return HandleWindowEvent(event); + // Do generate an event otherwise. + return SendEvent(evtType, n, true /* selection */); } // ----------------------------------------------------------------------------