X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=base%2Fdali-toolkit%2Finternal%2Fcontrols%2Fbuttons%2Fbutton-impl.h;h=3881cc170ae2014f040fa536c492a9ba6c6f14bd;hp=4ad9bd0fb8ff274385d43c6b9da30b099728c742;hb=88eec954ad7b59851b423be3b82a4af569f892dd;hpb=2359f074da61124b708a31212133c8e06fe2689b

diff --git a/base/dali-toolkit/internal/controls/buttons/button-impl.h b/base/dali-toolkit/internal/controls/buttons/button-impl.h
index 4ad9bd0..3881cc1 100644
--- a/base/dali-toolkit/internal/controls/buttons/button-impl.h
+++ b/base/dali-toolkit/internal/controls/buttons/button-impl.h
@@ -63,14 +63,14 @@ protected:
 public:
 
   /**
-   * @copydoc Dali::Toolkit::Button::SetDimmed( bool dimmed )
+   * @copydoc Dali::Toolkit::Button::SetDisabled( bool disabled )
    */
-  void SetDimmed( bool dimmed );
+  void SetDisabled( bool disabled );
 
   /**
-   * @copydoc Dali::Toolkit::Button::IsDimmed() const
+   * @copydoc Dali::Toolkit::Button::IsDisabled() const
    */
-  bool IsDimmed() const;
+  bool IsDisabled() const;
 
   /**
    * @copydoc Dali::Toolkit::Button::SetAnimationTime()
@@ -94,13 +94,13 @@ private:
    * This method is called from the OnTouchEvent method when the button is down.
    * Could be reimplemented in subclasses to provide specific behaviour.
    */
-  virtual void OnButtonDown() { }
+  virtual void OnButtonDown();
 
   /**
    * This method is called from the OnTouchEvent method when the button is up.
    * Could be reimplemented in subclasses to provide specific behaviour.
    */
-  virtual void OnButtonUp() { }
+  virtual void OnButtonUp();
 
   /**
    * This method is called from the OnTouchEvent method when the touch point leaves the boundary of the button or
@@ -140,12 +140,12 @@ public:
   /**
    * @copydoc Dali::Toolkit::Button::ClickedSignal()
    */
-  Toolkit::Button::ClickedSignalV2& ClickedSignal();
+  Toolkit::Button::ClickedSignalType& ClickedSignal();
 
   /**
-   * @copydoc Dali::Toolkit::Button::ToggledSignal()
+   * @copydoc Dali::Toolkit::Button::StateChangedSignal()
    */
-  Toolkit::Button::ToggledSignalV2& ToggledSignal();
+  Toolkit::Button::StateChangedSignalType& StateChangedSignal();
 
   /**
    * Connects a callback function with the object's signals.
@@ -211,7 +211,7 @@ private:
    * @param[in]  actor  The tapped actor.
    * @param[in]  tap    The tap gesture.
    */
-  void OnTap(Actor actor, TapGesture tap);
+  void OnTap(Actor actor, const TapGesture& tap);
 
 private:
 
@@ -221,7 +221,7 @@ private:
   // Undefined
   Button& operator = ( const Button& );
 
-protected: // Signals
+protected:
 
   enum ButtonState
   {
@@ -229,16 +229,16 @@ protected: // Signals
     ButtonDown,                       ///< The button is down.
   };
 
-  ButtonState      mState;                ///< Stores the button state.
-
-  bool             mDimmed;               ///< Stores the dimmed property.
-
   ButtonPainterPtr mPainter;              ///< Pointer to a ButtonPainter base class.
 
-  Toolkit::Button::ClickedSignalV2 mClickedSignalV2; ///< Signal emitted when the button is clicked.
-  Toolkit::Button::ToggledSignalV2 mToggledSignalV2; ///< Signal emitted when the button is toggled.
+  Toolkit::Button::ClickedSignalType mClickedSignal;           ///< Signal emitted when the button is clicked.
+  Toolkit::Button::StateChangedSignalType mStateChangedSignal; ///< Signal emitted when the button's state is changed.
 
   TapGestureDetector mTapDetector;
+
+  ButtonState      mState;                ///< Stores the button state.
+
+  bool             mDisabled;             ///< Stores the disabled property.
 };
 
 } // namespace Internal