(StyleManager) Remove StyleManager header include form CAPI

[platform/core/uifw/dali-toolkit.git] / capi / dali-toolkit / public-api / controls / control-impl.h

diff --git a/capi/dali-toolkit/public-api/controls/control-impl.h b/capi/dali-toolkit/public-api/controls/control-impl.h
index ff9e2c3..b2b687f 100644 (file)
--- a/capi/dali-toolkit/public-api/controls/control-impl.h
+++ b/capi/dali-toolkit/public-api/controls/control-impl.h
@@ -31,9 +31,10 @@ namespace Dali DALI_IMPORT_API
 namespace Toolkit
 {
 
 namespace Toolkit
 {
 

+class StyleManager;
+

 namespace Internal DALI_INTERNAL
 {
 namespace Internal DALI_INTERNAL
 {

-class StyleChangeProcessor;

 class RelayoutControllerImpl;
 class KeyInputFocusManager;
 }
 class RelayoutControllerImpl;
 class KeyInputFocusManager;
 }


@@ -289,12 +290,9 @@ private: // For derived classes to override
   virtual void OnInitialize() { }
 
   /**
   virtual void OnInitialize() { }
 
   /**

-   * @brief This method should be overridden by deriving classes when
-   * they wish to be notified when the style changes.
-   *
-   * @param[in] change  Information denoting what has changed.
+   * @brief Callback for when the theme changes.

    */
    */

-  virtual void OnStyleChange(StyleChange change) { }
+  virtual void OnThemeChange( Toolkit::StyleManager styleManager );

 
   /**
    * @brief Called whenever a pinch gesture is detected on this control.
 
   /**
    * @brief Called whenever a pinch gesture is detected on this control.


@@ -513,13 +511,29 @@ private:
 
 protected: // Construction
 
 
 protected: // Construction
 

+  // Flags for the constructor
+  enum ControlBehaviour
+  {
+    CONTROL_BEHAVIOUR_NONE        = 0x0,
+    REQUIRES_TOUCH_EVENTS         = 0x1,     ///< True if the OnTouchEvent() callback is required.
+    REQUIRES_THEME_CHANGE_SIGNALS = 0x2      ///< True if this control should listen to theme change signals
+  };
+

   /**
   /**

+   * @deprecated Use the constructor taking flags instead

    * @brief Create a Control.
    *
    * @param[in] requiresTouchEvents True if the OnTouchEvent() callback is required.
    */
   Control(bool requiresTouchEvents);
 
    * @brief Create a Control.
    *
    * @param[in] requiresTouchEvents True if the OnTouchEvent() callback is required.
    */
   Control(bool requiresTouchEvents);
 

+  /**
+   * @brief Create a Control.
+   *
+   * @param[in] behaviourFlags Behavioural flags from ControlBehaviour enum
+   */
+  Control(ControlBehaviour behaviourFlags);
+

 public:
 
   // Size negotiation
 public:
 
   // Size negotiation


@@ -695,7 +709,6 @@ private:
   class Impl;
   Impl *mImpl;
 
   class Impl;
   Impl *mImpl;
 

-  friend class Internal::StyleChangeProcessor;

   friend class Internal::RelayoutControllerImpl;   ///< Relayout controller needs to call Relayout() which is private.
   friend class Internal::KeyInputFocusManager;     ///< KeyInputFocusManager needs to call which is private.
 };
   friend class Internal::RelayoutControllerImpl;   ///< Relayout controller needs to call Relayout() which is private.
   friend class Internal::KeyInputFocusManager;     ///< KeyInputFocusManager needs to call which is private.
 };