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

Applied patch [ 1344168 ] wxUniv (on MSW) IM input no response

Browse Source 
By Danny Raynor


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36915 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2006-01-17 09:25:34 +00:00
parent 4617be085f
commit 568c0346fc
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/univ/textctrl.cpp
View File

@@ -4683,6 +4683,9 @@ void wxTextCtrl::OnChar(wxKeyEvent& event)
if ( !event.HasModifiers() ) if ( !event.HasModifiers() )
{ {
int keycode = event.GetKeyCode(); int keycode = event.GetKeyCode();
#if wxUSE_UNICODE
wxChar unicode = event.GetUnicodeKey();
#endif
if ( keycode == WXK_RETURN ) if ( keycode == WXK_RETURN )
{ {
if ( IsSingleLine() || (GetWindowStyle() & wxTE_PROCESS_ENTER) ) if ( IsSingleLine() || (GetWindowStyle() & wxTE_PROCESS_ENTER) )
@@ -4704,6 +4707,14 @@ void wxTextCtrl::OnChar(wxKeyEvent& event)
// skip event.Skip() below // skip event.Skip() below
return; return;
} }
#if wxUSE_UNICODE
else if (unicode > 0)
{
PerformAction(wxACTION_TEXT_INSERT, -1, unicode);
return;
}
#endif
} }
#ifdef __WXDEBUG__ #ifdef __WXDEBUG__
// Ctrl-R refreshes the control in debug mode // Ctrl-R refreshes the control in debug mode