summaryrefslogtreecommitdiff
path: root/Editor
diff options
context:
space:
mode:
authorchai <chaifix@163.com>2021-10-22 09:23:08 +0800
committerchai <chaifix@163.com>2021-10-22 09:23:08 +0800
commit1f18d2afec632aa9361079ca3bcb5a7f2d73db3a (patch)
treedab695a32735d1f19ae74ea7e7d094371531dde8 /Editor
parent998a13b08c43b0813d1d4d38692ea7f8bd31c936 (diff)
*misc
Diffstat (limited to 'Editor')
-rw-r--r--Editor/GUI/EditorWindows.h7
-rw-r--r--Editor/Scripting/EditorGUI/ContainerWindow.bind.cpp4
-rw-r--r--Editor/Scripting/EditorGUI/GUIWindow.bind.cpp10
3 files changed, 16 insertions, 5 deletions
diff --git a/Editor/GUI/EditorWindows.h b/Editor/GUI/EditorWindows.h
index ba71c06..58a37fb 100644
--- a/Editor/GUI/EditorWindows.h
+++ b/Editor/GUI/EditorWindows.h
@@ -159,16 +159,19 @@ private:
HDC m_DC;
HGLRC m_RC;
- LuaBind::Ref m_Script;
+ LuaBind::Ref m_Instance; // EditorWindow½Å±¾
LUA_BIND_DECL_FACTORY(GUIWindow);
- LUA_BIND_DECL_METHOD(_New);
+ LUA_BIND_DECL_METHOD(_New);
+ LUA_BIND_DECL_METHOD(_GC);
LUA_BIND_DECL_METHOD(_DoPaint);
LUA_BIND_DECL_METHOD(_Focus);
LUA_BIND_DECL_METHOD(_SetContainerWindow);
LUA_BIND_DECL_METHOD(_SetPosition);
+ LUA_BIND_DECL_METHOD(_SetInstance);
+
};
#endif \ No newline at end of file
diff --git a/Editor/Scripting/EditorGUI/ContainerWindow.bind.cpp b/Editor/Scripting/EditorGUI/ContainerWindow.bind.cpp
index 9c75829..75d28aa 100644
--- a/Editor/Scripting/EditorGUI/ContainerWindow.bind.cpp
+++ b/Editor/Scripting/EditorGUI/ContainerWindow.bind.cpp
@@ -3,10 +3,10 @@
LUA_BIND_REGISTRY(ContainerWindow)
{
LUA_BIND_REGISTER_METHODS(state,
+ { "New", _New },
{ "SetTitle", _SetTitle },
{ "SetIcon", _SetIcon },
- { "DoPaint", _DoPaint },
- { "New", _New }
+ { "DoPaint", _DoPaint }
);
}
diff --git a/Editor/Scripting/EditorGUI/GUIWindow.bind.cpp b/Editor/Scripting/EditorGUI/GUIWindow.bind.cpp
index 50acf44..78ea635 100644
--- a/Editor/Scripting/EditorGUI/GUIWindow.bind.cpp
+++ b/Editor/Scripting/EditorGUI/GUIWindow.bind.cpp
@@ -7,7 +7,8 @@ LUA_BIND_REGISTRY(GUIWindow)
{ "Focus", _Focus },
{ "SetContainerWindow", _SetContainerWindow },
{ "SetPosition", _SetPosition },
- { "New", _New }
+ { "New", _New },
+ { "__gc", _GC }
);
}
@@ -15,6 +16,13 @@ LUA_BIND_POSTPROCESS(GUIWindow)
{
}
+LUA_BIND_IMPL_METHOD(GUIWindow, _GC)
+{
+ LUA_BIND_PREPARE(L, GUIWindow);
+
+ return 0;
+}
+
LUA_BIND_IMPL_METHOD(GUIWindow, _DoPaint)
{
LUA_BIND_PREPARE(L, GUIWindow);