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
Fix compile error. Non initialized variable.
[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
630e1a3
..
3923d99
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.
@@
-23,7
+23,7
@@
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/controls/buttons/radio-button.h>
// INTERNAL INCLUDES
#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
@@
-69,19
+69,14
@@
private: // From Button
virtual void OnInitialize();
/**
virtual void OnInitialize();
/**
- * @copydoc Toolkit::Internal::Button::On
ButtonUp
+ * @copydoc Toolkit::Internal::Button::On
StateChange
*/
*/
- virtual void On
ButtonUp(
);
+ virtual void On
StateChange( State newState
);
/**
/**
- * @copydoc Toolkit::Internal::Button::On
Select
ed
+ * @copydoc Toolkit::Internal::Button::On
ToggleReleas
ed
*/
*/
- virtual void OnSelected();
-
- /**
- * @copydoc Toolkit::Internal::Button::OnLabelSet
- */
- virtual void OnLabelSet( bool noPadding );
+ virtual bool OnToggleReleased();
private:
private:
@@
-117,4
+112,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