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

x11 alrady support GetUnicodeKey() by last commit, remove these check

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

6
src/richtext/richtextctrl.cpp
View File

@@ -1413,7 +1413,7 @@ void wxRichTextCtrl::OnChar(wxKeyEvent& event)
GetId()); GetId());
cmdEvent1.SetEventObject(this); cmdEvent1.SetEventObject(this);
cmdEvent1.SetFlags(flags); cmdEvent1.SetFlags(flags);
#if wxUSE_UNICODE && !__WXX11__ #if wxUSE_UNICODE
cmdEvent1.SetCharacter(event.GetUnicodeKey()); cmdEvent1.SetCharacter(event.GetUnicodeKey());
#else #else
cmdEvent1.SetCharacter((wxChar) keycode); cmdEvent1.SetCharacter((wxChar) keycode);
@@ -1430,7 +1430,7 @@ void wxRichTextCtrl::OnChar(wxKeyEvent& event)
GetId()); GetId());
cmdEvent.SetEventObject(this); cmdEvent.SetEventObject(this);
cmdEvent.SetFlags(flags); cmdEvent.SetFlags(flags);
#if wxUSE_UNICODE && !__WXX11__ #if wxUSE_UNICODE
cmdEvent.SetCharacter(event.GetUnicodeKey()); cmdEvent.SetCharacter(event.GetUnicodeKey());
#else #else
cmdEvent.SetCharacter((wxChar) keycode); cmdEvent.SetCharacter((wxChar) keycode);
@@ -1473,7 +1473,7 @@ void wxRichTextCtrl::OnChar(wxKeyEvent& event)
long newPos = m_caretPosition; long newPos = m_caretPosition;
DeleteSelectedContent(& newPos); DeleteSelectedContent(& newPos);
#if wxUSE_UNICODE && !__WXX11__ #if wxUSE_UNICODE
wxString str = event.GetUnicodeKey(); wxString str = event.GetUnicodeKey();
#else #else
wxString str = (wxChar) event.GetKeyCode(); wxString str = (wxChar) event.GetKeyCode();

2
tests/events/keyboard.cpp
View File

@@ -162,7 +162,6 @@ 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 )
{ {
@@ -179,7 +178,6 @@ 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,