diff options
| -rw-r--r-- | dw/fltkui.cc | 12 | ||||
| -rw-r--r-- | dw/fltkviewbase.cc | 12 | ||||
| -rw-r--r-- | dw/fltkviewport.cc | 2 |
3 files changed, 13 insertions, 13 deletions
diff --git a/dw/fltkui.cc b/dw/fltkui.cc index 0af3fc02..ee94dd8b 100644 --- a/dw/fltkui.cc +++ b/dw/fltkui.cc @@ -293,12 +293,12 @@ static core::ButtonState getDwButtonState () int s1 = ::fltk::event_state (); int s2 = (core::ButtonState)0; - if (s1 & ::fltk::SHIFT) s2 |= core::SHIFT_MASK; - if (s1 & ::fltk::CTRL) s2 |= core::CONTROL_MASK; - if (s1 & ::fltk::ALT) s2 |= core::META_MASK; - if (s1 & ::fltk::BUTTON1) s2 |= core::BUTTON1_MASK; - if (s1 & ::fltk::BUTTON2) s2 |= core::BUTTON2_MASK; - if (s1 & ::fltk::BUTTON3) s2 |= core::BUTTON3_MASK; + if (s1 & FL_SHIFT) s2 |= core::SHIFT_MASK; + if (s1 & FL_CTRL) s2 |= core::CONTROL_MASK; + if (s1 & FL_ALT) s2 |= core::META_MASK; + if (s1 & FL_BUTTON1) s2 |= core::BUTTON1_MASK; + if (s1 & FL_BUTTON2) s2 |= core::BUTTON2_MASK; + if (s1 & FL_BUTTON3) s2 |= core::BUTTON3_MASK; return (core::ButtonState)s2; } diff --git a/dw/fltkviewbase.cc b/dw/fltkviewbase.cc index dcc9ed08..73b4cd7a 100644 --- a/dw/fltkviewbase.cc +++ b/dw/fltkviewbase.cc @@ -187,12 +187,12 @@ core::ButtonState getDwButtonState () int s1 = Fl::event_state (); int s2 = (core::ButtonState)0; - if (s1 & SHIFT) s2 |= core::SHIFT_MASK; - if (s1 & CTRL) s2 |= core::CONTROL_MASK; - if (s1 & ALT) s2 |= core::META_MASK; - if (s1 & BUTTON1) s2 |= core::BUTTON1_MASK; - if (s1 & BUTTON2) s2 |= core::BUTTON2_MASK; - if (s1 & BUTTON3) s2 |= core::BUTTON3_MASK; + if (s1 & FL_SHIFT) s2 |= core::SHIFT_MASK; + if (s1 & FL_CTRL) s2 |= core::CONTROL_MASK; + if (s1 & FL_ALT) s2 |= core::META_MASK; + if (s1 & FL_BUTTON1) s2 |= core::BUTTON1_MASK; + if (s1 & FL_BUTTON2) s2 |= core::BUTTON2_MASK; + if (s1 & FL_BUTTON3) s2 |= core::BUTTON3_MASK; return (core::ButtonState)s2; } diff --git a/dw/fltkviewport.cc b/dw/fltkviewport.cc index 1be6f0c0..1f544b67 100644 --- a/dw/fltkviewport.cc +++ b/dw/fltkviewport.cc @@ -215,7 +215,7 @@ int FltkViewport::handle (int event) _MSG("FltkViewport::handle %d\n", event); if (hscrollbar->Rectangle::contains (Fl::event_x (), Fl::event_y ()) && - !(Fl::event_state() & (SHIFT | CTRL | ALT)) && + !(Fl::event_state() & (FL_SHIFT | FL_CTRL | FL_ALT)) && hscrollbar->send (event)) { return 1; } |