Stop the property tree from keeping a shadow of the deleted input properties, as...

[flightgear.git] / src / Input / FGMouseInput.cxx

diff --git a/src/Input/FGMouseInput.cxx b/src/Input/FGMouseInput.cxx
index 276fc0ed55efb9d3e68180a37ab92c5ab77d0eb4..8ebdb6becffdd8419e97a137fe794e3cc595ac9a 100644 (file)
--- a/src/Input/FGMouseInput.cxx
+++ b/src/Input/FGMouseInput.cxx
@@ -22,9 +22,15 @@
 //
 // $Id$
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
 #include "FGMouseInput.hxx"
 #include "Main/globals.hxx"
 
+using std::ios_base;
+
 void ActivePickCallbacks::init( int b, const osgGA::GUIEventAdapter* ea )
 {
   // Get the list of hit callbacks. Take the first callback that
@@ -270,14 +276,9 @@ void FGMouseInput::doMouseClick (int b, int updown, int x, int y, bool mainWindo
   }
 
   if (mode.pass_through) {
+    // remove once PUI uses standard picking mechanism
     if (0 <= x && 0 <= y && puMouse(b, updown, x, y))
       return;
-    else if (0 <= x && 0 <= y && (globals->get_current_panel() != 0) &&
-             globals->get_current_panel()->getVisibility() &&
-             globals->get_current_panel()->doMouseAction(b, updown, x, y))
-      return;
-    else if (0 <= x && 0 <= y && fgHandle3DPanelMouseEvent(b, updown, x, y))
-      return;
     else {
       // pui didn't want the click event so compute a
       // scenegraph intersection point corresponding to the mouse click