AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

resolved a conflict

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4003 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 1999-10-15 16:21:25 +00:00
parent 5b7f1aab47
commit cb0f56f978
1 changed files with 56 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/msw/listctrl.cpp
View File

@ -1365,13 +1365,15 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
#endif #endif
::GetCursorPos(&(lvhti.pt)); ::GetCursorPos(&(lvhti.pt));
::ScreenToClient(GetHwnd(),&(lvhti.pt)); ::ScreenToClient(GetHwnd(),&(lvhti.pt));
if ( ListView_HitTest(GetHwnd(),&lvhti) != -1 )
{
// older headers don't have this symbol
#ifndef LVHT_ONITEM #ifndef LVHT_ONITEM
#define LVHT_ONITEM (LVHT_ONITEMICON|LVHT_ONITEMLABEL|LVHT_ONITEMSTATEICON) #define LVHT_ONITEM \
(LVHT_ONITEMICON | LVHT_ONITEMLABEL | LVHT_ONITEMSTATEICON)
#endif #endif
if ( lvhti.flags & LVHT_ONITEM )
if(ListView_HitTest(GetHwnd(),&lvhti)!=-1) { {
if(lvhti.flags & LVHT_ONITEM) {
eventType = wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK; eventType = wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK;
event.m_itemIndex = lvhti.iItem; event.m_itemIndex = lvhti.iItem;
} }