From 7ba7b13aa0c65cba7814cf9f883318c1650f340f Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 7 Oct 2016 14:51:39 +0100 Subject: [PATCH] Fixed VisualStudio warning Added local implementation of asEventHandler() --- include/osgViewer/ViewerEventHandlers | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/include/osgViewer/ViewerEventHandlers b/include/osgViewer/ViewerEventHandlers index 6a926ec67..30fbe2e26 100644 --- a/include/osgViewer/ViewerEventHandlers +++ b/include/osgViewer/ViewerEventHandlers @@ -521,7 +521,10 @@ public: virtual DrawableCullCallback* asDrawableCullCallback() { return osg::DrawableCullCallback::asDrawableCullCallback(); } virtual const DrawableCullCallback* asDrawableCullCallback() const { return osg::DrawableCullCallback::asDrawableCullCallback(); } - // use the osgGA::GUIEventHandler implementation of run. + virtual osgGA::EventHandler* asEventHandler() { return osgGA::EventHandler::asEventHandler(); } + virtual const osgGA::EventHandler* asEventHandler() const { return osgGA::EventHandler::asEventHandler(); } + + // use the osgGA::GUIEventHandler implementation of run. virtual bool run(osg::Object* object, osg::Object* data) { return osgGA::GUIEventHandler::run(object, data); } virtual bool handle(const osgGA::GUIEventAdapter& ea,osgGA::GUIActionAdapter& aa, osg::Object*, osg::NodeVisitor* nv);