From 249aad307f8396980986481ef17bebe966a91ab3 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Tue, 15 Apr 2003 17:07:27 +0000 Subject: [PATCH] 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 --- src/mac/carbon/window.cpp | 5 +++-- src/mac/window.cpp | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp index 9f7a20f4e7..c0cd298e80 100644 --- a/src/mac/carbon/window.cpp +++ b/src/mac/carbon/window.cpp @@ -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 { diff --git a/src/mac/window.cpp b/src/mac/window.cpp index 9f7a20f4e7..c0cd298e80 100644 --- a/src/mac/window.cpp +++ b/src/mac/window.cpp @@ -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 { -- 2.45.2