X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Fcontrols%2Fcontrol.cpp;h=4ceae4f28db0ab7c854226703a45fb164a7a223b;hp=0721ff9eaf3b08bd7272e73f9bc26cc903cf1923;hb=cc82bd9b187cda8fe2c8336b73fd1fa9376cfebd;hpb=77af5d8a3230bf16729573df1866be763938ca40 diff --git a/dali-toolkit/public-api/controls/control.cpp b/dali-toolkit/public-api/controls/control.cpp index 0721ff9..4ceae4f 100644 --- a/dali-toolkit/public-api/controls/control.cpp +++ b/dali-toolkit/public-api/controls/control.cpp @@ -69,51 +69,6 @@ const Internal::Control& Control::GetImplementation() const return static_cast(CustomActor::GetImplementation()); } -void Control::SetSizePolicy( SizePolicy widthPolicy, SizePolicy heightPolicy ) -{ - GetImplementation().SetSizePolicy( widthPolicy, heightPolicy ); -} - -void Control::GetSizePolicy( SizePolicy& widthPolicy, SizePolicy& heightPolicy ) const -{ - GetImplementation().GetSizePolicy( widthPolicy, heightPolicy ); -} - -void Control::SetMinimumSize( const Vector3& size ) -{ - GetImplementation().SetMinimumSize( size ); -} - -const Vector3& Control::GetMinimumSize() const -{ - return GetImplementation().GetMinimumSize(); -} - -void Control::SetMaximumSize( const Vector3& size ) -{ - GetImplementation().SetMaximumSize( size ); -} - -const Vector3& Control::GetMaximumSize() const -{ - return GetImplementation().GetMaximumSize(); -} - -Vector3 Control::GetNaturalSize() -{ - return GetImplementation().GetNaturalSize(); -} - -float Control::GetHeightForWidth( float width ) -{ - return GetImplementation().GetHeightForWidth( width ); -} - -float Control::GetWidthForHeight( float height ) -{ - return GetImplementation().GetWidthForHeight( height ); -} - void Control::SetKeyInputFocus() { GetImplementation().SetKeyInputFocus(); @@ -169,9 +124,9 @@ Vector4 Control::GetBackgroundColor() const return GetImplementation().GetBackgroundColor(); } -void Control::SetBackground( Image image ) +void Control::SetBackgroundImage( Image image ) { - GetImplementation().SetBackground( image ); + GetImplementation().SetBackgroundImage( image ); } void Control::ClearBackground()