Applied patch [ 851044 ] wxGrid receives wxFocusEvent
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25101 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -221,7 +221,7 @@ private:
|
|||||||
void OnKeyDown( wxKeyEvent& );
|
void OnKeyDown( wxKeyEvent& );
|
||||||
void OnKeyUp( wxKeyEvent& );
|
void OnKeyUp( wxKeyEvent& );
|
||||||
void OnEraseBackground( wxEraseEvent& );
|
void OnEraseBackground( wxEraseEvent& );
|
||||||
|
void OnFocus( wxFocusEvent& );
|
||||||
|
|
||||||
DECLARE_DYNAMIC_CLASS(wxGridWindow)
|
DECLARE_DYNAMIC_CLASS(wxGridWindow)
|
||||||
DECLARE_EVENT_TABLE()
|
DECLARE_EVENT_TABLE()
|
||||||
@@ -3662,6 +3662,8 @@ BEGIN_EVENT_TABLE( wxGridWindow, wxWindow )
|
|||||||
EVT_MOUSE_EVENTS( wxGridWindow::OnMouseEvent )
|
EVT_MOUSE_EVENTS( wxGridWindow::OnMouseEvent )
|
||||||
EVT_KEY_DOWN( wxGridWindow::OnKeyDown )
|
EVT_KEY_DOWN( wxGridWindow::OnKeyDown )
|
||||||
EVT_KEY_UP( wxGridWindow::OnKeyUp )
|
EVT_KEY_UP( wxGridWindow::OnKeyUp )
|
||||||
|
EVT_SET_FOCUS( wxGridWindow::OnFocus )
|
||||||
|
EVT_KILL_FOCUS( wxGridWindow::OnFocus )
|
||||||
EVT_ERASE_BACKGROUND( wxGridWindow::OnEraseBackground )
|
EVT_ERASE_BACKGROUND( wxGridWindow::OnEraseBackground )
|
||||||
END_EVENT_TABLE()
|
END_EVENT_TABLE()
|
||||||
|
|
||||||
@@ -3737,6 +3739,11 @@ void wxGridWindow::OnEraseBackground( wxEraseEvent& WXUNUSED(event) )
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void wxGridWindow::OnFocus(wxFocusEvent& event)
|
||||||
|
{
|
||||||
|
if ( !m_owner->GetEventHandler()->ProcessEvent( event ) )
|
||||||
|
event.Skip();
|
||||||
|
}
|
||||||
|
|
||||||
//////////////////////////////////////////////////////////////////////
|
//////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user