X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Fwindow-system%2Fubuntu-x11%2Fwindow-base-ecore-x.cpp;h=be17bdf97833bbac89d3bbd9157fa918e8370173;hb=refs%2Fchanges%2F82%2F214982%2F4;hp=a000b74b02612f38f7fb28802e04a81d8c669be8;hpb=fde0e4db4cbd45f71aaa2098552fc6a30bd36a04;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git diff --git a/dali/internal/window-system/ubuntu-x11/window-base-ecore-x.cpp b/dali/internal/window-system/ubuntu-x11/window-base-ecore-x.cpp index a000b74..be17bdf 100755 --- a/dali/internal/window-system/ubuntu-x11/window-base-ecore-x.cpp +++ b/dali/internal/window-system/ubuntu-x11/window-base-ecore-x.cpp @@ -898,25 +898,14 @@ void WindowBaseEcoreX::CreateWindow( PositionSize positionSize, bool isTranspare } } -void WindowBaseEcoreX::SetParent( Any parent ) +void WindowBaseEcoreX::SetParent( WindowBase* parentWinBase ) { - Ecore_X_Window mEcoreParent; - if ( parent.Empty() == false ) + Ecore_X_Window ecoreParent = 0; + if( parentWinBase ) { - // check we have a valid type - DALI_ASSERT_ALWAYS( ( (parent.GetType() == typeid (Ecore_X_Window) ) ) - && "Surface type is invalid" ); - - if ( parent.GetType() == typeid (Ecore_X_Window) ) - { - mEcoreParent = AnyCast< Ecore_X_Window >( parent ); - ecore_x_icccm_transient_for_set( mEcoreWindow, mEcoreParent ); - } - else - { - mEcoreParent = 0; - ecore_x_icccm_transient_for_unset( mEcoreWindow ); - } + WindowBaseEcoreX* winBaseEcoreX = static_cast( parentWinBase ); + ecoreParent = winBaseEcoreX->mEcoreWindow; + ecore_x_icccm_transient_for_set( mEcoreWindow, ecoreParent ); } else { @@ -925,21 +914,6 @@ void WindowBaseEcoreX::SetParent( Any parent ) } } -bool WindowBaseEcoreX::IsMatchedWindow( Any window ) -{ - bool ret = false; - if ( window.Empty() == false ) - { - // check we have a valid type - DALI_ASSERT_ALWAYS( ( (window.GetType() == typeid (Ecore_X_Window) ) ) && "Surface type is invalid" ); - if ( AnyCast< Ecore_X_Window >( window ) == mEcoreWindow ) - { - ret = true; - } - } - return ret; -} - } // namespace Adaptor } // namespace Internal