[dali_2.1.0] Merge branch 'devel/master'

Change-Id: Ibc57bdef6dec6183c9c7196cd9812d5e167d714e

diff --git a/dali-csharp-binder/src/atspi-wrap.cpp b/dali-csharp-binder/src/atspi-wrap.cpp
index e1757b1..386ce1a 100755 (executable)
--- a/dali-csharp-binder/src/atspi-wrap.cpp
+++ b/dali-csharp-binder/src/atspi-wrap.cpp
@@ -169,6 +169,46 @@ SWIGEXPORT bool SWIGSTDCALL csharp_dali_accessibility_IsEnabled()
   return Dali::AtspiAccessibility::IsEnabled();
 }
 
+SWIGEXPORT void SWIGSTDCALL csharp_dali_accessibility_RegisterEnabledDisabledSignalHandler(void (*newEnabledSignalHandler)(), void (*newDisabledSignalHandler)())
+{
+  using Dali::Accessibility::Bridge;
+
+  static void (*enabledSignalHandler)();
+  static void (*disabledSignalHandler)();
+
+  // Replace EnabledSignal
+  if (newEnabledSignalHandler != enabledSignalHandler)
+  {
+    if (enabledSignalHandler)
+    {
+      Bridge::EnabledSignal().Disconnect(enabledSignalHandler);
+    }
+
+    enabledSignalHandler = newEnabledSignalHandler;
+
+    if (enabledSignalHandler)
+    {
+      Bridge::EnabledSignal().Connect(enabledSignalHandler);
+    }
+  }
+
+  // Replace DisabledSignal
+  if (newDisabledSignalHandler != disabledSignalHandler)
+  {
+    if (disabledSignalHandler)
+    {
+      Bridge::DisabledSignal().Disconnect(disabledSignalHandler);
+    }
+
+    disabledSignalHandler = newDisabledSignalHandler;
+
+    if (disabledSignalHandler)
+    {
+      Bridge::DisabledSignal().Connect(disabledSignalHandler);
+    }
+  }
+}
+
 #ifdef __cplusplus
 }
 #endif

diff --git a/dali-csharp-binder/src/text-label-wrap.cpp b/dali-csharp-binder/src/text-label-wrap.cpp
index cc82c13..6ceb67f 100755 (executable)
--- a/dali-csharp-binder/src/text-label-wrap.cpp
+++ b/dali-csharp-binder/src/text-label-wrap.cpp
@@ -58,6 +58,22 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TextLabel_AnchorClickedSignal(void * j
   return jresult;
 }
 
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TextLabel_TextFitChangedSignal(void * jarg1) {
+  void * jresult ;
+  Dali::Toolkit::TextLabel *arg1 = (Dali::Toolkit::TextLabel *) 0 ;
+  Dali::Toolkit::DevelTextLabel::TextFitChangedSignalType *result = 0 ;
+
+  arg1 = (Dali::Toolkit::TextLabel *)jarg1;
+  {
+    try {
+      result = (Dali::Toolkit::DevelTextLabel::TextFitChangedSignalType *) &Dali::Toolkit::DevelTextLabel::TextFitChangedSignal(*arg1);
+    } CALL_CATCH_EXCEPTION(0);
+  }
+
+  jresult = (void *)result;
+  return jresult;
+}
+
 
 SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_TextLabelSignal_Empty(void * jarg1) {
   unsigned int jresult ;

diff --git a/dali-csharp-binder/src/window-wrap.cpp b/dali-csharp-binder/src/window-wrap.cpp
index cbf8eb5..07526c7 100644 (file)
--- a/dali-csharp-binder/src/window-wrap.cpp
+++ b/dali-csharp-binder/src/window-wrap.cpp
@@ -3200,6 +3200,194 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Window_Transition_Effect_Event_Signal_de
 
 }
 
+
+////////////////////////////////////////////////////////////////////
+/// Auxiliary Message event
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Window_Auxiliary_Message_Signal(void * jarg1) {
+  void * jresult ;
+  Dali::Window *window = (Dali::Window *) 0 ;
+  Dali::DevelWindow::AuxiliaryMessageSignalType *result = 0 ;
+
+  window = (Dali::Window *)jarg1;
+  {
+    try {
+      result = (Dali::DevelWindow::AuxiliaryMessageSignalType *) &(Dali::DevelWindow::AuxiliaryMessageSignal(*window));
+    } catch (std::out_of_range& e) {
+      {
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;
+      };
+    } catch (std::exception& e) {
+      {
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0;
+      };
+    } catch (Dali::DaliException e) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, e.condition); return 0;
+      };
+    } catch (...) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0;
+      };
+    }
+  }
+
+  jresult = (void *)result;
+  return jresult;
+}
+
+SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_Window_Auxiliary_Message_Signal_Empty(void * jarg1) {
+  bool result;
+  Dali::DevelWindow::AuxiliaryMessageSignalType* arg1 = (Dali::DevelWindow::AuxiliaryMessageSignalType*) jarg1;
+
+  if (arg1 == nullptr) {
+    DALI_LOG_ERROR("[ERR] arg1 == nullptr");
+    return false;
+  }
+
+  {
+    try {
+      result = arg1->Empty();
+    }
+    catch (std::out_of_range & e) {
+      {
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return false;
+      };
+    }
+    catch (std::exception & e) {
+      {
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return false;
+      };
+    }
+    catch (Dali::DaliException e) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, e.condition); return false;
+      };
+    }
+    catch (...) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return false;
+      };
+    }
+  }
+  return result;
+}
+
+
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_Window_Auxiliary_Message_Signal_GetConnectionCount(void * jarg1) {
+  unsigned int result;
+  Dali::DevelWindow::AuxiliaryMessageSignalType* arg1 = (Dali::DevelWindow::AuxiliaryMessageSignalType *) jarg1;
+
+  if (arg1 == nullptr) {
+    DALI_LOG_ERROR("[ERR] arg1 == nullptr");
+    return 0;
+  }
+
+  {
+    try {
+      result = arg1->GetConnectionCount();
+    }
+    catch (std::out_of_range & e) {
+      {
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;
+      };
+    }
+    catch (std::exception & e) {
+      {
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0;
+      };
+    }
+    catch (Dali::DaliException e) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, e.condition); return 0;
+      };
+    }
+    catch (...) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0;
+      };
+    }
+  }
+  return result;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Window_Auxiliary_Message_Signal_Connect(void * jarg1, void * jarg2) {
+  Dali::DevelWindow::AuxiliaryMessageSignalType* arg1 = (Dali::DevelWindow::AuxiliaryMessageSignalType *)jarg1;
+  void (*arg2)(const std::string&, const std::string&, const Dali::Property::Array&) = ( void (*)(const std::string&, const std::string&, const Dali::Property::Array&) )jarg2;
+
+  if (arg1 == nullptr) {
+    DALI_LOG_ERROR("[ERR] arg1 == nullptr");
+    return ;
+  }
+
+  {
+    try {
+      arg1->Connect(arg2);
+    }
+    catch (std::out_of_range & e) {
+      {
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return;
+      };
+    }
+    catch (std::exception & e) {
+      {
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return;
+      };
+    }
+    catch (Dali::DaliException e) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, e.condition); return;
+      };
+    }
+    catch (...) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return;
+      };
+    }
+  }
+  return ;
+}
+
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Window_Auxiliary_Message_Signal_Disconnect(void * jarg1, void * jarg2) {
+  Dali::DevelWindow::AuxiliaryMessageSignalType* arg1 = (Dali::DevelWindow::AuxiliaryMessageSignalType *)jarg1;
+  void (*arg2)(const std::string&, const std::string&, const Dali::Property::Array&) = ( void (*)(const std::string&, const std::string&, const Dali::Property::Array&) )jarg2;
+
+  if (arg1 == nullptr) {
+    DALI_LOG_ERROR("[ERR] arg1 == nullptr");
+    return;
+  }
+
+  {
+    try {
+      arg1->Disconnect(arg2);
+    }
+    catch (std::out_of_range & e) {
+      {
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return;
+      };
+    }
+    catch (std::exception & e) {
+      {
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return;
+      };
+    }
+    catch (Dali::DaliException e) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, e.condition); return;
+      };
+    }
+    catch (...) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return;
+      };
+    }
+  }
+  return;
+}
+
+/////////////////
 // Keyboard Repeat Settings Changed
 SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Window_Keyboard_Repeat_Settings_ChangedSignal(void * jarg1) {
   void * jresult ;

diff --git a/packaging/dali-csharp-binder.spec b/packaging/dali-csharp-binder.spec
index 3f66ff9..680741b 100644 (file)
--- a/packaging/dali-csharp-binder.spec
+++ b/packaging/dali-csharp-binder.spec
@@ -21,7 +21,7 @@
 
 Name: dali2-csharp-binder
 Summary: The DALI Csharp Binder
-Version: 2.0.53
+Version: 2.1.0
 Release: 1
 Group: uifw/graphic
 License: Apache-2.0 and BSD-3-Clause and MIT