Merge remote-tracking branch 'origin/tizen' into new_text

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / controls / buttons / radio-button-impl.h

diff --git a/dali-toolkit/internal/controls/buttons/radio-button-impl.h b/dali-toolkit/internal/controls/buttons/radio-button-impl.h
index dc31882..d525a43 100644 (file)
--- a/dali-toolkit/internal/controls/buttons/radio-button-impl.h
+++ b/dali-toolkit/internal/controls/buttons/radio-button-impl.h
@@ -23,8 +23,8 @@
 #include <dali/public-api/common/dali-vector.h>
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/public-api/controls/text-view/text-view.h>
 #include <dali-toolkit/public-api/controls/buttons/radio-button.h>
+#include <dali-toolkit/public-api/controls/table-view/table-view.h>
 #include "button-impl.h"
 
 namespace Dali
@@ -41,74 +41,56 @@ namespace Internal
  */
 class RadioButton: public Button
 {
- public:
+public:
 
   /**
    * Create a new RadioButton.
    *
-   * @return A smart-pointer to the newly allocated PushButton.
+   * @return A smart-pointer to the newly allocated RadioButton.
    */
   static Dali::Toolkit::RadioButton New();
 
-  /**
-   * Construct a new PushButton.
-   */
-  RadioButton();
+private:
 
   /**
-   * Construct a new PushButton with label.
+   * Construct a new RadioButton.
    */
-  RadioButton( const std::string& label );
-
-  /**
-   * Construct a new PushButton with label.
-   */
-  RadioButton( Actor label );
+  RadioButton();
 
   /**
    * A reference counted object may only be deleted by calling Unreference()
    */
   virtual ~RadioButton();
 
-  /**
-   * @copydoc Dali::Toolkit::Button::SetLabel( Actor label )
-   */
-  virtual void SetLabel( Actor label );   // TODO: After refactoring painter, this will be removed
+private: // From Button
 
   /**
-   * @copydoc Dali::Toolkit::Button::SetSelected( bool selected )
+   * @copydoc Toolkit::Internal::Button::OnButtonInitialize()
    */
-  virtual void SetSelected( bool selected );
+  virtual void OnButtonInitialize();
 
   /**
-   * @copydoc Dali::Toolkit::Control::OnRelayout()
+   * @copydoc Toolkit::Internal::Button::OnButtonUp()
    */
-  virtual void OnRelayout( const Vector2& size, ActorSizeContainer& container );
-
- protected: // From Control
+  virtual void OnButtonUp();
 
   /**
-   * Sets the relative position of image and label.
+   * @copydoc Toolkit::Internal::Button::OnSelected()
    */
-  virtual void OnInitialize();
+  virtual bool OnSelected();
 
- protected: // From Button
   /**
-   * Change button state when the button is pressed.
+   * @copydoc Toolkit::Internal::Button::OnLabelSet()
    */
-  virtual void OnButtonUp();
+  virtual void OnLabelSet();
 
- private:
+private:
 
   // Undefined
   RadioButton( const RadioButton& origin );
 
   // Undefined
   RadioButton& operator=( const RadioButton& origin );
-
-  Image mUnselectedImage;  ///< Stores the unselected image
-  Image mSelectedImage;    ///< Stores the selected image
-  ImageActor mRadioIcon;   ///< Stores the current image
 };
 
 } // namespace Internal