events

2 files changed, 29 insertions, 29 deletions

diff --git a/dw/fltkui.cc b/dw/fltkui.cc
index ee94dd8b..ff8c7539 100644
--- a/dw/fltkui.cc
+++ b/dw/fltkui.cc
@@ -290,7 +290,7 @@ void FltkLabelButtonResource::sizeRequest (core::Requisition *requisition)
  */
 static core::ButtonState getDwButtonState ()
 {
-   int s1 = ::fltk::event_state ();
+   int s1 = Fl::event_state ();
    int s2 = (core::ButtonState)0;
 
    if (s1 & FL_SHIFT)   s2 |= core::SHIFT_MASK;
@@ -305,20 +305,20 @@ static core::ButtonState getDwButtonState ()
 
 static void setButtonEvent(dw::core::EventButton *event)
 {
-   event->xCanvas = ::fltk::event_x();
-   event->yCanvas = ::fltk::event_y();
+   event->xCanvas = Fl::event_x();
+   event->yCanvas = Fl::event_y();
    event->state = getDwButtonState();
-   event->button = ::fltk::event_button();
-   event->numPressed = ::fltk::event_clicks() + 1;
+   event->button = Fl::event_button();
+   event->numPressed = Fl::event_clicks() + 1;
 }
 
 void FltkLabelButtonResource::widgetCallback (::fltk::Widget *widget,
                                               void *data)
 {
    if ((widget->when () & ::fltk::WHEN_RELEASE) &&
-       ((::fltk::event_key() == FL_Enter) ||
-        (::fltk::event_button() == FL_LEFT_MOUSE ||
-         ::fltk::event_button() == FL_MIDDLE_MOUSE))) {
+       ((Fl::event_key() == FL_Enter) ||
+        (Fl::event_button() == FL_LEFT_MOUSE ||
+         Fl::event_button() == FL_MIDDLE_MOUSE))) {
       FltkLabelButtonResource *lbr = (FltkLabelButtonResource*) data;
       dw::core::EventButton event;
       setButtonEvent(&event);
@@ -364,16 +364,16 @@ void FltkComplexButtonResource::widgetCallback (::fltk::Widget *widget,
    FltkComplexButtonResource *res = (FltkComplexButtonResource*)data;
 
    if (widget->when() == ::fltk::WHEN_RELEASE &&
-       ((::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();
+       ((Fl::event_key() == FL_Enter) ||
+        (Fl::event_button() == FL_LEFT_MOUSE ||
+         Fl::event_button() == FL_MIDDLE_MOUSE))) {
+      res->click_x = Fl::event_x();
+      res->click_y = Fl::event_y();
       dw::core::EventButton event;
       setButtonEvent(&event);
       res->emitClicked(&event);
    } else {
-      ((FltkViewBase*)res->flatView)->handle(::fltk::event());
+      ((FltkViewBase*)res->flatView)->handle(Fl::event());
    }
 }
 
@@ -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() == FL_Enter))
+       (Fl::event_key() == FL_Enter))
       ((FltkEntryResource*)data)->emitActivate ();
 }
 
diff --git a/dw/fltkviewbase.cc b/dw/fltkviewbase.cc
index 73b4cd7a..db500e9b 100644
--- a/dw/fltkviewbase.cc
+++ b/dw/fltkviewbase.cc
@@ -209,10 +209,10 @@ int FltkViewBase::handle (int event)
    switch(event) {
    case FL_PUSH:
       processed =
-         theLayout->buttonPress (this, event_clicks () + 1,
-                                 translateViewXToCanvasX (event_x ()),
-                                 translateViewYToCanvasY (event_y ()),
-                                 getDwButtonState (), event_button ());
+         theLayout->buttonPress (this, Fl::event_clicks () + 1,
+                                 translateViewXToCanvasX (Fl::event_x ()),
+                                 translateViewYToCanvasY (Fl::event_y ()),
+                                 getDwButtonState (), Fl::event_button ());
       _MSG("PUSH => %s\n", processed ? "true" : "false");
       if (processed) {
          /* pressed dw content; give focus to the view */
@@ -222,16 +222,16 @@ int FltkViewBase::handle (int event)
 
    case FL_RELEASE:
       processed =
-         theLayout->buttonRelease (this, event_clicks () + 1,
-                                   translateViewXToCanvasX (event_x ()),
-                                   translateViewYToCanvasY (event_y ()),
-                                   getDwButtonState (), event_button ());
+         theLayout->buttonRelease (this, Fl::event_clicks () + 1,
+                                   translateViewXToCanvasX (Fl::event_x ()),
+                                   translateViewYToCanvasY (Fl::event_y ()),
+                                   getDwButtonState (), Fl::event_button ());
       _MSG("RELEASE => %s\n", processed ? "true" : "false");
       return processed ? true : Group::handle (event);
 
    case FL_MOVE:
-      mouse_x = event_x();
-      mouse_y = event_y();
+      mouse_x = Fl::event_x();
+      mouse_y = Fl::event_y();
       processed =
          theLayout->motionNotify (this,
                                   translateViewXToCanvasX (mouse_x),
@@ -243,15 +243,15 @@ int FltkViewBase::handle (int event)
    case FL_DRAG:
       processed =
          theLayout->motionNotify (this,
-                                  translateViewXToCanvasX (event_x ()),
-                                  translateViewYToCanvasY (event_y ()),
+                                  translateViewXToCanvasX (Fl::event_x ()),
+                                  translateViewYToCanvasY (Fl::event_y ()),
                                   getDwButtonState ());
       _MSG("DRAG => %s\n", processed ? "true" : "false");
       return processed ? true : Group::handle (event);
 
    case FL_ENTER:
-      theLayout->enterNotify (this, translateViewXToCanvasX (event_x ()),
-                              translateViewYToCanvasY (event_y ()),
+      theLayout->enterNotify (this, translateViewXToCanvasX (Fl::event_x ()),
+                              translateViewYToCanvasY (Fl::event_y ()),
                               getDwButtonState ());
       return Group::handle (event);