summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES1
-rw-r--r--src/Fl_Text_Display.cxx3
2 files changed, 3 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index 5a5c1de8f..e8620e2c6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,7 @@ CHANGES IN FLTK 1.1.7
- Documentation fixes (STR #571, STR #648, STR #692, STR
#730, STR #744, STR #745, STR #931, STR #942, STR #960,
STR #969)
+ - Fixed handling of Crl-C in Fl_Text_Display (STR #1122)
- OS X Quartz version now draw a nice resize control (STR
#1099)
- FLTK now enables large file support when available (STR
diff --git a/src/Fl_Text_Display.cxx b/src/Fl_Text_Display.cxx
index e95f0095e..74e7aebc4 100644
--- a/src/Fl_Text_Display.cxx
+++ b/src/Fl_Text_Display.cxx
@@ -3087,7 +3087,8 @@ int Fl_Text_Display::handle(int event) {
// This isn't very elegant!
if (!Fl::event_inside(text_area.x, text_area.y, text_area.w, text_area.h) &&
!dragging && event != FL_LEAVE && event != FL_ENTER &&
- event != FL_MOVE && event != FL_FOCUS && event != FL_UNFOCUS) {
+ event != FL_MOVE && event != FL_FOCUS && event != FL_UNFOCUS &&
+ event != FL_KEYBOARD && event != FL_KEYUP) {
return Fl_Group::handle(event);
}