projects
/
platform
/
core
/
uifw
/
dali-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "[Tizen] Revert the change for 0x0 size of the actor"
[platform/core/uifw/dali-core.git]
/
dali
/
internal
/
event
/
actors
/
custom-actor-internal.h
diff --git
a/dali/internal/event/actors/custom-actor-internal.h
b/dali/internal/event/actors/custom-actor-internal.h
index
f4bef9f
..
b70c0b9
100644
(file)
--- a/
dali/internal/event/actors/custom-actor-internal.h
+++ b/
dali/internal/event/actors/custom-actor-internal.h
@@
-1,8
+1,8
@@
-#ifndef
__DALI_INTERNAL_CUSTOM_ACTOR_H__
-#define
__DALI_INTERNAL_CUSTOM_ACTOR_H__
+#ifndef
DALI_INTERNAL_CUSTOM_ACTOR_H
+#define
DALI_INTERNAL_CUSTOM_ACTOR_H
/*
/*
- * Copyright (c) 20
14
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.
@@
-58,6
+58,13
@@
public:
return *mImpl;
}
return *mImpl;
}
+ /**
+ * Get the type info associated with this object.
+ *
+ * @return The type info
+ */
+ Dali::TypeInfo GetTypeInfo();
+
protected:
/**
protected:
/**
@@
-68,19
+75,19
@@
protected:
private:
/**
private:
/**
- * @copydoc Internal::Actor::OnS
tag
eConnectionExternal
+ * @copydoc Internal::Actor::OnS
cen
eConnectionExternal
*/
*/
- virtual void OnS
tageConnectionExternal( in
t depth )
+ virtual void OnS
ceneConnectionExternal( int32_
t depth )
{
{
- mImpl->OnS
tag
eConnection( depth );
+ mImpl->OnS
cen
eConnection( depth );
}
/**
}
/**
- * @copydoc Internal::Actor::OnS
tag
eDisconnectionExternal
+ * @copydoc Internal::Actor::OnS
cen
eDisconnectionExternal
*/
*/
- virtual void OnS
tag
eDisconnectionExternal()
+ virtual void OnS
cen
eDisconnectionExternal()
{
{
- mImpl->OnS
tag
eDisconnection();
+ mImpl->OnS
cen
eDisconnection();
}
/**
}
/**
@@
-233,17
+240,17
@@
private:
/**
* Private constructor; see also CustomActor::New()
*/
/**
* Private constructor; see also CustomActor::New()
*/
- CustomActor(
CustomActorImpl& extension
);
+ CustomActor(
const SceneGraph::Node& node, CustomActorImpl& extension
);
- // Undefined
- CustomActor(const CustomActor&);
-
- // Undefined
- CustomActor& operator=(const CustomActor& rhs);
+ // no default or copy constructor or assignment
+ CustomActor() = delete;
+ CustomActor( const CustomActor& ) = delete;
+ CustomActor& operator=( const CustomActor& rhs ) = delete;
protected:
CustomActorImplPtr mImpl;
protected:
CustomActorImplPtr mImpl;
+
};
} // namespace Internal
};
} // namespace Internal
@@
-270,4
+277,4
@@
inline const Internal::CustomActor& GetImpl(const Dali::CustomActor& actor)
} // namespace Dali
} // namespace Dali
-#endif //
__DALI_INTERNAL_CUSTOM_ACTOR_H__
+#endif //
DALI_INTERNAL_CUSTOM_ACTOR_H