Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 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
Download Patch File Download Diff File Expand all files Collapse all files

110
src/msw/listctrl.cpp
View File

@@ -1197,9 +1197,9 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
switch ( hdr1->code ) switch ( hdr1->code )
{ {
case LVN_BEGINRDRAG: case LVN_BEGINRDRAG:
eventType = wxEVT_COMMAND_LIST_BEGIN_RDRAG; eventType = wxEVT_COMMAND_LIST_BEGIN_RDRAG;
// fall through // fall through
case LVN_BEGINDRAG: case LVN_BEGINDRAG:
if ( eventType == wxEVT_NULL ) if ( eventType == wxEVT_NULL )
{ {
@@ -1343,60 +1343,62 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
// else translate it into wxEVT_COMMAND_LIST_ITEM_ACTIVATED event // else translate it into wxEVT_COMMAND_LIST_ITEM_ACTIVATED event
eventType = wxEVT_COMMAND_LIST_ITEM_ACTIVATED; eventType = wxEVT_COMMAND_LIST_ITEM_ACTIVATED;
break; break;
case NM_RCLICK:
/* TECH NOTE: NM_RCLICK isn't really good enough here. We want to
subclass and check for the actual WM_RBUTTONDOWN message, because
NM_RCLICK waits for the WM_RBUTTONUP message as well before firing off.
We want to have notify events for both down -and- up. */
{
// if the user processes it in wxEVT_COMMAND_RIGHT_CLICK(), don't do
// anything else
if ( wxControl::MSWOnNotify(idCtrl, lParam, result) ) {
return TRUE;
}
// else translate it into wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK event
LV_HITTESTINFO lvhti;
#ifdef __GNUWIN32__
memset(&lvhti,0,sizeof(LV_HITTESTINFO));
#else
ZeroMemory(&lvhti, sizeof(LV_HITTESTINFO)); // must set all fields to 0
#endif
::GetCursorPos(&(lvhti.pt));
::ScreenToClient(GetHwnd(),&(lvhti.pt));
#ifndef LVHT_ONITEM case NM_RCLICK:
#define LVHT_ONITEM (LVHT_ONITEMICON|LVHT_ONITEMLABEL|LVHT_ONITEMSTATEICON) /* TECH NOTE: NM_RCLICK isn't really good enough here. We want to
#endif subclass and check for the actual WM_RBUTTONDOWN message, because
NM_RCLICK waits for the WM_RBUTTONUP message as well before firing off.
if(ListView_HitTest(GetHwnd(),&lvhti)!=-1) { We want to have notify events for both down -and- up. */
if(lvhti.flags & LVHT_ONITEM) { {
eventType = wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK; // if the user processes it in wxEVT_COMMAND_RIGHT_CLICK(), don't do
event.m_itemIndex = lvhti.iItem; // anything else
} if ( wxControl::MSWOnNotify(idCtrl, lParam, result) ) {
return TRUE;
} }
}
break; // else translate it into wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK event
LV_HITTESTINFO lvhti;
/* #ifdef __GNUWIN32__
case NM_MCLICK: // ***** THERE IS NO NM_MCLICK. Subclass anyone? ****** memset(&lvhti,0,sizeof(LV_HITTESTINFO));
{ #else
// if the user processes it in wxEVT_COMMAND_MIDDLE_CLICK(), don't do ZeroMemory(&lvhti, sizeof(LV_HITTESTINFO)); // must set all fields to 0
// anything else #endif
if ( wxControl::MSWOnNotify(idCtrl, lParam, result) ) ::GetCursorPos(&(lvhti.pt));
{ ::ScreenToClient(GetHwnd(),&(lvhti.pt));
return TRUE; if ( ListView_HitTest(GetHwnd(),&lvhti) != -1 )
} {
// older headers don't have this symbol
// else translate it into wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK event #ifndef LVHT_ONITEM
eventType = wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK; #define LVHT_ONITEM \
NMITEMACTIVATE* hdr = (NMITEMACTIVATE*)lParam; (LVHT_ONITEMICON | LVHT_ONITEMLABEL | LVHT_ONITEMSTATEICON)
event.m_itemIndex = hdr->iItem; #endif
} if ( lvhti.flags & LVHT_ONITEM )
break; {
*/ eventType = wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK;
event.m_itemIndex = lvhti.iItem;
}
}
}
break;
/*
case NM_MCLICK: // ***** THERE IS NO NM_MCLICK. Subclass anyone? ******
{
// if the user processes it in wxEVT_COMMAND_MIDDLE_CLICK(), don't do
// anything else
if ( wxControl::MSWOnNotify(idCtrl, lParam, result) )
{
return TRUE;
}
// else translate it into wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK event
eventType = wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK;
NMITEMACTIVATE* hdr = (NMITEMACTIVATE*)lParam;
event.m_itemIndex = hdr->iItem;
}
break;
*/
case LVN_SETDISPINFO: case LVN_SETDISPINFO:
{ {
eventType = wxEVT_COMMAND_LIST_SET_INFO; eventType = wxEVT_COMMAND_LIST_SET_INFO;