From: taeyoon0.lee Date: Tue, 16 May 2017 07:25:23 +0000 (+0900) Subject: Revert "[Tizen] keygrab & ecore-wl-window-handle c# binding" X-Git-Tag: submit/tizen/20170517.061745~25 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4b40d3f81d357ea339f9e11ca645ada240e81d85;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git Revert "[Tizen] keygrab & ecore-wl-window-handle c# binding" This reverts commit 6f971e1a15d30e80f8331e27d628cc784875cff0. Change-Id: I52195f40b9b6de514c08459805e3eea2c56fb4d8 --- diff --git a/adaptors/common/window-impl.h b/adaptors/common/window-impl.h old mode 100755 new mode 100644 index 13a2349dd..0cf251bcc --- a/adaptors/common/window-impl.h +++ b/adaptors/common/window-impl.h @@ -328,10 +328,6 @@ private: IndicatorSignalType mIndicatorVisibilityChangedSignal; FocusSignalType mFocusChangedSignal; SignalType mDeleteRequestSignal; - -public: - - void* GetNativeWindowHandler(); }; } // namespace Adaptor diff --git a/adaptors/devel-api/adaptor-framework/window-devel.cpp b/adaptors/devel-api/adaptor-framework/window-devel.cpp old mode 100755 new mode 100644 index 30c3d0ac7..70ad18e92 --- a/adaptors/devel-api/adaptor-framework/window-devel.cpp +++ b/adaptors/devel-api/adaptor-framework/window-devel.cpp @@ -55,11 +55,6 @@ bool IsVisible( Window window ) return GetImplementation( window ).IsVisible(); } -void * GetNativeWindowHandler( Window window ) -{ - return GetImplementation( window ).GetNativeWindowHandler(); -} - } // namespace DevelWindow } // namespace Dali diff --git a/adaptors/devel-api/adaptor-framework/window-devel.h b/adaptors/devel-api/adaptor-framework/window-devel.h old mode 100755 new mode 100644 index b12c0b992..db6c6ace1 --- a/adaptors/devel-api/adaptor-framework/window-devel.h +++ b/adaptors/devel-api/adaptor-framework/window-devel.h @@ -82,13 +82,6 @@ DALI_IMPORT_API void Hide( Window window ); */ DALI_IMPORT_API bool IsVisible( Window window ); -/** - * @brief Returns native Ecore Wayland Window handle only for c# binding - * @param[in] window The window where Ecore Wayland window handle is extracted - * @return void * of native Ecore Wayland Window - */ -DALI_IMPORT_API void * GetNativeWindowHandler( Window window ); - } // namespace DevelWindow } // namespace Dali diff --git a/adaptors/ecore/wayland/window-impl-ecore-wl.cpp b/adaptors/ecore/wayland/window-impl-ecore-wl.cpp old mode 100755 new mode 100644 index 1408fabc0..5c0523ca0 --- a/adaptors/ecore/wayland/window-impl-ecore-wl.cpp +++ b/adaptors/ecore/wayland/window-impl-ecore-wl.cpp @@ -676,12 +676,6 @@ void Window::RotationDone( int orientation, int width, int height ) ecore_wl_window_rotation_change_done_send( mEventHandler->mEcoreWindow ); } -void* Window::GetNativeWindowHandler() -{ - return mEventHandler->mEcoreWindow; -} - - } // Adaptor } // Internal } // Dali diff --git a/adaptors/wayland/window-impl-wl.cpp b/adaptors/wayland/window-impl-wl.cpp old mode 100755 new mode 100644 index 7b3303d90..e9ec667b0 --- a/adaptors/wayland/window-impl-wl.cpp +++ b/adaptors/wayland/window-impl-wl.cpp @@ -305,16 +305,11 @@ bool Window::IsVisible() const return mVisible; } -void Window::RotationDone( int orientation, int width, int height ) -{ -} -void* Window::GetNativeWindowHandler() +void Window::RotationDone( int orientation, int width, int height ) { - return NULL; } - } // Adaptor } // Internal } // Dali diff --git a/adaptors/x11/window-impl-x.cpp b/adaptors/x11/window-impl-x.cpp old mode 100755 new mode 100644 index 20b5d7c26..63069b252 --- a/adaptors/x11/window-impl-x.cpp +++ b/adaptors/x11/window-impl-x.cpp @@ -811,11 +811,6 @@ void Window::RotationDone( int orientation, int width, int height ) } } -void* Window::GetNativeWindowHandler() -{ - return &(mEventHandler->mEcoreWindow); -} - } // Adaptor } // Internal