Canvas window: Update for SimGear MouseEvent changes.

[flightgear.git] / src / Canvas / window.cxx

diff --git a/src/Canvas/window.cxx b/src/Canvas/window.cxx
index 80ef5677e9e34f5f64c04dd1a1e3a8f68ad4e3ba..cdebb5d0e12df21c0bbf206e1b96f2855d696202 100644 (file)
--- a/src/Canvas/window.cxx
+++ b/src/Canvas/window.cxx
@@ -79,17 +79,6 @@ namespace canvas
         _capture_events = node->getBoolValue();
       else
         handled = false;
-
-      // Ensure canvas is redrawn before the window is displayed after it has
-      // been hidden. We can't rely on the cull callback as it gets called too
-      // late (GUI camera is attached as POST_RENDER whereas canvas contents are
-      // rendered during PRE_RENDER).
-      if( node->getNameString() == "visible" && node->getBoolValue() )
-      {
-        simgear::canvas::CanvasPtr canvas = getCanvas().lock();
-        if( canvas )
-          canvas->enableRendering();
-      }
     }
 
     if( !handled )
@@ -141,7 +130,7 @@ namespace canvas
   //----------------------------------------------------------------------------
   bool Window::handleMouseEvent(const simgear::canvas::MouseEventPtr& event)
   {
-    return _image.handleMouseEvent(event);
+    return _image.handleEvent(event);
   }
 
   //----------------------------------------------------------------------------