mirror of
https://github.com/fltk/fltk.git
synced 2026-06-07 09:13:58 +08:00
To fix STR #2451
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7877 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
+11
-2
@@ -44,10 +44,15 @@ int Fl::compose_state = 0;
|
||||
#endif
|
||||
|
||||
#if defined(__APPLE__) || defined(WIN32)
|
||||
// under Mac OS X character composition is handled by the OS
|
||||
// under Mac OS X and MS Windows, character composition is handled by the OS
|
||||
int Fl::compose(int& del) {
|
||||
// this stuff is to be treated as a function key
|
||||
if(Fl::e_length == 0 || Fl::e_keysym == FL_Enter || Fl::e_keysym == FL_KP_Enter ||
|
||||
Fl::e_keysym == FL_Tab || Fl::e_keysym == FL_Escape || Fl::e_state&FL_META || Fl::e_state&FL_CTRL) {
|
||||
Fl::e_keysym == FL_Tab || Fl::e_keysym == FL_Escape || Fl::e_state&FL_META || Fl::e_state&FL_CTRL
|
||||
#ifdef WIN32
|
||||
|| Fl::e_state&FL_ALT
|
||||
#endif
|
||||
) {
|
||||
del = 0;
|
||||
return 0;
|
||||
}
|
||||
@@ -57,6 +62,10 @@ int Fl::compose(int& del) {
|
||||
}
|
||||
else {
|
||||
del = 0;
|
||||
#ifdef WIN32
|
||||
// Only insert non-control characters:
|
||||
if (!( e_text[0] & ~31 && e_text[0] != 127) ) { return 0; }
|
||||
#endif
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user