Skipping Right_down event if generated context menu event is not handled
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20222 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -2084,7 +2084,7 @@ void wxWindowMac::OnMouseEvent( wxMouseEvent &event )
|
||||
if ( event.GetEventType() == wxEVT_RIGHT_DOWN )
|
||||
{
|
||||
// copied from wxGTK : CS
|
||||
// generate a "context menu" event: this is similar to wxEVT_RIGHT_UP
|
||||
// generate a "context menu" event: this is similar to wxEVT_RIGHT_DOWN
|
||||
// except that:
|
||||
//
|
||||
// (a) it's a command event and so is propagated to the parent
|
||||
@@ -2093,7 +2093,8 @@ void wxWindowMac::OnMouseEvent( wxMouseEvent &event )
|
||||
wxContextMenuEvent evtCtx(wxEVT_CONTEXT_MENU,
|
||||
this->GetId(),
|
||||
this->ClientToScreen(event.GetPosition()));
|
||||
this->GetEventHandler()->ProcessEvent(evtCtx);
|
||||
if ( ! GetEventHandler()->ProcessEvent(evtCtx) )
|
||||
event.Skip() ;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@@ -2084,7 +2084,7 @@ void wxWindowMac::OnMouseEvent( wxMouseEvent &event )
|
||||
if ( event.GetEventType() == wxEVT_RIGHT_DOWN )
|
||||
{
|
||||
// copied from wxGTK : CS
|
||||
// generate a "context menu" event: this is similar to wxEVT_RIGHT_UP
|
||||
// generate a "context menu" event: this is similar to wxEVT_RIGHT_DOWN
|
||||
// except that:
|
||||
//
|
||||
// (a) it's a command event and so is propagated to the parent
|
||||
@@ -2093,7 +2093,8 @@ void wxWindowMac::OnMouseEvent( wxMouseEvent &event )
|
||||
wxContextMenuEvent evtCtx(wxEVT_CONTEXT_MENU,
|
||||
this->GetId(),
|
||||
this->ClientToScreen(event.GetPosition()));
|
||||
this->GetEventHandler()->ProcessEvent(evtCtx);
|
||||
if ( ! GetEventHandler()->ProcessEvent(evtCtx) )
|
||||
event.Skip() ;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
Reference in New Issue
Block a user