AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Propagate EVT_CONTEXT_MENU if standard Scintilla context menu wasn't displayed

Browse Source 
EVT_CONTEXT_MENU event should be consumed in the event handler only if Scintilla context menu was actually displayed.
This commit is contained in:
Artur Wieczorek 2017-03-16 23:36:54 +01:00
parent 962979ebf1
commit cbbd7b44b2
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/stc/ScintillaWX.cpp
View File

@ -1143,9 +1143,13 @@ void ScintillaWX::DoCommand(int ID) {
} }
void ScintillaWX::DoContextMenu(Point pt) { bool ScintillaWX::DoContextMenu(Point pt) {
if (ShouldDisplayPopup(pt)) if (ShouldDisplayPopup(pt))
{
ContextMenu(pt); ContextMenu(pt);
return true;
}
return false;
} }
void ScintillaWX::DoOnListBox() { void ScintillaWX::DoOnListBox() {

2
src/stc/ScintillaWX.h
View File

@ -179,7 +179,7 @@ public:
#endif #endif
void DoCommand(int ID); void DoCommand(int ID);
void DoContextMenu(Point pt); bool DoContextMenu(Point pt);
void DoOnListBox(); void DoOnListBox();

3
src/stc/stc.cpp
View File

@ -5248,7 +5248,8 @@ void wxStyledTextCtrl::OnContextMenu(wxContextMenuEvent& evt) {
if (ht != wxHT_WINDOW_INSIDE) { if (ht != wxHT_WINDOW_INSIDE) {
pt = this->PointFromPosition(this->GetCurrentPos()); pt = this->PointFromPosition(this->GetCurrentPos());
} }
m_swx->DoContextMenu(Point(pt.x, pt.y)); if ( !m_swx->DoContextMenu(Point(pt.x, pt.y)) )
evt.Skip();
} }