From 6031cb0ba08bdf3470bc3bd9e1f8c223015ef9f4 Mon Sep 17 00:00:00 2001 From: Victor Cebollada Date: Tue, 21 Jul 2020 11:46:59 +0100 Subject: [PATCH] Fix compile error in MS-Windows. * The patch "Modify parameters of CreateNativeSurface()" adds a new parameter to the RenderSurfaceFactory that is not added in the implementation for MS Windows * Couple of warnings 'struct/class declaration' removed. Change-Id: If68666e14c78f20c1480afa5b2e9e6ed125d5bb8 Signed-off-by: Victor Cebollada --- dali/devel-api/adaptor-framework/window-devel.h | 4 ++-- dali/internal/window-system/windows/render-surface-factory-win.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dali/devel-api/adaptor-framework/window-devel.h b/dali/devel-api/adaptor-framework/window-devel.h index 8b19720..2f83702 100644 --- a/dali/devel-api/adaptor-framework/window-devel.h +++ b/dali/devel-api/adaptor-framework/window-devel.h @@ -27,9 +27,9 @@ namespace Dali { -class KeyEvent; +struct KeyEvent; class TouchData; -class WheelEvent; +struct WheelEvent; class RenderTaskList; namespace DevelWindow diff --git a/dali/internal/window-system/windows/render-surface-factory-win.h b/dali/internal/window-system/windows/render-surface-factory-win.h index 436ad70..a4e6626 100755 --- a/dali/internal/window-system/windows/render-surface-factory-win.h +++ b/dali/internal/window-system/windows/render-surface-factory-win.h @@ -34,7 +34,7 @@ public: std::unique_ptr< PixmapRenderSurface > CreatePixmapRenderSurface( Dali::PositionSize positionSize, Any surface, bool isTransparent = false ) override; - std::unique_ptr< NativeRenderSurface > CreateNativeRenderSurface( SurfaceSize surfaceSize, bool isTransparent = false ) override; + std::unique_ptr< NativeRenderSurface > CreateNativeRenderSurface(SurfaceSize surfaceSize, Any surface, bool isTransparent = false) override; }; } // namespace Adaptor -- 2.7.4