resolved a conflict
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4003 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
5b7f1aab47
commit
cb0f56f978
@ -1365,13 +1365,15 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
|
||||
#endif
|
||||
::GetCursorPos(&(lvhti.pt));
|
||||
::ScreenToClient(GetHwnd(),&(lvhti.pt));
|
||||
|
||||
if ( ListView_HitTest(GetHwnd(),&lvhti) != -1 )
|
||||
{
|
||||
// older headers don't have this symbol
|
||||
#ifndef LVHT_ONITEM
|
||||
#define LVHT_ONITEM (LVHT_ONITEMICON|LVHT_ONITEMLABEL|LVHT_ONITEMSTATEICON)
|
||||
#define LVHT_ONITEM \
|
||||
(LVHT_ONITEMICON | LVHT_ONITEMLABEL | LVHT_ONITEMSTATEICON)
|
||||
#endif
|
||||
|
||||
if(ListView_HitTest(GetHwnd(),&lvhti)!=-1) {
|
||||
if(lvhti.flags & LVHT_ONITEM) {
|
||||
if ( lvhti.flags & LVHT_ONITEM )
|
||||
{
|
||||
eventType = wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK;
|
||||
event.m_itemIndex = lvhti.iItem;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user