Use TranslateAccelerator so that TAB, Return, etc. keys are properly processed by...

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 6b78486076d105421e91a5dd960fb501ba3b4658..bef4563dc9df2cc0f083bd1b53f042eb78721c37 100644 (file)
--- 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)
 {
 
 void wxActiveX::CreateActiveX(REFCLSID clsid)
 {

-    SetTransparent();
-

     HRESULT hret;
 
     ////////////////////////////////////////////////////////
     HRESULT hret;
 
     ////////////////////////////////////////////////////////


@@ -1777,6 +1775,16 @@ void wxActiveX::OnMouse(wxMouseEvent& event)
     wxLogTrace(wxT(""),wxT("msg sent"));
 }
 
     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)
 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 c5e3902a5911da7edc8b35f18410e765e4b83368..3b64e172e4ac8c738fa7d13061b35b9b58b53f51 100644 (file)
--- 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;
 
     FuncXArray      m_methods;
     NameMap         m_methodNames;
 

+    virtual bool MSWTranslateMessage(WXMSG* pMsg);

     long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
 
     DECLARE_CLASS(wxActiveX)
     long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
 
     DECLARE_CLASS(wxActiveX)