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@4004 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-10-15 16:28:09 +00:00
parent cb0f56f978
commit 52f13e4930
1 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/msw/treectrl.cpp
View File

@@ -1348,22 +1348,24 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
switch ( hdr->code ) switch ( hdr->code )
{ {
case NM_RCLICK: case NM_RCLICK:
{ {
if ( wxControl::MSWOnNotify(idCtrl, lParam, result) ) if ( wxControl::MSWOnNotify(idCtrl, lParam, result) )
return TRUE; return TRUE;
TV_HITTESTINFO tvhti; TV_HITTESTINFO tvhti;
::GetCursorPos(&(tvhti.pt)); ::GetCursorPos(&(tvhti.pt));
::ScreenToClient(GetHwnd(),&(tvhti.pt)); ::ScreenToClient(GetHwnd(),&(tvhti.pt));
if ((HTREEITEM) TreeView_HitTest(GetHwnd(),&tvhti) != (HTREEITEM) NULL) { if ( TreeView_HitTest(GetHwnd(),&tvhti) )
if (tvhti.flags & TVHT_ONITEM) { {
event.m_item = (WXHTREEITEM) tvhti.hItem; if( tvhti.flags & TVHT_ONITEM )
eventType=wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK; {
} event.m_item = (WXHTREEITEM) tvhti.hItem;
} eventType=wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK;
break; }
} }
break;
}
case TVN_BEGINDRAG: case TVN_BEGINDRAG:
eventType = wxEVT_COMMAND_TREE_BEGIN_DRAG; eventType = wxEVT_COMMAND_TREE_BEGIN_DRAG;
// fall through // fall through