From: Paul Wisbey <p.wisbey@samsung.com>
Date: Thu, 23 Mar 2017 09:56:22 +0000 (-0700)
Subject: Merge "Fix for Text::Controller::KeyEvent()" into devel/master
X-Git-Tag: dali_1.2.32~5
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=a030789855b611196da6adb785b71d2a6e5ef948;hp=acb204611a5c1c11ffd0e698be3c477438cdd9fc

Merge "Fix for Text::Controller::KeyEvent()" into devel/master
---

diff --git a/plugins/dali-swig/SWIG/adaptor/window.i b/plugins/dali-swig/SWIG/adaptor/window.i
new file mode 100755
index 0000000..5870e36
--- /dev/null
+++ b/plugins/dali-swig/SWIG/adaptor/window.i
@@ -0,0 +1,36 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+%typemap(cscode) Dali::Window %{
+    public void Show()
+    {
+      NDalicPINVOKE.Show(swigCPtr);
+      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+    }
+
+    public void Hide()
+    {
+      NDalicPINVOKE.Hide(swigCPtr);
+      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+    }
+
+    public void IsVisible()
+    {
+      NDalicPINVOKE.IsVisible(swigCPtr);
+      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+    }
+%}
diff --git a/plugins/dali-swig/SWIG/dali-adaptor.i b/plugins/dali-swig/SWIG/dali-adaptor.i
index 3ce308e..5834e10 100755
--- a/plugins/dali-swig/SWIG/dali-adaptor.i
+++ b/plugins/dali-swig/SWIG/dali-adaptor.i
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 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.
@@ -27,6 +27,7 @@
 %include <dali/devel-api/adaptor-framework/drag-and-drop-detector.h>
 %include <dali/devel-api/adaptor-framework/application-extensions.h>
 %include <dali/public-api/adaptor-framework/window.h>
+%include <dali/devel-api/adaptor-framework/window-devel.h>
 
 #if defined(SWIGCSHARP)
 
diff --git a/plugins/dali-swig/SWIG/dali.i b/plugins/dali-swig/SWIG/dali.i
index 1cd7ef8..861bc43 100755
--- a/plugins/dali-swig/SWIG/dali.i
+++ b/plugins/dali-swig/SWIG/dali.i
@@ -63,6 +63,7 @@
 #include <dali/public-api/adaptor-framework/style-change.h>
 #include <dali/devel-api/adaptor-framework/drag-and-drop-detector.h>
 #include <dali/devel-api/adaptor-framework/application-extensions.h>
+#include <dali/devel-api/adaptor-framework/window-devel.h>
 
 #include <dali/devel-api/images/nine-patch-image.h>
 
@@ -302,7 +303,8 @@ using namespace Dali::Toolkit;
 %include gestures/touch.i
 %include gestures/key.i
 
+%include adaptor/window.i
+
 %include dali-core.i
 %include dali-adaptor.i
 %include dali-toolkit.i
-