X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=plugins%2Fdali-swig%2FSWIG%2Fdali-toolkit.i;h=56693b8c941e2644256df6e38a8a9dac37522b36;hb=89ae5b785c2eb8276d5fb350004414bc3fab8a2d;hp=19c1d4ecc3d5118c83f981ae45c231f91087959a;hpb=0b5d20c961476797f7ffcdfb67026aac3253f94d;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/plugins/dali-swig/SWIG/dali-toolkit.i b/plugins/dali-swig/SWIG/dali-toolkit.i index 19c1d4e..56693b8 100644 --- a/plugins/dali-swig/SWIG/dali-toolkit.i +++ b/plugins/dali-swig/SWIG/dali-toolkit.i @@ -24,6 +24,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&); @@ -92,8 +94,10 @@ %ignore *::Button::SetTogglableButton(bool); %ignore *::Button::SetUnselectedImage(const std::string &); -%rename(ControlImpl) Dali::Toolkit::Internal::Control; +%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(NewItemLayout) Dali::Toolkit::DefaultItemLayout::New; @@ -124,17 +128,48 @@ %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("Control.PropertyRange.PROPERTY_START_INDEX+1000") PROPERTY_END_INDEX; +%csconstvalue("View.PropertyRange.PROPERTY_START_INDEX+1000") PROPERTY_END_INDEX; %csconstvalue("PropertyRanges.CHILD_PROPERTY_REGISTRATION_START_INDEX") CHILD_PROPERTY_START_INDEX; %csconstvalue("PropertyRanges.CHILD_PROPERTY_REGISTRATION_START_INDEX+1000") CHILD_PROPERTY_END_INDEX; %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 ItemIdContainer; @@ -151,12 +186,17 @@ typedef Dali::IntrusivePtr RulerPtr; %include %include %include +%include %include +%include + %include %include +%include + %include %include %include @@ -198,6 +238,10 @@ typedef Dali::IntrusivePtr RulerPtr; %include %include +%include +%include +%include + %template(ItemIdContainer) std::vector; %template(Item) std::pair; %template(ItemContainer) std::vector>;