diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-06-27 20:52:44 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-06-27 20:52:44 +0000 |
| commit | cdc15f49a6d491b6a117a98f96e282113ee9cc97 (patch) | |
| tree | 48206e15c898445851f56f5fe7d429bc425b6b97 /src | |
| parent | 9c29ecde90d6c415ed842c5139937e73ebd2f274 (diff) | |
Fix math header for nocygwin mode.
Revert focus check in fl_fix_focus().
Don't click the click count in Fl_Browser_::select().
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2324 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
| -rw-r--r-- | src/Fl.cxx | 10 | ||||
| -rw-r--r-- | src/Fl_Browser_.cxx | 5 |
2 files changed, 8 insertions, 7 deletions
diff --git a/src/Fl.cxx b/src/Fl.cxx index 5b126c4b5..16690b930 100644 --- a/src/Fl.cxx +++ b/src/Fl.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl.cxx,v 1.24.2.41.2.38 2002/06/11 16:17:41 easysw Exp $" +// "$Id: Fl.cxx,v 1.24.2.41.2.39 2002/06/27 20:52:44 easysw Exp $" // // Main event handling code for the Fast Light Tool Kit (FLTK). // @@ -467,8 +467,10 @@ void fl_fix_focus() { } else Fl::focus(0); - if (!(Fl::event_state() & 0x7f00000 /*FL_BUTTONS*/)) { - +// MRS: Originally we checked the button state, but a user reported that it +// broke click-to-focus in FLWM?!? +// if (!(Fl::event_state() & 0x7f00000 /*FL_BUTTONS*/)) { + if (!Fl::pushed()) { // set belowmouse based on Fl::modal() and fl_xmousewin: w = fl_xmousewin; if (w) { @@ -931,5 +933,5 @@ void Fl_Window::flush() { } // -// End of "$Id: Fl.cxx,v 1.24.2.41.2.38 2002/06/11 16:17:41 easysw Exp $". +// End of "$Id: Fl.cxx,v 1.24.2.41.2.39 2002/06/27 20:52:44 easysw Exp $". // diff --git a/src/Fl_Browser_.cxx b/src/Fl_Browser_.cxx index 0741ea11e..0215a55d5 100644 --- a/src/Fl_Browser_.cxx +++ b/src/Fl_Browser_.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Browser_.cxx,v 1.10.2.16.2.11 2002/04/11 10:46:19 easysw Exp $" +// "$Id: Fl_Browser_.cxx,v 1.10.2.16.2.12 2002/06/27 20:52:44 easysw Exp $" // // Base Browser widget class for the Fast Light Tool Kit (FLTK). // @@ -464,7 +464,6 @@ int Fl_Browser_::select(void* l, int i, int docallbacks) { display(l); } } - Fl::event_clicks(0); if (docallbacks) do_callback(); return 1; } @@ -712,5 +711,5 @@ void Fl_Browser_::item_select(void*, int) {} int Fl_Browser_::item_selected(void* l) const {return l==selection_;} // -// End of "$Id: Fl_Browser_.cxx,v 1.10.2.16.2.11 2002/04/11 10:46:19 easysw Exp $". +// End of "$Id: Fl_Browser_.cxx,v 1.10.2.16.2.12 2002/06/27 20:52:44 easysw Exp $". // |