X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=plugins%2Fdali-swig%2FSWIG%2Fdali-adaptor.i;h=011437899708248fbd8de725659ae2a97a08f6d1;hb=24ea337df1049251ab2e47c556edc6e8458f9c93;hp=ddd74c344b9ef719808bfad222af0ba54b23f383;hpb=85affa07d97fb47fd8a244247710efc077cfd096;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/plugins/dali-swig/SWIG/dali-adaptor.i b/plugins/dali-swig/SWIG/dali-adaptor.i
old mode 100644
new mode 100755
index ddd74c3..0114378
--- 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.
@@ -25,7 +25,9 @@
 %include <dali/public-api/adaptor-framework/style-change.h>
 %include <dali/public-api/adaptor-framework/timer.h>
 %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)
 
@@ -74,92 +76,6 @@
   */
   public";
 
-%typemap(cscode) Dali::Application %{
-
-  private static  Application instance; // singleton
-
-  public delegate void InitDelegate();
-
-  public delegate void TerminateDelegate();
-
-  public delegate void PauseDelegate();
-
-  public delegate void ResumeDelegate();
-
-  public delegate void ResizeDelegate();
-
-  public delegate void AppControlDelegate();
-
-  public delegate void LanguageChangedDelegate();
-
-  public delegate void RegionChangedDelegate();
-
-  public delegate void BatteryLowDelegate();
-
-  public delegate void MemoryLowDelegate();
-
-  [System.Runtime.InteropServices.UnmanagedFunctionPointer(System.Runtime.InteropServices.CallingConvention.StdCall)]
-  internal delegate void InitDelegateInternal();
-
-  [System.Runtime.InteropServices.UnmanagedFunctionPointer(System.Runtime.InteropServices.CallingConvention.StdCall)]
-  internal delegate void TerminateDelegateInternal();
-
-  [System.Runtime.InteropServices.UnmanagedFunctionPointer(System.Runtime.InteropServices.CallingConvention.StdCall)]
-  internal delegate void PauseDelegateInternal();
-
-  [System.Runtime.InteropServices.UnmanagedFunctionPointer(System.Runtime.InteropServices.CallingConvention.StdCall)]
-  internal delegate void ResumeDelegateInternal();
-
-  [System.Runtime.InteropServices.UnmanagedFunctionPointer(System.Runtime.InteropServices.CallingConvention.StdCall)]
-  internal delegate void ResizeDelegateInternal();
-
-  [System.Runtime.InteropServices.UnmanagedFunctionPointer(System.Runtime.InteropServices.CallingConvention.StdCall)]
-  internal delegate void AppControlDelegateInternal();
-
-  [System.Runtime.InteropServices.UnmanagedFunctionPointer(System.Runtime.InteropServices.CallingConvention.StdCall)]
-  internal delegate void LanguageChangedDelegateInternal();
-
-  [System.Runtime.InteropServices.UnmanagedFunctionPointer(System.Runtime.InteropServices.CallingConvention.StdCall)]
-  internal delegate void RegionChangedDelegateInternal();
-
-  [System.Runtime.InteropServices.UnmanagedFunctionPointer(System.Runtime.InteropServices.CallingConvention.StdCall)]
-  internal delegate void BatteryLowDelegateInternal();
-
-  [System.Runtime.InteropServices.UnmanagedFunctionPointer(System.Runtime.InteropServices.CallingConvention.StdCall)]
-  internal delegate void MemoryLowDelegateInternal();
-
-  static void Initialize()
-  {
-  //	instance.InitDelegate();
-  }
-
- public static Application ApplicationFromPtr(global::System.IntPtr cPtr) {
-    Application ret = new Application(cPtr, false);
-	if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  internal void SetupDelegates() {
-    InitDelegateInternal initializeCallback = new InitDelegateInternal( Initialize );
-    System.Console.WriteLine( "InitSignal connection count");
-
-    this.InitSignal().Connect( initializeCallback );
-    //Console.WriteLine( "InitSignal connection count = " + app.InitSignal().GetConnectionCount() );
- }
-
-   public static Application NewApplication() {
-    Application ret = New(1);
-	if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-
-    // we've got an application now connect the signals
-    ret.SetupDelegates();
-    // set the singleton
-
-    return ret;
-  }
-
-%}
-
 %typemap(in) ( int* argc, char **argv[]  ) {
 
   // Todo generate argv data from the C# args
@@ -191,6 +107,7 @@
 %template(ApplicationSignal) Dali::Signal<void(Dali::Application&)>;
 %template(ApplicationControlSignal) Dali::Signal<void(Dali::Application&, void*)>;
 %template(TimerSignalType) Dali::Signal<bool()>;
+%template(WindowFocusSignalType) Dali::Signal<void(bool)>;
 
 
 // Application specialisation