AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remember the last key event in wxGTK before passing it over to IM.

Browse Source 
Save the last key event before calling IM filter to be able to get the correct
modifiers, timestamp, position &c to use for the CHAR event generated from IM
commit callback.

This restores the changes of r34504 which were reverted for unknown (or at
least unmentioned) reason in r34521.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65517 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2010-09-11 10:18:19 +00:00
parent 371412145f
commit 9cbe96d093
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gtk/window.cpp
View File

@ -881,8 +881,10 @@ gtk_window_key_press_callback( GtkWidget *WXUNUSED(widget),
return_after_IM = true;
}
if ((!ret) && (win->m_imData != NULL))
if (!ret && win->m_imData)
{
win->m_imData->lastKeyEvent = gdk_event;
// We should let GTK+ IM filter key event first. According to GTK+ 2.0 API
// docs, if IM filter returns true, no further processing should be done.
// we should send the key_down event anyway.