Removed REQUIRES_STYLE_CHANGE_SIGNALS

Change-Id: I8bacc71a58a052e68aa6f0af9e0ab8634fcd576e

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.cpp
index 7ca109c..a7ccfba 100644 (file)
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.cpp
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.cpp
@@ -93,7 +93,7 @@ DummyControl DummyControlImpl::New()
 }
 
 DummyControlImpl::DummyControlImpl()
 }
 
 DummyControlImpl::DummyControlImpl()

-: Control( ControlBehaviour( REQUIRES_STYLE_CHANGE_SIGNALS ) ),
+: Control( ControlBehaviour() ),

   mCustomSlot1Called(false)
 {
 }
   mCustomSlot1Called(false)
 {
 }

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-button.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-button.cpp
index 69b60b5..3b5f451 100644 (file)
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-button.cpp
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-button.cpp
@@ -57,7 +57,7 @@ Test::TestButton TestButton::New()
 }
 
 TestButton::TestButton()
 }
 
 TestButton::TestButton()

-: Control( ControlBehaviour( REQUIRES_STYLE_CHANGE_SIGNALS ) )
+: Control( ControlBehaviour() )

 {
 }
 
 {
 }
 

diff --git a/dali-toolkit/public-api/controls/control-impl.cpp b/dali-toolkit/public-api/controls/control-impl.cpp
index 4916474..41c1274 100644 (file)
--- a/dali-toolkit/public-api/controls/control-impl.cpp
+++ b/dali-toolkit/public-api/controls/control-impl.cpp
@@ -461,8 +461,7 @@ void Control::Initialize()
   // Call deriving classes so initialised before styling is applied to them.
   OnInitialize();
 
   // Call deriving classes so initialised before styling is applied to them.
   OnInitialize();
 

-  if( (mImpl->mFlags & REQUIRES_STYLE_CHANGE_SIGNALS) ||
-      !(mImpl->mFlags & DISABLE_STYLE_CHANGE_SIGNALS) )
+  if( !(mImpl->mFlags & DISABLE_STYLE_CHANGE_SIGNALS) )

   {
     Toolkit::StyleManager styleManager = StyleManager::Get();
 
   {
     Toolkit::StyleManager styleManager = StyleManager::Get();
 

diff --git a/dali-toolkit/public-api/controls/control-impl.h b/dali-toolkit/public-api/controls/control-impl.h
index 745d444..611659e 100644 (file)
--- a/dali-toolkit/public-api/controls/control-impl.h
+++ b/dali-toolkit/public-api/controls/control-impl.h
@@ -394,10 +394,10 @@ protected: // Helpers for deriving classes
   enum ControlBehaviour
   {
     CONTROL_BEHAVIOUR_DEFAULT            = 0, ///< Default behaviour: Size negotiation is enabled & listens to Style Change signal, but doesn't receive event callbacks. @SINCE_1_2_10
   enum ControlBehaviour
   {
     CONTROL_BEHAVIOUR_DEFAULT            = 0, ///< Default behaviour: Size negotiation is enabled & listens to Style Change signal, but doesn't receive event callbacks. @SINCE_1_2_10

-    REQUIRES_STYLE_CHANGE_SIGNALS        = 1 << ( CustomActorImpl::ACTOR_FLAG_COUNT + 0 ),     ///< True if needs to monitor style change signals such as theme/font change @SINCE_1_0.0 @DEPRECATED_1_2_10
-    REQUIRES_KEYBOARD_NAVIGATION_SUPPORT = 1 << ( CustomActorImpl::ACTOR_FLAG_COUNT + 1 ),     ///< True if needs to support keyboard navigation @SINCE_1_0.0

 
 

-    DISABLE_STYLE_CHANGE_SIGNALS         = 1 << ( CustomActorImpl::ACTOR_FLAG_COUNT + 2 ),     ///< True if control should not monitor style change signals @SINCE_1_2_10
+    REQUIRES_KEYBOARD_NAVIGATION_SUPPORT = 1 << ( CustomActorImpl::ACTOR_FLAG_COUNT + 0 ),     ///< True if needs to support keyboard navigation @SINCE_1_0.0
+
+    DISABLE_STYLE_CHANGE_SIGNALS         = 1 << ( CustomActorImpl::ACTOR_FLAG_COUNT + 1 ),     ///< True if control should not monitor style change signals @SINCE_1_2_10

 
     LAST_CONTROL_BEHAVIOUR_FLAG
   };
 
     LAST_CONTROL_BEHAVIOUR_FLAG
   };