diff options
Diffstat (limited to 'dw')
| -rw-r--r-- | dw/fltkui.cc | 16 | ||||
| -rw-r--r-- | dw/fltkviewport.cc | 12 |
2 files changed, 14 insertions, 14 deletions
diff --git a/dw/fltkui.cc b/dw/fltkui.cc index ff80e14c..0af3fc02 100644 --- a/dw/fltkui.cc +++ b/dw/fltkui.cc @@ -316,9 +316,9 @@ void FltkLabelButtonResource::widgetCallback (::fltk::Widget *widget, void *data) { if ((widget->when () & ::fltk::WHEN_RELEASE) && - ((::fltk::event_key() == ::fltk::ReturnKey) || - (::fltk::event_button() == ::fltk::LeftButton || - ::fltk::event_button() == ::fltk::MiddleButton))) { + ((::fltk::event_key() == FL_Enter) || + (::fltk::event_button() == FL_LEFT_MOUSE || + ::fltk::event_button() == FL_MIDDLE_MOUSE))) { FltkLabelButtonResource *lbr = (FltkLabelButtonResource*) data; dw::core::EventButton event; setButtonEvent(&event); @@ -364,9 +364,9 @@ void FltkComplexButtonResource::widgetCallback (::fltk::Widget *widget, FltkComplexButtonResource *res = (FltkComplexButtonResource*)data; if (widget->when() == ::fltk::WHEN_RELEASE && - ((::fltk::event_key() == ::fltk::ReturnKey) || - (::fltk::event_button() == ::fltk::LeftButton || - ::fltk::event_button() == ::fltk::MiddleButton))) { + ((::fltk::event_key() == FL_Enter) || + (::fltk::event_button() == FL_LEFT_MOUSE || + ::fltk::event_button() == FL_MIDDLE_MOUSE))) { res->click_x = ::fltk::event_x(); res->click_y = ::fltk::event_y(); dw::core::EventButton event; @@ -518,7 +518,7 @@ void FltkEntryResource::sizeRequest (core::Requisition *requisition) void FltkEntryResource::widgetCallback (::fltk::Widget *widget, void *data) { - /* The (::fltk::event_key() == ::fltk::ReturnKey) test + /* 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 @@ -526,7 +526,7 @@ void FltkEntryResource::widgetCallback (::fltk::Widget *widget, */ _MSG("when = %d\n", widget->when ()); if ((widget->when () & ::fltk::WHEN_ENTER_KEY_ALWAYS) && - (::fltk::event_key() == ::fltk::ReturnKey)) + (::fltk::event_key() == FL_Enter)) ((FltkEntryResource*)data)->emitActivate (); } diff --git a/dw/fltkviewport.cc b/dw/fltkviewport.cc index a8555c60..0d6c1b46 100644 --- a/dw/fltkviewport.cc +++ b/dw/fltkviewport.cc @@ -229,8 +229,8 @@ int FltkViewport::handle (int event) case ::fltk::KEY: /* Tell fltk we want to receive KEY events as SHORTCUT. * As we don't know the exact keybindings set by the user, we ask - * for all of them (except TabKey to keep form navigation). */ - if (::fltk::event_key() != TabKey) + * for all of them (except Tab to keep form navigation). */ + if (::fltk::event_key() != FL_Tab) return 0; break; @@ -241,7 +241,7 @@ int FltkViewport::handle (int event) * and thereby unfocus any form widgets. * Otherwise we let fltk do the focus handling. */ - if (::fltk::event_button() == ::fltk::LeftButton || focus_index() < 0) { + if (::fltk::event_button() == FL_LEFT_MOUSE || focus_index() < 0) { focus_index(-1); return 1; } @@ -253,7 +253,7 @@ int FltkViewport::handle (int event) case ::fltk::PUSH: take_focus(); - if (::fltk::event_button() == ::fltk::MiddleButton) { + if (::fltk::event_button() == FL_MIDDLE_MOUSE) { /* pass event so that middle click can open link in new window */ if (FltkWidgetView::handle (event) == 0) { dragScrolling = 1; @@ -266,7 +266,7 @@ int FltkViewport::handle (int event) break; case ::fltk::DRAG: - if (::fltk::event_button() == ::fltk::MiddleButton) { + if (::fltk::event_button() == FL_MIDDLE_MOUSE) { if (dragScrolling) { scroll(dragX - ::fltk::event_x(), dragY - ::fltk::event_y()); dragX = ::fltk::event_x(); @@ -281,7 +281,7 @@ int FltkViewport::handle (int event) break; case ::fltk::RELEASE: - if (::fltk::event_button() == ::fltk::MiddleButton) { + if (::fltk::event_button() == FL_MIDDLE_MOUSE) { dragScrolling = 0; setCursor (core::style::CURSOR_DEFAULT); } |