[Tizen] Fix unParent Bug

[platform/core/uifw/dali-adaptor.git] / dali / internal / window-system / ubuntu-x11 / window-base-ecore-x.cpp

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 (executable)
--- 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<WindowBaseEcoreX*>( 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