From a6b0ac5016d7c6aa09d2e774529faaad10ae0ce3 Mon Sep 17 00:00:00 2001
From: Seoyeon Kim <seoyeon2.kim@samsung.com>
Date: Tue, 13 Jun 2017 10:54:05 +0900
Subject: [PATCH] Revert "[Tizen] keygrab & ecore-wl-window-handle c# binding"

This reverts commit a604472622bcc2f14e125786f4fccb356ae629d1.

Change-Id: I847b961ed7074e518151f74242e06380cfbede38
---
 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       | 7 +------
 adaptors/wayland/window-impl-wl.cpp                   | 6 +-----
 adaptors/x11/window-impl-x.cpp                        | 5 -----
 6 files changed, 2 insertions(+), 32 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 d7442b3..09a7541
--- a/adaptors/common/window-impl.h
+++ b/adaptors/common/window-impl.h
@@ -417,10 +417,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 eb830fd..b6f977c
--- a/adaptors/devel-api/adaptor-framework/window-devel.cpp
+++ b/adaptors/devel-api/adaptor-framework/window-devel.cpp
@@ -145,11 +145,6 @@ int GetBrightness( Window window )
   return GetImplementation( window ).GetBrightness();
 }
 
-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 c8a4a26..6d07c71
--- a/adaptors/devel-api/adaptor-framework/window-devel.h
+++ b/adaptors/devel-api/adaptor-framework/window-devel.h
@@ -293,13 +293,6 @@ DALI_IMPORT_API bool SetBrightness( Window window, int brightness );
  */
 DALI_IMPORT_API int GetBrightness( 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 f300e77..d0dbdb7
--- a/adaptors/ecore/wayland/window-impl-ecore-wl.cpp
+++ b/adaptors/ecore/wayland/window-impl-ecore-wl.cpp
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2017 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -1410,11 +1410,6 @@ int Window::GetBrightness()
   return mEventHandler->mBrightness;
 }
 
-void* Window::GetNativeWindowHandler()
-{
-  return mEventHandler->mEcoreWindow;
-}
-
 } // Adaptor
 
 } // Internal
diff --git a/adaptors/wayland/window-impl-wl.cpp b/adaptors/wayland/window-impl-wl.cpp
old mode 100755
new mode 100644
index da26daf..631681f
--- a/adaptors/wayland/window-impl-wl.cpp
+++ b/adaptors/wayland/window-impl-wl.cpp
@@ -309,6 +309,7 @@ bool Window::IsVisible() const
   return mVisible;
 }
 
+
 void Window::RotationDone( int orientation, int width, int height )
 {
 }
@@ -402,11 +403,6 @@ int Window::GetBrightness()
   return 0;
 }
 
-void* Window::GetNativeWindowHandler()
-{
-  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 c8ce7a6..710d9fb
--- a/adaptors/x11/window-impl-x.cpp
+++ b/adaptors/x11/window-impl-x.cpp
@@ -907,11 +907,6 @@ int Window::GetBrightness()
   return 0;
 }
 
-void* Window::GetNativeWindowHandler()
-{
-  return &(mEventHandler->mEcoreWindow);
-}
-
 } // Adaptor
 
 } // Internal
-- 
2.7.4