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

Applied patch [ 1325857 ] CJK input method doesn't work properly(GTK, CVS)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36976 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart 2006-01-18 16:51:09 +00:00
parent abe64011cd
commit 25f182c18b
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/gtk/window.cpp
View File

@ -1163,12 +1163,7 @@ static gint gtk_window_key_press_callback( GtkWidget *widget,
bool ret = false; bool ret = false;
bool return_after_IM = false; bool return_after_IM = false;
if( wxTranslateGTKKeyEventToWx(event, win, gdk_event) ) if( wxTranslateGTKKeyEventToWx(event, win, gdk_event) == false )
{
// Emit KEY_DOWN event
ret = win->GetEventHandler()->ProcessEvent( event );
}
else
{ {
// Return after IM processing as we cannot do // Return after IM processing as we cannot do
// anything with it anyhow. // anything with it anyhow.
@ -1203,6 +1198,9 @@ static gint gtk_window_key_press_callback( GtkWidget *widget,
#endif #endif
if (return_after_IM) if (return_after_IM)
return false; return false;
// Emit KEY_DOWN event
ret = win->GetEventHandler()->ProcessEvent( event );
#ifndef __WXGTK20__ #ifndef __WXGTK20__
// This is for GTK+ 1.2 only. The char event generatation for GTK+ 2.0 is done // This is for GTK+ 1.2 only. The char event generatation for GTK+ 2.0 is done

10
src/gtk1/window.cpp
View File

@ -1163,12 +1163,7 @@ static gint gtk_window_key_press_callback( GtkWidget *widget,
bool ret = false; bool ret = false;
bool return_after_IM = false; bool return_after_IM = false;
if( wxTranslateGTKKeyEventToWx(event, win, gdk_event) ) if( wxTranslateGTKKeyEventToWx(event, win, gdk_event) == false )
{
// Emit KEY_DOWN event
ret = win->GetEventHandler()->ProcessEvent( event );
}
else
{ {
// Return after IM processing as we cannot do // Return after IM processing as we cannot do
// anything with it anyhow. // anything with it anyhow.
@ -1203,6 +1198,9 @@ static gint gtk_window_key_press_callback( GtkWidget *widget,
#endif #endif
if (return_after_IM) if (return_after_IM)
return false; return false;
// Emit KEY_DOWN event
ret = win->GetEventHandler()->ProcessEvent( event );
#ifndef __WXGTK20__ #ifndef __WXGTK20__
// This is for GTK+ 1.2 only. The char event generatation for GTK+ 2.0 is done // This is for GTK+ 1.2 only. The char event generatation for GTK+ 2.0 is done