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

Include the location of the right-click, or the item, in the MENU_ITEM event.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34203 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Kevin Hock 2005-05-21 02:58:47 +00:00
parent 8044571559
commit 147964ca88
1 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/msw/treectrl.cpp
View File

@ -2245,14 +2245,38 @@ WXLRESULT wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lPara
WXLRESULT rc = 0; WXLRESULT rc = 0;
bool isMultiple = HasFlag(wxTR_MULTIPLE); bool isMultiple = HasFlag(wxTR_MULTIPLE);
// This message is sent after a right-click, or when the "menu" key is pressed
if ( nMsg == WM_CONTEXTMENU ) if ( nMsg == WM_CONTEXTMENU )
{ {
int x = GET_X_LPARAM(lParam),
y = GET_Y_LPARAM(lParam);
// Convert the screen point to a client point
wxPoint MenuPoint = ScreenToClient(wxPoint(x, y));
wxTreeEvent event( wxEVT_COMMAND_TREE_ITEM_MENU, GetId() ); wxTreeEvent event( wxEVT_COMMAND_TREE_ITEM_MENU, GetId() );
// can't use GetSelection() here as it would assert in multiselect mode // can't use GetSelection() here as it would assert in multiselect mode
event.m_item = wxTreeItemId(TreeView_GetSelection(GetHwnd())); event.m_item = wxTreeItemId(TreeView_GetSelection(GetHwnd()));
event.SetEventObject( this ); event.SetEventObject( this );
// Get the bounding rectangle for the item, including the non-text areas
wxRect ItemRect;
GetBoundingRect(event.m_item, ItemRect, false);
// If the point is inside the bounding rectangle, use it as the click position.
// This should be the case for WM_CONTEXTMENU as the result of a right-click
if (ItemRect.Inside(MenuPoint))
{
event.m_pointDrag = MenuPoint;
}
// Use the Explorer standard of putting the menu at the left edge of the text,
// in the vertical middle of the text. Should be the case for the "menu" key
else
{
// Use the bounding rectangle of only the text part
GetBoundingRect(event.m_item, ItemRect, true);
event.m_pointDrag = wxPoint(ItemRect.GetX(), ItemRect.GetY() + ItemRect.GetHeight() / 2);
}
if ( GetEventHandler()->ProcessEvent(event) ) if ( GetEventHandler()->ProcessEvent(event) )
processed = true; processed = true;
//else: continue with generating wxEVT_CONTEXT_MENU in base class code //else: continue with generating wxEVT_CONTEXT_MENU in base class code