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
/
radio-button-impl.h
diff --git
a/dali-toolkit/internal/controls/buttons/radio-button-impl.h
b/dali-toolkit/internal/controls/buttons/radio-button-impl.h
index
eec11ab
..
075f8bd
100644
(file)
--- a/
dali-toolkit/internal/controls/buttons/radio-button-impl.h
+++ b/
dali-toolkit/internal/controls/buttons/radio-button-impl.h
@@
-1,8
+1,8
@@
-#ifndef
__DALI_TOOLKIT_INTERNAL_RADIO_BUTTON_H__
-#define
__DALI_TOOLKIT_INTERNAL_RADIO_BUTTON_H__
+#ifndef
DALI_TOOLKIT_INTERNAL_RADIO_BUTTON_H
+#define
DALI_TOOLKIT_INTERNAL_RADIO_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.
@@
-19,13
+19,11
@@
*/
// EXTERNAL INCLUDES
*/
// EXTERNAL INCLUDES
-#include <dali/public-api/actors/image-actor.h>
#include <dali/public-api/common/dali-vector.h>
// INTERNAL INCLUDES
#include <dali/public-api/common/dali-vector.h>
// INTERNAL INCLUDES
-#include <dali-toolkit/public-api/controls/text-view/text-view.h>
#include <dali-toolkit/public-api/controls/buttons/radio-button.h>
#include <dali-toolkit/public-api/controls/buttons/radio-button.h>
-#include <dali-toolkit/
public
-api/controls/table-view/table-view.h>
+#include <dali-toolkit/
devel
-api/controls/table-view/table-view.h>
#include "button-impl.h"
namespace Dali
#include "button-impl.h"
namespace Dali
@@
-66,24
+64,19
@@
private:
private: // From Button
/**
private: // From Button
/**
- * @copydoc Toolkit::Internal::Button::On
ButtonInitialize()
+ * @copydoc Toolkit::Internal::Button::On
Initialize
*/
*/
- v
irtual void OnButtonInitialize()
;
+ v
oid OnInitialize() override
;
/**
/**
- * @copydoc Toolkit::Internal::Button::On
ButtonUp()
+ * @copydoc Toolkit::Internal::Button::On
StateChange
*/
*/
- v
irtual void OnButtonUp()
;
+ v
oid OnStateChange( State newState ) override
;
/**
/**
- * @copydoc Toolkit::Internal::Button::On
Selected()
+ * @copydoc Toolkit::Internal::Button::On
ToggleReleased
*/
*/
- virtual bool OnSelected();
-
- /**
- * @copydoc Toolkit::Internal::Button::OnLabelSet()
- */
- virtual void OnLabelSet();
+ bool OnToggleReleased() override;
private:
private:
@@
-92,6
+85,14
@@
private:
// Undefined
RadioButton& operator=( const RadioButton& origin );
// Undefined
RadioButton& operator=( const RadioButton& origin );
+
+protected:
+ struct AccessibleImpl : public Button::AccessibleImpl
+ {
+ using Button::AccessibleImpl::AccessibleImpl;
+
+ Dali::Accessibility::States CalculateStates() override;
+ };
};
} // namespace Internal
};
} // namespace Internal
@@
-119,4
+120,4
@@
inline const Toolkit::Internal::RadioButton& GetImplementation(const Toolkit::Ra
} // namespace Toolkit
} // namespace Dali
} // namespace Toolkit
} // namespace Dali
-#endif //
__DALI_TOOLKIT_INTERNAL_RADIO_BUTTON_H__
+#endif //
DALI_TOOLKIT_INTERNAL_RADIO_BUTTON_H