Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use correct item index for wxEVT_COMMAND_LISTBOX_DOUBLECLICKED events (see #10429)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58405 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-01-25 18:09:00 +00:00
parent c1099d9254
commit 44e7bad0d4
1 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/msw/listbox.cpp
View File

@@ -479,12 +479,12 @@ int wxListBox::DoInsertItems(const wxArrayStringsAdapter & items,
int wxListBox::DoListHitTest(const wxPoint& point) const int wxListBox::DoListHitTest(const wxPoint& point) const
{ {
LRESULT lRes = ::SendMessage(GetHwnd(), LB_ITEMFROMPOINT, LRESULT lRes = ::SendMessage(GetHwnd(), LB_ITEMFROMPOINT,
0L, MAKELONG(point.x, point.y)); 0, MAKELPARAM(point.x, point.y));
// non zero high-order word means that this item is outside of the client // non zero high-order word means that this item is outside of the client
// area, IOW the point is outside of the listbox // 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) void wxListBox::SetString(unsigned int n, const wxString& s)
@@ -640,13 +640,18 @@ bool wxListBox::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
} }
wxEventType evtType; wxEventType evtType;
int n;
if ( param == LBN_SELCHANGE ) if ( param == LBN_SELCHANGE )
{ {
evtType = wxEVT_COMMAND_LISTBOX_SELECTED; 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 ) else if ( param == LBN_DBLCLK )
{ {
evtType = wxEVT_COMMAND_LISTBOX_DOUBLECLICKED; evtType = wxEVT_COMMAND_LISTBOX_DOUBLECLICKED;
n = HitTest(ScreenToClient(wxGetMousePosition()));
} }
else else
{ {
@@ -654,25 +659,19 @@ bool wxListBox::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
return false; return false;
} }
wxCommandEvent event(evtType, m_windowId);
event.SetEventObject( this );
// retrieve the affected item // retrieve the affected item
int n = SendMessage(GetHwnd(), LB_GETCARETINDEX, 0, 0); if ( n == wxNOT_FOUND )
if ( n != LB_ERR )
{
if ( HasClientObjectData() )
event.SetClientObject( GetClientObject(n) );
else if ( HasClientUntypedData() )
event.SetClientData( GetClientData(n) );
event.SetString(GetString(n));
}
else
{
return false; return false;
}
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); event.SetInt(n);
return HandleWindowEvent(event); return HandleWindowEvent(event);