From 9e0efc1e888217d07cd1ac07e27f0f3d1ac1e52a Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Thu, 24 Oct 2002 12:53:41 +0000 Subject: First fixes for 1.1.2 - Fl_Scrollbar shouldn't take keyboard focus, move Fl_Slider focus stuff to main handle() method, use Fl_Light_Button in scroll demo. Bump version numbers to 1.1.2. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2690 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/Fl_Scrollbar.cxx | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'src/Fl_Scrollbar.cxx') diff --git a/src/Fl_Scrollbar.cxx b/src/Fl_Scrollbar.cxx index d5fbe987e..099e9ab5a 100644 --- a/src/Fl_Scrollbar.cxx +++ b/src/Fl_Scrollbar.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Scrollbar.cxx,v 1.7.2.14.2.13 2002/10/06 18:37:14 easysw Exp $" +// "$Id: Fl_Scrollbar.cxx,v 1.7.2.14.2.14 2002/10/24 12:53:40 easysw Exp $" // // Scroll bar widget for the Fast Light Tool Kit (FLTK). // @@ -112,7 +112,6 @@ int Fl_Scrollbar::handle(int event) { handle_release(); return 1; case FL_PUSH: - if (Fl::visible_focus()) Fl::focus(this); if (pushed_) return 1; if (area != 8) pushed_ = area; if (pushed_) { @@ -130,12 +129,6 @@ int Fl_Scrollbar::handle(int event) { if (horizontal()) return 0; handle_drag(clamp(value() + linesize_ * Fl::e_dy)); return 1; - case FL_FOCUS : - case FL_UNFOCUS : - if (Fl::visible_focus()) { - redraw(); - return 1; - } else return 0; case FL_SHORTCUT: case FL_KEYBOARD: { int v = value(); @@ -249,5 +242,5 @@ Fl_Scrollbar::Fl_Scrollbar(int X, int Y, int W, int H, const char* L) } // -// End of "$Id: Fl_Scrollbar.cxx,v 1.7.2.14.2.13 2002/10/06 18:37:14 easysw Exp $". +// End of "$Id: Fl_Scrollbar.cxx,v 1.7.2.14.2.14 2002/10/24 12:53:40 easysw Exp $". // -- cgit v1.2.3