diff --git a/src/osgGA/AnimationPathManipulator.cpp b/src/osgGA/AnimationPathManipulator.cpp index b1ac82501..2169e2b51 100644 --- a/src/osgGA/AnimationPathManipulator.cpp +++ b/src/osgGA/AnimationPathManipulator.cpp @@ -65,9 +65,6 @@ bool AnimationPathManipulator::handle(const osgGA::GUIEventAdapter& ea,osgGA::GU { if( !valid() ) return false; - us = us; - - bool retval = false; switch( ea.getEventType() ) { case GUIEventAdapter::FRAME: @@ -79,8 +76,7 @@ bool AnimationPathManipulator::handle(const osgGA::GUIEventAdapter& ea,osgGA::GU { handleFrame( ea.time() ); } - retval = true; - break; + return false; case GUIEventAdapter::KEYDOWN: if (ea.getKey()==' ') { @@ -108,12 +104,11 @@ bool AnimationPathManipulator::handle(const osgGA::GUIEventAdapter& ea,osgGA::GU return true; } - retval = false; break; default: break; } - return retval; + return false; } void AnimationPathManipulator::getUsage(osg::ApplicationUsage& usage) const diff --git a/src/osgGA/DriveManipulator.cpp b/src/osgGA/DriveManipulator.cpp index 8ca11097b..5db1ed423 100644 --- a/src/osgGA/DriveManipulator.cpp +++ b/src/osgGA/DriveManipulator.cpp @@ -328,7 +328,7 @@ bool DriveManipulator::handle(const GUIEventAdapter& ea,GUIActionAdapter& us) { addMouseEvent(ea); if (calcMovement()) us.requestRedraw(); - return true; + return false; } case(GUIEventAdapter::RESIZE): diff --git a/src/osgGA/FlightManipulator.cpp b/src/osgGA/FlightManipulator.cpp index c0a35b06a..d0717bbed 100644 --- a/src/osgGA/FlightManipulator.cpp +++ b/src/osgGA/FlightManipulator.cpp @@ -147,7 +147,7 @@ bool FlightManipulator::handle(const GUIEventAdapter& ea,GUIActionAdapter& us) case(GUIEventAdapter::FRAME): addMouseEvent(ea); if (calcMovement()) us.requestRedraw(); - return true; + return false; case(GUIEventAdapter::RESIZE): init(ea,us); diff --git a/src/osgGA/TrackballManipulator.cpp b/src/osgGA/TrackballManipulator.cpp index ec7e4e46f..ac8209462 100644 --- a/src/osgGA/TrackballManipulator.cpp +++ b/src/osgGA/TrackballManipulator.cpp @@ -152,7 +152,6 @@ bool TrackballManipulator::handle(const GUIEventAdapter& ea,GUIActionAdapter& us if (_thrown) { if (calcMovement()) us.requestRedraw(); - return true; } return false; default: