Revert "[Tizen] remove GetNativeWindowHandler() in devel window"

This reverts commit 2e11ac633482990dd8c64c102a1874be7adbde52.

Change-Id: I9436b7199f95a87294aa740134429739a54840a5

diff --git a/configure.ac b/configure.ac
index 4f8b044..d081046 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -12,20 +12,8 @@ AM_INIT_AUTOMAKE(1.6)
 AC_PROG_CXX
 AC_PROG_LIBTOOL
 
-# added for key grab binding only for tizen
-AC_ARG_ENABLE(tizenBuild,
-              [  --enable-tizenBuild       build on tizen],
-              enable_tizenBuild=yes,
-              enable_tizenBuild=no)
-
-AM_CONDITIONAL([TIZENBUILD], [test x$enable_tizenBuild = xyes])
-
 # Checks for libraries.
 PKG_CHECK_MODULES([DALI], [dali-core dali-adaptor dali-toolkit])
-# added for key grab binding only for tizen
-if test x$enable_tizenBuild = xyes; then
-PKG_CHECK_MODULES(ECORE_WAYLAND, ecore-wayland)
-fi
 
 AC_CONFIG_FILES([
 Makefile

diff --git a/dali-csharp-binder/Makefile.am b/dali-csharp-binder/Makefile.am
index abcc7cd..7680c31 100755 (executable)
--- a/dali-csharp-binder/Makefile.am
+++ b/dali-csharp-binder/Makefile.am
@@ -11,16 +11,9 @@ libdali_csharp_binder_la_LDFLAGS = ${LDFLAGS}
 libdali_csharp_binder_la_CXXFLAGS = \
    ${CFLAGS} \
    $(DALI_CFLAGS) \
-   $(ECORE_WAYLAND_CFLAGS) \
    $(dali_csharp_binder_includes)
 
-# added for key grab binding only for tizen
-if TIZENBUILD
-libdali_csharp_binder_la_CXXFLAGS += -DTIZEN_BUILD
-libdali_csharp_binder_la_SOURCES = $(dali_csharp_binder_src_files_tizen)
-else
 libdali_csharp_binder_la_SOURCES = $(dali_csharp_binder_src_files)
-endif
 
 libdali_csharp_binderdir = $(includedir)/dali-csharp-binder
 libdali_csharp_binder_HEADERS = $(dali_csharp_binder_header_files)

diff --git a/dali-csharp-binder/file.list b/dali-csharp-binder/file.list
index 7e10a37..630a6ec 100755 (executable)
--- a/dali-csharp-binder/file.list
+++ b/dali-csharp-binder/file.list
@@ -11,18 +11,6 @@ dali_csharp_binder_src_files = \
   src/view-wrapper-impl-wrap.cpp \
   src/event-thread-callback-wrap.cpp \
   src/manual-bindings-all.cpp \
-  src/tts-player.cpp
-
-# added for key grab binding only for tizen
-dali_csharp_binder_src_files_tizen = \
-  src/dali_wrap.cpp \
-  src/callbackbase_wrap.cpp \
-  src/keyboard_focus_manager_wrap.cpp \
-  src/devel-property-wrap.cpp \
-  src/version-check.cpp \
-  src/view-wrapper-impl-wrap.cpp \
-  src/event-thread-callback-wrap.cpp \
-  src/manual-bindings-all.cpp \
   src/tts-player.cpp \
   src/text-editor.cpp \
   src/window.cpp \

diff --git a/dali-csharp-binder/src/dali_wrap.cpp b/dali-csharp-binder/src/dali_wrap.cpp
index 4b539e9..51a7ddc 100755 (executable)
--- a/dali-csharp-binder/src/dali_wrap.cpp
+++ b/dali-csharp-binder/src/dali_wrap.cpp
@@ -3496,8 +3496,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Any_Assign(void * jarg1, void * jarg2)
   Dali::Any *arg2 = 0 ;
   Dali::Any *result = 0 ;
 
-  //DALI_LOG_ERROR("#####CSharp_Dali_Any_Assign()!\n");
-  arg1 = (Dali::Any *)jarg1; 
+  arg1 = (Dali::Any *)jarg1;
   arg2 = (Dali::Any *)jarg2;
   if (!arg2) {
     SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Any const & type is null", 0);
@@ -3530,8 +3529,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Any_GetType(void * jarg1) {
   Dali::Any *arg1 = (Dali::Any *) 0 ;
   std::type_info *result = 0 ;
 
-  //DALI_LOG_ERROR("#####CSharp_Dali_Any_GetType()!\n");
-  arg1 = (Dali::Any *)jarg1; 
+  arg1 = (Dali::Any *)jarg1;
   {
     try {
       result = (std::type_info *) &((Dali::Any const *)arg1)->GetType();
@@ -3559,8 +3557,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Any_Empty(void * jarg1) {
   Dali::Any *arg1 = (Dali::Any *) 0 ;
   bool result;
 
-  //DALI_LOG_ERROR("##### CSharp_Dali_Any_Empty()!\n");
-  arg1 = (Dali::Any *)jarg1; 
+  arg1 = (Dali::Any *)jarg1;
   {
     try {
       result = (bool)((Dali::Any const *)arg1)->Empty();
@@ -3590,7 +3587,6 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Any_AnyContainerBase(void * jarg1,
   Dali::Any::DeleteFunc arg3 = (Dali::Any::DeleteFunc) 0 ;
   Dali::Any::AnyContainerBase *result = 0 ;
 
-  //DALI_LOG_ERROR("##### CSharp_Dali_new_Any_AnyContainerBase()!\n");
   arg1 = (std::type_info *)jarg1;
   if (!arg1) {
     SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "std::type_info const & type is null", 0);
@@ -3625,8 +3621,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Any_AnyContainerBase_GetType(void * ja
   Dali::Any::AnyContainerBase *arg1 = (Dali::Any::AnyContainerBase *) 0 ;
   std::type_info *result = 0 ;
 
-  //DALI_LOG_ERROR("##### CSharp_Dali_Any_AnyContainerBase_GetType()!\n");
-  arg1 = (Dali::Any::AnyContainerBase *)jarg1; 
+  arg1 = (Dali::Any::AnyContainerBase *)jarg1;
   {
     try {
       result = (std::type_info *) &((Dali::Any::AnyContainerBase const *)arg1)->GetType();
@@ -3654,8 +3649,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Any_AnyContainerBase_mType_get(void *
   Dali::Any::AnyContainerBase *arg1 = (Dali::Any::AnyContainerBase *) 0 ;
   ::std::type_info *result = 0 ;
 
-  //DALI_LOG_ERROR("##### CSharp_Dali_Any_AnyContainerBase_mType_get()!\n");
-  arg1 = (Dali::Any::AnyContainerBase *)jarg1; 
+  arg1 = (Dali::Any::AnyContainerBase *)jarg1;
   result = (::std::type_info *) &(::std::type_info const &) ((arg1)->mType);
   jresult = (void *)result;
   return jresult;
@@ -3666,9 +3660,8 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Any_AnyContainerBase_mCloneFunc_set(void
   Dali::Any::AnyContainerBase *arg1 = (Dali::Any::AnyContainerBase *) 0 ;
   Dali::Any::CloneFunc arg2 = (Dali::Any::CloneFunc) 0 ;
 
-  //DALI_LOG_ERROR("##### CSharp_Dali_Any_AnyContainerBase_mCloneFunc_set()!\n");
-  arg1 = (Dali::Any::AnyContainerBase *)jarg1; 
-  arg2 = (Dali::Any::CloneFunc)jarg2; 
+  arg1 = (Dali::Any::AnyContainerBase *)jarg1;
+  arg2 = (Dali::Any::CloneFunc)jarg2;
   if (arg1) (arg1)->mCloneFunc = arg2;
 }
 
@@ -3678,8 +3671,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Any_AnyContainerBase_mCloneFunc_get(vo
   Dali::Any::AnyContainerBase *arg1 = (Dali::Any::AnyContainerBase *) 0 ;
   Dali::Any::CloneFunc result;
 
-  //DALI_LOG_ERROR("##### CSharp_Dali_Any_AnyContainerBase_mCloneFunc_get()!\n");
-  arg1 = (Dali::Any::AnyContainerBase *)jarg1; 
+  arg1 = (Dali::Any::AnyContainerBase *)jarg1;
   result = (Dali::Any::CloneFunc) ((arg1)->mCloneFunc);
   jresult = (void *)result;
   return jresult;
@@ -3690,9 +3682,8 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Any_AnyContainerBase_mDeleteFunc_set(voi
   Dali::Any::AnyContainerBase *arg1 = (Dali::Any::AnyContainerBase *) 0 ;
   Dali::Any::DeleteFunc arg2 = (Dali::Any::DeleteFunc) 0 ;
 
-  //DALI_LOG_ERROR("##### CSharp_Dali_Any_AnyContainerBase_mDeleteFunc_set()!\n");
-  arg1 = (Dali::Any::AnyContainerBase *)jarg1; 
-  arg2 = (Dali::Any::DeleteFunc)jarg2; 
+  arg1 = (Dali::Any::AnyContainerBase *)jarg1;
+  arg2 = (Dali::Any::DeleteFunc)jarg2;
   if (arg1) (arg1)->mDeleteFunc = arg2;
 }
 
@@ -3702,8 +3693,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Any_AnyContainerBase_mDeleteFunc_get(v
   Dali::Any::AnyContainerBase *arg1 = (Dali::Any::AnyContainerBase *) 0 ;
   Dali::Any::DeleteFunc result;
 
-  //DALI_LOG_ERROR("##### CSharp_Dali_Any_AnyContainerBase_mDeleteFunc_get()!\n");
-  arg1 = (Dali::Any::AnyContainerBase *)jarg1; 
+  arg1 = (Dali::Any::AnyContainerBase *)jarg1;
   result = (Dali::Any::DeleteFunc) ((arg1)->mDeleteFunc);
   jresult = (void *)result;
   return jresult;
@@ -3713,8 +3703,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Any_AnyContainerBase_mDeleteFunc_get(v
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Any_AnyContainerBase(void * jarg1) {
   Dali::Any::AnyContainerBase *arg1 = (Dali::Any::AnyContainerBase *) 0 ;
 
-  //DALI_LOG_ERROR("##### CSharp_Dali_delete_Any_AnyContainerBase()!\n");
-  arg1 = (Dali::Any::AnyContainerBase *)jarg1; 
+  arg1 = (Dali::Any::AnyContainerBase *)jarg1;
   {
     try {
       delete arg1;
@@ -3739,9 +3728,8 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Any_mContainer_set(void * jarg1, void *
   Dali::Any *arg1 = (Dali::Any *) 0 ;
   Dali::Any::AnyContainerBase *arg2 = (Dali::Any::AnyContainerBase *) 0 ;
 
-  //DALI_LOG_ERROR("##### CSharp_Dali_Any_mContainer_set()!\n");
-  arg1 = (Dali::Any *)jarg1; 
-  arg2 = (Dali::Any::AnyContainerBase *)jarg2; 
+  arg1 = (Dali::Any *)jarg1;
+  arg2 = (Dali::Any::AnyContainerBase *)jarg2;
   if (arg1) (arg1)->mContainer = arg2;
 }
 
@@ -3751,8 +3739,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Any_mContainer_get(void * jarg1) {
   Dali::Any *arg1 = (Dali::Any *) 0 ;
   Dali::Any::AnyContainerBase *result = 0 ;
 
-  //DALI_LOG_ERROR("##### CSharp_Dali_Any_mContainer_get()!\n");
-  arg1 = (Dali::Any *)jarg1; 
+  arg1 = (Dali::Any *)jarg1;
   result = (Dali::Any::AnyContainerBase *) ((arg1)->mContainer);
   jresult = (void *)result;
   return jresult;
@@ -3763,9 +3750,8 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_DaliAssertMessage(char * jarg1, char * j
   char *arg1 = (char *) 0 ;
   char *arg2 = (char *) 0 ;
 
-  //DALI_LOG_ERROR("##### CSharp_Dali_DaliAssertMessage()!\n");
-  arg1 = (char *)jarg1; 
-  arg2 = (char *)jarg2; 
+  arg1 = (char *)jarg1;
+  arg2 = (char *)jarg2;
   {
     try {
       Dali::DaliAssertMessage((char const *)arg1,(char const *)arg2);

diff --git a/dali-csharp-binder/src/key-grab.cpp b/dali-csharp-binder/src/key-grab.cpp
index d589e4f..248edd0 100755 (executable)
--- a/dali-csharp-binder/src/key-grab.cpp
+++ b/dali-csharp-binder/src/key-grab.cpp
@@ -20,9 +20,6 @@
 #include <dali/public-api/adaptor-framework/key-grab.h>
 #include <dali/devel-api/adaptor-framework/window-devel.h>
 
-#ifdef TIZEN_BUILD
-#include <Ecore_Wayland.h>
-#endif
 
 #undef LOG
 //#define LOG DALI_LOG_ERROR
@@ -33,6 +30,7 @@
 extern "C" {
 #endif
 
+
 SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_GrabKeyTopmost(void * window, int daliKey)
 {
   Dali::Window *_win = (Dali::Window *)window;
@@ -161,13 +159,8 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_GetNativeWindowHandler( void* window )
   LOG("CSharp_Dali_GetNativeWindowHandler() [DP1] window=%d", window);
 
   {
-    Dali::Any result;
     try {
-      result = _win->GetNativeHandle();
-
-      Ecore_Wl_Window * ecore_win = Dali::AnyCast<Ecore_Wl_Window*>(result);
-      ret = (void*)ecore_win;
-
+      ret = Dali::DevelWindow::GetNativeWindowHandler(*_win);
     } catch (std::out_of_range& e) {
     {
       SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return NULL;

diff --git a/packaging/dali-csharp-binder.spec b/packaging/dali-csharp-binder.spec
index 1005c27..85cf9e4 100755 (executable)
--- a/packaging/dali-csharp-binder.spec
+++ b/packaging/dali-csharp-binder.spec
@@ -1,4 +1,3 @@
-
 Name: dali-csharp-binder
 Version: 1.2.41
 Release: 1
@@ -10,7 +9,6 @@ Source: %{name}-%{version}.tar.xz
 BuildRequires: pkgconfig(dali-core)
 BuildRequires: pkgconfig(dali-adaptor)
 BuildRequires: pkgconfig(dali-toolkit)
-BuildRequires: pkgconfig(ecore-wayland)
 
 %description
 dali-csharp-binder
@@ -37,8 +35,6 @@ This package includes developer files common to all packages.
 ##############################
 %build
 %autogen
-# added for key grab binding only for tizen
-%configure --enable-tizenBuild=yes
 make %{?_smp_mflags}
 
 ##############################