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

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

diff --git a/dali-toolkit/internal/controls/buttons/push-button-painter-impl.h b/dali-toolkit/internal/controls/buttons/push-button-painter-impl.h
index 8f0574a..9c43fe9 100644 (file)
--- a/dali-toolkit/internal/controls/buttons/push-button-painter-impl.h
+++ b/dali-toolkit/internal/controls/buttons/push-button-painter-impl.h
@@ -1,21 +1,22 @@
 #ifndef __DALI_TOOLKIT_INTERNAL_PUSH_BUTTON_PAINTER_H__
 #define __DALI_TOOLKIT_INTERNAL_PUSH_BUTTON_PAINTER_H__
 
-//
-// Copyright (c) 2014 Samsung Electronics Co., Ltd.
-//
-// Licensed under the Flora License, Version 1.0 (the License);
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://floralicense.org/license/
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an AS IS BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
+/*
+ * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
 
 // INTERNAL INCLUDES
 #include "button-painter-impl.h"
@@ -53,45 +54,6 @@ public:
    */
   virtual ~PushButtonPainter() {}
 
-  /**
-   * This method is called from the Dali::Toolkit::Internal::PushButton when the
-   * \e autorepeating property changes.
-   * @param[in] autorepeating property.
-   */
-  virtual void SetAutoRepeating( bool autorepeating ) = 0;
-
-  /**
-   * This method is called when the Dali::Toolkit::Internal::PushButton, in which this
-   * object is registered, is pressed.
-   * @param[inout] button The Dali::Toolkit::PushButton, linked to the internal
-   * implementation, in which this object is registered.
-   */
-  virtual void Pressed( Toolkit::PushButton& button ) = 0;
-
-  /**
-   * This method is called when the Dali::Toolkit::Internal::PushButton, in which this
-   * object is registered, is released.
-   * @param[inout] button The Dali::Toolkit::PushButton, linked to the internal
-   * implementation, in which this object is registered.
-   */
-  virtual void Released( Toolkit::PushButton& button ) = 0;
-
-  /**
-   * This method is called when the Dali::Toolkit::Internal::PushButton, in which this
-   * object is registered, is clicked.
-   * @param[inout] button The Dali::Toolkit::PushButton, linked to the internal
-   * implementation, in which this object is registered.
-   */
-  virtual void Clicked( Toolkit::PushButton& button ) = 0;
-
-  /**
-   * This method is called when the Dali::Toolkit::Internal::PushButton, in which this
-   * object is registered, is toggled.
-   * @param[inout] button The Dali::Toolkit::PushButton, linked to the internal
-   * implementation, in which this object is registered.
-   */
-  virtual void Toggled( Toolkit::PushButton& button ) = 0;
-
   /////////////////////////////////////////////////////////////////////////////
   // ButtonPainter interface
   /////////////////////////////////////////////////////////////////////////////
@@ -107,9 +69,9 @@ public:
   virtual void SetSize( Toolkit::Button& button, const Vector3& size ) = 0;
 
   /**
-   * @copydoc ButtonPainter::SetDimmed( Toolkit::Button& button, bool dimmed )
+   * @copydoc ButtonPainter::SetDisabled( Toolkit::Button& button, bool disabled )
    */
-  virtual void SetDimmed( Toolkit::Button& button, bool dimmed ) = 0;
+  virtual void SetDisabled( Toolkit::Button& button, bool disabled ) = 0;
 
   /**
    * @copydoc ButtonPainter::SetAnimationTime()