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=d17226609431e5952901a005b0e708157844c207;hp=1a9c001b1d2e2889eb5172b7ff01a490b032a846;hb=b8c40a552195976cd5860b9f82f13fbed127d2f4;hpb=cf26b85b96c6bbb58f93bd9970fed6240cc53870

diff --git a/plugins/dali-swig/SWIG/dali-toolkit.i b/plugins/dali-swig/SWIG/dali-toolkit.i
index 1a9c001..d172266 100644
--- a/plugins/dali-swig/SWIG/dali-toolkit.i
+++ b/plugins/dali-swig/SWIG/dali-toolkit.i
@@ -32,7 +32,6 @@
 %ignore *::ImageView(Dali::Internal::CustomActor*);
 %ignore *::ItemView(Internal::ItemView&);
 %ignore *::ItemView(Dali::Internal::CustomActor*);
-%ignore *::KeyboardFocusManager(Internal::KeyboardFocusManager*);
 %ignore *::Model3dView(Internal::Model3dView&);
 %ignore *::Model3dView(Dali::Internal::CustomActor*);
 %ignore *::PageTurnLandscapeView(Internal::PageTurnLandscapeView&);
@@ -93,7 +92,8 @@
 %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(ControlOrientationType) Dali::Toolkit::ControlOrientation::Type;
 %rename(DefaultItemLayoutType) Dali::Toolkit::DefaultItemLayout::Type;
@@ -128,7 +128,7 @@
 %rename(COLOR_VISUAL_MIX_COLOR) Dali::Toolkit::Color::Visual::Property::MIX_COLOR;
 
 %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;
@@ -184,7 +184,6 @@ typedef Dali::IntrusivePtr<Dali::Toolkit::Ruler> RulerPtr;
 %include <dali-toolkit/public-api/controls/text-controls/text-field.h>
 %include <dali-toolkit/public-api/controls/text-controls/text-label.h>
 %include <dali-toolkit/public-api/accessibility-manager/accessibility-manager.h>
-%include <dali-toolkit/public-api/focus-manager/keyboard-focus-manager.h>
 %include <dali-toolkit/public-api/styling/style-manager.h>
 %include <dali-toolkit/public-api/controls/slider/slider.h>
 %include <dali-toolkit/public-api/controls/video-view/video-view.h>
@@ -208,7 +207,6 @@ typedef Dali::IntrusivePtr<Dali::Toolkit::Ruler> RulerPtr;
 %template(AccessibilityActionScrollSignal) Dali::Signal<bool(Dali::Toolkit::AccessibilityManager&, const Dali::TouchEvent&)>;
 %template(AccessibilityFocusOvershotSignal) Dali::Signal<void(Dali::Actor, Dali::Toolkit::AccessibilityManager::FocusOvershotDirection)>;
 %template(FocusChangedSignal) Dali::Signal<void(Dali::Actor, Dali::Actor)>;
-%template(KeyboardPreFocusChangeSignal) Dali::Signal<Dali::Actor(Dali::Actor, Dali::Actor, Dali::Toolkit::Control::KeyboardFocus::Direction)>;
 %template(FocusGroupChangedSignal) Dali::Signal<void(Dali::Actor, bool)>;
 %template(StyleChangedSignal) Dali::Signal<void(Dali::Toolkit::StyleManager, Dali::StyleChange::Type)>;
 %template(ButtonSignal) Dali::Signal<bool(Dali::Toolkit::Button)>;