The keypad Enter key works as the normal Enter/Return key in

common widgets (STR #191)


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3117 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

6 files changed, 17 insertions, 12 deletions

diff --git a/CHANGES b/CHANGES
index 56da73ff9..5fd4d0286 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,7 @@
 CHANGES IN FLTK 1.1.5rc1
 
+	- The keypad Enter key works as the normal Enter/Return
+	  key in common widgets (STR #191)
 	- Doco fixes (STR #186)
 	- Fixed some OS/2-specific build problems (STR #185)
 	- Calling Fl_Text_Display::buffer() with the same buffer
diff --git a/src/Fl_Browser_.cxx b/src/Fl_Browser_.cxx
index d7d49adf7..ddd6004ed 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.18 2003/01/30 21:41:27 easysw Exp $"
+// "$Id: Fl_Browser_.cxx,v 1.10.2.16.2.19 2003/11/01 01:49:35 easysw Exp $"
 //
 // Base Browser widget class for the Fast Light Tool Kit (FLTK).
 //
@@ -559,6 +559,7 @@ int Fl_Browser_::handle(int event) {
 	return 1;
       } else switch (Fl::event_key()) {
       case FL_Enter:
+      case FL_KP_Enter:
 	select_only(l, 1);
 	return 1;
       case ' ':
@@ -757,5 +758,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.18 2003/01/30 21:41:27 easysw Exp $".
+// End of "$Id: Fl_Browser_.cxx,v 1.10.2.16.2.19 2003/11/01 01:49:35 easysw Exp $".
 //
diff --git a/src/Fl_File_Chooser2.cxx b/src/Fl_File_Chooser2.cxx
index ce1c5d25c..6f1179223 100644
--- a/src/Fl_File_Chooser2.cxx
+++ b/src/Fl_File_Chooser2.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_File_Chooser2.cxx,v 1.1.2.32 2003/09/03 19:38:01 easysw Exp $"
+// "$Id: Fl_File_Chooser2.cxx,v 1.1.2.33 2003/11/01 01:49:35 easysw Exp $"
 //
 // More Fl_File_Chooser routines.
 //
@@ -488,7 +488,7 @@ Fl_File_Chooser::fileNameCB()
   filename = pathname;
 
   // Now process things according to the key pressed...
-  if (Fl::event_key() == FL_Enter)
+  if (Fl::event_key() == FL_Enter  ||  Fl::event_key() == FL_KP_Enter)
   {
     // Enter pressed - select or change directory...
 #if (defined(WIN32) && ! defined(__CYGWIN__)) || defined(__EMX__)
@@ -1163,5 +1163,5 @@ unquote_pathname(char       *dst,	// O - Destination string
 
 
 //
-// End of "$Id: Fl_File_Chooser2.cxx,v 1.1.2.32 2003/09/03 19:38:01 easysw Exp $".
+// End of "$Id: Fl_File_Chooser2.cxx,v 1.1.2.33 2003/11/01 01:49:35 easysw Exp $".
 //
diff --git a/src/Fl_Group.cxx b/src/Fl_Group.cxx
index c89ef034c..d742601b4 100644
--- a/src/Fl_Group.cxx
+++ b/src/Fl_Group.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Group.cxx,v 1.8.2.8.2.21 2003/01/30 21:41:51 easysw Exp $"
+// "$Id: Fl_Group.cxx,v 1.8.2.8.2.22 2003/11/01 01:49:35 easysw Exp $"
 //
 // Group widget for the Fast Light Tool Kit (FLTK).
 //
@@ -158,7 +158,7 @@ int Fl_Group::handle(int event) {
       if (o->takesevents() && !Fl::event_inside(o) && send(o,FL_SHORTCUT))
 	return 1;
     }
-    if (Fl::event_key() == FL_Enter) return navigation(FL_Down);
+    if ((Fl::event_key() == FL_Enter || Fl::event_key() == FL_KP_Enter)) return navigation(FL_Down);
     return 0;
 
   case FL_ENTER:
@@ -593,5 +593,5 @@ void Fl_Group::draw_outside_label(const Fl_Widget& widget) const {
 }
 
 //
-// End of "$Id: Fl_Group.cxx,v 1.8.2.8.2.21 2003/01/30 21:41:51 easysw Exp $".
+// End of "$Id: Fl_Group.cxx,v 1.8.2.8.2.22 2003/11/01 01:49:35 easysw Exp $".
 //
diff --git a/src/Fl_Menu.cxx b/src/Fl_Menu.cxx
index e28a940d9..fc3489c1d 100644
--- a/src/Fl_Menu.cxx
+++ b/src/Fl_Menu.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Menu.cxx,v 1.18.2.12.2.27 2003/07/18 22:36:00 matthiaswm Exp $"
+// "$Id: Fl_Menu.cxx,v 1.18.2.12.2.28 2003/11/01 01:49:35 easysw Exp $"
 //
 // Menu code for the Fast Light Tool Kit (FLTK).
 //
@@ -535,6 +535,7 @@ int menuwindow::handle(int e) {
 	setitem(pp.menu_number-1, pp.p[pp.menu_number-1]->selected);
       return 1;
     case FL_Enter:
+    case FL_KP_Enter:
     case ' ':
       pp.state = DONE_STATE;
       return 1;
@@ -793,5 +794,5 @@ const Fl_Menu_Item* Fl_Menu_Item::test_shortcut() const {
 }
 
 //
-// End of "$Id: Fl_Menu.cxx,v 1.18.2.12.2.27 2003/07/18 22:36:00 matthiaswm Exp $".
+// End of "$Id: Fl_Menu.cxx,v 1.18.2.12.2.28 2003/11/01 01:49:35 easysw Exp $".
 //
diff --git a/src/fl_show_colormap.cxx b/src/fl_show_colormap.cxx
index 6ba68d2a4..250af14e4 100644
--- a/src/fl_show_colormap.cxx
+++ b/src/fl_show_colormap.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: fl_show_colormap.cxx,v 1.5.2.4.2.4 2003/01/30 21:44:23 easysw Exp $"
+// "$Id: fl_show_colormap.cxx,v 1.5.2.4.2.5 2003/11/01 01:49:35 easysw Exp $"
 //
 // Colormap color selection dialog for the Fast Light Tool Kit (FLTK).
 //
@@ -102,6 +102,7 @@ int ColorMenu::handle(int e) {
     case FL_Left: if (c > 0) c--; break;
     case FL_Right: if (c < 255) c++; break;
     case FL_Escape: which = initial; done = 1; return 1;
+    case FL_KP_Enter:
     case FL_Enter: done = 1; return 1;
     default: return 0;
     }
@@ -150,5 +151,5 @@ Fl_Color fl_show_colormap(Fl_Color oldcol) {
 }
 
 //
-// End of "$Id: fl_show_colormap.cxx,v 1.5.2.4.2.4 2003/01/30 21:44:23 easysw Exp $".
+// End of "$Id: fl_show_colormap.cxx,v 1.5.2.4.2.5 2003/11/01 01:49:35 easysw Exp $".
 //