projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Add PIXEL_SIZE and ELLIPSIS property in text-controls" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
plugins
/
dali-swig
/
SWIG
/
signals.i
diff --git
a/plugins/dali-swig/SWIG/signals.i
b/plugins/dali-swig/SWIG/signals.i
old mode 100644
(file)
new mode 100755
(executable)
index
e7aa444
..
5605405
--- a/
plugins/dali-swig/SWIG/signals.i
+++ b/
plugins/dali-swig/SWIG/signals.i
@@
-220,6
+220,13
@@
Macros for signals with return values
*****************/
Macros for signals with return values
*****************/
+// 0 param signals ( with return )
+%define DALI_SIGNAL_0_PARAM_RETURN( returnType )
+
+ SIGNAL_TYPEMAP_HELPER( returnType (*func) () );
+ SIGNAL_TEMPLATE_HELPER_0( returnType, return);
+%enddef
+
// 1 param signals ( with return )
%define DALI_SIGNAL_1_PARAM_RETURN( returnType, argumentType1 )
// 1 param signals ( with return )
%define DALI_SIGNAL_1_PARAM_RETURN( returnType, argumentType1 )
@@
-249,12
+256,18
@@
namespace Dali
// Signal< void () >
DALI_SIGNAL_0_PARAM();
// Signal< void () >
DALI_SIGNAL_0_PARAM();
+// Signal< bool () >
+DALI_SIGNAL_0_PARAM_RETURN( bool );
+
// Signal< void (Actor) >
DALI_SIGNAL_1_PARAM( Dali::Actor );
// Signal< void (float) >
DALI_SIGNAL_1_PARAM( float );
// Signal< void (Actor) >
DALI_SIGNAL_1_PARAM( Dali::Actor );
// Signal< void (float) >
DALI_SIGNAL_1_PARAM( float );
+// Signal< void (bool) >
+DALI_SIGNAL_1_PARAM( bool );
+
// Signal< void (Dali::Application&) >
DALI_SIGNAL_1_PARAM( Dali::Application& );
// Signal< void (Dali::Application&) >
DALI_SIGNAL_1_PARAM( Dali::Application& );
@@
-351,6
+364,9
@@
DALI_SIGNAL_3_PARAM( Dali::Toolkit::PageTurnView, unsigned int, bool );
// void Signal< Dali::Toolkit::PageTurnView >;
DALI_SIGNAL_1_PARAM( Dali::Toolkit::PageTurnView );
// void Signal< Dali::Toolkit::PageTurnView >;
DALI_SIGNAL_1_PARAM( Dali::Toolkit::PageTurnView );
+// void Signal< Dali::Toolkit::ProgressBar, float, float >;
+DALI_SIGNAL_3_PARAM( Dali::Toolkit::ProgressBar, float, float );
+
// void Signal< const Dali::Toolkit::ScrollView::SnapEvent& >;
DALI_SIGNAL_1_PARAM( const Dali::Toolkit::ScrollView::SnapEvent& );
// void Signal< const Dali::Toolkit::ScrollView::SnapEvent& >;
DALI_SIGNAL_1_PARAM( const Dali::Toolkit::ScrollView::SnapEvent& );