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 5e3d95b65a799ce0b8155fb27bbc3d0d9ff39a7c..50bfac2f18b2b53a92956a4946ea0e883c52459c 100644 (file)
--- 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) {
 
 
 void ScintillaWX::DoContextMenu(Point pt) {

-    ContextMenu(pt);
+    if (displayPopupMenu)
+        ContextMenu(pt);

 }
 
 void ScintillaWX::DoOnListBox() {
 }
 
 void ScintillaWX::DoOnListBox() {

diff --git a/src/stc/ScintillaWX.cpp b/src/stc/ScintillaWX.cpp
index 5e3d95b65a799ce0b8155fb27bbc3d0d9ff39a7c..50bfac2f18b2b53a92956a4946ea0e883c52459c 100644 (file)
--- a/src/stc/ScintillaWX.cpp
+++ b/src/stc/ScintillaWX.cpp
@@ -578,7 +578,8 @@ void ScintillaWX::DoCommand(int ID) {
 
 
 void ScintillaWX::DoContextMenu(Point pt) {
 
 
 void ScintillaWX::DoContextMenu(Point pt) {

-    ContextMenu(pt);
+    if (displayPopupMenu)
+        ContextMenu(pt);

 }
 
 void ScintillaWX::DoOnListBox() {
 }
 
 void ScintillaWX::DoOnListBox() {