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

set wxKeyEvent::m_uniChar correctly in the events generated by generic wxListCtrl (#4581)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@54608 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-07-13 18:16:38 +00:00
parent f8ae0bd260
commit e95308c0ae
2 changed files with 11 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/changes.txt
View File

@@ -101,6 +101,8 @@ All (GUI):
- Fixed wxHTML default font size for printing to be 12pt regardless of the - Fixed wxHTML default font size for printing to be 12pt regardless of the
platform, instead of depending on GUI toolkit's screen configuration. platform, instead of depending on GUI toolkit's screen configuration.
- Support wxDP_ALLOWNONE style in generic wxDatePickerCtrl version. - Support wxDP_ALLOWNONE style in generic wxDatePickerCtrl version.
- Set wxKeyEvent::m_uniChar correctly in the events generated by generic
wxListCtrl (Mikkel S).
All (Unix): All (Unix):

38
src/generic/listctrl.cpp
View File

@@ -3415,16 +3415,9 @@ void wxListMainWindow::OnKeyDown( wxKeyEvent &event )
wxWindow *parent = GetParent(); wxWindow *parent = GetParent();
// propagate the key event upwards // propagate the key event upwards
wxKeyEvent ke( wxEVT_KEY_DOWN ); wxKeyEvent ke(event);
ke.m_shiftDown = event.m_shiftDown; if (parent->GetEventHandler()->ProcessEvent( ke ))
ke.m_controlDown = event.m_controlDown; return;
ke.m_altDown = event.m_altDown;
ke.m_metaDown = event.m_metaDown;
ke.m_keyCode = event.m_keyCode;
ke.m_x = event.m_x;
ke.m_y = event.m_y;
ke.SetEventObject( parent );
if (parent->GetEventHandler()->ProcessEvent( ke )) return;
event.Skip(); event.Skip();
} }
@@ -3434,16 +3427,10 @@ void wxListMainWindow::OnKeyUp( wxKeyEvent &event )
wxWindow *parent = GetParent(); wxWindow *parent = GetParent();
// propagate the key event upwards // propagate the key event upwards
wxKeyEvent ke( wxEVT_KEY_UP ); wxKeyEvent ke(event);
ke.m_shiftDown = event.m_shiftDown;
ke.m_controlDown = event.m_controlDown;
ke.m_altDown = event.m_altDown;
ke.m_metaDown = event.m_metaDown;
ke.m_keyCode = event.m_keyCode;
ke.m_x = event.m_x;
ke.m_y = event.m_y;
ke.SetEventObject( parent ); ke.SetEventObject( parent );
if (parent->GetEventHandler()->ProcessEvent( ke )) return; if (parent->GetEventHandler()->ProcessEvent( ke ))
return;
event.Skip(); event.Skip();
} }
@@ -3464,16 +3451,9 @@ void wxListMainWindow::OnChar( wxKeyEvent &event )
} }
// propagate the char event upwards // propagate the char event upwards
wxKeyEvent ke( wxEVT_CHAR ); wxKeyEvent ke(event);
ke.m_shiftDown = event.m_shiftDown; if (parent->GetEventHandler()->ProcessEvent( ke ))
ke.m_controlDown = event.m_controlDown; return;
ke.m_altDown = event.m_altDown;
ke.m_metaDown = event.m_metaDown;
ke.m_keyCode = event.m_keyCode;
ke.m_x = event.m_x;
ke.m_y = event.m_y;
ke.SetEventObject( parent );
if (parent->GetEventHandler()->ProcessEvent( ke )) return;
if (event.GetKeyCode() == WXK_TAB) if (event.GetKeyCode() == WXK_TAB)
{ {