diff --git a/src/richtext/richtextctrl.cpp b/src/richtext/richtextctrl.cpp
index 3faa179fe3..2a5f2771c8 100644
--- a/src/richtext/richtextctrl.cpp
+++ b/src/richtext/richtextctrl.cpp
@@ -1413,7 +1413,7 @@ void wxRichTextCtrl::OnChar(wxKeyEvent& event)
                     GetId());
                 cmdEvent1.SetEventObject(this);
                 cmdEvent1.SetFlags(flags);
-#if wxUSE_UNICODE && !__WXX11__
+#if wxUSE_UNICODE
                 cmdEvent1.SetCharacter(event.GetUnicodeKey());
 #else
                 cmdEvent1.SetCharacter((wxChar) keycode);
@@ -1430,7 +1430,7 @@ void wxRichTextCtrl::OnChar(wxKeyEvent& event)
                     GetId());
                 cmdEvent.SetEventObject(this);
                 cmdEvent.SetFlags(flags);
-#if wxUSE_UNICODE && !__WXX11__
+#if wxUSE_UNICODE
                 cmdEvent.SetCharacter(event.GetUnicodeKey());
 #else
                 cmdEvent.SetCharacter((wxChar) keycode);
@@ -1473,7 +1473,7 @@ void wxRichTextCtrl::OnChar(wxKeyEvent& event)
                 long newPos = m_caretPosition;
                 DeleteSelectedContent(& newPos);
 
-#if wxUSE_UNICODE && !__WXX11__
+#if wxUSE_UNICODE
                 wxString str = event.GetUnicodeKey();
 #else
                 wxString str = (wxChar) event.GetKeyCode();
diff --git a/tests/events/keyboard.cpp b/tests/events/keyboard.cpp
index 4355a70cc8..cb54248c35 100644
--- a/tests/events/keyboard.cpp
+++ b/tests/events/keyboard.cpp
@@ -162,7 +162,6 @@ 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 )
     {
@@ -179,7 +178,6 @@ 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,