Merge "DALi Version 1.2.40" into devel/master

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

diff --git a/plugins/dali-swig/SWIG/events/builder-event.i b/plugins/dali-swig/SWIG/events/builder-event.i
index ad55258..268b7d7 100644 (file)
--- a/plugins/dali-swig/SWIG/events/builder-event.i
+++ b/plugins/dali-swig/SWIG/events/builder-event.i
@@ -33,14 +33,11 @@
     }
 
     [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-    public delegate void QuitEventHandler(object source, QuitEventArgs e);
-
-    [UnmanagedFunctionPointer(CallingConvention.StdCall)]
     private delegate void QuitEventCallbackDelegate();
-    private QuitEventHandler _builderQuitEventHandler;
+    private DaliEventHandler<object,QuitEventArgs> _builderQuitEventHandler;
     private QuitEventCallbackDelegate _builderQuitEventCallbackDelegate;
 
-    public event QuitEventHandler Quit
+    public event DaliEventHandler<object,QuitEventArgs> Quit
     {
       add
       {
@@ -83,6 +80,29 @@
       }
     }
 
+    ///
+  public void LoadFromFile( string fileName )
+  {
+    try
+    {
+      string json = System.IO.File.ReadAllText( fileName );
+      if( json.Length > 0 )
+      {
+        LoadFromString( json );
+      }
+      else
+      {
+        throw new global::System.InvalidOperationException("Failed to load file " +fileName);
+
+      }
+    }
+    catch ( System.Exception e)
+    {
+      throw new global::System.InvalidOperationException("Failed to parse " +fileName);
+    }
+  }
+
+
     %}
     %enddef