diff Framework/Scene2D/PanSceneTracker.cpp @ 860:238693c3bc51 am-dev

merge default -> am-dev
author Alain Mazy <alain@mazy.be>
date Mon, 24 Jun 2019 14:35:00 +0200
parents e42b491f1fb2
children 13e078adfb94
line wrap: on
line diff
--- a/Framework/Scene2D/PanSceneTracker.cpp	Wed Jun 19 17:36:33 2019 +0200
+++ b/Framework/Scene2D/PanSceneTracker.cpp	Mon Jun 24 14:35:00 2019 +0200
@@ -20,11 +20,11 @@
 
 
 #include "PanSceneTracker.h"
-#include <Framework/Scene2DViewport/ViewportController.h>
+#include "../Scene2DViewport/ViewportController.h"
 
 namespace OrthancStone
 {
-  PanSceneTracker::PanSceneTracker(ViewportControllerWPtr controllerW,
+  PanSceneTracker::PanSceneTracker(boost::weak_ptr<ViewportController> controllerW,
                                    const PointerEvent& event)
     : OneGesturePointerTracker(controllerW)
     , originalSceneToCanvas_(GetController()->GetSceneToCanvasTransform())