X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Fwindow-system%2Fubuntu-x11%2Fwindow-base-ecore-x.h;h=6c99f462a0b4ab93ccd3d6e4204a6074870d9e28;hb=63d63464ee0ea3f3eb802b90419f8fef6bc67d83;hp=6cb051324c5a1c7d0860d6ad63221f66fe85f151;hpb=361480c3a72b189b3c11980de011d233b4aea721;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 6cb0513..6c99f46 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 @@ -2,7 +2,7 @@ #define DALI_INTERNAL_WINDOWSYSTEM_ECOREX_WINDOW_BASE_ECORE_X_H /* - * Copyright (c) 2018 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,8 +22,8 @@ #include // EXTERNAL HEADERS -#include -#include +#include +#include namespace Dali { @@ -179,21 +179,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; @@ -363,6 +348,16 @@ public: */ virtual void SetTransparency( bool transparent ) override; + /** + * @copydoc Dali::Internal::Adaptor::WindowBase::SetParent() + */ + virtual void SetParent( Any parent ) override; + + /** + * @copydoc Dali::Internal::Adaptor::WindowBase::IsMatchedWindow() + */ + virtual bool IsMatchedWindow( Any window ) override; + private: /**