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

diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp
index 9f7a20f4e7a0be3afa0b3844757d33b1002d5032..c0cd298e80c76829cfd01d5af2c833aabcb389d7 100644 (file)
--- 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 9f7a20f4e7a0be3afa0b3844757d33b1002d5032..c0cd298e80c76829cfd01d5af2c833aabcb389d7 100644 (file)
--- 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
        {