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

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36451 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Kevin Ollivier
2005-12-19 01:42:32 +00:00
parent 89c8318014
commit 39fc328f03
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
wxPython/contrib/activex/wxie/wxactivex.cpp
View File

@@ -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) long wxActiveX::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
{ {
if (m_oleObjectHWND == NULL) if (m_oleObjectHWND == NULL)

1
wxPython/contrib/activex/wxie/wxactivex.h
View File

@@ -610,6 +610,7 @@ protected:
FuncXArray m_methods; FuncXArray m_methods;
NameMap m_methodNames; NameMap m_methodNames;
virtual bool MSWTranslateMessage(WXMSG* pMsg);
long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
DECLARE_CLASS(wxActiveX) DECLARE_CLASS(wxActiveX)