summaryrefslogtreecommitdiff
path: root/src/Fl.cxx
diff options
context:
space:
mode:
authorBill Spitzak <spitzak@gmail.com>2000-06-10 21:31:00 +0000
committerBill Spitzak <spitzak@gmail.com>2000-06-10 21:31:00 +0000
commitabcd0b44882811764557c00c509dd145baf81bb8 (patch)
tree0d340864d19ccb0226bb07bbc993aa01361dcc0c /src/Fl.cxx
parentb3d9c227bc6d167fe24fc21e318c04a05d810be8 (diff)
You can no longer insert ^J,^K,^L,^M into Fl_Int/Float_Input.
Fixed bug noticed by Alexander Rabi Beels, if you are in point-to-type and move the cursor to a different window with a multiline input and type up/down, the saved up/down horizontal position from the previous multiline input was used. It now resets this on any focus change, fixing this. Some code cleanup in Fl_Input.cxx, removed unneeded calls to Fl::compose_reset. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.0@1191 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Fl.cxx')
-rw-r--r--src/Fl.cxx5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/Fl.cxx b/src/Fl.cxx
index 9543bf3a3..73fa187bb 100644
--- a/src/Fl.cxx
+++ b/src/Fl.cxx
@@ -1,5 +1,5 @@
//
-// "$Id: Fl.cxx,v 1.24.2.24 2000/06/05 21:20:46 mike Exp $"
+// "$Id: Fl.cxx,v 1.24.2.25 2000/06/10 21:30:59 bill Exp $"
//
// Main event handling code for the Fast Light Tool Kit (FLTK).
//
@@ -321,6 +321,7 @@ void Fl::focus(Fl_Widget *o) {
if (grab()) return; // don't do anything while grab is on
Fl_Widget *p = focus_;
if (o != p) {
+ Fl::compose_reset();
focus_ = o;
fl_oldfocus = 0;
for (; p && !p->contains(o); p = p->parent()) {
@@ -720,5 +721,5 @@ void Fl_Window::flush() {
}
//
-// End of "$Id: Fl.cxx,v 1.24.2.24 2000/06/05 21:20:46 mike Exp $".
+// End of "$Id: Fl.cxx,v 1.24.2.25 2000/06/10 21:30:59 bill Exp $".
//