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
Remove Actor class and move Actor APIs into View
[platform/core/uifw/dali-toolkit.git]
/
plugins
/
dali-sharp
/
sharp
/
internal
/
Button.cs
diff --git
a/plugins/dali-sharp/sharp/internal/Button.cs
b/plugins/dali-sharp/sharp/internal/Button.cs
index
81aa7db
..
d9767f6
100644
(file)
--- a/
plugins/dali-sharp/sharp/internal/Button.cs
+++ b/
plugins/dali-sharp/sharp/internal/Button.cs
@@
-617,8
+617,8
@@
public class StateChangedEventArgs : EventArgs
return ret;
}
return ret;
}
- public void SetLabel(
Actor
label) {
- NDalicPINVOKE.Button_SetLabel(swigCPtr,
Actor
.getCPtr(label));
+ public void SetLabel(
View
label) {
+ NDalicPINVOKE.Button_SetLabel(swigCPtr,
View
.getCPtr(label));
if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
}
if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
}
@@
-632,14
+632,14
@@
public class StateChangedEventArgs : EventArgs
if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
}
if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
}
- public
Actor
GetButtonImage() {
-
Actor ret = new Actor
(NDalicPINVOKE.Button_GetButtonImage(swigCPtr), true);
+ public
View
GetButtonImage() {
+
View ret = new View
(NDalicPINVOKE.Button_GetButtonImage(swigCPtr), true);
if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
return ret;
}
if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
return ret;
}
- public
Actor
GetSelectedImage() {
-
Actor ret = new Actor
(NDalicPINVOKE.Button_GetSelectedImage(swigCPtr), true);
+ public
View
GetSelectedImage() {
+
View ret = new View
(NDalicPINVOKE.Button_GetSelectedImage(swigCPtr), true);
if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
return ret;
}
if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
return ret;
}