X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fbuttons%2Fradio-button-impl.h;h=1012196f73fea185c861b8b5279a68fbffda9956;hp=495e41f6b20af9d0db277a3a1435dc9fab0472ce;hb=abbf60ed35112186269d2fe93b949eb8abd4283d;hpb=306d2f61a1b64179e801fa8a0bb2bd7b4e9dd682

diff --git a/dali-toolkit/internal/controls/buttons/radio-button-impl.h b/dali-toolkit/internal/controls/buttons/radio-button-impl.h
index 495e41f..1012196 100644
--- a/dali-toolkit/internal/controls/buttons/radio-button-impl.h
+++ b/dali-toolkit/internal/controls/buttons/radio-button-impl.h
@@ -19,11 +19,11 @@
  */
 
 // EXTERNAL INCLUDES
-#include <dali/public-api/actors/image-actor.h>
 #include <dali/public-api/common/dali-vector.h>
 
 // INTERNAL INCLUDES
 #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
@@ -40,110 +40,52 @@ 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::RadioButton::SetLabel(const std::string& label)
-   */
-  void SetLabel(const std::string& label);
-
-  /**
-   * @copydoc Dali::Toolkit::RadioButton::SetLabel(Actor label)
-   */
-  void SetLabel(Actor label);
-
-  /**
-   * @copydoc Dali::Toolkit::RadioButton::GetLabel()
-   */
-  Actor GetLabel() const;
-
-  /**
-   * @copydoc Dali::Toolkit::RadioButton::SetSelected(bool selected)
-   */
-  void SetSelected(bool selected);
-
-  /**
-   * @copydoc Dali::Toolkit::RadioButton::IsSelected()
-   */
-  bool IsSelected()const;
+private: // From Button
 
   /**
-   * @copydoc Dali::Toolkit::RadioButton::ToggleState()
+   * @copydoc Toolkit::Internal::Button::OnInitialize
    */
-  void ToggleState();
-
-  /**
-   * @copydoc Dali::Toolkit::Control::OnRelayout()
-   */
-  virtual void OnRelayout( const Vector2& size, ActorSizeContainer& container );
-
- public:
-  // Properties
-
-  /**
-   * @copydoc Button::SetProperty
-   */
-  static void SetProperty(BaseObject* object, Property::Index propertyIndex, const Property::Value& value);
-
-  /**
-   * @copydoc Button::GetProperty
-   */
-  static Property::Value GetProperty(BaseObject* object, Property::Index propertyIndex);
-
- protected: // From Control
+  virtual void OnInitialize();
 
   /**
-   * Sets the relative position of image and label.
+   * @copydoc Toolkit::Internal::Button::OnStateChange
    */
-  virtual void OnInitialize();
+  virtual void OnStateChange( State newState );
 
- protected: // From Button
   /**
-   * Change button state when the button is pressed.
+   * @copydoc Toolkit::Internal::Button::OnToggleReleased
    */
-  virtual void OnButtonUp();
+  virtual bool OnToggleReleased();
 
- private:
+private:
 
   // Undefined
-  RadioButton(const RadioButton& origin);
+  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
-  Actor mLabel;            ///< Stores the button label
-  bool mSelected;          ///< Stores the selected state
-} ;
+  RadioButton& operator=( const RadioButton& origin );
+};
 
 } // namespace Internal