X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=base%2Fdali-toolkit%2Fpublic-api%2Fcontrols%2Fcontrol-impl.cpp;h=7fcbf76b358912ee1d09f1c8499ac7c3906fbde2;hp=bc97f30cef5d04bd14ccb74547a5136736926777;hb=42112a7873ace9129326e94b2d31e83b7d9657b9;hpb=3d10f2d19d7ac376d3b9df198e1625c48157fc55 diff --git a/base/dali-toolkit/public-api/controls/control-impl.cpp b/base/dali-toolkit/public-api/controls/control-impl.cpp index bc97f30..7fcbf76 100644 --- a/base/dali-toolkit/public-api/controls/control-impl.cpp +++ b/base/dali-toolkit/public-api/controls/control-impl.cpp @@ -604,7 +604,7 @@ void Control::Initialize() Toolkit::StyleManager styleManager = Toolkit::StyleManager::Get(); // Register for style changes - styleManager.StyleChangeSignal().Connect( this, &ControlImpl::DoStyleChange ); + styleManager.StyleChangeSignal().Connect( this, &Control::DoStyleChange ); // SetTheme GetImpl( styleManager ).ApplyThemeStyle( GetOwner() ); @@ -953,9 +953,6 @@ void Control::DoStyleChange( Toolkit::StyleManager styleManager, StyleChange cha } else if( change.defaultFontChange || change.defaultFontSizeChange ) { - // This OnStyleChange(StyleChange change ) is deprecated, use OnFontChange instead - OnStyleChange( change ); - OnFontChange( change.defaultFontChange, change.defaultFontSizeChange ); } } @@ -1283,17 +1280,6 @@ void Control::SignalDisconnected( SlotObserver* slotObserver, CallbackBase* call mImpl->SignalDisconnected( slotObserver, callback ); } -std::size_t Control::GetConnectionCount() const -{ - return mImpl->GetConnectionCount(); -} - -Control::Control( bool requiresTouchEvents ) -: CustomActorImpl( requiresTouchEvents ), - mImpl(new Impl(*this)) -{ -} - Control::Control( ControlBehaviour behaviourFlags ) : CustomActorImpl( behaviourFlags & REQUIRES_TOUCH_EVENTS ), mImpl(new Impl(*this))