X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2Fcanvas%2FCanvasMgr.cxx;h=1e0bb693c7df5cd5d2dd2ffa8dfd36585310dbd2;hb=d3a14bfd612efa7c7e2dda444bfc85fdbf2ebbcf;hp=3c087774c09670c9d02d8491e7b9471b666416b7;hpb=904d714d6d53cb30d0bfb483210bfc9cf38652be;p=simgear.git diff --git a/simgear/canvas/CanvasMgr.cxx b/simgear/canvas/CanvasMgr.cxx index 3c087774..1e0bb693 100644 --- a/simgear/canvas/CanvasMgr.cxx +++ b/simgear/canvas/CanvasMgr.cxx @@ -18,6 +18,7 @@ #include "CanvasMgr.hxx" #include "Canvas.hxx" +#include "CanvasEventManager.hxx" #include @@ -35,10 +36,8 @@ namespace canvas } //---------------------------------------------------------------------------- - CanvasMgr::CanvasMgr( SGPropertyNode_ptr node, - SystemAdapterPtr system_adapter ): - PropertyBasedMgr(node, "texture", &canvasFactory), - _system_adapter(system_adapter) + CanvasMgr::CanvasMgr(SGPropertyNode_ptr node): + PropertyBasedMgr(node, "texture", &canvasFactory) { } @@ -46,26 +45,25 @@ namespace canvas //---------------------------------------------------------------------------- CanvasPtr CanvasMgr::createCanvas(const std::string& name) { - return boost::static_pointer_cast( createElement(name) ); + return static_cast( createElement(name).get() ); } //---------------------------------------------------------------------------- CanvasPtr CanvasMgr::getCanvas(size_t index) const { - return boost::static_pointer_cast( getElement(index) ); + return static_cast( getElement(index).get() ); } //---------------------------------------------------------------------------- CanvasPtr CanvasMgr::getCanvas(const std::string& name) const { - return boost::static_pointer_cast( getElement(name) ); + return static_cast( getElement(name).get() ); } //---------------------------------------------------------------------------- void CanvasMgr::elementCreated(PropertyBasedElementPtr element) { - CanvasPtr canvas = boost::static_pointer_cast(element); - canvas->setSystemAdapter(_system_adapter); + CanvasPtr canvas = static_cast(element.get()); canvas->setCanvasMgr(this); }