Fix #1125. Correct overloads...

diff --git a/src/Model/panelnode.cxx b/src/Model/panelnode.cxx
index 33d9d6a76b69138c3a8095f9bf17a9b542bd83ee..4d9a2faf1ebbccb9545d10de547787845f5598e6 100644 (file)
--- 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 1f6d4c3c24825ac1c56be8e0da08383318433c83..55dcb6de8bee2920009b02b1641ce1e172f2c452 100644 (file)
--- 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)