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
DALi Version 1.2.36
[platform/core/uifw/dali-toolkit.git]
/
plugins
/
dali-swig
/
SWIG
/
dali.i
diff --git
a/plugins/dali-swig/SWIG/dali.i
b/plugins/dali-swig/SWIG/dali.i
index
824ed85
..
4c1e882
100755
(executable)
--- a/
plugins/dali-swig/SWIG/dali.i
+++ b/
plugins/dali-swig/SWIG/dali.i
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 201
6
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
7
Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-49,6
+49,9
@@
#include <dali/dali.h>
#include <dali-toolkit/dali-toolkit.h>
#include <dali/dali.h>
#include <dali-toolkit/dali-toolkit.h>
+#include <dali/devel-api/actors/actor-devel.h>
+#include <dali/devel-api/events/key-event-devel.h>
+
#include <dali/public-api/math/matrix.h>
#include <dali/public-api/math/matrix3.h>
#include <dali/public-api/math/viewport.h>
#include <dali/public-api/math/matrix.h>
#include <dali/public-api/math/matrix3.h>
#include <dali/public-api/math/viewport.h>
@@
-61,12
+64,14
@@
#include <dali/public-api/adaptor-framework/style-change.h>
#include <dali/devel-api/adaptor-framework/drag-and-drop-detector.h>
#include <dali/devel-api/adaptor-framework/application-extensions.h>
#include <dali/public-api/adaptor-framework/style-change.h>
#include <dali/devel-api/adaptor-framework/drag-and-drop-detector.h>
#include <dali/devel-api/adaptor-framework/application-extensions.h>
+#include <dali/devel-api/adaptor-framework/window-devel.h>
#include <dali/devel-api/images/nine-patch-image.h>
#include <dali-toolkit/devel-api/builder/builder.h>
#include <dali-toolkit/devel-api/focus-manager/keyinput-focus-manager.h>
#include <dali/devel-api/images/nine-patch-image.h>
#include <dali-toolkit/devel-api/builder/builder.h>
#include <dali-toolkit/devel-api/focus-manager/keyinput-focus-manager.h>
+#include <dali-toolkit/devel-api/focus-manager/keyboard-focus-manager-devel.h>
#include <dali-toolkit/devel-api/controls/popup/popup.h>
#include <dali-toolkit/devel-api/controls/progress-bar/progress-bar.h>
#include <dali-toolkit/devel-api/controls/popup/popup.h>
#include <dali-toolkit/devel-api/controls/progress-bar/progress-bar.h>
@@
-75,6
+80,7
@@
#include <dali-toolkit/devel-api/controls/page-turn-view/page-turn-view.h>
#include <dali-toolkit/devel-api/controls/page-turn-view/page-turn-landscape-view.h>
#include <dali-toolkit/devel-api/controls/page-turn-view/page-turn-portrait-view.h>
#include <dali-toolkit/devel-api/controls/page-turn-view/page-turn-view.h>
#include <dali-toolkit/devel-api/controls/page-turn-view/page-turn-landscape-view.h>
#include <dali-toolkit/devel-api/controls/page-turn-view/page-turn-portrait-view.h>
+#include <dali-toolkit/devel-api/controls/buttons/toggle-button.h>
#include <dali-toolkit/devel-api/visual-factory/visual-base.h>
#include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
#include <dali-toolkit/devel-api/visual-factory/visual-base.h>
#include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
@@
-241,6
+247,8
@@
using namespace Dali::Toolkit;
%feature("notabstract") Dali::Toolkit::FixedRuler;
%feature("notabstract") Dali::Toolkit::DefaultRuler;
%feature("notabstract") Dali::Toolkit::FixedRuler;
%feature("notabstract") Dali::Toolkit::DefaultRuler;
+%feature("director") Dali::Toolkit::DevelKeyboardFocusManager::CustomAlgorithmInterface;
+
// Note... all the typemap declarations have to be included before the DALi C++ head files are include otherwise
// they have no effect.
// Note... all the typemap declarations have to be included before the DALi C++ head files are include otherwise
// they have no effect.
@@
-264,9
+272,11
@@
using namespace Dali::Toolkit;
%include events/pinchgesture-event.i
%include events/pageturnview-event.i
%include events/pangesture-event.i
%include events/pinchgesture-event.i
%include events/pageturnview-event.i
%include events/pangesture-event.i
+%include events/progress-bar-event.i
%include events/propertynotification-event.i
%include events/longpressgesture-event.i
%include events/propertynotification-event.i
%include events/longpressgesture-event.i
-%include events/rectinteger.i
+%include events/rectangle.i
+%include events/padding.i
%include events/resourceimage-event.i
%include events/scrollable-event.i
%include events/scrollbar-event.i
%include events/resourceimage-event.i
%include events/scrollable-event.i
%include events/scrollbar-event.i
@@
-281,15
+291,24
@@
using namespace Dali::Toolkit;
%include events/videoview-event.i
%include alphafunction.i
%include events/videoview-event.i
%include alphafunction.i
+%include rotation.i
%include name-changed.i
%include property-value.i
%include dali-operator.i
%include devel-properties.i
%include gestures/hover.i
%include name-changed.i
%include property-value.i
%include dali-operator.i
%include devel-properties.i
%include gestures/hover.i
+%include gestures/gesture.i
+%include gestures/long-press-gesture.i
+%include gestures/pan-gesture.i
+%include gestures/tap-gesture.i
+%include gestures/pinch-gesture.i
+%include gestures/wheel.i
+%include gestures/touch.i
+%include gestures/key.i
+%include adaptor/window.i
%include dali-core.i
%include dali-adaptor.i
%include dali-toolkit.i
%include dali-core.i
%include dali-adaptor.i
%include dali-toolkit.i
-