diff options
| author | nyamatongwe <unknown> | 2002-07-05 13:15:06 +0000 |
|---|---|---|
| committer | nyamatongwe <unknown> | 2002-07-05 13:15:06 +0000 |
| commit | 521ce6c9c3abd57a3df3d5c5ce670fc9606e3317 (patch) | |
| tree | ae6d56a01e72d5c4ba4b0da764e48d20882ecb59 /src/ScintillaBase.cxx | |
| parent | 08715d659d326ff53460dec24f00c447f7a89bb6 (diff) | |
| download | scintilla-mirror-521ce6c9c3abd57a3df3d5c5ce670fc9606e3317.tar.gz | |
Added check in ScintillaBase::Context menu to stop popup when feature
turned off. This check had been in the platform layer.
Diffstat (limited to 'src/ScintillaBase.cxx')
| -rw-r--r-- | src/ScintillaBase.cxx | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/src/ScintillaBase.cxx b/src/ScintillaBase.cxx index 617cef26f..1238e2ecb 100644 --- a/src/ScintillaBase.cxx +++ b/src/ScintillaBase.cxx @@ -337,18 +337,20 @@ void ScintillaBase::AutoCompleteCompleted() { } void ScintillaBase::ContextMenu(Point pt) { - bool writable = !WndProc(SCI_GETREADONLY, 0, 0); - popup.CreatePopUp(); - AddToPopUp("Undo", idcmdUndo, writable && pdoc->CanUndo()); - AddToPopUp("Redo", idcmdRedo, writable && pdoc->CanRedo()); - AddToPopUp(""); - AddToPopUp("Cut", idcmdCut, writable && currentPos != anchor); - AddToPopUp("Copy", idcmdCopy, currentPos != anchor); - AddToPopUp("Paste", idcmdPaste, writable && WndProc(SCI_CANPASTE, 0, 0)); - AddToPopUp("Delete", idcmdDelete, writable && currentPos != anchor); - AddToPopUp(""); - AddToPopUp("Select All", idcmdSelectAll); - popup.Show(pt, wMain); + if (displayPopupMenu) { + bool writable = !WndProc(SCI_GETREADONLY, 0, 0); + popup.CreatePopUp(); + AddToPopUp("Undo", idcmdUndo, writable && pdoc->CanUndo()); + AddToPopUp("Redo", idcmdRedo, writable && pdoc->CanRedo()); + AddToPopUp(""); + AddToPopUp("Cut", idcmdCut, writable && currentPos != anchor); + AddToPopUp("Copy", idcmdCopy, currentPos != anchor); + AddToPopUp("Paste", idcmdPaste, writable && WndProc(SCI_CANPASTE, 0, 0)); + AddToPopUp("Delete", idcmdDelete, writable && currentPos != anchor); + AddToPopUp(""); + AddToPopUp("Select All", idcmdSelectAll); + popup.Show(pt, wMain); + } } void ScintillaBase::CancelModes() { |