diff --git a/Fltk/Colorbar_Window.cpp b/Fltk/Colorbar_Window.cpp index 7da789c3d769b351d84e1828102edfec37814f8d..4ba804983d2e97aaf9adeaeaf605b8e62891c7b8 100644 --- a/Fltk/Colorbar_Window.cpp +++ b/Fltk/Colorbar_Window.cpp @@ -1,4 +1,4 @@ -// $Id: Colorbar_Window.cpp,v 1.15 2001-11-14 14:39:39 geuzaine Exp $ +// $Id: Colorbar_Window.cpp,v 1.16 2001-11-23 12:14:05 geuzaine Exp $ #include "Gmsh.h" #include "GmshUI.h" @@ -349,7 +349,14 @@ int Colorbar_Window::handle(int event){ switch(event){ + case FL_FOCUS : + return 1; + + case FL_UNFOCUS : + return 1; + case FL_SHORTCUT : + case FL_KEYBOARD : if(Fl::test_shortcut('0')){ ColorTable_InitParam(0, ct, 1, 1); compute=1; @@ -476,6 +483,7 @@ int Colorbar_Window::handle(int event){ return 1; case FL_PUSH : + take_focus(); //force keyboard focus on the ColorbarWindow ibut = Fl::event_button(); xpos = Fl::event_x(); ypos = Fl::event_y(); diff --git a/Fltk/GUI.cpp b/Fltk/GUI.cpp index e2c71381a3d2ec97b4e68cd25c92e085240d76e7..9addec20843f36c5fde30467bed9c77b290ea8ef 100644 --- a/Fltk/GUI.cpp +++ b/Fltk/GUI.cpp @@ -1,4 +1,4 @@ -// $Id: GUI.cpp,v 1.137 2001-11-23 08:42:33 geuzaine Exp $ +// $Id: GUI.cpp,v 1.138 2001-11-23 12:14:05 geuzaine Exp $ // To make the interface as visually consistent as possible, please: // - use the IW, BB, BH, BW and WB values @@ -2341,7 +2341,6 @@ void GUI::create_view_options_window(int num){ o->hide(); view_colorbar_window = new Colorbar_Window(2*WB, 2*WB+1*BH, width-4*WB, height-5*WB-2*BH); - //view_colorbar_window->take_focus(); // fltk >= 1.1.0 view_colorbar_window->end(); //no set_changed since colorbarwindow has its own callbacks o->end();