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

fixed wxTextCtrl::EmulateKeyPress to work in Unicode build of wxGTK2

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30141 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2004-10-28 11:19:39 +00:00
parent adb61e4d0d
commit c4d25c01ae
3 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/common/textcmn.cpp
View File

@@ -411,6 +411,13 @@ bool wxTextCtrlBase::EmulateKeyPress(const wxKeyEvent& event)
break; break;
default: default:
#if wxUSE_UNICODE
if ( event.GetUnicodeKey() )
{
ch = event.GetUnicodeKey();
}
else
#endif
if ( keycode < 256 && keycode >= 0 && wxIsprint(keycode) ) if ( keycode < 256 && keycode >= 0 && wxIsprint(keycode) )
{ {
// FIXME this is not going to work for non letters... // FIXME this is not going to work for non letters...

3
src/gtk/window.cpp
View File

@@ -967,6 +967,9 @@ static void wxFillOtherKeyEventFields(wxKeyEvent& event,
event.m_scanCode = gdk_event->keyval; event.m_scanCode = gdk_event->keyval;
event.m_rawCode = (wxUint32) gdk_event->keyval; event.m_rawCode = (wxUint32) gdk_event->keyval;
event.m_rawFlags = 0; event.m_rawFlags = 0;
#if wxUSE_UNICODE
event.m_uniChar = gdk_keyval_to_unicode(gdk_event->keyval);
#endif
event.m_x = x; event.m_x = x;
event.m_y = y; event.m_y = y;
event.SetEventObject( win ); event.SetEventObject( win );

3
src/gtk1/window.cpp
View File

@@ -967,6 +967,9 @@ static void wxFillOtherKeyEventFields(wxKeyEvent& event,
event.m_scanCode = gdk_event->keyval; event.m_scanCode = gdk_event->keyval;
event.m_rawCode = (wxUint32) gdk_event->keyval; event.m_rawCode = (wxUint32) gdk_event->keyval;
event.m_rawFlags = 0; event.m_rawFlags = 0;
#if wxUSE_UNICODE
event.m_uniChar = gdk_keyval_to_unicode(gdk_event->keyval);
#endif
event.m_x = x; event.m_x = x;
event.m_y = y; event.m_y = y;
event.SetEventObject( win ); event.SetEventObject( win );