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
Combined Stage and Window class, and removed Stage class
[platform/core/uifw/dali-toolkit.git]
/
plugins
/
dali-sharp
/
sharp
/
internal
/
ItemView.cs
diff --git
a/plugins/dali-sharp/sharp/internal/ItemView.cs
b/plugins/dali-sharp/sharp/internal/ItemView.cs
index
a29fb74
..
5c791df
100644
(file)
--- a/
plugins/dali-sharp/sharp/internal/ItemView.cs
+++ b/
plugins/dali-sharp/sharp/internal/ItemView.cs
@@
-46,7
+46,7
@@
public class ItemView : Scrollable {
}
public override void Dispose() {
}
public override void Dispose() {
- if (!
Stage
.IsInstalled()) {
+ if (!
Window
.IsInstalled()) {
DisposeQueue.Instance.Add(this);
return;
}
DisposeQueue.Instance.Add(this);
return;
}
@@
-269,14
+269,14
@@
public class ItemView : Scrollable {
if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
}
if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
}
- public
Actor
GetItem(uint itemId) {
-
Actor ret = new Actor
(NDalicPINVOKE.ItemView_GetItem(swigCPtr, itemId), true);
+ public
View
GetItem(uint itemId) {
+
View ret = new View
(NDalicPINVOKE.ItemView_GetItem(swigCPtr, itemId), true);
if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
return ret;
}
if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
return ret;
}
- public uint GetItemId(
Actor actor
) {
- uint ret = NDalicPINVOKE.ItemView_GetItemId(swigCPtr,
Actor.getCPtr(actor
));
+ public uint GetItemId(
View view
) {
+ uint ret = NDalicPINVOKE.ItemView_GetItemId(swigCPtr,
View.getCPtr(view
));
if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
return ret;
}
if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
return ret;
}