summaryrefslogtreecommitdiff
path: root/src/Fl.cxx
diff options
context:
space:
mode:
authorBill Spitzak <spitzak@gmail.com>1999-07-27 17:24:14 +0000
committerBill Spitzak <spitzak@gmail.com>1999-07-27 17:24:14 +0000
commitf7e0e7627f94f98d4a8955ceb6f84106dc0b12a2 (patch)
treeac724296423a36c80db8fd539988868e63984a21 /src/Fl.cxx
parentdf045b0e36f08c7d6ae4884667744203057d95c8 (diff)
Can draw xpm pixmaps with spaces in the color names (such as the ones in
/usr/X11/include/X11/icons). Esc closes the modal window, not the window the cursor is in, if a modal window is up. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.0@632 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Fl.cxx')
-rw-r--r--src/Fl.cxx7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/Fl.cxx b/src/Fl.cxx
index caf418e20..1579d5ac4 100644
--- a/src/Fl.cxx
+++ b/src/Fl.cxx
@@ -1,5 +1,5 @@
//
-// "$Id: Fl.cxx,v 1.24.2.10 1999/07/22 21:37:03 bill Exp $"
+// "$Id: Fl.cxx,v 1.24.2.11 1999/07/27 17:24:13 bill Exp $"
//
// Main event handling code for the Fast Light Tool Kit (FLTK).
//
@@ -508,7 +508,8 @@ int Fl::handle(int event, Fl_Window* window)
// make Escape key close windows:
if (event_key()==FL_Escape) {
- window->do_callback();
+ w = modal(); if (!w) w = window;
+ w->do_callback();
return 1;
}
@@ -694,5 +695,5 @@ int fl_old_shortcut(const char* s) {
}
//
-// End of "$Id: Fl.cxx,v 1.24.2.10 1999/07/22 21:37:03 bill Exp $".
+// End of "$Id: Fl.cxx,v 1.24.2.11 1999/07/27 17:24:13 bill Exp $".
//