Canvas: update for SimGear changes.

diff --git a/src/Canvas/canvas_fwd.hpp b/src/Canvas/canvas_fwd.hpp
index 1512f007ac19124f7e297aa1d165ca04a4532b93..b9e5ddcac01b62f23d17a5f3b9b2c103fb8c6d67 100644 (file)
--- a/src/Canvas/canvas_fwd.hpp
+++ b/src/Canvas/canvas_fwd.hpp
@@ -19,14 +19,13 @@
 #ifndef CANVAS_FWD_HPP_
 #define CANVAS_FWD_HPP_
 
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
+#include <simgear/structure/SGSharedPtr.hxx>
 
 namespace canvas
 {
   class Window;
-  typedef boost::shared_ptr<Window> WindowPtr;
-  typedef boost::weak_ptr<Window> WindowWeakPtr;
+  typedef SGSharedPtr<Window> WindowPtr;
+  typedef SGWeakPtr<Window> WindowWeakPtr;
 }
 
 #endif /* CANVAS_FWD_HPP_ */

diff --git a/src/Canvas/canvas_mgr.cxx b/src/Canvas/canvas_mgr.cxx
index 27c4290b62b7efdf1aa59783f2cd7fc0d4b86a33..6646b7762d42b86e39bc22fe15a5eb4010b97407 100644 (file)
--- a/src/Canvas/canvas_mgr.cxx
+++ b/src/Canvas/canvas_mgr.cxx
@@ -138,6 +138,5 @@ CanvasMgr::getCanvasTexId(const simgear::canvas::CanvasPtr& canvas) const
 void CanvasMgr::handleModelReinit(SGPropertyNode*)
 {
   for(size_t i = 0; i < _elements.size(); ++i)
-    boost::static_pointer_cast<sc::Canvas>(_elements[i])
-      ->reloadPlacements("object");
+    static_cast<sc::Canvas*>(_elements[i].get())->reloadPlacements("object");
 }

diff --git a/src/Canvas/gui_mgr.cxx b/src/Canvas/gui_mgr.cxx
index 82b07615cd057d88dba1f3a0c80c9af109b0a25a..711297e94e333025642b48c2a2074d2b531e681a 100644 (file)
--- a/src/Canvas/gui_mgr.cxx
+++ b/src/Canvas/gui_mgr.cxx
@@ -37,8 +37,8 @@
 #include <boost/lexical_cast.hpp>
 
 class DesktopGroup;
-typedef boost::shared_ptr<DesktopGroup> DesktopPtr;
-typedef boost::weak_ptr<DesktopGroup> DesktopWeakPtr;
+typedef SGSharedPtr<DesktopGroup> DesktopPtr;
+typedef SGWeakPtr<DesktopGroup> DesktopWeakPtr;
 
 /**
  * Event handler
@@ -288,9 +288,11 @@ bool DesktopGroup::handleMouse(const osgGA::GUIEventAdapter& ea)
     assert(element->getUserData());
 
     canvas::WindowPtr window =
-      boost::dynamic_pointer_cast<canvas::Window>
+      dynamic_cast<canvas::Window*>
       (
-        static_cast<sc::Element::OSGUserData*>(element->getUserData())->element
+        static_cast<sc::Element::OSGUserData*>(
+          element->getUserData()
+        )->element.get()
       );
 
     if( !window || !window->isCapturingEvents() || !window->isVisible() )