diff Framework/Scene2DViewport/MeasureTool.h @ 1331:ab81ee8fce1f broker

- Viewport is not passed and stored as a shared_ptr instead of raw reference. - ViewportController can now be injected with an undo stack (not a ctor param anymore, as a preparation for the move of the undo stack to an interactor) - Added (temp) flag to disable emscripten events registration in the WebAssemblyViewport (because legacy client code deals with them directly) - Added emscripten_clear_timeout in ~WebGLViewportsRegistry - Removed GenericToolbox::HoldingRef whose responsibility is better served with proper callback un-registration.
author Benjamin Golinvaux <bgo@osimis.io>
date Mon, 30 Mar 2020 14:23:46 +0200
parents 9b126de2cde2
children
line wrap: on
line diff
--- a/Framework/Scene2DViewport/MeasureTool.h	Mon Mar 30 08:47:30 2020 +0200
+++ b/Framework/Scene2DViewport/MeasureTool.h	Mon Mar 30 14:23:46 2020 +0200
@@ -113,7 +113,7 @@
     virtual std::string GetDescription() = 0;
 
   protected:
-    MeasureTool(IViewport& viewport);
+    MeasureTool(boost::shared_ptr<IViewport> viewport);
 
     void PostConstructor();
 
@@ -141,7 +141,7 @@
     Protected to allow sub-classes to use this weak pointer in factory methods
     (pass them to created objects)
     */
-    IViewport& viewport_;
+    boost::shared_ptr<IViewport> viewport_;
 
 
   private: