From: Kevin Ollivier Date: Mon, 19 Dec 2005 01:42:32 +0000 (+0000) Subject: Use TranslateAccelerator so that TAB, Return, etc. keys are properly processed by... X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/39fc328f030824cf247a48bf276f2b5e6acbba01?ds=inline Use TranslateAccelerator so that TAB, Return, etc. keys are properly processed by wxActiveX controls. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36451 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/wxPython/contrib/activex/wxie/wxactivex.cpp b/wxPython/contrib/activex/wxie/wxactivex.cpp index 6b78486076..bef4563dc9 100644 --- a/wxPython/contrib/activex/wxie/wxactivex.cpp +++ b/wxPython/contrib/activex/wxie/wxactivex.cpp @@ -305,8 +305,6 @@ wxActiveX::~wxActiveX() void wxActiveX::CreateActiveX(REFCLSID clsid) { - SetTransparent(); - HRESULT hret; //////////////////////////////////////////////////////// @@ -1777,6 +1775,16 @@ void wxActiveX::OnMouse(wxMouseEvent& event) wxLogTrace(wxT(""),wxT("msg sent")); } +bool wxActiveX::MSWTranslateMessage(WXMSG *msg){ + + if (msg->message == WM_KEYDOWN){ + HRESULT result = m_oleInPlaceActiveObject->TranslateAccelerator(msg); + return (result == S_OK); + } + + return wxWindow::MSWTranslateMessage(msg); +} + long wxActiveX::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) { if (m_oleObjectHWND == NULL) diff --git a/wxPython/contrib/activex/wxie/wxactivex.h b/wxPython/contrib/activex/wxie/wxactivex.h index c5e3902a59..3b64e172e4 100644 --- a/wxPython/contrib/activex/wxie/wxactivex.h +++ b/wxPython/contrib/activex/wxie/wxactivex.h @@ -610,6 +610,7 @@ protected: FuncXArray m_methods; NameMap m_methodNames; + virtual bool MSWTranslateMessage(WXMSG* pMsg); long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); DECLARE_CLASS(wxActiveX)