Merge "Fix compile error in MS-Windows." into devel/master

diff --git a/dali/devel-api/adaptor-framework/window-devel.h b/dali/devel-api/adaptor-framework/window-devel.h
index 8b19720..2f83702 100644 (file)
--- 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 (executable)
--- 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