Author: manolo
Date: 2010-11-20 04:59:39 -0800 (Sat, 20 Nov 2010)
New Revision: 7878
Log:
To fix STR #2452
Modified:
branches/branch-1.3/src/Fl_compose.cxx
Modified: branches/branch-1.3/src/Fl_compose.cxx
===================================================================
--- branches/branch-1.3/src/Fl_compose.cxx 2010-11-19 19:00:50 UTC (rev
7877)
+++ branches/branch-1.3/src/Fl_compose.cxx 2010-11-20 12:59:39 UTC (rev
7878)
@@ -46,25 +46,25 @@
#if defined(__APPLE__) || defined(WIN32)
// under Mac OS X and MS Windows, character composition is handled by the OS
int Fl::compose(int& del) {
+ del = 0;
+#ifdef WIN32
+ unsigned char ascii = (unsigned)e_text[0];
+ if ((e_state & (FL_ALT|FL_META)) && !(ascii & 128)) return 0;
+#elif defined(__APPLE__)
// 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
-#ifdef WIN32
- || Fl::e_state&FL_ALT
-#endif
- ) {
- del = 0;
+ Fl::e_keysym == FL_Tab || Fl::e_keysym == FL_Escape ||
Fl::e_state&FL_META || Fl::e_state&FL_CTRL ) {
return 0;
}
+#endif
if(Fl::compose_state) {
del = 1;
Fl::compose_state = 0;
}
else {
- del = 0;
#ifdef WIN32
// Only insert non-control characters:
- if (!( e_text[0] & ~31 && e_text[0] != 127) ) { return 0; }
+ if (! (ascii & ~31 && ascii!=127)) { return 0; }
#endif
}
return 1;
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
