*misc

1 files changed, 7 insertions, 10 deletions

diff --git a/Editor/Scripting/EditorGUI/GUIWindow.bind.cpp b/Editor/Scripting/EditorGUI/GUIWindow.bind.cpp
index dbb26f4..212cb50 100644
--- a/Editor/Scripting/EditorGUI/GUIWindow.bind.cpp
+++ b/Editor/Scripting/EditorGUI/GUIWindow.bind.cpp
@@ -8,7 +8,6 @@ LUA_BIND_REGISTRY(GUIWindow)
         { "Focus", _Focus },
         { "SetContainerWindow", _SetContainerWindow },
         { "SetPosition", _SetPosition },
-        { "SetInstance", _SetInstance},
         { "New", _New }
     );
 }
@@ -17,11 +16,17 @@ LUA_BIND_POSTPROCESS(GUIWindow)
 {
 }
 
+// GUIWindow.New([script])
 LUA_BIND_IMPL_METHOD(GUIWindow, _New)
 {
 	LUA_BIND_STATE(L, GUIWindow);
+	LUA_BIND_CHECK(L, "T");
+
 	GUIWindow* wnd = new GUIWindow(state.GetVM());
-	wnd->Init();
+
+	if (LuaHelper::IsType(state, "GameLab.Editor.GUI.GUIWindow", -1))
+		wnd->SetMemberRef(state, wnd->m_Script, -1);
+
 	wnd->PushUserdata(state);
 	return 1;
 }
@@ -48,14 +53,6 @@ LUA_BIND_IMPL_METHOD(GUIWindow, _SetContainerWindow)
     return 0;
 }
 
-// SetInstance(self, editorWindow)
-LUA_BIND_IMPL_METHOD(GUIWindow, _SetInstance)
-{
-    LUA_BIND_PREPARE(L, GUIWindow);
-    self->SetMemberRef(state,self->m_Script, -1);
-    return 0;
-}
-
 // GUIWindow.SetPosition(self, {x, y, width, height})
 LUA_BIND_IMPL_METHOD(GUIWindow, _SetPosition)
 {