From: Robin Dunn <robin@alldunn.com>
Date: Sat, 6 Jul 2002 00:47:02 +0000 (+0000)
Subject: Actually check if the menu should be shown before popping it up
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/752cd08c659c7393bacbfe4305760f4ee58a8255

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
---

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() {