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

wxX11 could not get UnicodeKey yet, not wxUniversal. And use AND instead OR. otherwise the check not work.

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

12
src/richtext/richtextctrl.cpp
View File

@@ -1413,9 +1413,9 @@ void wxRichTextCtrl::OnChar(wxKeyEvent& event)
GetId()); GetId());
cmdEvent1.SetEventObject(this); cmdEvent1.SetEventObject(this);
cmdEvent1.SetFlags(flags); cmdEvent1.SetFlags(flags);
#if wxUSE_UNICODE || !__WXUNIVERSAL__ #if wxUSE_UNICODE || !__WXX11__
cmdEvent1.SetCharacter(event.GetUnicodeKey()); cmdEvent1.SetCharacter(event.GetUnicodeKey());
#elif !wxUSE_UNICODE || __WXUNIVERSAL__ #elif !wxUSE_UNICODE || __WXX11__
cmdEvent1.SetCharacter((wxChar) keycode); cmdEvent1.SetCharacter((wxChar) keycode);
#endif #endif
cmdEvent1.SetPosition(m_caretPosition+1); cmdEvent1.SetPosition(m_caretPosition+1);
@@ -1430,9 +1430,9 @@ void wxRichTextCtrl::OnChar(wxKeyEvent& event)
GetId()); GetId());
cmdEvent.SetEventObject(this); cmdEvent.SetEventObject(this);
cmdEvent.SetFlags(flags); cmdEvent.SetFlags(flags);
#if wxUSE_UNICODE || !__WXUNIVERSAL__ #if wxUSE_UNICODE && !__WXX11__
cmdEvent.SetCharacter(event.GetUnicodeKey()); cmdEvent.SetCharacter(event.GetUnicodeKey());
#elif !wxUSE_UNICODE || __WXUNIVERSAL__ #elif !wxUSE_UNICODE || __WXX11__
cmdEvent.SetCharacter((wxChar) keycode); cmdEvent.SetCharacter((wxChar) keycode);
#endif #endif
cmdEvent.SetPosition(m_caretPosition+1); cmdEvent.SetPosition(m_caretPosition+1);
@@ -1473,9 +1473,9 @@ void wxRichTextCtrl::OnChar(wxKeyEvent& event)
long newPos = m_caretPosition; long newPos = m_caretPosition;
DeleteSelectedContent(& newPos); DeleteSelectedContent(& newPos);
#if wxUSE_UNICODE || !__WXUNIVERSAL__ #if wxUSE_UNICODE && !__WXX11__
wxString str = event.GetUnicodeKey(); wxString str = event.GetUnicodeKey();
#elif !wxUSE_UNICODE || __WXUNIVERSAL__ #elif !wxUSE_UNICODE || __WXX11__
wxString str = (wxChar) event.GetKeyCode(); wxString str = (wxChar) event.GetKeyCode();
#endif #endif
GetFocusObject()->InsertTextWithUndo(& GetBuffer(), newPos+1, str, this, 0); GetFocusObject()->InsertTextWithUndo(& GetBuffer(), newPos+1, str, this, 0);