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
[AT-SPI] Squashed implementation
[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
aa60871
..
531b53b
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) 201
4
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
9
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.
@@
-50,7
+50,7
@@
public:
*/
static Dali::Toolkit::CheckBoxButton New();
*/
static Dali::Toolkit::CheckBoxButton New();
-pr
otected
:
+pr
ivate
:
/**
* Construct a new CheckBoxButton.
/**
* Construct a new CheckBoxButton.
@@
-62,6
+62,14
@@
protected:
*/
virtual ~CheckBoxButton();
*/
virtual ~CheckBoxButton();
+private: // From Button
+
+
+ /**
+ * @copydoc Toolkit::Internal::Button::OnInitialize
+ */
+ void OnInitialize() override;
+
private:
// Undefined
private:
// Undefined
@@
-69,6
+77,14
@@
private:
// Undefined
CheckBoxButton& operator=( const CheckBoxButton& );
// Undefined
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
};
} // namespace Internal
@@
-97,4
+113,4
@@
inline const Toolkit::Internal::CheckBoxButton& GetImplementation( const Toolkit
} // namespace Dali
} // namespace Dali
-#endif //
__DALI_TOOLKIT_INTERNAL_CHECK_BOX_BUTTON_H__
+#endif //
DALI_TOOLKIT_INTERNAL_CHECK_BOX_BUTTON_H