From e06bef55c72677dfe180ac0749817c056b39a595 Mon Sep 17 00:00:00 2001 From: Heeyong Song Date: Mon, 8 May 2017 12:28:58 +0900 Subject: [PATCH] Revert "[Tizen] keygrab & ecore-wl-window-handle c# binding" This reverts commit 15137bb2a4d50455579aadd3b9fb1874577c0a1a. Change-Id: Ib64b4c435f4435c7d4366ec001b0e8534efe1ffd --- adaptors/common/window-impl.h | 4 ---- adaptors/devel-api/adaptor-framework/window-devel.cpp | 5 ----- adaptors/devel-api/adaptor-framework/window-devel.h | 7 ------- adaptors/ecore/wayland/window-impl-ecore-wl.cpp | 6 ------ adaptors/wayland/window-impl-wl.cpp | 7 +------ adaptors/x11/window-impl-x.cpp | 5 ----- 6 files changed, 1 insertion(+), 33 deletions(-) mode change 100755 => 100644 adaptors/common/window-impl.h mode change 100755 => 100644 adaptors/devel-api/adaptor-framework/window-devel.cpp mode change 100755 => 100644 adaptors/devel-api/adaptor-framework/window-devel.h mode change 100755 => 100644 adaptors/ecore/wayland/window-impl-ecore-wl.cpp mode change 100755 => 100644 adaptors/wayland/window-impl-wl.cpp mode change 100755 => 100644 adaptors/x11/window-impl-x.cpp diff --git a/adaptors/common/window-impl.h b/adaptors/common/window-impl.h old mode 100755 new mode 100644 index 13a2349..0cf251b --- 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 30c3d0a..70ad18e --- 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 b12c0b9..db6c6ac --- 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 1408fab..5c0523c --- 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 7b3303d..e9ec667 --- 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 4f07fc6..63069b2 --- 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 -- 2.7.4