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

wxX11 return keycode by GetKeyCode directly, not support GetUnicodeKey yet

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77833 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2014-09-23 17:42:54 +00:00
parent fdbc16ed8d
commit adf61108be
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/events/keyboard.cpp
View File

@@ -162,6 +162,7 @@ void TestEvent(int line, const wxKeyEvent& ev, const KeyDesc& desc)
desc.m_keycode, desc.m_keycode,
ev.GetKeyCode() ); ev.GetKeyCode() );
#if !defined(__WXX11__)
#if wxUSE_UNICODE #if wxUSE_UNICODE
if ( desc.m_keycode < WXK_START ) if ( desc.m_keycode < WXK_START )
{ {
@@ -178,6 +179,7 @@ void TestEvent(int line, const wxKeyEvent& ev, const KeyDesc& desc)
(int)ev.GetUnicodeKey() ); (int)ev.GetUnicodeKey() );
} }
#endif // wxUSE_UNICODE #endif // wxUSE_UNICODE
#endif
CPPUNIT_ASSERT_EQUAL_MESSAGE( "wrong modifiers in " + msg, CPPUNIT_ASSERT_EQUAL_MESSAGE( "wrong modifiers in " + msg,
desc.m_mods, desc.m_mods,
@@ -229,6 +231,7 @@ wxREGISTER_UNIT_TEST(KeyboardEvent);
void KeyboardEventTestCase::setUp() void KeyboardEventTestCase::setUp()
{ {
m_win = new KeyboardTestWindow(wxTheApp->GetTopWindow()); m_win = new KeyboardTestWindow(wxTheApp->GetTopWindow());
wxYield();
m_win->SetFocus(); m_win->SetFocus();
wxYield(); // needed to show the new window wxYield(); // needed to show the new window