From 17c3ad19143f7391a097f379d26e0f897c52df3c Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 23 Sep 2014 17:43:09 +0000 Subject: [PATCH] wxX11 could not get UnicodeKey yet, not wxUniversal. And use AND instead OR. otherwise the check not work. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77838 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/richtext/richtextctrl.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/richtext/richtextctrl.cpp b/src/richtext/richtextctrl.cpp index 0282110b6c..51faa58970 100644 --- a/src/richtext/richtextctrl.cpp +++ b/src/richtext/richtextctrl.cpp @@ -1413,9 +1413,9 @@ void wxRichTextCtrl::OnChar(wxKeyEvent& event) GetId()); cmdEvent1.SetEventObject(this); cmdEvent1.SetFlags(flags); -#if wxUSE_UNICODE || !__WXUNIVERSAL__ +#if wxUSE_UNICODE || !__WXX11__ cmdEvent1.SetCharacter(event.GetUnicodeKey()); -#elif !wxUSE_UNICODE || __WXUNIVERSAL__ +#elif !wxUSE_UNICODE || __WXX11__ cmdEvent1.SetCharacter((wxChar) keycode); #endif cmdEvent1.SetPosition(m_caretPosition+1); @@ -1430,9 +1430,9 @@ void wxRichTextCtrl::OnChar(wxKeyEvent& event) GetId()); cmdEvent.SetEventObject(this); cmdEvent.SetFlags(flags); -#if wxUSE_UNICODE || !__WXUNIVERSAL__ +#if wxUSE_UNICODE && !__WXX11__ cmdEvent.SetCharacter(event.GetUnicodeKey()); -#elif !wxUSE_UNICODE || __WXUNIVERSAL__ +#elif !wxUSE_UNICODE || __WXX11__ cmdEvent.SetCharacter((wxChar) keycode); #endif cmdEvent.SetPosition(m_caretPosition+1); @@ -1473,9 +1473,9 @@ void wxRichTextCtrl::OnChar(wxKeyEvent& event) long newPos = m_caretPosition; DeleteSelectedContent(& newPos); -#if wxUSE_UNICODE || !__WXUNIVERSAL__ +#if wxUSE_UNICODE && !__WXX11__ wxString str = event.GetUnicodeKey(); -#elif !wxUSE_UNICODE || __WXUNIVERSAL__ +#elif !wxUSE_UNICODE || __WXX11__ wxString str = (wxChar) event.GetKeyCode(); #endif GetFocusObject()->InsertTextWithUndo(& GetBuffer(), newPos+1, str, this, 0);