Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Restore sending wxEVT_CONTEXT_MENU for wxTE_RICH controls in wxMSW

Browse Source 
Since the changes to use IRichEditOleCallback in wxMSW wxTextCtrl (i.e.
bd650ec3d9 in master), wxEVT_CONTEXT_MENU was
not sent for it any more as the control consumed it after using the callback.

Send the event manually before the default handling takes place to fix this.
This commit is contained in:
Vadim Zeitlin
2015-09-23 03:04:35 +02:00
parent 56a6bc8006
commit 585b49474d
2 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/msw/textctrl.cpp
View File

@@ -563,7 +563,16 @@ bool wxTextCtrl::MSWCreateText(const wxString& value,
if ( m_verRichEdit >= 4 )
{
wxTextCtrlOleCallback *cb = new wxTextCtrlOleCallback(this);
contextMenuConnected = ::SendMessage(GetHwnd(), EM_SETOLECALLBACK, 0, (LPARAM)cb) != 0;
if ( ::SendMessage(GetHwnd(), EM_SETOLECALLBACK, 0, (LPARAM)cb) )
{
// If we succeeded in setting up the callback, we don't need to
// connect to wxEVT_CONTEXT_MENU to show the menu ourselves,
// but we do need to connect to wxEVT_RIGHT_UP to generate
// wxContextMenuEvent ourselves as we're not going to get it
// from the control which consumes it.
contextMenuConnected = true;
Bind(wxEVT_RIGHT_UP, &wxTextCtrl::OnRightUp, this);
}
}
#endif
if ( !contextMenuConnected )
@@ -2405,6 +2414,16 @@ void wxTextCtrl::OnSetFocus(wxFocusEvent& event)
// the rest of the file only deals with the rich edit controls
#if wxUSE_RICHEDIT
void wxTextCtrl::OnRightUp(wxMouseEvent& eventMouse)
{
wxContextMenuEvent eventMenu(wxEVT_CONTEXT_MENU,
GetId(),
ClientToScreen(eventMouse.GetPosition()));
if ( !ProcessWindowEvent(eventMenu) )
eventMouse.Skip();
}
void wxTextCtrl::OnContextMenu(wxContextMenuEvent& event)
{
if (IsRich())