From adf61108be4a0d43677feac6206a59d16d5e3637 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 23 Sep 2014 17:42:54 +0000
Subject: [PATCH] wxX11 return keycode by GetKeyCode directly, not support
 GetUnicodeKey yet

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77833 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 tests/events/keyboard.cpp | 3 +++
 1 file changed, 3 insertions(+)

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