X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=plugins%2Fdali-swig%2FSWIG%2Fdali-toolkit.i;h=1175a476e6d6c69b25b5099d98eb61216514f137;hp=d17226609431e5952901a005b0e708157844c207;hb=fb6643323927e106d95ddeacedf6665638a52251;hpb=a0bc72c2530d445a843cc0ad5dbe047f1f6c0883

diff --git a/plugins/dali-swig/SWIG/dali-toolkit.i b/plugins/dali-swig/SWIG/dali-toolkit.i
old mode 100644
new mode 100755
index d172266..1175a47
--- a/plugins/dali-swig/SWIG/dali-toolkit.i
+++ b/plugins/dali-swig/SWIG/dali-toolkit.i
@@ -15,6 +15,7 @@
  *
  */
 %apply unsigned int& OUTPUT { unsigned int& volume };
+%feature("director") Dali::Toolkit::ItemFactory;
 
 %ignore *::AccessibilityManager(Internal::AccessibilityManager*);
 %ignore *::Alignment(Internal::Alignment&);
@@ -24,6 +25,8 @@
 %ignore *::CheckBoxButton(Internal::CheckBoxButton&);
 %ignore *::CheckBoxButton(Dali::Internal::CustomActor*);
 %ignore *::Control(Dali::Internal::CustomActor*);
+%ignore *::ControlWrapper( Internal::ControlWrapper& );
+%ignore *::ControlWrapper( Dali::Internal::CustomActor* );
 %ignore *::FlexContainer(Internal::FlexContainer&);
 %ignore *::FlexContainer(Dali::Internal::CustomActor*);
 %ignore *::GaussianBlurView(Internal::GaussianBlurView&);
@@ -95,8 +98,10 @@
 %rename(View) Dali::Toolkit::Control;
 %rename(ViewImpl) Dali::Toolkit::Internal::Control;
 %rename(VisualBase) Dali::Toolkit::Visual::Base;
+%rename(LoadImageSynchronously) Dali::Toolkit::SyncImageLoader::Load;
 %rename(ControlOrientationType) Dali::Toolkit::ControlOrientation::Type;
 %rename(DefaultItemLayoutType) Dali::Toolkit::DefaultItemLayout::Type;
+%rename(DefaultItemLayoutProperty) Dali::Toolkit::DefaultItemLayoutProperty::Property;
 %rename(NewItemLayout) Dali::Toolkit::DefaultItemLayout::New;
 %rename(ContentDirectionType) Dali::Toolkit::FlexContainer::ContentDirection;
 %rename(FlexDirectionType) Dali::Toolkit::FlexContainer::FlexDirection;
@@ -125,7 +130,31 @@
 %rename(IMAGE_VISUAL_DESIRED_HEIGHT) Dali::Toolkit::ImageVisual::Property::DESIRED_HEIGHT;
 %rename(IMAGE_VISUAL_SYNCHRONOUS_LOADING) Dali::Toolkit::ImageVisual::Property::SYNCHRONOUS_LOADING;
 %rename(IMAGE_VISUAL_BORDER_ONLY) Dali::Toolkit::ImageVisual::Property::BORDER_ONLY;
+%rename(IMAGE_VISUAL_BATCHING_ENABLED) Dali::Toolkit::ImageVisual::Property::BATCHING_ENABLED;
+%rename(IMAGE_VISUAL_PIXEL_AREA) Dali::Toolkit::ImageVisual::Property::PIXEL_AREA;
+%rename(IMAGE_VISUAL_WRAP_MODE_U) Dali::Toolkit::ImageVisual::Property::WRAP_MODE_U;
+%rename(IMAGE_VISUAL_WRAP_MODE_V) Dali::Toolkit::ImageVisual::Property::WRAP_MODE_V;
 %rename(COLOR_VISUAL_MIX_COLOR) Dali::Toolkit::Color::Visual::Property::MIX_COLOR;
+%rename(TEXT_VISUAL_RENDERING_BACKEND) Dali::Toolkit::Text::Visual::Property::RENDERING_BACKEND;
+%rename(TEXT_VISUAL_TEXT) Dali::Toolkit::Text::Visual::Property::TEXT;
+%rename(TEXT_VISUAL_FONT_FAMILY) Dali::Toolkit::Text::Visual::Property::FONT_FAMILY;
+%rename(TEXT_VISUAL_FONT_STYLE) Dali::Toolkit::Text::Visual::Property::FONT_STYLE;
+%rename(TEXT_VISUAL_POINT_SIZE) Dali::Toolkit::Text::Visual::Property::POINT_SIZE;
+%rename(TEXT_VISUAL_MULTI_LINE) Dali::Toolkit::Text::Visual::Property::MULTI_LINE;
+%rename(TEXT_VISUAL_HORIZONTAL_ALIGNMENT) Dali::Toolkit::Text::Visual::Property::HORIZONTAL_ALIGNMENT;
+%rename(TEXT_VISUAL_VERTICAL_ALIGNMENT) Dali::Toolkit::Text::Visual::Property::VERTICAL_ALIGNMENT;
+%rename(TEXT_VISUAL_TEXT_COLOR) Dali::Toolkit::Text::Visual::Property::TEXT_COLOR;
+%rename(TEXT_VISUAL_ENABLE_MARKUP) Dali::Toolkit::Text::Visual::Property::ENABLE_MARKUP;
+%rename(TEXT_VISUAL_ENABLE_AUTO_SCROLL) Dali::Toolkit::Text::Visual::Property::ENABLE_AUTO_SCROLL;
+%rename(TEXT_VISUAL_AUTO_SCROLL_SPEED) Dali::Toolkit::Text::Visual::Property::AUTO_SCROLL_SPEED;
+%rename(TEXT_VISUAL_AUTO_SCROLL_LOOP_COUNT) Dali::Toolkit::Text::Visual::Property::AUTO_SCROLL_LOOP_COUNT;
+%rename(TEXT_VISUAL_AUTO_SCROLL_GAP) Dali::Toolkit::Text::Visual::Property::AUTO_SCROLL_GAP;
+%rename(TEXT_VISUAL_LINE_SPACING) Dali::Toolkit::Text::Visual::Property::LINE_SPACING;
+%rename(TEXT_VISUAL_UNDERLINE) Dali::Toolkit::Text::Visual::Property::UNDERLINE;
+%rename(TEXT_VISUAL_SHADOW) Dali::Toolkit::Text::Visual::Property::SHADOW;
+%rename(TEXT_VISUAL_EMBOSS) Dali::Toolkit::Text::Visual::Property::EMBOSS;
+%rename(TEXT_VISUAL_OUTLINE) Dali::Toolkit::Text::Visual::Property::OUTLINE;
+%rename(TEXT_VISUAL_BATCHING_ENABLED) Dali::Toolkit::Text::Visual::Property::BATCHING_ENABLED;
 
 %csconstvalue("PropertyRanges.PROPERTY_REGISTRATION_START_INDEX") PROPERTY_START_INDEX;
 %csconstvalue("View.PropertyRange.PROPERTY_START_INDEX+1000") PROPERTY_END_INDEX;
@@ -134,8 +163,15 @@
 %csconstvalue("PropertyRanges.ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX") ANIMATABLE_PROPERTY_START_INDEX;
 %csconstvalue("PropertyRanges.ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX+1000") ANIMATABLE_PROPERTY_END_INDEX;
 %csconstvalue("PropertyRanges.CORE_PROPERTY_MAX_INDEX+1") VISUAL_PROPERTY_BASE_START_INDEX;
-%csconstvalue("1 << 5") REQUIRES_STYLE_CHANGE_SIGNALS;
-%csconstvalue("1 << 6") REQUIRES_KEYBOARD_NAVIGATION_SUPPORT;
+%csconstvalue("0") CONTROL_BEHAVIOUR_NONE;
+%csconstvalue("0") CONTROL_BEHAVIOUR_DEFAULT;
+%csconstvalue("1 << 0") DISABLE_SIZE_NEGOTIATION;
+%csconstvalue("1 << 1") REQUIRES_TOUCH_EVENTS;
+%csconstvalue("1 << 2") REQUIRES_HOVER_EVENTS;
+%csconstvalue("1 << 3") REQUIRES_WHEEL_EVENTS;
+%csconstvalue("1 << 4") REQUIRES_STYLE_CHANGE_SIGNALS;
+%csconstvalue("1 << 5") REQUIRES_KEYBOARD_NAVIGATION_SUPPORT;
+%csconstvalue("1 << 6") DISABLE_STYLE_CHANGE_SIGNALS;
 
 typedef unsigned int ItemId;
 typedef std::vector<ItemId> ItemIdContainer;
@@ -152,12 +188,17 @@ typedef Dali::IntrusivePtr<Dali::Toolkit::Ruler> RulerPtr;
 %include <dali-toolkit/public-api/visuals/image-visual-properties.h>
 %include <dali-toolkit/public-api/visuals/mesh-visual-properties.h>
 %include <dali-toolkit/public-api/visuals/primitive-visual-properties.h>
+%include <dali-toolkit/devel-api/visuals/text-visual-properties.h>
 
 %include <dali-toolkit/devel-api/builder/builder.h>
 
+%include <dali-toolkit/devel-api/visual-factory/transition-data.h>
+
 %include <dali-toolkit/public-api/controls/control-impl.h>
 %include <dali-toolkit/public-api/controls/control.h>
 
+%include <dali-toolkit/devel-api/focus-manager/keyinput-focus-manager.h>
+
 %include <dali-toolkit/public-api/controls/alignment/alignment.h>
 %include <dali-toolkit/public-api/controls/buttons/button.h>
 %include <dali-toolkit/public-api/controls/buttons/check-box-button.h>
@@ -171,6 +212,7 @@ typedef Dali::IntrusivePtr<Dali::Toolkit::Ruler> RulerPtr;
 %include <dali-toolkit/public-api/enums.h>
 %include <dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h>
 %include <dali-toolkit/public-api/controls/scrollable/item-view/default-item-layout.h>
+%include <dali-toolkit/devel-api/controls/scrollable/item-view/default-item-layout-property.h>
 %include <dali-toolkit/public-api/controls/scrollable/item-view/item-factory.h>
 %include <dali-toolkit/public-api/controls/scrollable/item-view/item-view-declarations.h>
 %include <dali-toolkit/public-api/controls/scrollable/item-view/item-view.h>
@@ -199,6 +241,10 @@ typedef Dali::IntrusivePtr<Dali::Toolkit::Ruler> RulerPtr;
 %include <dali-toolkit/devel-api/visual-factory/visual-base.h>
 %include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
 
+%include <dali-toolkit/public-api/image-loader/async-image-loader.h>
+%include <dali-toolkit/public-api/image-loader/sync-image-loader.h>
+%include <dali-toolkit/public-api/text/rendering-backend.h>
+
 %template(ItemIdContainer) std::vector<unsigned int>;
 %template(Item) std::pair<unsigned int, Dali::Actor>;
 %template(ItemContainer) std::vector<std::pair<unsigned int, Dali::Actor>>;