Merge branch 'hotfixes' into develop

Conflicts:
	include/nana/detail/linux_X11/platform_spec.hpp
	source/detail/linux_X11/platform_spec.cpp
	source/paint/detail/native_paint_interface.cpp
This commit is contained in:
cnjinhao
2015-01-02 23:54:55 +08:00
11 changed files with 87 additions and 16 deletions

View File

@@ -1196,7 +1196,7 @@ namespace nana{ namespace widgets
undo(false);
break;
default:
if (key >= 0xFF || (32 <= key && key <= 126))
if (key > 0x7F || (32 <= key && key <= 126))
put(key);
else if (sizeof(nana::char_t) == sizeof(char))
{ //Non-Unicode Version for Non-English characters