Mercurial > hg > toolkit / file diff

--- a/ui/wpf/UIwrapper/UIwrapper/window.cpp	Tue Jan 27 09:59:32 2015 +0100
+++ b/ui/wpf/UIwrapper/UIwrapper/window.cpp	Sat Jan 31 11:51:54 2015 +0100
@@ -7,7 +7,11 @@
 
 #using "UIcore.dll"
 
-UI_EXPORT void* UIwindow(char *title, void *uiobj) {
+UI_EXPORT void* __stdcall UIwindow(char *title, void *uiobj) {
 	UI::MainWindow ^window = UI::MainWindow::CreateMainWindow(gcnew String(title), IntPtr(uiobj));
-	return ObjectToPtr(window);
+	gcroot<UI::MainWindow^> *ptr = new gcroot<UI::MainWindow^>();
+	*ptr = window;
+	return ptr;
 }
+
+