diff --git a/src/Fl.cxx b/src/Fl.cxx index fae4c980f..01c625b7a 100644 --- a/src/Fl.cxx +++ b/src/Fl.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl.cxx,v 1.16 1999/01/26 21:37:14 mike Exp $" +// "$Id: Fl.cxx,v 1.17 1999/01/29 16:56:47 carl Exp $" // // Main event handling code for the Fast Light Tool Kit (FLTK). // @@ -665,6 +665,15 @@ void Fl_Window::flush() { draw(); } +int fl_old_shortcut(const char* s) { + if (!s || !*s) return 0; + int n = 0; + if (*s == '#') {n |= FL_ALT; s++;} + if (*s == '+') {n |= FL_SHIFT; s++;} + if (*s == '^') {n |= FL_CTRL; s++;} + return n | *s; +} + // -// End of "$Id: Fl.cxx,v 1.16 1999/01/26 21:37:14 mike Exp $". +// End of "$Id: Fl.cxx,v 1.17 1999/01/29 16:56:47 carl Exp $". // diff --git a/src/Fl_Menu_add.cxx b/src/Fl_Menu_add.cxx index cb4441e8e..cb6b91b4d 100644 --- a/src/Fl_Menu_add.cxx +++ b/src/Fl_Menu_add.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Menu_add.cxx,v 1.5 1999/01/07 19:17:23 mike Exp $" +// "$Id: Fl_Menu_add.cxx,v 1.6 1999/01/29 16:56:48 carl Exp $" // // Menu utilities for the Fast Light Tool Kit (FLTK). // @@ -38,15 +38,6 @@ #include #include -int fl_old_shortcut(const char* s) { - if (!s || !*s) return 0; - int n = 0; - if (*s == '#') {n |= FL_ALT; s++;} - if (*s == '+') {n |= FL_SHIFT; s++;} - if (*s == '^') {n |= FL_CTRL; s++;} - return n | *s; -} - // always allocate this much initially: #define INITIAL_MENU_SIZE 15 @@ -201,5 +192,5 @@ void Fl_Menu_::clear() { } // -// End of "$Id: Fl_Menu_add.cxx,v 1.5 1999/01/07 19:17:23 mike Exp $". +// End of "$Id: Fl_Menu_add.cxx,v 1.6 1999/01/29 16:56:48 carl Exp $". //