diff options
| -rw-r--r-- | dw/fltkpreview.cc | 2 | ||||
| -rw-r--r-- | dw/layout.cc | 4 | ||||
| -rw-r--r-- | dw/layout.hh | 2 | ||||
| -rw-r--r-- | dw/widget.cc | 8 | ||||
| -rw-r--r-- | dw/widget.hh | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/dw/fltkpreview.cc b/dw/fltkpreview.cc index 84744ca1..79269bd5 100644 --- a/dw/fltkpreview.cc +++ b/dw/fltkpreview.cc @@ -154,7 +154,7 @@ bool FltkPreview::usesFltkWidgets () return false; } -void FltkPreview::drawFltkWidget (Widget *widget, +void FltkPreview::drawFltkWidget (::fltk::Widget *widget, core::Rectangle *area) { } diff --git a/dw/layout.cc b/dw/layout.cc index 8a9d48e2..27b155e3 100644 --- a/dw/layout.cc +++ b/dw/layout.cc @@ -38,8 +38,8 @@ void Layout::Receiver::canvasSizeChanged (int width, int ascent, int descent) // ---------------------------------------------------------------------- bool Layout::Emitter::emitToReceiver (lout::signal::Receiver *receiver, - int signalNo, - int argc, Object **argv) + int signalNo, int argc, + lout::object::Object **argv) { Receiver *layoutReceiver = (Receiver*)receiver; diff --git a/dw/layout.hh b/dw/layout.hh index b910ac20..29e6ba56 100644 --- a/dw/layout.hh +++ b/dw/layout.hh @@ -37,7 +37,7 @@ private: protected: bool emitToReceiver (lout::signal::Receiver *receiver, int signalNo, - int argc, Object **argv); + int argc, lout::object::Object **argv); public: inline void connectLayout (Receiver *receiver) { connect (receiver); } diff --git a/dw/widget.cc b/dw/widget.cc index 128c21a4..289ef380 100644 --- a/dw/widget.cc +++ b/dw/widget.cc @@ -54,8 +54,8 @@ void Widget::EventReceiver::leaveNotify (Widget *widget, EventCrossing *event) bool Widget::EventEmitter::emitToReceiver (lout::signal::Receiver *receiver, - int signalNo, - int argc, Object **argv) + int signalNo, int argc, + lout::object::Object **argv) { EventReceiver *eventReceiver = (EventReceiver*)receiver; @@ -152,8 +152,8 @@ bool Widget::LinkReceiver::click (Widget *widget, int link, int img, bool Widget::LinkEmitter::emitToReceiver (lout::signal::Receiver *receiver, - int signalNo, - int argc, Object **argv) + int signalNo, int argc, + lout::object::Object **argv) { LinkReceiver *linkReceiver = (LinkReceiver*)receiver; diff --git a/dw/widget.hh b/dw/widget.hh index 0515f250..569d7d6d 100644 --- a/dw/widget.hh +++ b/dw/widget.hh @@ -118,7 +118,7 @@ private: protected: bool emitToReceiver (lout::signal::Receiver *receiver, int signalNo, - int argc, Object **argv); + int argc, lout::object::Object **argv); public: inline void connectEvent (EventReceiver *receiver) @@ -138,7 +138,7 @@ private: protected: bool emitToReceiver (lout::signal::Receiver *receiver, int signalNo, - int argc, Object **argv); + int argc, lout::object::Object **argv); public: inline void connectLink (LinkReceiver *receiver) { connect (receiver); } |