diff -r 0cdb8089a29f -r a38aec91bd66 ui/wpf/UIwrapper/UIwrapper/toolkit.h
--- a/ui/wpf/UIwrapper/UIwrapper/toolkit.h	Tue Jan 27 09:59:32 2015 +0100
+++ b/ui/wpf/UIwrapper/UIwrapper/toolkit.h	Sat Jan 31 11:51:54 2015 +0100
@@ -2,6 +2,8 @@
 
 #pragma once
 
+#include <vcclr.h>
+
 using namespace System;
 using namespace System::Runtime::InteropServices;
 using namespace System::Threading;
@@ -13,16 +15,27 @@
 extern "C" typedef void(*UIcallback)(void*, void*);
 
 void* ObjectToPtr(Object ^obj);
+Object^ PtrToObject(void *ptr);
 
-public ref class EventWrapper {
+public ref class ObjEventWrapper {
 	UIcallback callback = NULL;
-	void *userdata = NULL;
+	void *eventdata = NULL;
 	Action<IntPtr> ^action;
 
 public:
-	EventWrapper(UIcallback callback, void *userdata);
+	ObjEventWrapper(UIcallback callback, void *eventdata);
 
 	Action<IntPtr>^ GetAction();
 
 	void Callback(IntPtr uiobj);
 };
+
+public ref class EventWrapper {
+	UIcallback callback = NULL;
+	void *eventdata = NULL;
+	
+
+public:
+	EventWrapper(UIcallback callback, void *eventdata);
+	void Callback(Object ^sender, RoutedEventArgs ^e);
+};