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

let the control process WM_RBUTTONDOWN finally, trying to do it ourselves doesn't look right and results in some weird events (see bug 1541148), it's easier to generate WM_CONTEXTMENU manually instead

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41453 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2006-09-26 00:58:49 +00:00
parent f600738e8f
commit df63b2a48f
1 changed files with 14 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/msw/treectrl.cpp
View File

@ -2050,21 +2050,6 @@ WXLRESULT wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lPara
switch ( nMsg ) switch ( nMsg )
{ {
case WM_RBUTTONDOWN:
// if the item we are about to right click on is not already
// selected or if we click outside of any item, remove the
// entire previous selection
if ( !htItem || !::IsItemSelected(GetHwnd(), htItem) )
{
UnselectAll();
}
// select item and set the focus to the
// newly selected item
::SelectItem(GetHwnd(), htItem);
::SetFocus(GetHwnd(), htItem);
break;
case WM_LBUTTONDOWN: case WM_LBUTTONDOWN:
if ( htItem && isMultiple && (tvht.flags & TVHT_ONITEM) != 0 ) if ( htItem && isMultiple && (tvht.flags & TVHT_ONITEM) != 0 )
{ {
@ -2367,32 +2352,9 @@ WXLRESULT wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lPara
WXLRESULT WXLRESULT
wxTreeCtrl::MSWDefWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) wxTreeCtrl::MSWDefWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
{ {
// default WM_RBUTTONDOWN handler enters modal loop inside DefWindowProc()
// waiting for WM_RBUTTONUP and then sends the resulting WM_CONTEXTMENU to
// the parent window, not us, which completely breaks everything so simply
// don't let it see this message at all
if ( nMsg == WM_RBUTTONDOWN )
return 0;
// but because of the above we don't get NM_RCLICK which is normally
// generated by tree window proc when the modal loop mentioned above ends
// because the mouse is released -- synthesize it ourselves instead
if ( nMsg == WM_RBUTTONUP )
{
NMHDR hdr;
hdr.hwndFrom = GetHwnd();
hdr.idFrom = GetId();
hdr.code = NM_RCLICK;
WXLPARAM rc;
MSWOnNotify(GetId(), (LPARAM)&hdr, &rc);
// continue as usual
}
if ( nMsg == WM_CHAR ) if ( nMsg == WM_CHAR )
{ {
// also don't let the control process Space and Return keys because it // don't let the control process Space and Return keys because it
// doesn't do anything useful with them anyhow but always beeps // doesn't do anything useful with them anyhow but always beeps
// annoyingly when it receives them and there is no way to turn it off // annoyingly when it receives them and there is no way to turn it off
// simply if you just process TREEITEM_ACTIVATED event to which Space // simply if you just process TREEITEM_ACTIVATED event to which Space
@ -2503,8 +2465,8 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
break; break;
} }
#endif #endif // TVN_GETINFOTIP
#endif #endif // !__WXWINCE__
case TVN_GETDISPINFO: case TVN_GETDISPINFO:
eventType = wxEVT_COMMAND_TREE_GET_INFO; eventType = wxEVT_COMMAND_TREE_GET_INFO;
@ -2775,6 +2737,17 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
*result = false; *result = false;
break; break;
case NM_RCLICK:
// prevent tree control from sending WM_CONTEXTMENU to our parent
// (which it does if NM_RCLICK is not handled) because we want to
// send it to the control itself
*result =
processed = true;
::SendMessage(GetHwnd(), WM_CONTEXTMENU,
(WPARAM)GetHwnd(), ::GetMessagePos());
break;
case TVN_BEGINDRAG: case TVN_BEGINDRAG:
case TVN_BEGINRDRAG: case TVN_BEGINRDRAG:
if ( event.IsAllowed() ) if ( event.IsAllowed() )