Fix build error on Windows

Change-Id: Ifdf50fc466a57a400e9ca91347050149b12b093b

diff --git a/dali/internal/window-system/windows/display-connection-impl-win.cpp b/dali/internal/window-system/windows/display-connection-impl-win.cpp
index d4e696d..c8d7e90 100755 (executable)
--- a/dali/internal/window-system/windows/display-connection-impl-win.cpp
+++ b/dali/internal/window-system/windows/display-connection-impl-win.cpp
@@ -85,9 +85,9 @@ bool DisplayConnectionWin::InitializeGraphics()
   return true;\r
 }\r
 \r
-void DisplayConnectionWin::SetSurfaceType( RenderSurface::Type type )\r
+void DisplayConnectionWin::SetSurfaceType( Dali::Integration::RenderSurface::Type type )\r
 {\r
-  if( type == RenderSurface::WINDOW_RENDER_SURFACE )\r
+  if( type == Dali::Integration::RenderSurface::WINDOW_RENDER_SURFACE )\r
   {\r
      mDisplay = GetDC( GetForegroundWindow() );\r
   }\r

diff --git a/dali/internal/window-system/windows/display-connection-impl-win.h b/dali/internal/window-system/windows/display-connection-impl-win.h
index 14321bf..a81072f 100755 (executable)
--- a/dali/internal/window-system/windows/display-connection-impl-win.h
+++ b/dali/internal/window-system/windows/display-connection-impl-win.h
@@ -79,7 +79,7 @@ public:
   /**\r
   * @copydoc Dali::Internal::Adaptor::DisplayConnection::SetSurfaceType\r
   */\r
-  void SetSurfaceType( RenderSurface::Type type );\r
+  void SetSurfaceType( Dali::Integration::RenderSurface::Type type );\r
 \r
   /**\r
   * @copydoc Dali::Internal::Adaptor::DisplayConnection::SetGraphicsInterface\r

diff --git a/dali/internal/window-system/windows/window-base-win.cpp b/dali/internal/window-system/windows/window-base-win.cpp
index 2b75b9f..b1d6f1c 100755 (executable)
--- a/dali/internal/window-system/windows/window-base-win.cpp
+++ b/dali/internal/window-system/windows/window-base-win.cpp
@@ -297,18 +297,6 @@ void WindowBaseWin::MoveResize( PositionSize positionSize )
 {
 }
 
-void WindowBaseWin::ShowIndicator( Dali::Window::IndicatorVisibleMode visibleMode, Dali::Window::IndicatorBgOpacity opacityMode )
-{
-}
-
-void WindowBaseWin::SetIndicatorProperties( bool isShow, Dali::Window::WindowOrientation lastOrientation )
-{
-}
-
-void WindowBaseWin::IndicatorTypeChanged( IndicatorInterface::Type type )
-{
-}
-
 void WindowBaseWin::SetClass( const std::string& name, const std::string& className )
 {
 }

diff --git a/dali/internal/window-system/windows/window-base-win.h b/dali/internal/window-system/windows/window-base-win.h
index e9d99bb..b0e48c6 100755 (executable)
--- a/dali/internal/window-system/windows/window-base-win.h
+++ b/dali/internal/window-system/windows/window-base-win.h
@@ -167,21 +167,6 @@ public:
   virtual void MoveResize( PositionSize positionSize ) override;
 
   /**
-   * @copydoc Dali::Internal::Adaptor::WindowBase::ShowIndicator()
-   */
-  virtual void ShowIndicator( Dali::Window::IndicatorVisibleMode visibleMode, Dali::Window::IndicatorBgOpacity opacityMode ) override;
-
-  /**
-   * @copydoc Dali::Internal::Adaptor::WindowBase::SetIndicatorProperties()
-   */
-  virtual void SetIndicatorProperties( bool isShow, Dali::Window::WindowOrientation lastOrientation ) override;
-
-  /**
-   * @copydoc Dali::Internal::Adaptor::WindowBase::IndicatorTypeChanged()
-   */
-  virtual void IndicatorTypeChanged( IndicatorInterface::Type type ) override;
-
-  /**
    * @copydoc Dali::Internal::Adaptor::WindowBase::SetClass()
    */
   virtual void SetClass( const std::string& name, const std::string& className ) override;

diff --git a/dali/internal/window-system/windows/window-factory-win.cpp b/dali/internal/window-system/windows/window-factory-win.cpp
index 7359548..4be2aaa 100755 (executable)
--- a/dali/internal/window-system/windows/window-factory-win.cpp
+++ b/dali/internal/window-system/windows/window-factory-win.cpp
@@ -34,11 +34,6 @@ std::unique_ptr< WindowBase > WindowFactoryWin::CreateWindowBase( Dali::Position
   return Utils::MakeUnique< WindowBaseWin >( positionSize, surface, isTransparent );
 }
 
-std::unique_ptr< IndicatorInterface > WindowFactoryWin::CreateIndicator( Adaptor* adaptor, Dali::Window::WindowOrientation orientation, IndicatorInterface::Observer* observer )
-{
-  return std::unique_ptr< IndicatorInterface >( nullptr );
-}
-
 // this should be created from Window impl
 std::unique_ptr< WindowFactory > GetWindowFactory()
 {

diff --git a/dali/internal/window-system/windows/window-factory-win.h b/dali/internal/window-system/windows/window-factory-win.h
index ca88e1d..9b1b8de 100755 (executable)
--- a/dali/internal/window-system/windows/window-factory-win.h
+++ b/dali/internal/window-system/windows/window-factory-win.h
@@ -31,8 +31,6 @@ class WindowFactoryWin : public WindowFactory
 {
 public:
   std::unique_ptr< WindowBase > CreateWindowBase( Dali::PositionSize positionSize, Any surface, bool isTransparent ) override;
-
-  std::unique_ptr< IndicatorInterface > CreateIndicator( Adaptor* adaptor, Dali::Window::WindowOrientation orientation, IndicatorInterface::Observer* observer ) override;
 };
 
 } // namespace Adaptor