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
Revert "[Tizen] Fix unParent Bug"
[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
9fdd599
..
ea08334
100755
(executable)
--- a/
dali/internal/window-system/windows/window-base-win.h
+++ b/
dali/internal/window-system/windows/window-base-win.h
@@
-350,7
+350,12
@@
public:
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::SetParent()
*/
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::SetParent()
*/
- virtual void SetParent( WindowBase* parentWinBase ) override;
+ virtual void SetParent( Any parent ) override;
+
+ /**
+ * @copydoc Dali::Internal::Adaptor::WindowBase::IsMatchedWindow()
+ */
+ virtual bool IsMatchedWindow( Any window ) override;
private:
private: