changeset 2055:d8eaa1203895

rm fltk2 workaround Haven't found any need for it with 1.3.
author corvid <corvid@lavabit.com>
date Fri, 27 May 2011 15:20:08 +0000
parents 68399783ccec
children c7e61b0a1515
files dw/fltkui.cc src/ui.cc
diffstat 2 files changed, 3 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/dw/fltkui.cc	Fri May 27 09:47:48 2011 -0400
+++ b/dw/fltkui.cc	Fri May 27 15:20:08 2011 +0000
@@ -513,16 +513,7 @@
 
 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 ()
--- a/src/ui.cc	Fri May 27 09:47:48 2011 -0400
+++ b/src/ui.cc	Fri May 27 15:20:08 2011 +0000
@@ -320,13 +320,8 @@
    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);
    }