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

For consistency with the docs and with wxMSW the keycode for

Browse Source 
Ctrl-letter EVT_CHAR events should be in the range 1-26.  Also, make
the m_uniChar value match the keycode for KEY_UP/DOWN events for
letters.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37339 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2006-02-05 22:10:13 +00:00
parent 22b549f247
commit 1dabdced0e
1 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/gtk/window.cpp
View File

@@ -830,6 +830,10 @@ static void wxFillOtherKeyEventFields(wxKeyEvent& event,
event.m_rawFlags = 0; event.m_rawFlags = 0;
#if wxUSE_UNICODE #if wxUSE_UNICODE
event.m_uniChar = gdk_keyval_to_unicode(gdk_event->keyval); event.m_uniChar = gdk_keyval_to_unicode(gdk_event->keyval);
if ( gdk_event->type == GDK_KEY_PRESS || gdk_event->type == GDK_KEY_RELEASE )
{
event.m_uniChar = toupper(event.m_uniChar);
}
#endif #endif
wxGetMousePosition( &x, &y ); wxGetMousePosition( &x, &y );
win->ScreenToClient( &x, &y ); win->ScreenToClient( &x, &y );
@@ -1066,6 +1070,16 @@ static gint gtk_window_key_press_callback( GtkWidget *widget,
event.m_keyCode = key_code; event.m_keyCode = key_code;
// To conform to the docs we need to translate Ctrl-alpha
// characters to values in the range 1-26.
if (event.ControlDown() && key_code >= 'a' && key_code <= 'z' )
{
event.m_keyCode = key_code - 'a' + 1;
#if wxUSE_UNICODE
event.m_uniChar = event.m_keyCode;
#endif
}
// Implement OnCharHook by checking ancestor top level windows // Implement OnCharHook by checking ancestor top level windows
wxWindow *parent = win; wxWindow *parent = win;
while (parent && !parent->IsTopLevel()) while (parent && !parent->IsTopLevel())
@@ -1200,6 +1214,17 @@ static void gtk_wxwindow_commit_cb (GtkIMContext *context,
#else #else
event.m_keyCode = *pstr; event.m_keyCode = *pstr;
#endif // wxUSE_UNICODE #endif // wxUSE_UNICODE
// To conform to the docs we need to translate Ctrl-alpha
// characters to values in the range 1-26.
if (event.ControlDown() && *pstr >= 'a' && *pstr <= 'z' )
{
event.m_keyCode = *pstr - 'a' + 1;
#if wxUSE_UNICODE
event.m_uniChar = event.m_keyCode;
#endif
}
if (parent) if (parent)
{ {
event.SetEventType( wxEVT_CHAR_HOOK ); event.SetEventType( wxEVT_CHAR_HOOK );