X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Fwindow-system%2Fubuntu-x11%2Fwindow-base-ecore-x.h;h=8ab70805821dcf9a7a00ba7e7907d0549ef469d7;hb=8786ea8fbb26a9cb555a613518cf108017467c69;hp=f6618e787d80bccd79b4ea56652aa4d252cdd44a;hpb=c8065c6e16203bb3a06ce0e1c716d9784f7d2428;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git diff --git a/dali/internal/window-system/ubuntu-x11/window-base-ecore-x.h b/dali/internal/window-system/ubuntu-x11/window-base-ecore-x.h index f6618e7..8ab7080 100644 --- a/dali/internal/window-system/ubuntu-x11/window-base-ecore-x.h +++ b/dali/internal/window-system/ubuntu-x11/window-base-ecore-x.h @@ -199,14 +199,14 @@ public: virtual void Activate() override; /** - * @copydoc Dali::Internal::Adaptor::WindowBase::SetAvailableOrientations() + * @copydoc Dali::Internal::Adaptor::WindowBase::SetAvailableAnlges() */ - virtual void SetAvailableOrientations( const std::vector< Dali::Window::WindowOrientation >& orientations ) override; + virtual void SetAvailableAnlges( const std::vector< int >& angles ) override; /** - * @copydoc Dali::Internal::Adaptor::WindowBase::SetPreferredOrientation() + * @copydoc Dali::Internal::Adaptor::WindowBase::SetPreferredAngle() */ - virtual void SetPreferredOrientation( Dali::Window::WindowOrientation orientation ) override; + virtual void SetPreferredAngle( int angle ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::SetAcceptFocus() @@ -329,12 +329,6 @@ public: virtual void GetDpi( unsigned int& dpiHorizontal, unsigned int& dpiVertical ) override; /** - * @brief Return the orientation of the surface. - * @return The orientation - */ - virtual int GetOrientation() const override; - - /** * @copydoc Dali::Internal::Adaptor::WindowBase::GetScreenRotationAngle() */ virtual int GetScreenRotationAngle() override; @@ -345,11 +339,6 @@ public: virtual void SetWindowRotationAngle( int degree ) override; /** - * @copydoc Dali::Internal::Adaptor::WindowBase::GetWindowRotationAngle() - */ - virtual int GetWindowRotationAngle() override; - - /** * @copydoc Dali::Internal::Adaptor::WindowBase::WindowRotationCompleted() */ virtual void WindowRotationCompleted( int degree, int width, int height ) override; @@ -362,12 +351,7 @@ public: /** * @copydoc Dali::Internal::Adaptor::WindowBase::SetParent() */ - virtual void SetParent( Any parent ) override; - - /** - * @copydoc Dali::Internal::Adaptor::WindowBase::IsMatchedWindow() - */ - virtual bool IsMatchedWindow( Any window ) override; + virtual void SetParent( WindowBase* parentWinBase ) override; private: