Mercurial > hg > toolkit / file diff

--- a/ui/wpf/UIwrapper/UIwrapper/toolkit.cpp	Sun Jan 25 15:01:04 2015 +0100
+++ b/ui/wpf/UIwrapper/UIwrapper/toolkit.cpp	Tue Jan 27 09:59:32 2015 +0100
@@ -23,18 +23,20 @@
 
 // EventWrapper
 
-EventWrapper::EventWrapper(UIcallback callback, void *userdata) {
+EventWrapper::EventWrapper(UIcallback callback, void *eventdata) {
 	this->callback = callback;
-	this->userdata = userdata;
-	action = gcnew Action(this, &EventWrapper::Callback);
+	this->userdata = eventdata;
+	action = gcnew Action<IntPtr>(this, &EventWrapper::Callback);
 }
 
-Action^ EventWrapper::GetAction() {
+Action<IntPtr>^ EventWrapper::GetAction() {
 	return action;
 }
 
-void EventWrapper::Callback() {
-	callback(NULL, NULL);
+void EventWrapper::Callback(IntPtr uiobj) {
+	if (callback) {
+		callback(uiobj.ToPointer(), userdata);
+	}
 }
 
 UI_EXPORT void __stdcall UIinit(char *appname) {