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 "Fixed IsCandidate bug" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
buttons
/
check-box-button-impl.h
diff --git
a/dali-toolkit/internal/controls/buttons/check-box-button-impl.h
b/dali-toolkit/internal/controls/buttons/check-box-button-impl.h
index
daee597
..
ffae507
100644
(file)
--- a/
dali-toolkit/internal/controls/buttons/check-box-button-impl.h
+++ b/
dali-toolkit/internal/controls/buttons/check-box-button-impl.h
@@
-1,8
+1,8
@@
-#ifndef
__DALI_TOOLKIT_INTERNAL_CHECK_BOX_BUTTON_H__
-#define
__DALI_TOOLKIT_INTERNAL_CHECK_BOX_BUTTON_H__
+#ifndef
DALI_TOOLKIT_INTERNAL_CHECK_BOX_BUTTON_H
+#define
DALI_TOOLKIT_INTERNAL_CHECK_BOX_BUTTON_H
/*
/*
- * Copyright (c) 20
16
Samsung Electronics Co., Ltd.
+ * Copyright (c) 20
21
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.
@@
-28,13
+28,10
@@
namespace Dali
{
namespace Dali
{
-
namespace Toolkit
{
namespace Toolkit
{
-
namespace Internal
{
namespace Internal
{
-
/**
* CheckBoxButton implementation class.
*
/**
* CheckBoxButton implementation class.
*
@@
-43,7
+40,6
@@
namespace Internal
class CheckBoxButton : public Button
{
public:
class CheckBoxButton : public Button
{
public:
-
/**
* Create a new CheckBoxButton.
* @return A smart-pointer to the newly allocated CheckBoxButton.
/**
* Create a new CheckBoxButton.
* @return A smart-pointer to the newly allocated CheckBoxButton.
@@
-51,7
+47,6
@@
public:
static Dali::Toolkit::CheckBoxButton New();
private:
static Dali::Toolkit::CheckBoxButton New();
private:
-
/**
* Construct a new CheckBoxButton.
*/
/**
* Construct a new CheckBoxButton.
*/
@@
-63,47
+58,52
@@
private:
virtual ~CheckBoxButton();
private: // From Button
virtual ~CheckBoxButton();
private: // From Button
-
-
/**
* @copydoc Toolkit::Internal::Button::OnInitialize
*/
/**
* @copydoc Toolkit::Internal::Button::OnInitialize
*/
- v
irtual void OnInitialize()
;
+ v
oid OnInitialize() override
;
private:
private:
-
// Undefined
// Undefined
- CheckBoxButton(
const CheckBoxButton&
);
+ CheckBoxButton(
const CheckBoxButton&
);
// Undefined
// Undefined
- CheckBoxButton& operator=( const CheckBoxButton& );
+ CheckBoxButton& operator=(const CheckBoxButton&);
+
+protected:
+ struct AccessibleImpl : public Button::AccessibleImpl
+ {
+ using Button::AccessibleImpl::AccessibleImpl;
+ Dali::Accessibility::States CalculateStates() override;
+ };
+ void OnStateChange(State newState) override;
};
} // namespace Internal
// Helpers for public-api forwarding methods
};
} // namespace Internal
// Helpers for public-api forwarding methods
-inline Toolkit::Internal::CheckBoxButton& GetImplementation(
Toolkit::CheckBoxButton& button
)
+inline Toolkit::Internal::CheckBoxButton& GetImplementation(
Toolkit::CheckBoxButton& button
)
{
{
- DALI_ASSERT_ALWAYS(
button
);
+ DALI_ASSERT_ALWAYS(
button
);
Dali::RefObject& handle = button.GetImplementation();
Dali::RefObject& handle = button.GetImplementation();
- return static_cast<Toolkit::Internal::CheckBoxButton&>(
handle
);
+ return static_cast<Toolkit::Internal::CheckBoxButton&>(
handle
);
}
}
-inline const Toolkit::Internal::CheckBoxButton& GetImplementation(
const Toolkit::CheckBoxButton& button
)
+inline const Toolkit::Internal::CheckBoxButton& GetImplementation(
const Toolkit::CheckBoxButton& button
)
{
{
- DALI_ASSERT_ALWAYS(
button
);
+ DALI_ASSERT_ALWAYS(
button
);
const Dali::RefObject& handle = button.GetImplementation();
const Dali::RefObject& handle = button.GetImplementation();
- return static_cast<const Toolkit::Internal::CheckBoxButton&>(
handle
);
+ return static_cast<const Toolkit::Internal::CheckBoxButton&>(
handle
);
}
} // namespace Toolkit
} // namespace Dali
}
} // namespace Toolkit
} // namespace Dali
-#endif //
__DALI_TOOLKIT_INTERNAL_CHECK_BOX_BUTTON_H__
+#endif //
DALI_TOOLKIT_INTERNAL_CHECK_BOX_BUTTON_H