Merge "fixup! DALi C# binding - Generic Delegates support for EventHandlers" into...

diff --git a/plugins/dali-swig/SWIG/events/accessibilitymanager-event.i b/plugins/dali-swig/SWIG/events/accessibilitymanager-event.i
index f28e3ca..64e070d 100644 (file)
--- a/plugins/dali-swig/SWIG/events/accessibilitymanager-event.i
+++ b/plugins/dali-swig/SWIG/events/accessibilitymanager-event.i
@@ -891,7 +891,7 @@
       if (_accessibilityManagerStatusChangedEventHandler != null)
       {
         //here we send all data to user event handlers
-        return _accessibilityManagerStatusChangedEventHandler(this, e, true);
+        return _accessibilityManagerStatusChangedEventHandler(this, e);
       }
       return false;
     }
@@ -938,7 +938,7 @@
       if (_accessibilityManagerActionNextEventHandler != null)
       {
         //here we send all data to user event handlers
-        return _accessibilityManagerActionNextEventHandler(this, e, true);
+        return _accessibilityManagerActionNextEventHandler(this, e);
       }
       return false;
     }
@@ -985,7 +985,7 @@
       if (_accessibilityManagerActionPreviousEventHandler != null)
       {
         //here we send all data to user event handlers
-        return _accessibilityManagerActionPreviousEventHandler(this, e, true);
+        return _accessibilityManagerActionPreviousEventHandler(this, e);
       }
       return false;
     }
@@ -1032,7 +1032,7 @@
       if (_accessibilityManagerActionActivateEventHandler != null)
       {
         //here we send all data to user event handlers
-        return _accessibilityManagerActionActivateEventHandler(this, e, true);
+        return _accessibilityManagerActionActivateEventHandler(this, e);
       }
       return false;
     }
@@ -1079,7 +1079,7 @@
       if (_accessibilityManagerActionReadEventHandler != null)
       {
         //here we send all data to user event handlers
-        return _accessibilityManagerActionReadEventHandler(this, e, true);
+        return _accessibilityManagerActionReadEventHandler(this, e);
       }
       return false;
     }
@@ -1126,7 +1126,7 @@
       if (_accessibilityManagerActionOverEventHandler != null)
       {
         //here we send all data to user event handlers
-        return _accessibilityManagerActionOverEventHandler(this, e, true);
+        return _accessibilityManagerActionOverEventHandler(this, e);
       }
       return false;
     }
@@ -1173,7 +1173,7 @@
       if (_accessibilityManagerActionReadNextEventHandler != null)
       {
         //here we send all data to user event handlers
-        return _accessibilityManagerActionReadNextEventHandler(this, e, true);
+        return _accessibilityManagerActionReadNextEventHandler(this, e);
       }
       return false;
     }
@@ -1221,7 +1221,7 @@
       if (_accessibilityManagerActionReadPreviousEventHandler != null)
       {
         //here we send all data to user event handlers
-        return _accessibilityManagerActionReadPreviousEventHandler(this, e, true);
+        return _accessibilityManagerActionReadPreviousEventHandler(this, e);
       }
       return false;
     }
@@ -1268,7 +1268,7 @@
       if (_accessibilityManagerActionUpEventHandler != null)
       {
         //here we send all data to user event handlers
-        return _accessibilityManagerActionUpEventHandler(this, e, true);
+        return _accessibilityManagerActionUpEventHandler(this, e);
       }
       return false;
     }
@@ -1315,7 +1315,7 @@
       if (_accessibilityManagerActionDownEventHandler != null)
       {
         //here we send all data to user event handlers
-        return _accessibilityManagerActionDownEventHandler(this, e, true);
+        return _accessibilityManagerActionDownEventHandler(this, e);
       }
       return false;
     }
@@ -1362,7 +1362,7 @@
       if (_accessibilityManagerActionClearFocusEventHandler != null)
       {
         //here we send all data to user event handlers
-        return _accessibilityManagerActionClearFocusEventHandler(this, e, true);
+        return _accessibilityManagerActionClearFocusEventHandler(this, e);
       }
       return false;
     }
@@ -1409,7 +1409,7 @@
       if (_accessibilityManagerActionBackEventHandler != null)
       {
         //here we send all data to user event handlers
-        return _accessibilityManagerActionBackEventHandler(this, e, true);
+        return _accessibilityManagerActionBackEventHandler(this, e);
       }
       return false;
     }
@@ -1456,7 +1456,7 @@
       if (_accessibilityManagerActionScrollUpEventHandler != null)
       {
         //here we send all data to user event handlers
-        return _accessibilityManagerActionScrollUpEventHandler(this, e, true);
+        return _accessibilityManagerActionScrollUpEventHandler(this, e);
       }
       return false;
     }
@@ -1503,7 +1503,7 @@
       if (_accessibilityManagerActionScrollDownEventHandler != null)
       {
         //here we send all data to user event handlers
-        return _accessibilityManagerActionScrollDownEventHandler(this, e, true);
+        return _accessibilityManagerActionScrollDownEventHandler(this, e);
       }
       return false;
     }
@@ -1551,7 +1551,7 @@
       if (_accessibilityManagerActionPageLeftEventHandler != null)
       {
         //here we send all data to user event handlers
-        return _accessibilityManagerActionPageLeftEventHandler(this, e, true);
+        return _accessibilityManagerActionPageLeftEventHandler(this, e);
       }
       return false;
     }
@@ -1598,7 +1598,7 @@
       if (_accessibilityManagerActionPageRightEventHandler != null)
       {
         //here we send all data to user event handlers
-        return _accessibilityManagerActionPageRightEventHandler(this, e, true);
+        return _accessibilityManagerActionPageRightEventHandler(this, e);
       }
       return false;
     }
@@ -1645,7 +1645,7 @@
       if (_accessibilityManagerActionPageUpEventHandler != null)
       {
         //here we send all data to user event handlers
-        return _accessibilityManagerActionPageUpEventHandler(this, e, true);
+        return _accessibilityManagerActionPageUpEventHandler(this, e);
       }
       return false;
     }
@@ -1693,7 +1693,7 @@
       if (_accessibilityManagerActionPageDownEventHandler != null)
       {
         //here we send all data to user event handlers
-        return _accessibilityManagerActionPageDownEventHandler(this, e, true);
+        return _accessibilityManagerActionPageDownEventHandler(this, e);
       }
       return false;
     }
@@ -1741,7 +1741,7 @@
       if (_accessibilityManagerActionMoveToFirstEventHandler != null)
       {
         //here we send all data to user event handlers
-        return _accessibilityManagerActionMoveToFirstEventHandler(this, e, true);
+        return _accessibilityManagerActionMoveToFirstEventHandler(this, e);
       }
       return false;
     }
@@ -1788,7 +1788,7 @@
       if (_accessibilityManagerActionMoveToLastEventHandler != null)
       {
         //here we send all data to user event handlers
-        return _accessibilityManagerActionMoveToLastEventHandler(this, e, true);
+        return _accessibilityManagerActionMoveToLastEventHandler(this, e);
       }
       return false;
     }
@@ -1835,7 +1835,7 @@
       if (_accessibilityManagerActionReadFromTopEventHandler != null)
       {
         //here we send all data to user event handlers
-        return _accessibilityManagerActionReadFromTopEventHandler(this, e, true);
+        return _accessibilityManagerActionReadFromTopEventHandler(this, e);
       }
       return false;
     }
@@ -1882,7 +1882,7 @@
       if (_accessibilityManagerActionReadFromNextEventHandler != null)
       {
         //here we send all data to user event handlers
-        return _accessibilityManagerActionReadFromNextEventHandler(this, e, true);
+        return _accessibilityManagerActionReadFromNextEventHandler(this, e);
       }
       return false;
     }
@@ -1929,7 +1929,7 @@
       if (_accessibilityManagerActionZoomEventHandler != null)
       {
         //here we send all data to user event handlers
-        return _accessibilityManagerActionZoomEventHandler(this, e, true);
+        return _accessibilityManagerActionZoomEventHandler(this, e);
       }
       return false;
     }
@@ -1976,7 +1976,7 @@
       if (_accessibilityManagerActionReadIndicatorInformationEventHandler != null)
       {
         //here we send all data to user event handlers
-        return _accessibilityManagerActionReadIndicatorInformationEventHandler(this, e, true);
+        return _accessibilityManagerActionReadIndicatorInformationEventHandler(this, e);
       }
       return false;
     }
@@ -2023,7 +2023,7 @@
       if (_accessibilityManagerActionReadPauseResumeEventHandler != null)
       {
         //here we send all data to user event handlers
-        return _accessibilityManagerActionReadPauseResumeEventHandler(this, e, true);
+        return _accessibilityManagerActionReadPauseResumeEventHandler(this, e);
       }
       return false;
     }
@@ -2070,7 +2070,7 @@
       if (_accessibilityManagerActionStartStopEventHandler != null)
       {
         //here we send all data to user event handlers
-        return _accessibilityManagerActionStartStopEventHandler(this, e, true);
+        return _accessibilityManagerActionStartStopEventHandler(this, e);
       }
       return false;
     }
@@ -2118,7 +2118,7 @@
       if (_accessibilityManagerActionScrollEventHandler != null)
       {
         //here we send all data to user event handlers
-        return _accessibilityManagerActionScrollEventHandler(this, e, true);
+        return _accessibilityManagerActionScrollEventHandler(this, e);
       }
       return false;
     }

diff --git a/plugins/dali-swig/SWIG/events/actor-event.i b/plugins/dali-swig/SWIG/events/actor-event.i
index 1a4b05a..4a5f51f 100644 (file)
--- a/plugins/dali-swig/SWIG/events/actor-event.i
+++ b/plugins/dali-swig/SWIG/events/actor-event.i
@@ -308,7 +308,7 @@
       if (_actorTouchDataEventHandler != null)
       {
         //here we send all data to user event handlers
-        return _actorTouchDataEventHandler(this, e, true);
+        return _actorTouchDataEventHandler(this, e);
       }
 
       return false;
@@ -362,7 +362,7 @@
       if (_actorHoverEventHandler != null)
       {
         //here we send all data to user event handlers
-        return _actorHoverEventHandler(this, e, true);
+        return _actorHoverEventHandler(this, e);
       }
 
       return false;
@@ -416,7 +416,7 @@
       if (_actorWheelEventHandler != null)
       {
         //here we send all data to user event handlers
-        return _actorWheelEventHandler(this, e, true);
+        return _actorWheelEventHandler(this, e);
       }
 
       return false;

diff --git a/plugins/dali-swig/SWIG/events/button-event.i b/plugins/dali-swig/SWIG/events/button-event.i
index e568870..bfef5ad 100644 (file)
--- a/plugins/dali-swig/SWIG/events/button-event.i
+++ b/plugins/dali-swig/SWIG/events/button-event.i
@@ -160,7 +160,7 @@ public class StateChangedEventArgs : EventArgs
      if (_buttonClickedEventHandler != null)
      {
         //here we send all data to user event handlers
-        return _buttonClickedEventHandler(this, e,true);
+        return _buttonClickedEventHandler(this, e);
      }
      return false;
   }
@@ -207,7 +207,7 @@ public class StateChangedEventArgs : EventArgs
      if (_buttonPressedEventHandler != null)
      {
         //here we send all data to user event handlers
-       return _buttonPressedEventHandler(this, e,true);
+       return _buttonPressedEventHandler(this, e);
      }
      return false;
   }
@@ -254,7 +254,7 @@ public class StateChangedEventArgs : EventArgs
      if (_buttonReleasedEventHandler != null)
      {
         //here we send all data to user event handlers
-       return _buttonReleasedEventHandler(this, e, true);
+       return _buttonReleasedEventHandler(this, e);
      }
      return false;
   }
@@ -301,7 +301,7 @@ public class StateChangedEventArgs : EventArgs
      if (_buttonStateChangedEventHandler != null)
      {
         //here we send all data to user event handlers
-       return _buttonStateChangedEventHandler(this, e, true);
+       return _buttonStateChangedEventHandler(this, e);
      }
      return false;
   }

diff --git a/plugins/dali-swig/SWIG/events/control-event.i b/plugins/dali-swig/SWIG/events/control-event.i
index 83eb9c4..9f7d02f 100644 (file)
--- a/plugins/dali-swig/SWIG/events/control-event.i
+++ b/plugins/dali-swig/SWIG/events/control-event.i
@@ -283,7 +283,7 @@ public class KeyEventArgs : EventArgs
    if (_KeyEventHandler != null)
    {
       //here we send all data to user event handlers
-      return _KeyEventHandler(this, e, true);
+      return _KeyEventHandler(this, e);
    }
    return false;
 

diff --git a/plugins/dali-swig/SWIG/events/slider-event.i b/plugins/dali-swig/SWIG/events/slider-event.i
index 53906d6..02ef3da 100644 (file)
--- a/plugins/dali-swig/SWIG/events/slider-event.i
+++ b/plugins/dali-swig/SWIG/events/slider-event.i
@@ -175,7 +175,7 @@ public class MarkReachedEventArgs : EventArgs
      if (_sliderValueChangedEventHandler != null)
      {
         //here we send all page to user event handlers
-      return _sliderValueChangedEventHandler(this, e, true);
+      return _sliderValueChangedEventHandler(this, e);
      }
      return false;
   }
@@ -223,7 +223,7 @@ public class MarkReachedEventArgs : EventArgs
      if (_sliderSlidingFinishedEventHandler != null)
      {
         //here we send all page to user event handlers
-      return _sliderSlidingFinishedEventHandler(this, e, true);
+      return _sliderSlidingFinishedEventHandler(this, e);
      }
      return false;
   }
@@ -271,7 +271,7 @@ public class MarkReachedEventArgs : EventArgs
      if (_sliderMarkReachedEventHandler != null)
      {
         //here we send all page to user event handlers
-      return _sliderMarkReachedEventHandler(this, e, true);
+      return _sliderMarkReachedEventHandler(this, e);
      }
      return false;
   }

diff --git a/plugins/dali-swig/SWIG/events/timer-event.i b/plugins/dali-swig/SWIG/events/timer-event.i
index e6fb89a..1604a08 100644 (file)
--- a/plugins/dali-swig/SWIG/events/timer-event.i
+++ b/plugins/dali-swig/SWIG/events/timer-event.i
@@ -83,7 +83,7 @@ using System.Runtime.InteropServices;
      if (_timerTickEventHandler != null)
      {
         //here we send all data to user event handlers
-        return _timerTickEventHandler(this, e, true);
+        return _timerTickEventHandler(this, e);
      }
      return false;
   }

diff --git a/plugins/dali-swig/manual/csharp/DaliEventHandler.cs b/plugins/dali-swig/manual/csharp/DaliEventHandler.cs
index 1df1557..a7de698 100644 (file)
--- a/plugins/dali-swig/manual/csharp/DaliEventHandler.cs
+++ b/plugins/dali-swig/manual/csharp/DaliEventHandler.cs
@@ -7,6 +7,6 @@ namespace Dali {
        public delegate void DaliEventHandler<T,U>(T source, U e);
 
        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-       public delegate R DaliEventHandlerWithReturnType<T,U,R>(T source, U e, R ret);
+       public delegate R DaliEventHandlerWithReturnType<T,U,R>(T source, U e);
 
 }