Revert to tizen branch.

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

diff --git a/dali-toolkit/public-api/controls/control-impl.h b/dali-toolkit/public-api/controls/control-impl.h
index 2583450..5c29c39 100644 (file)
--- a/dali-toolkit/public-api/controls/control-impl.h
+++ b/dali-toolkit/public-api/controls/control-impl.h
@@ -170,6 +170,16 @@ public:
   // Background
 
   /**
+   * @copydoc Dali::Toolkit::Control::SetStyleName
+   */
+  void SetStyleName( const std::string& styleName );
+
+  /**
+   * @copydoc Dali::Toolkit::Control::GetStyleName
+   */
+  const std::string& GetStyleName() const;
+
+  /**
    * @copydoc Dali::Toolkit::Control::SetBackgroundColor
    */
   void SetBackgroundColor( const Vector4& color );
@@ -374,7 +384,7 @@ protected:
   /**
    * @copydoc Dali::CustomActorImpl::RelayoutDependentOnChildren()
    */
-  virtual bool RelayoutDependentOnChildren( Dimension dimension = ALL_DIMENSIONS );
+  virtual bool RelayoutDependentOnChildren( Dimension::Type dimension = Dimension::ALL_DIMENSIONS );
 
 private:
 
@@ -395,21 +405,12 @@ private:
   virtual void OnActivated();
 
   /**
-   * @brief This method should be overridden by deriving classes when
-   * they wish to be notified when the style manager changes the theme.
+   * @brief This method should be overridden by deriving classes requiring notifications when the style changes.
    *
    * @param[in] styleManager  The StyleManager object.
+   * @param[in] change  Information denoting what has changed.
    */
-  virtual void OnThemeChange( Toolkit::StyleManager styleManager );
-
-  /**
-   * @brief This method should be overridden by deriving classes when
-   * they wish to be notified when the style changes the default font.
-   *
-   * @param[in] defaultFontChange  Information denoting whether the default font has changed.
-   * @param[in] defaultFontSizeChange Information denoting whether the default font size has changed.
-   */
-  virtual void OnFontChange( bool defaultFontChange, bool defaultFontSizeChange );
+  virtual void OnStyleChange( Toolkit::StyleManager styleManager, StyleChange change );
 
   /**
    * @brief Called whenever a pinch gesture is detected on this control.
@@ -549,12 +550,12 @@ private:
   /**
    * @copydoc Dali::CustomActorImpl::OnCalculateRelayoutSize()
    */
-  virtual void OnCalculateRelayoutSize( Dimension dimension );
+  virtual void OnCalculateRelayoutSize( Dimension::Type dimension );
 
   /**
    * @copydoc Dali::CustomActorImpl::OnLayoutNegotiated()
    */
-  virtual void OnLayoutNegotiated( float size, Dimension dimension );
+  virtual void OnLayoutNegotiated( float size, Dimension::Type dimension );
 
   /**
    * @copydoc Dali::CustomActorImpl::OnRelayout()
@@ -564,12 +565,12 @@ private:
   /**
    * @copydoc Dali::CustomActorImpl::OnSetResizePolicy()
    */
-  virtual void OnSetResizePolicy( ResizePolicy policy, Dimension dimension );
+  virtual void OnSetResizePolicy( ResizePolicy::Type policy, Dimension::Type dimension );
 
   /**
    * @copydoc Dali::CustomActorImpl::CalculateChildSize()
    */
-  virtual float CalculateChildSize( const Dali::Actor& child, Dimension dimension );
+  virtual float CalculateChildSize( const Dali::Actor& child, Dimension::Type dimension );
 
   // From CustomActorImpl, derived classes should NOT override these.
 
@@ -646,16 +647,6 @@ private:
    */
   virtual void SignalDisconnected( SlotObserver* slotObserver, CallbackBase* callback );
 
-  // Style
-
-  /**
-   * @brief This method is the callback for the StyleChangeSignal from StyleManager
-   *
-   * @param[in] styleManager The StyleManager Object
-   * @param[in] change  Information denoting what has changed.
-   */
-  DALI_INTERNAL void DoStyleChange( Toolkit::StyleManager styleManager, StyleChange change );
-
 private:
 
   // Undefined