aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dw/fltkui.cc11
-rw-r--r--src/ui.cc9
2 files changed, 3 insertions, 17 deletions
diff --git a/dw/fltkui.cc b/dw/fltkui.cc
index f3192c22..62928ed4 100644
--- a/dw/fltkui.cc
+++ b/dw/fltkui.cc
@@ -513,16 +513,7 @@ void FltkEntryResource::sizeRequest (core::Requisition *requisition)
void FltkEntryResource::widgetCallback (Fl_Widget *widget, void *data)
{
- /* The (::fltk::event_key() == FL_Enter) test
- * is necessary because WHEN_ENTER_KEY also includes
- * other events we're not interested in. For instance pressing
- * The Back or Forward, buttons, or the first click on a rendered
- * page. BUG: this must be investigated and reported to FLTK2 team
- */
- _MSG("when = %d\n", widget->when ());
- if ((widget->when () & FL_WHEN_ENTER_KEY_ALWAYS) &&
- (Fl::event_key() == FL_Enter))
- ((FltkEntryResource*)data)->emitActivate ();
+ ((FltkEntryResource*)data)->emitActivate ();
}
const char *FltkEntryResource::getText ()
diff --git a/src/ui.cc b/src/ui.cc
index 1004bfdc..30106c21 100644
--- a/src/ui.cc
+++ b/src/ui.cc
@@ -320,13 +320,8 @@ static void location_cb(Fl_Widget *wid, void *data)
UI *ui = (UI*)data;
_MSG("location_cb()\n");
- /* This test is necessary because WHEN_ENTER_KEY also includes
- * other events we're not interested in. For instance pressing
- * The Back or Forward, buttons, or the first click on a rendered
- * page. BUG: this must be investigated and reported to FLTK2 team */
- if (Fl::event_key() == FL_Enter) {
- a_UIcmd_open_urlstr(a_UIcmd_get_bw_by_widget(i), i->value());
- }
+ a_UIcmd_open_urlstr(a_UIcmd_get_bw_by_widget(i), i->value());
+
if (ui->get_panelmode() == UI_TEMPORARILY_SHOW_PANELS) {
ui->set_panelmode(UI_HIDDEN);
}