Merge "DALi Version 1.2.40" into devel/master

[platform/core/uifw/dali-toolkit.git] / plugins / dali-swig / SWIG / events / application-event.i

diff --git a/plugins/dali-swig/SWIG/events/application-event.i b/plugins/dali-swig/SWIG/events/application-event.i
index bc81dec..3050ae7 100644 (file)
--- a/plugins/dali-swig/SWIG/events/application-event.i
+++ b/plugins/dali-swig/SWIG/events/application-event.i
@@ -404,6 +404,9 @@
     // Callback for Application InitSignal
     private void OnApplicationInit(IntPtr data)
     {
+      // Initialize DisposeQueue Singleton class. This is also required to create DisposeQueue on main thread.
+      DisposeQueue.Instance.Initialize();
+
       NUIApplicationInitEventArgs e = new NUIApplicationInitEventArgs();
 
       // Populate all members of "e" (NUIApplicationInitEventArgs) with real data
@@ -1018,6 +1021,9 @@
 
     public static Application NewApplication(string stylesheet, Application.WINDOW_MODE windowMode) {
 
+      // register all Views with the type registry, so that can be created / styled via JSON
+      ViewRegistryHelper.Initialize();
+
       Application ret = New(1, stylesheet, windowMode);
       if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
 
@@ -1028,16 +1034,6 @@
       return ret;
     }
 
-    public bool AddIdle(System.Delegate func) {
-      System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForDelegate(func);
-      System.IntPtr ip2 = NDalicManualPINVOKE.MakeCallback(new System.Runtime.InteropServices.HandleRef(this, ip));
-
-      bool ret = NDalicPINVOKE.Application_AddIdle(swigCPtr, new System.Runtime.InteropServices.HandleRef(this, ip2));
-
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    }
-
     %}
     %enddef