projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "DALi Version 2.0.19" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
devel-api
/
controls
/
buttons
/
toggle-button.h
diff --git
a/dali-toolkit/devel-api/controls/buttons/toggle-button.h
b/dali-toolkit/devel-api/controls/buttons/toggle-button.h
index
2e61901
..
36520bf
100644
(file)
--- a/
dali-toolkit/devel-api/controls/buttons/toggle-button.h
+++ b/
dali-toolkit/devel-api/controls/buttons/toggle-button.h
@@
-1,8
+1,8
@@
-#ifndef
__DALI_TOOLKIT_TOGGLE_BUTTON_H__
-#define
__DALI_TOOLKIT_TOGGLE_BUTTON_H__
+#ifndef
DALI_TOOLKIT_TOGGLE_BUTTON_H
+#define
DALI_TOOLKIT_TOGGLE_BUTTON_H
/*
/*
- * Copyright (c) 20
17
Samsung Electronics Co., Ltd.
+ * Copyright (c) 20
20
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.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-23,10
+23,8
@@
namespace Dali
{
namespace Dali
{
-
namespace Toolkit
{
namespace Toolkit
{
-
// Forward declarations
namespace Internal DALI_INTERNAL
// Forward declarations
namespace Internal DALI_INTERNAL
@@
-34,7
+32,7
@@
namespace Internal DALI_INTERNAL
// Forward declarations
class ToggleButton;
// Forward declarations
class ToggleButton;
-}
+}
// namespace DALI_INTERNAL
/**
* @addtogroup dali_toolkit_controls_buttons
* @{
/**
* @addtogroup dali_toolkit_controls_buttons
* @{
@@
-98,7
+96,7
@@
class ToggleButton;
*
* See Button for more detail on signals and modifying states via properties.
*/
*
* See Button for more detail on signals and modifying states via properties.
*/
-class DALI_
IMPOR
T_API ToggleButton : public Button
+class DALI_
TOOLKI
T_API ToggleButton : public Button
{
public:
/**
{
public:
/**
@@
-106,8
+104,8
@@
public:
*/
enum PropertyRange
{
*/
enum PropertyRange
{
- PROPERTY_START_INDEX = Button::PROPERTY_END_INDEX + 1,
///< Toggle button start index
- PROPERTY_END_INDEX
= PROPERTY_START_INDEX + 1000
///< Reserving 1000 property indices
+ PROPERTY_START_INDEX = Button::PROPERTY_END_INDEX + 1, ///< Toggle button start index
+ PROPERTY_END_INDEX
= PROPERTY_START_INDEX + 1000
///< Reserving 1000 property indices
};
/**
};
/**
@@
-148,7
+146,6
@@
public:
};
public:
};
public:
-
/**
* @brief Create an uninitialized ToggleButton; this can be initialized with ToggleButton::New().
*
/**
* @brief Create an uninitialized ToggleButton; this can be initialized with ToggleButton::New().
*
@@
-160,14
+157,14
@@
public:
* @brief Copy constructor.
* @param[in] toggleButton Handle to an object
*/
* @brief Copy constructor.
* @param[in] toggleButton Handle to an object
*/
- ToggleButton(
const ToggleButton& toggleButton
);
+ ToggleButton(
const ToggleButton& toggleButton
);
/**
* @brief Assignment operator.
* @param[in] toggleButton Handle to an object
* @return A reference to this
*/
/**
* @brief Assignment operator.
* @param[in] toggleButton Handle to an object
* @return A reference to this
*/
- ToggleButton& operator=(
const ToggleButton& toggleButton
);
+ ToggleButton& operator=(
const ToggleButton& toggleButton
);
/**
* @brief Destructor
/**
* @brief Destructor
@@
-192,24
+189,23
@@
public:
* @param[in] handle Handle to an object
* @return handle to a ToggleButton or an uninitialized handle
*/
* @param[in] handle Handle to an object
* @return handle to a ToggleButton or an uninitialized handle
*/
- static ToggleButton DownCast(
BaseHandle handle
);
+ static ToggleButton DownCast(
BaseHandle handle
);
public: // Not intended for application developers
public: // Not intended for application developers
-
/// @cond internal
/**
* @brief Creates a handle using the Toolkit::Internal implementation.
*
* @param[in] implementation The Control implementation.
*/
/// @cond internal
/**
* @brief Creates a handle using the Toolkit::Internal implementation.
*
* @param[in] implementation The Control implementation.
*/
- DALI_INTERNAL ToggleButton(
Internal::ToggleButton& implementation
);
+ DALI_INTERNAL ToggleButton(
Internal::ToggleButton& implementation
);
/**
* @brief Allows the creation of this Control from an Internal::CustomActor pointer.
*
* @param[in] internal A pointer to the internal CustomActor.
*/
/**
* @brief Allows the creation of this Control from an Internal::CustomActor pointer.
*
* @param[in] internal A pointer to the internal CustomActor.
*/
- DALI_INTERNAL ToggleButton(
Dali::Internal::CustomActor* internal
);
+ DALI_INTERNAL ToggleButton(
Dali::Internal::CustomActor* internal
);
/// @endcond
};
/// @endcond
};
@@
-220,4
+216,4
@@
public: // Not intended for application developers
} // namespace Dali
} // namespace Dali
-#endif //
__DALI_TOOLKIT_TOGGLE_BUTTON_H__
+#endif //
DALI_TOOLKIT_TOGGLE_BUTTON_H