diff --git a/vstgui/plugin-bindings/vst3editor.cpp b/vstgui/plugin-bindings/vst3editor.cpp
index e3fc3daf9..4609bcfe2 100644
--- a/vstgui/plugin-bindings/vst3editor.cpp
+++ b/vstgui/plugin-bindings/vst3editor.cpp
@@ -819,9 +819,11 @@ static void addCOptionMenuEntriesToIContextMenu (VST3Editor* editor, COptionMenu
 #endif
 
 //-----------------------------------------------------------------------------
-CMouseEventResult VST3Editor::onMouseDown (CFrame* frame, const CPoint& where, const CButtonState& buttons)
+void VST3Editor::onMouseEvent (MouseEvent& event, CFrame* frame)
 {
-	CMouseEventResult result = kMouseEventNotHandled;
+	if (event.type != EventType::MouseDown)
+		return;
+
 	if (buttons.isRightButton ())
 	{
 		COptionMenu* controllerMenu = (delegate && editingEnabled == false) ? delegate->createContextMenu (where, this) : nullptr;
@@ -894,10 +896,10 @@ CMouseEventResult VST3Editor::onMouseDown (CFrame* frame, const CPoint& where, c
 					                    static_cast<Steinberg::UCoord> (where2.y));
 					contextMenu->release ();
 				});
-				result = kMouseEventHandled;
+				event.consumed = true;
 			}
 		}
-		if (result == kMouseEventNotHandled)
+		if (!event.consumed)
 		{
 	#endif
 			if (controllerMenu)
@@ -910,13 +912,12 @@ CMouseEventResult VST3Editor::onMouseDown (CFrame* frame, const CPoint& where, c
 					controllerMenu->popup (blockFrame, where);
 					controllerMenu->forget ();
 				});
-				result = kMouseEventHandled;
+				event.consumed = true;
 			}
 		}
 		if (controllerMenu)
 			controllerMenu->forget ();
 	}
-	return result;
 }
 
 //-----------------------------------------------------------------------------
diff --git a/vstgui/plugin-bindings/vst3editor.h b/vstgui/plugin-bindings/vst3editor.h
index ee6546ec1..6b79732e9 100644
--- a/vstgui/plugin-bindings/vst3editor.h
+++ b/vstgui/plugin-bindings/vst3editor.h
@@ -129,8 +129,7 @@ class VST3Editor : public Steinberg::Vst::VSTGUIEditor,
 	// IMouseObserver
 	void onMouseEntered (CView* view, CFrame* frame) override {}
 	void onMouseExited (CView* view, CFrame* frame) override {}
-	CMouseEventResult onMouseMoved (CFrame* frame, const CPoint& where, const CButtonState& buttons) override { return kMouseEventNotHandled; }
-	CMouseEventResult onMouseDown (CFrame* frame, const CPoint& where, const CButtonState& buttons) override;
+	void onMouseEvent (MouseEvent& event, CFrame* frame) override;
 
 	// CommandMenuItemTargetAdapter
 	bool validateCommandMenuItem (CCommandMenuItem* item) override;