projects
/
platform
/
core
/
uifw
/
dali-adaptor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'devel/master' into sandbox/dkdk/tizen
[platform/core/uifw/dali-adaptor.git]
/
dali
/
internal
/
window-system
/
windows
/
window-base-win.h
diff --git
a/dali/internal/window-system/windows/window-base-win.h
b/dali/internal/window-system/windows/window-base-win.h
index
ea449d0
..
d93153b
100755
(executable)
--- a/
dali/internal/window-system/windows/window-base-win.h
+++ b/
dali/internal/window-system/windows/window-base-win.h
@@
-109,258
+109,247
@@
public:
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::GetNativeWindow()
*/
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::GetNativeWindow()
*/
-
virtual
Any GetNativeWindow() override;
+ Any GetNativeWindow() override;
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::GetNativeWindowId()
*/
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::GetNativeWindowId()
*/
-
virtual
int GetNativeWindowId() override;
+ int GetNativeWindowId() override;
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::CreateEglWindow()
*/
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::CreateEglWindow()
*/
-
virtual
EGLNativeWindowType CreateEglWindow( int width, int height ) override;
+ EGLNativeWindowType CreateEglWindow( int width, int height ) override;
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::DestroyEglWindow()
*/
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::DestroyEglWindow()
*/
- v
irtual v
oid DestroyEglWindow() override;
+ void DestroyEglWindow() override;
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::SetEglWindowRotation()
*/
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::SetEglWindowRotation()
*/
- v
irtual v
oid SetEglWindowRotation( int angle ) override;
+ void SetEglWindowRotation( int angle ) override;
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::SetEglWindowBufferTransform()
*/
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::SetEglWindowBufferTransform()
*/
- v
irtual v
oid SetEglWindowBufferTransform( int angle ) override;
+ void SetEglWindowBufferTransform( int angle ) override;
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::SetEglWindowTransform()
*/
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::SetEglWindowTransform()
*/
- v
irtual v
oid SetEglWindowTransform( int angle ) override;
+ void SetEglWindowTransform( int angle ) override;
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::ResizeEglWindow()
*/
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::ResizeEglWindow()
*/
- v
irtual v
oid ResizeEglWindow( PositionSize positionSize ) override;
+ void ResizeEglWindow( PositionSize positionSize ) override;
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::IsEglWindowRotationSupported()
*/
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::IsEglWindowRotationSupported()
*/
-
virtual
bool IsEglWindowRotationSupported() override;
+ bool IsEglWindowRotationSupported() override;
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::Move()
*/
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::Move()
*/
- v
irtual v
oid Move( PositionSize positionSize ) override;
+ void Move( PositionSize positionSize ) override;
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::Resize()
*/
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::Resize()
*/
- v
irtual v
oid Resize( PositionSize positionSize ) override;
+ void Resize( PositionSize positionSize ) override;
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::MoveResize()
*/
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::MoveResize()
*/
- v
irtual v
oid MoveResize( PositionSize positionSize ) override;
+ void MoveResize( PositionSize positionSize ) override;
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::SetClass()
*/
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::SetClass()
*/
- v
irtual v
oid SetClass( const std::string& name, const std::string& className ) override;
+ void SetClass( const std::string& name, const std::string& className ) override;
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::Raise()
*/
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::Raise()
*/
- v
irtual v
oid Raise() override;
+ void Raise() override;
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::Lower()
*/
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::Lower()
*/
- v
irtual v
oid Lower() override;
+ void Lower() override;
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::Activate()
*/
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::Activate()
*/
- v
irtual v
oid Activate() override;
+ void Activate() override;
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::SetAvailableAnlges()
*/
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::SetAvailableAnlges()
*/
- v
irtual v
oid SetAvailableAnlges( const std::vector< int >& angles ) override;
+ void SetAvailableAnlges( const std::vector< int >& angles ) override;
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::SetPreferredAngle()
*/
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::SetPreferredAngle()
*/
- v
irtual v
oid SetPreferredAngle( int angle ) override;
+ void SetPreferredAngle( int angle ) override;
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::SetAcceptFocus()
*/
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::SetAcceptFocus()
*/
- v
irtual v
oid SetAcceptFocus( bool accept ) override;
+ void SetAcceptFocus( bool accept ) override;
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::Show()
*/
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::Show()
*/
- v
irtual v
oid Show() override;
+ void Show() override;
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::Hide()
*/
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::Hide()
*/
- v
irtual v
oid Hide() override;
+ void Hide() override;
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::GetSupportedAuxiliaryHintCount()
*/
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::GetSupportedAuxiliaryHintCount()
*/
-
virtual
unsigned int GetSupportedAuxiliaryHintCount() const override;
+ unsigned int GetSupportedAuxiliaryHintCount() const override;
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::GetSupportedAuxiliaryHint()
*/
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::GetSupportedAuxiliaryHint()
*/
-
virtual
std::string GetSupportedAuxiliaryHint( unsigned int index ) const override;
+ std::string GetSupportedAuxiliaryHint( unsigned int index ) const override;
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::AddAuxiliaryHint()
*/
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::AddAuxiliaryHint()
*/
-
virtual
unsigned int AddAuxiliaryHint( const std::string& hint, const std::string& value ) override;
+ unsigned int AddAuxiliaryHint( const std::string& hint, const std::string& value ) override;
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::RemoveAuxiliaryHint()
*/
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::RemoveAuxiliaryHint()
*/
-
virtual
bool RemoveAuxiliaryHint( unsigned int id ) override;
+ bool RemoveAuxiliaryHint( unsigned int id ) override;
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::SetAuxiliaryHintValue()
*/
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::SetAuxiliaryHintValue()
*/
-
virtual
bool SetAuxiliaryHintValue( unsigned int id, const std::string& value ) override;
+ bool SetAuxiliaryHintValue( unsigned int id, const std::string& value ) override;
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::GetAuxiliaryHintValue()
*/
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::GetAuxiliaryHintValue()
*/
-
virtual
std::string GetAuxiliaryHintValue( unsigned int id ) const override;
+ std::string GetAuxiliaryHintValue( unsigned int id ) const override;
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::GetAuxiliaryHintId()
*/
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::GetAuxiliaryHintId()
*/
-
virtual
unsigned int GetAuxiliaryHintId( const std::string& hint ) const override;
+ unsigned int GetAuxiliaryHintId( const std::string& hint ) const override;
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::SetInputRegion()
*/
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::SetInputRegion()
*/
- v
irtual v
oid SetInputRegion( const Rect< int >& inputRegion ) override;
+ void SetInputRegion( const Rect< int >& inputRegion ) override;
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::SetType()
*/
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::SetType()
*/
- v
irtual v
oid SetType( Dali::Window::Type type ) override;
+ void SetType( Dali::Window::Type type ) override;
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::SetNotificationLevel()
*/
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::SetNotificationLevel()
*/
-
virtual
bool SetNotificationLevel( Dali::Window::NotificationLevel::Type level ) override;
+ bool SetNotificationLevel( Dali::Window::NotificationLevel::Type level ) override;
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::GetNotificationLevel()
*/
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::GetNotificationLevel()
*/
-
virtual
Dali::Window::NotificationLevel::Type GetNotificationLevel() const override;
+ Dali::Window::NotificationLevel::Type GetNotificationLevel() const override;
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::SetOpaqueState()
*/
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::SetOpaqueState()
*/
- v
irtual v
oid SetOpaqueState( bool opaque ) override;
+ void SetOpaqueState( bool opaque ) override;
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::SetScreenOffMode()
*/
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::SetScreenOffMode()
*/
-
virtual
bool SetScreenOffMode(Dali::Window::ScreenOffMode::Type screenOffMode) override;
+ bool SetScreenOffMode(Dali::Window::ScreenOffMode::Type screenOffMode) override;
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::GetScreenOffMode()
*/
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::GetScreenOffMode()
*/
-
virtual
Dali::Window::ScreenOffMode::Type GetScreenOffMode() const override;
+ Dali::Window::ScreenOffMode::Type GetScreenOffMode() const override;
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::SetBrightness()
*/
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::SetBrightness()
*/
-
virtual
bool SetBrightness( int brightness ) override;
+ bool SetBrightness( int brightness ) override;
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::GetBrightness()
*/
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::GetBrightness()
*/
-
virtual
int GetBrightness() const override;
+ int GetBrightness() const override;
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::GrabKey()
*/
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::GrabKey()
*/
-
virtual
bool GrabKey( Dali::KEY key, KeyGrab::KeyGrabMode grabMode ) override;
+ bool GrabKey( Dali::KEY key, KeyGrab::KeyGrabMode grabMode ) override;
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::UngrabKey()
*/
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::UngrabKey()
*/
-
virtual
bool UngrabKey( Dali::KEY key ) override;
+ bool UngrabKey( Dali::KEY key ) override;
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::GrabKeyList()
*/
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::GrabKeyList()
*/
-
virtual
bool GrabKeyList( const Dali::Vector< Dali::KEY >& key, const Dali::Vector< KeyGrab::KeyGrabMode >& grabMode, Dali::Vector< bool >& result ) override;
+ bool GrabKeyList( const Dali::Vector< Dali::KEY >& key, const Dali::Vector< KeyGrab::KeyGrabMode >& grabMode, Dali::Vector< bool >& result ) override;
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::UngrabKeyList()
*/
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::UngrabKeyList()
*/
-
virtual
bool UngrabKeyList( const Dali::Vector< Dali::KEY >& key, Dali::Vector< bool >& result ) override;
+ bool UngrabKeyList( const Dali::Vector< Dali::KEY >& key, Dali::Vector< bool >& result ) override;
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::GetDpi()
*/
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::GetDpi()
*/
- v
irtual v
oid GetDpi( unsigned int& dpiHorizontal, unsigned int& dpiVertical ) override;
+ void GetDpi( unsigned int& dpiHorizontal, unsigned int& dpiVertical ) override;
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::GetScreenRotationAngle()
*/
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::GetScreenRotationAngle()
*/
-
virtual
int GetScreenRotationAngle() override;
+ int GetScreenRotationAngle() override;
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::SetWindowRotationAngle()
*/
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::SetWindowRotationAngle()
*/
- virtual void SetWindowRotationAngle( int degree ) override;
-
- /**
- * @copydoc Dali::Internal::Adaptor::WindowBase::GetWindowRotationAngle()
- */
- virtual void GetWindowRotationAngle() override;
+ void SetWindowRotationAngle( int degree ) override;
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::WindowRotationCompleted()
*/
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::WindowRotationCompleted()
*/
- v
irtual v
oid WindowRotationCompleted( int degree, int width, int height ) override;
+ void WindowRotationCompleted( int degree, int width, int height ) override;
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::SetTransparency()
*/
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::SetTransparency()
*/
- virtual void SetTransparency( bool transparent ) override;
-
- /**
- * @brief Return the orientation of the surface.
- * @return The orientation
- */
- virtual int GetOrientation() const override;
+ void SetTransparency( bool transparent ) override;
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::SetParent()
*/
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::SetParent()
*/
- v
irtual v
oid SetParent( WindowBase* parentWinBase ) override;
+ void SetParent( WindowBase* parentWinBase ) override;
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::CreateFrameRenderedSyncFence()
*/
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::CreateFrameRenderedSyncFence()
*/
-
virtual
int CreateFrameRenderedSyncFence() override;
+ int CreateFrameRenderedSyncFence() override;
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::CreateFramePresentedSyncFence()
*/
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::CreateFramePresentedSyncFence()
*/
-
virtual
int CreateFramePresentedSyncFence() override;
+ int CreateFramePresentedSyncFence() override;
private:
private: