From 752cd08c659c7393bacbfe4305760f4ee58a8255 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Sat, 6 Jul 2002 00:47:02 +0000 Subject: [PATCH] Actually check if the menu should be shown before popping it up git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16052 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- contrib/src/stc/ScintillaWX.cpp | 3 ++- src/stc/ScintillaWX.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/contrib/src/stc/ScintillaWX.cpp b/contrib/src/stc/ScintillaWX.cpp index 5e3d95b65a..50bfac2f18 100644 --- a/contrib/src/stc/ScintillaWX.cpp +++ b/contrib/src/stc/ScintillaWX.cpp @@ -578,7 +578,8 @@ void ScintillaWX::DoCommand(int ID) { void ScintillaWX::DoContextMenu(Point pt) { - ContextMenu(pt); + if (displayPopupMenu) + ContextMenu(pt); } void ScintillaWX::DoOnListBox() { diff --git a/src/stc/ScintillaWX.cpp b/src/stc/ScintillaWX.cpp index 5e3d95b65a..50bfac2f18 100644 --- a/src/stc/ScintillaWX.cpp +++ b/src/stc/ScintillaWX.cpp @@ -578,7 +578,8 @@ void ScintillaWX::DoCommand(int ID) { void ScintillaWX::DoContextMenu(Point pt) { - ContextMenu(pt); + if (displayPopupMenu) + ContextMenu(pt); } void ScintillaWX::DoOnListBox() { -- 2.45.2