diff options
Diffstat (limited to 'dw')
| -rw-r--r-- | dw/fltkpreview.cc | 8 | ||||
| -rw-r--r-- | dw/fltkviewbase.cc | 14 | ||||
| -rw-r--r-- | dw/fltkviewport.cc | 52 |
3 files changed, 37 insertions, 37 deletions
diff --git a/dw/fltkpreview.cc b/dw/fltkpreview.cc index 7096420f..b169ff6b 100644 --- a/dw/fltkpreview.cc +++ b/dw/fltkpreview.cc @@ -278,18 +278,18 @@ int FltkPreviewButton::handle (int event) /** \bug Some parts are missing. */ switch (event) { - case PUSH: + case FL_PUSH: window->showWindow (); return Button::handle (event); - case DRAG: + case FL_DRAG: if (window->visible ()) { - window->scrollTo (event_x_root (), event_y_root ()); + window->scrollTo (Fl::event_x_root (), Fl::event_y_root ()); return 1; } return Button::handle (event); - case RELEASE: + case FL_RELEASE: window->hideWindow (); return Button::handle (event); diff --git a/dw/fltkviewbase.cc b/dw/fltkviewbase.cc index cab22cf4..dcc9ed08 100644 --- a/dw/fltkviewbase.cc +++ b/dw/fltkviewbase.cc @@ -184,7 +184,7 @@ void FltkViewBase::drawChildWidgets () { core::ButtonState getDwButtonState () { - int s1 = event_state (); + int s1 = Fl::event_state (); int s2 = (core::ButtonState)0; if (s1 & SHIFT) s2 |= core::SHIFT_MASK; @@ -207,7 +207,7 @@ int FltkViewBase::handle (int event) * when passed a fltk::PUSH event. " */ switch(event) { - case PUSH: + case FL_PUSH: processed = theLayout->buttonPress (this, event_clicks () + 1, translateViewXToCanvasX (event_x ()), @@ -220,7 +220,7 @@ int FltkViewBase::handle (int event) } return processed ? true : Group::handle (event); - case RELEASE: + case FL_RELEASE: processed = theLayout->buttonRelease (this, event_clicks () + 1, translateViewXToCanvasX (event_x ()), @@ -229,7 +229,7 @@ int FltkViewBase::handle (int event) _MSG("RELEASE => %s\n", processed ? "true" : "false"); return processed ? true : Group::handle (event); - case MOVE: + case FL_MOVE: mouse_x = event_x(); mouse_y = event_y(); processed = @@ -240,7 +240,7 @@ int FltkViewBase::handle (int event) _MSG("MOVE => %s\n", processed ? "true" : "false"); return processed ? true : Group::handle (event); - case DRAG: + case FL_DRAG: processed = theLayout->motionNotify (this, translateViewXToCanvasX (event_x ()), @@ -249,13 +249,13 @@ int FltkViewBase::handle (int event) _MSG("DRAG => %s\n", processed ? "true" : "false"); return processed ? true : Group::handle (event); - case ENTER: + case FL_ENTER: theLayout->enterNotify (this, translateViewXToCanvasX (event_x ()), translateViewYToCanvasY (event_y ()), getDwButtonState ()); return Group::handle (event); - case LEAVE: + case FL_LEAVE: theLayout->leaveNotify (this, getDwButtonState ()); return Group::handle (event); diff --git a/dw/fltkviewport.cc b/dw/fltkviewport.cc index 0d6c1b46..1be6f0c0 100644 --- a/dw/fltkviewport.cc +++ b/dw/fltkviewport.cc @@ -214,87 +214,87 @@ int FltkViewport::handle (int event) { _MSG("FltkViewport::handle %d\n", event); - if (hscrollbar->Rectangle::contains (event_x (), event_y ()) && - !(event_state() & (SHIFT | CTRL | ALT)) && + if (hscrollbar->Rectangle::contains (Fl::event_x (), Fl::event_y ()) && + !(Fl::event_state() & (SHIFT | CTRL | ALT)) && hscrollbar->send (event)) { return 1; } - if (vscrollbar->Rectangle::contains (event_x (), event_y ()) && + if (vscrollbar->Rectangle::contains (Fl::event_x (), Fl::event_y ()) && vscrollbar->send (event)) { return 1; } switch(event) { - case ::fltk::KEY: - /* Tell fltk we want to receive KEY events as SHORTCUT. + case FL_KEYBOARD: + /* Tell fltk we want to receive KEYBOARD events as SHORTCUT. * As we don't know the exact keybindings set by the user, we ask * for all of them (except Tab to keep form navigation). */ - if (::fltk::event_key() != FL_Tab) + if (Fl::event_key() != FL_Tab) return 0; break; - case ::fltk::FOCUS: + case FL_FOCUS: /** \bug Draw focus box. */ /* If the user clicks with the left button we take focus * and thereby unfocus any form widgets. * Otherwise we let fltk do the focus handling. */ - if (::fltk::event_button() == FL_LEFT_MOUSE || focus_index() < 0) { + if (Fl::event_button() == FL_LEFT_MOUSE || focus_index() < 0) { focus_index(-1); return 1; } break; - case ::fltk::UNFOCUS: + case FL_UNFOCUS: /** \bug Undraw focus box. */ break; - case ::fltk::PUSH: + case FL_PUSH: take_focus(); - if (::fltk::event_button() == FL_MIDDLE_MOUSE) { + if (Fl::event_button() == FL_MIDDLE_MOUSE) { /* pass event so that middle click can open link in new window */ if (FltkWidgetView::handle (event) == 0) { dragScrolling = 1; - dragX = ::fltk::event_x(); - dragY = ::fltk::event_y(); + dragX = Fl::event_x(); + dragY = Fl::event_y(); setCursor (core::style::CURSOR_MOVE); } return 1; } break; - case ::fltk::DRAG: - if (::fltk::event_button() == FL_MIDDLE_MOUSE) { + case FL_DRAG: + if (Fl::event_button() == FL_MIDDLE_MOUSE) { if (dragScrolling) { - scroll(dragX - ::fltk::event_x(), dragY - ::fltk::event_y()); - dragX = ::fltk::event_x(); - dragY = ::fltk::event_y(); + scroll(dragX - Fl::event_x(), dragY - Fl::event_y()); + dragX = Fl::event_x(); + dragY = Fl::event_y(); return 1; } } break; - case ::fltk:: MOUSEWHEEL: - return (event_dx() ? hscrollbar : vscrollbar)->handle(event); + case FL_MOUSEWHEEL: + return (Fl::event_dx() ? hscrollbar : vscrollbar)->handle(event); break; - case ::fltk::RELEASE: - if (::fltk::event_button() == FL_MIDDLE_MOUSE) { + case FL_RELEASE: + if (Fl::event_button() == FL_MIDDLE_MOUSE) { dragScrolling = 0; setCursor (core::style::CURSOR_DEFAULT); } break; - case ::fltk::ENTER: + case FL_ENTER: /* could be the result of, e.g., closing another window. */ - mouse_x = ::fltk::event_x(); - mouse_y = ::fltk::event_y(); + mouse_x = Fl::event_x(); + mouse_y = Fl::event_y(); positionChanged(); break; - case ::fltk::LEAVE: + case FL_LEAVE: mouse_x = mouse_y = -1; break; } |