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-impl.cpp;h=a736f7d8f7fd9a0b24bdb3334e4f087f1a5f5c23;hp=719c6a8f60cd607a31ace3f4bdb58b1f0c106332;hb=99e2ea03e6d6059f5803d700932df1ff1c848cd3;hpb=805ae527fca54726f894fb9936c288c7c0f7dbe7 diff --git a/dali-toolkit/public-api/controls/control-impl.cpp b/dali-toolkit/public-api/controls/control-impl.cpp index 719c6a8..a736f7d 100644 --- a/dali-toolkit/public-api/controls/control-impl.cpp +++ b/dali-toolkit/public-api/controls/control-impl.cpp @@ -36,11 +36,11 @@ #include #include #include -#include +#include #include #include -#include -#include +#include +#include namespace Dali { @@ -368,7 +368,7 @@ public: Control& mControlImpl; std::string mStyleName; - Toolkit::Visual mBackgroundRenderer; ///< The control renderer to render the background + Toolkit::Visual::Base mBackgroundRenderer; ///< The control renderer to render the background Vector4 mBackgroundColor; ///< The color of the background renderer Vector3* mStartingPinchScale; ///< The scale when a pinch gesture starts, TODO: consider removing this Toolkit::Control::KeyEventSignalType mKeyEventSignal;