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

Handle Unicode keys correctly in wxTextValidator.

Browse Source 
Don't allow entering arbitrary Unicode keys in wxTextValidator limited to
digits only, for example.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75451 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2013-12-29 00:19:12 +00:00
parent a425e9f70d
commit aff918ab1d
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/common/valtext.cpp
View File

@ -308,10 +308,20 @@ void wxTextValidator::OnChar(wxKeyEvent& event)
return; return;
} }
#if wxUSE_UNICODE
// We only filter normal, printable characters.
int keyCode = event.GetUnicodeKey();
#else // !wxUSE_UNICODE
int keyCode = event.GetKeyCode(); int keyCode = event.GetKeyCode();
if (keyCode > WXK_START)
{
event.Skip();
return;
}
#endif // wxUSE_UNICODE/!wxUSE_UNICODE
// we don't filter special keys and delete // we don't filter special keys and delete
if (keyCode < WXK_SPACE || keyCode == WXK_DELETE || keyCode >= WXK_START) if (keyCode < WXK_SPACE || keyCode == WXK_DELETE)
{ {
event.Skip(); event.Skip();
return; return;