Applied patch [ 1678626 ] Non-ascii characters in wxRichTextCtrl (unicode build)

Laumingis Skripkauskas

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44775 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/richtext/richtextctrl.cpp b/src/richtext/richtextctrl.cpp
index 5953ab31afa8be0d4b0004924d7e70d1077c33a6..fd698b0ad0a359f369b6ff96f3125d19f927d3f5 100644 (file)
--- a/src/richtext/richtextctrl.cpp
+++ b/src/richtext/richtextctrl.cpp
@@ -781,7 +781,11 @@ void wxRichTextCtrl::OnChar(wxKeyEvent& event)
                     GetId());
                 cmdEvent.SetEventObject(this);
                 cmdEvent.SetFlags(flags);
                     GetId());
                 cmdEvent.SetEventObject(this);
                 cmdEvent.SetFlags(flags);

+#if wxUSE_UNICODE
+                cmdEvent.SetCharacter(event.GetUnicodeKey());
+#else

                 cmdEvent.SetCharacter((wxChar) keycode);
                 cmdEvent.SetCharacter((wxChar) keycode);

+#endif

                 cmdEvent.SetPosition(m_caretPosition+1);
 
                 if (keycode == wxT('\t'))
                 cmdEvent.SetPosition(m_caretPosition+1);
 
                 if (keycode == wxT('\t'))


@@ -813,7 +817,11 @@ void wxRichTextCtrl::OnChar(wxKeyEvent& event)
                 long newPos = m_caretPosition;
                 DeleteSelectedContent(& newPos);
 
                 long newPos = m_caretPosition;
                 DeleteSelectedContent(& newPos);
 

+#if wxUSE_UNICODE
+                wxString str = event.GetUnicodeKey();
+#else

                 wxString str = (wxChar) event.GetKeyCode();
                 wxString str = (wxChar) event.GetKeyCode();

+#endif

                 GetBuffer().InsertTextWithUndo(newPos+1, str, this, 0);
 
                 EndBatchUndo();
                 GetBuffer().InsertTextWithUndo(newPos+1, str, this, 0);
 
                 EndBatchUndo();