From bb7189eb18e447e71a3b8949061e965ed83581e1 Mon Sep 17 00:00:00 2001 From: Thomas Geymayer Date: Mon, 20 May 2013 18:37:23 +0200 Subject: [PATCH] Fix #1125. Correct overloads... --- src/Model/panelnode.cxx | 10 +++++++--- src/Scenery/scenery.cxx | 4 +++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/Model/panelnode.cxx b/src/Model/panelnode.cxx index 33d9d6a76..4d9a2faf1 100644 --- a/src/Model/panelnode.cxx +++ b/src/Model/panelnode.cxx @@ -61,7 +61,9 @@ public: panel(p) {} - virtual bool buttonPressed(int b, const osgGA::GUIEventAdapter*, const Info& info) + virtual bool buttonPressed( int b, + const osgGA::GUIEventAdapter&, + const Info& info ) { button = b; // convert to panel coordinates @@ -74,12 +76,14 @@ public: picked.x(), picked.y()); } - virtual void update(double dt) + virtual void update(double dt, int keyModState) { panel->getPanel()->updateMouseDelay(dt); } - virtual void buttonReleased(void) + virtual void buttonReleased( int, + const osgGA::GUIEventAdapter&, + const Info* ) { panel->getPanel()->doLocalMouseAction(button, MOUSE_BUTTON_UP, picked.x(), picked.y()); diff --git a/src/Scenery/scenery.cxx b/src/Scenery/scenery.cxx index 1f6d4c3c2..55dcb6de8 100644 --- a/src/Scenery/scenery.cxx +++ b/src/Scenery/scenery.cxx @@ -64,7 +64,9 @@ public: FGGroundPickCallback() : SGPickCallback(PriorityScenery) { } - virtual bool buttonPressed(int button, const osgGA::GUIEventAdapter*, const Info& info) + virtual bool buttonPressed( int button, + const osgGA::GUIEventAdapter&, + const Info& info ) { // only on left mouse button if (button != 0) -- 2.39.5