+containers

22 files changed, 72 insertions, 69 deletions

diff --git a/Editor/EditorApplication.cpp b/Editor/EditorApplication.cpp
index 0ebff72..2f2d1e3 100644
--- a/Editor/EditorApplication.cpp
+++ b/Editor/EditorApplication.cpp
@@ -14,7 +14,7 @@ EditorApplication::~EditorApplication()
 

 }

 

-void EditorApplication::SetMainWindow(ContainnerWindow* wnd)

+void EditorApplication::SetMainWindow(ContainerWindow* wnd)

 {

     Assert(wnd);

     EditorManager::Instance()->SetMainWindow(wnd);

diff --git a/Editor/EditorApplication.h b/Editor/EditorApplication.h
index 35c427c..9109a1f 100644
--- a/Editor/EditorApplication.h
+++ b/Editor/EditorApplication.h
@@ -7,20 +7,20 @@
 using namespace LuaBind;

 

 class EditorApplication 

-    : public LuaBind::NativeClass<EditorApplication >
+    : public LuaBind::NativeClass<EditorApplication >

 {

 public:

     EditorApplication();

     ~EditorApplication();

 

     void PullMessage();

-    void SetMainWindow(ContainnerWindow* wnd);

+    void SetMainWindow(ContainerWindow* wnd);

 

     void OnQuit();

 

 private : 

 

-    LUA_BIND_DECL_FACTORY(EditorApplication);
+    LUA_BIND_DECL_FACTORY(EditorApplication);

 

     LUA_BIND_DECL_METHOD(_New);

     LUA_BIND_DECL_METHOD(_SetMainWindow);

diff --git a/Editor/EditorManager.cpp b/Editor/EditorManager.cpp
index 6f589d9..a375d81 100644
--- a/Editor/EditorManager.cpp
+++ b/Editor/EditorManager.cpp
@@ -7,12 +7,12 @@ const std::string EditorDefine::kResourceRoot = "./";
 #endif
 
 
-void EditorManager::SetMainWindow(ContainnerWindow* wnd)
+void EditorManager::SetMainWindow(ContainerWindow* wnd)
 {
 	m_MainWindow = wnd;
 }
 
-ContainnerWindow* EditorManager::GetMainWindow()
+ContainerWindow* EditorManager::GetMainWindow()
 {
 	return m_MainWindow;
 }
diff --git a/Editor/EditorManager.h b/Editor/EditorManager.h
index 6e6da19..774f2de 100644
--- a/Editor/EditorManager.h
+++ b/Editor/EditorManager.h
@@ -23,10 +23,10 @@ public :
 class EditorManager : public Singleton<EditorManager>
 {
 public:
-	void SetMainWindow(ContainnerWindow* wnd);
-	ContainnerWindow* GetMainWindow();
+	void SetMainWindow(ContainerWindow* wnd);
+	ContainerWindow* GetMainWindow();
 	
 private: 
-	ContainnerWindow* m_MainWindow;
+	ContainerWindow* m_MainWindow;
 
 };
diff --git a/Editor/GUI/ContainnerWindow.cpp b/Editor/GUI/ContainerWindow.cpp
index d6a67c9..ee42635 100644
--- a/Editor/GUI/ContainnerWindow.cpp
+++ b/Editor/GUI/ContainerWindow.cpp
@@ -14,17 +14,17 @@ static bool	 s_IsMainWindowMaximized;
 extern bool ProcessMainWindowMessages(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam, LRESULT& result);
 
 static PAINTSTRUCT ps;
-LRESULT CALLBACK ContainnerWindow::ContainerWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
+LRESULT CALLBACK ContainerWindow::ContainerWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 {
 	 
-	ContainnerWindow *self = (ContainnerWindow*)GetWindowLongPtr(hWnd, GWLP_USERDATA);
+	ContainerWindow *self = (ContainerWindow*)GetWindowLongPtr(hWnd, GWLP_USERDATA);
 	if (!self)
 	{
-		log_warning("Nullptr ContainnerWindow");
+		log_warning("Nullptr ContainerWindow");
 		return DefWindowProcW(hWnd, message, wParam, lParam);
 	}
 
-	//log_info("WndProc", "ContainnerWindow::ContainerWndProc(), ContainnerWindow name is " + self->GetName());
+	//log_info("WndProc", "ContainerWindow::ContainerWndProc(), ContainerWindow name is " + self->GetName());
 
 	switch (message)
 	{
@@ -177,22 +177,22 @@ LRESULT CALLBACK ContainnerWindow::ContainerWndProc(HWND hWnd, UINT message, WPA
 	return flag;
 }
 
-ContainnerWindow::ContainnerWindow()
+ContainerWindow::ContainerWindow()
 {
 }
 
-ContainnerWindow::~ContainnerWindow()
+ContainerWindow::~ContainerWindow()
 {
 
 }
 
-void ContainnerWindow::DoPaint()
+void ContainerWindow::DoPaint()
 {
 	SetWindowLongPtr(m_Window, GWLP_USERDATA, (LONG_PTR)this);
 	SendMessage(m_Window, WM_PAINT, 0, 0);
 }
 
-void ContainnerWindow::SetAsRenderContext()
+void ContainerWindow::SetAsRenderContext()
 {
 	Assert(m_DC != NULL);
 	Assert(m_RC != NULL);
@@ -202,7 +202,7 @@ void ContainnerWindow::SetAsRenderContext()
 	glViewport(0, 0, rect.right - rect.left, rect.bottom - rect.top);
 }
 
-bool ContainnerWindow::SetRenderContext()
+bool ContainerWindow::SetRenderContext()
 {
 	m_DC = ::GetDC(m_Window);
 	if (!m_DC)
@@ -273,7 +273,7 @@ bool ContainnerWindow::SetRenderContext()
 }
 
 // 初始化，创建窗口
-void ContainnerWindow::Init(Rectf pixelRect, int showMode, const Vector2f& minSize, const Vector2f& maxSize, std::string name)
+void ContainerWindow::Init(Rectf pixelRect, int showMode, const Vector2f& minSize, const Vector2f& maxSize, std::string name)
 {
 	// Aux windows are mac only. on windows they look just like normal utility windows.
 	if (showMode == kShowAuxWindow)
@@ -401,12 +401,12 @@ void ContainnerWindow::Init(Rectf pixelRect, int showMode, const Vector2f& minSi
 
 }
 
-void ContainnerWindow::SetTitle(const char* title)
+void ContainerWindow::SetTitle(const char* title)
 {
 	SetWindowTextA(m_Window, title);
 }
 
-void ContainnerWindow::SetIcon(LPCSTR iconName)
+void ContainerWindow::SetIcon(LPCSTR iconName)
 {
 	Assert(m_ShowMode == ShowMode::kShowMainWindow);
 
@@ -419,19 +419,19 @@ void ContainnerWindow::SetIcon(LPCSTR iconName)
 		log_error("icon error: " + to_string(GetLastError()));
 }
 
-void ContainnerWindow::Close()
+void ContainerWindow::Close()
 {
 	log_info("Close window " + m_Name);
 
 	SendMessage(m_Window, WM_CLOSE, 0, 0);
 }
 
-void ContainnerWindow::OnRectChanged()
+void ContainerWindow::OnRectChanged()
 {
 
 }
 
-void ContainnerWindow::OnActivateApplication(bool active)
+void ContainerWindow::OnActivateApplication(bool active)
 {
 
 }
diff --git a/Editor/GUI/EditorWindows.h b/Editor/GUI/EditorWindows.h
index 97175b3..ba71c06 100644
--- a/Editor/GUI/EditorWindows.h
+++ b/Editor/GUI/EditorWindows.h
@@ -38,8 +38,8 @@ private:
 };
 
 // 一个containner window中有多个viewport
-class ContainnerWindow 
-	: public LuaBind::NativeClass<ContainnerWindow>
+class ContainerWindow 
+	: public LuaBind::NativeClass<ContainerWindow>
 {
 public:
 	static LRESULT CALLBACK ContainerWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
@@ -53,8 +53,8 @@ public:
         kShowAuxWindow = 5,		// Popup windows like the color picker, gradient editor, etc. Drawn with black background on Mac
     };
 
-    ContainnerWindow(); 
-    ~ContainnerWindow();
+    ContainerWindow(); 
+    ~ContainerWindow();
 
     void Init(Rectf size, int showMode, const Vector2f& minSize, const Vector2f& maxSize, std::string name = "");
 	void SetTitle(const char* title);
@@ -89,7 +89,7 @@ private:
     POINT m_MinSize;
     POINT m_MaxSize;
 
-	LUA_BIND_DECL_FACTORY(ContainnerWindow);
+	LUA_BIND_DECL_FACTORY(ContainerWindow);
 
     LUA_BIND_DECL_METHOD(_New);
     LUA_BIND_DECL_METHOD(_SetTitle);
@@ -136,7 +136,7 @@ public:
 
 	void Init(std::string name = "");
     void DoPaint();
-	void SetContainnerWindow(ContainnerWindow* wnd);
+	void SetContainerWindow(ContainerWindow* wnd);
 	void Focus();
 	void SetPosition(Rectf position);
 	void SetAsRenderContext();
@@ -154,7 +154,7 @@ private:
 
 	std::string m_Name; 
 
-	ContainnerWindow* m_ContainnerWindow;
+	ContainerWindow* m_ContainerWindow;
 	HWND m_Handle;
 	HDC m_DC;
 	HGLRC m_RC;
@@ -166,7 +166,7 @@ private:
     LUA_BIND_DECL_METHOD(_New);
     LUA_BIND_DECL_METHOD(_DoPaint);
     LUA_BIND_DECL_METHOD(_Focus);
-    LUA_BIND_DECL_METHOD(_SetContainnerWindow);
+    LUA_BIND_DECL_METHOD(_SetContainerWindow);
     LUA_BIND_DECL_METHOD(_SetPosition);
 
 };
diff --git a/Editor/GUI/GUIWindow.cpp b/Editor/GUI/GUIWindow.cpp
index 34d7705..107a298 100644
--- a/Editor/GUI/GUIWindow.cpp
+++ b/Editor/GUI/GUIWindow.cpp
@@ -294,10 +294,10 @@ bool GUIWindow::SetRenderContext()
     if (m_RC && !g_IsGLInitialized)
     {
         log_info("Initialize OpenGL");
-        wglMakeCurrent(m_DC, m_RC);

-        if (!gladLoadGL()) {

-            log_error("初始化GL错误");

-        }

+        wglMakeCurrent(m_DC, m_RC);
+        if (!gladLoadGL()) {
+            log_error("初始化GL错误");
+        }
         g_IsGLInitialized = true;
     }
 	return true;
@@ -343,17 +343,17 @@ void GUIWindow::Focus()
 	log_info("Focus GUIWindow " + (long)this);
 	if (m_Handle)
 	{
-		if (::GetForegroundWindow() != m_ContainnerWindow->GetWindowHandle())
-			::SetForegroundWindow(m_ContainnerWindow->GetWindowHandle());
+		if (::GetForegroundWindow() != m_ContainerWindow->GetWindowHandle())
+			::SetForegroundWindow(m_ContainerWindow->GetWindowHandle());
 		SetFocus(m_Handle);
 	}
 }
 
-void GUIWindow::SetContainnerWindow(ContainnerWindow* wnd)
+void GUIWindow::SetContainerWindow(ContainerWindow* wnd)
 {
 	Assert(wnd != NULL);
 
-	m_ContainnerWindow = wnd;
+	m_ContainerWindow = wnd;
 
 	if (wnd->GetWindowHandle() != m_Handle)
 	{
diff --git a/Editor/GUI/MenuManager.cpp b/Editor/GUI/MenuManager.cpp
index 53dfd5a..c0fc989 100644
--- a/Editor/GUI/MenuManager.cpp
+++ b/Editor/GUI/MenuManager.cpp
@@ -18,7 +18,7 @@ MenuManager::MenuManager()
 
 void MenuManager::Init() 
 {
-	ContainnerWindow* mainWnd = EditorManager::Instance()->GetMainWindow();
+	ContainerWindow* mainWnd = EditorManager::Instance()->GetMainWindow();
 	Assert(mainWnd != NULL);
 
 	HMENU hMenubar = CreateMenu();
diff --git a/Editor/GUI/WindowUtil.cpp b/Editor/GUI/WindowUtil.cpp
index b76b6d0..34a7b30 100644
--- a/Editor/GUI/WindowUtil.cpp
+++ b/Editor/GUI/WindowUtil.cpp
@@ -13,7 +13,7 @@ void WindowUtil::RegisterClasses()
 {
 	log_info("WindowUtil::Init()");
 
-	ContainerWindowClassAtom = winutils::RegisterWindowClass(kContainerWindowClassName, ContainnerWindow::ContainerWndProc, CS_HREDRAW | CS_VREDRAW);
-	PopupWindowClassAtom = winutils::RegisterWindowClass(kPopupWindowClassName, ContainnerWindow::ContainerWndProc, CS_HREDRAW | CS_VREDRAW | CS_DROPSHADOW);//CS_HREDRAW宽度（水平）变化时重绘、CS_VREDRAW高度（垂直）变化时重绘
+	ContainerWindowClassAtom = winutils::RegisterWindowClass(kContainerWindowClassName, ContainerWindow::ContainerWndProc, CS_HREDRAW | CS_VREDRAW);
+	PopupWindowClassAtom = winutils::RegisterWindowClass(kPopupWindowClassName, ContainerWindow::ContainerWndProc, CS_HREDRAW | CS_VREDRAW | CS_DROPSHADOW);//CS_HREDRAW宽度（水平）变化时重绘、CS_VREDRAW高度（垂直）变化时重绘
 	GUIViewClassAtom = winutils::RegisterWindowClass(kGUIWindowClassName, GUIWindow::GUIViewWndProc, CS_HREDRAW | CS_VREDRAW | CS_DROPSHADOW);
 }
\ No newline at end of file
diff --git a/Editor/Scripting/Editor/EditorApplication.bind.cpp b/Editor/Scripting/Editor/EditorApplication.bind.cpp
index 184870a..672bdcd 100644
--- a/Editor/Scripting/Editor/EditorApplication.bind.cpp
+++ b/Editor/Scripting/Editor/EditorApplication.bind.cpp
@@ -1,5 +1,5 @@
-#include "Editor/EditorApplication.h"

-

+#include "Editor/EditorApplication.h"
+
 LUA_BIND_REGISTRY(EditorApplication)
 {
     LUA_BIND_REGISTER_METHODS(state,
@@ -33,9 +33,9 @@ LUA_BIND_IMPL_METHOD(EditorApplication, _SetMainWindow)
     LUA_BIND_PREPARE(L, EditorApplication);
     LUA_BIND_CHECK(L, "UU");
 
-    ContainnerWindow* wnd = state.GetUserdata<ContainnerWindow>(2);
+    ContainerWindow* wnd = state.GetUserdata<ContainerWindow>(2);
     self->SetMainWindow(wnd);
 
-	MenuManager::Instance()->Init();

+	MenuManager::Instance()->Init();
     return 0;
 }
diff --git a/Editor/Scripting/EditorGUI/ContainerWindow.bind.cpp b/Editor/Scripting/EditorGUI/ContainerWindow.bind.cpp
index d3d0997..9c75829 100644
--- a/Editor/Scripting/EditorGUI/ContainerWindow.bind.cpp
+++ b/Editor/Scripting/EditorGUI/ContainerWindow.bind.cpp
@@ -1,6 +1,6 @@
 #include "Editor/GUI/EditorWindows.h"
 
-LUA_BIND_REGISTRY(ContainnerWindow)
+LUA_BIND_REGISTRY(ContainerWindow)
 {
 	LUA_BIND_REGISTER_METHODS(state,
         { "SetTitle", _SetTitle },
@@ -10,7 +10,7 @@ LUA_BIND_REGISTRY(ContainnerWindow)
     );
 }
 
-LUA_BIND_POSTPROCESS(ContainnerWindow)
+LUA_BIND_POSTPROCESS(ContainerWindow)
 {
 	LUA_BIND_REGISTER_ENUM(state, "EShowMode",
 		{ "NormalWindow", ShowMode::kShowNormalWindow },
@@ -22,9 +22,9 @@ LUA_BIND_POSTPROCESS(ContainnerWindow)
 	);
 }
 
-LUA_BIND_IMPL_METHOD(ContainnerWindow, _SetTitle)
+LUA_BIND_IMPL_METHOD(ContainerWindow, _SetTitle)
 {
-    LUA_BIND_PREPARE(L, ContainnerWindow);
+    LUA_BIND_PREPARE(L, ContainerWindow);
 
     cc8* title = state.GetValue<cc8*>(2, "");
     self->SetTitle(title);
@@ -32,9 +32,9 @@ LUA_BIND_IMPL_METHOD(ContainnerWindow, _SetTitle)
     return 0;
 }
 
-LUA_BIND_IMPL_METHOD(ContainnerWindow, _SetIcon)
+LUA_BIND_IMPL_METHOD(ContainerWindow, _SetIcon)
 {
-    LUA_BIND_PREPARE(L, ContainnerWindow);
+    LUA_BIND_PREPARE(L, ContainerWindow);
 
     cc8* path = state.GetValue<cc8*>(2, "");
     self->SetIcon(path);
@@ -42,19 +42,19 @@ LUA_BIND_IMPL_METHOD(ContainnerWindow, _SetIcon)
     return 0;
 }
 
-LUA_BIND_IMPL_METHOD(ContainnerWindow, _DoPaint)
+LUA_BIND_IMPL_METHOD(ContainerWindow, _DoPaint)
 {
-    LUA_BIND_PREPARE(L, ContainnerWindow);
+    LUA_BIND_PREPARE(L, ContainerWindow);
     self->DoPaint();
     return 0;
 }
 
-LUA_BIND_IMPL_METHOD(ContainnerWindow, ContainnerWindow::_New)
+LUA_BIND_IMPL_METHOD(ContainerWindow, ContainerWindow::_New)
 {
-    LUA_BIND_STATE(L, ContainnerWindow);
+    LUA_BIND_STATE(L, ContainerWindow);
     LUA_BIND_CHECK(L, "TNTT");
 
-    ContainnerWindow* wnd = new ContainnerWindow();
+    ContainerWindow* wnd = new ContainerWindow();
 
     Rectf rect = state.GetValue<Rectf>(state, Rectf());
     int showMode = state.GetValue<int>(2, 0);
diff --git a/Editor/Scripting/EditorGUI/EditorGUI.bind.cpp b/Editor/Scripting/EditorGUI/EditorGUI.bind.cpp
index 4e908c4..0f30276 100644
--- a/Editor/Scripting/EditorGUI/EditorGUI.bind.cpp
+++ b/Editor/Scripting/EditorGUI/EditorGUI.bind.cpp
@@ -12,7 +12,7 @@ int luaopen_GameLab_Editor_GUI(lua_State* L)
 	state.PushNamespace("Editor");
 	state.PushNamespace("GUI");
 
-    state.RegisterFactory<ContainnerWindow>();
+    state.RegisterFactory<ContainerWindow>();
     state.RegisterFactory<GUIWindow>();
 
 	return 1;
diff --git a/Editor/Scripting/EditorGUI/GUIWindow.bind.cpp b/Editor/Scripting/EditorGUI/GUIWindow.bind.cpp
index ec8f830..50acf44 100644
--- a/Editor/Scripting/EditorGUI/GUIWindow.bind.cpp
+++ b/Editor/Scripting/EditorGUI/GUIWindow.bind.cpp
@@ -5,7 +5,7 @@ LUA_BIND_REGISTRY(GUIWindow)
     LUA_BIND_REGISTER_METHODS(state,
         { "DoPaint", _DoPaint },
         { "Focus", _Focus },
-        { "SetContainnerWindow", _SetContainnerWindow },
+        { "SetContainerWindow", _SetContainerWindow },
         { "SetPosition", _SetPosition },
         { "New", _New }
     );
@@ -29,11 +29,11 @@ LUA_BIND_IMPL_METHOD(GUIWindow, _Focus)
     return 0;
 }
 
-LUA_BIND_IMPL_METHOD(GUIWindow, _SetContainnerWindow)
+LUA_BIND_IMPL_METHOD(GUIWindow, _SetContainerWindow)
 {
     LUA_BIND_PREPARE(L, GUIWindow);
-    ContainnerWindow* wnd = state.GetUserdata<ContainnerWindow>(2);
-    self->SetContainnerWindow(wnd);
+    ContainerWindow* wnd = state.GetUserdata<ContainerWindow>(2);
+    self->SetContainerWindow(wnd);
     return 0;
 }
 
diff --git a/Projects/VisualStudio/Editor/Editor.vcxproj b/Projects/VisualStudio/Editor/Editor.vcxproj
index 8d8afbe..e6ffe4b 100644
--- a/Projects/VisualStudio/Editor/Editor.vcxproj
+++ b/Projects/VisualStudio/Editor/Editor.vcxproj
@@ -147,7 +147,7 @@
     <ClCompile Include="..\..\..\Editor\EditorMain.cpp" />

     <ClCompile Include="..\..\..\Editor\EditorManager.cpp" />

     <ClCompile Include="..\..\..\Editor\Graphics\Graphics.cpp" />

-    <ClCompile Include="..\..\..\Editor\GUI\ContainnerWindow.cpp" />

+    <ClCompile Include="..\..\..\Editor\GUI\ContainerWindow.cpp" />

     <ClCompile Include="..\..\..\Editor\GUI\Dock.cpp" />

     <ClCompile Include="..\..\..\Editor\GUI\MainWindow.cpp" />

     <ClCompile Include="..\..\..\Editor\GUI\WindowManager.cpp" />

diff --git a/Projects/VisualStudio/Editor/Editor.vcxproj.filters b/Projects/VisualStudio/Editor/Editor.vcxproj.filters
index 81d32e6..30d6087 100644
--- a/Projects/VisualStudio/Editor/Editor.vcxproj.filters
+++ b/Projects/VisualStudio/Editor/Editor.vcxproj.filters
@@ -64,6 +64,9 @@
     <Filter Include="Editor\Graphics">

       <UniqueIdentifier>{66d581bf-85b1-4108-b1e1-d5e44f391af8}</UniqueIdentifier>

     </Filter>

+    <Filter Include="Runtime\LuaUtils">

+      <UniqueIdentifier>{8810f29e-3166-4dd6-af85-8eebab583f0c}</UniqueIdentifier>

+    </Filter>

     <Filter Include="Runtime\Lua">

       <UniqueIdentifier>{d076ff69-6f78-4c7d-be95-e59daf26a3e2}</UniqueIdentifier>

     </Filter>

@@ -102,9 +105,6 @@
     <ClCompile Include="..\..\..\Editor\GUI\WinUtils.cpp">

       <Filter>Editor\GUI</Filter>

     </ClCompile>

-    <ClCompile Include="..\..\..\Editor\GUI\ContainnerWindow.cpp">

-      <Filter>Editor\GUI</Filter>

-    </ClCompile>

     <ClCompile Include="..\..\..\Editor\GUI\GUIWindow.cpp">

       <Filter>Editor\GUI</Filter>

     </ClCompile>

@@ -225,6 +225,9 @@
     <ClCompile Include="..\..\..\Runtime\Scripting\Path.bind.cpp">

       <Filter>Runtime\Scripting</Filter>

     </ClCompile>

+    <ClCompile Include="..\..\..\Editor\GUI\ContainerWindow.cpp">

+      <Filter>Editor\GUI</Filter>

+    </ClCompile>

   </ItemGroup>

   <ItemGroup>

     <ClInclude Include="..\..\..\Editor\GUI\Dock.h">

diff --git a/Resources/DefaultContent/Libraries/Container/README.md b/Resources/DefaultContent/Libraries/containers/README.md
index cba8776..cba8776 100644
--- a/Resources/DefaultContent/Libraries/Container/README.md
+++ b/Resources/DefaultContent/Libraries/containers/README.md
diff --git a/Resources/DefaultContent/Libraries/Container/list.lua b/Resources/DefaultContent/Libraries/containers/list.lua
index 59233b9..59233b9 100644
--- a/Resources/DefaultContent/Libraries/Container/list.lua
+++ b/Resources/DefaultContent/Libraries/containers/list.lua
diff --git a/Resources/DefaultContent/Libraries/Container/queue.lua b/Resources/DefaultContent/Libraries/containers/queue.lua
index 126daa8..126daa8 100644
--- a/Resources/DefaultContent/Libraries/Container/queue.lua
+++ b/Resources/DefaultContent/Libraries/containers/queue.lua
diff --git a/Resources/DefaultContent/Libraries/Container/stack.lua b/Resources/DefaultContent/Libraries/containers/stack.lua
index d828c81..d828c81 100644
--- a/Resources/DefaultContent/Libraries/Container/stack.lua
+++ b/Resources/DefaultContent/Libraries/containers/stack.lua
diff --git a/Resources/DefaultContent/Libraries/Container/tuple.lua b/Resources/DefaultContent/Libraries/containers/tuple.lua
index 0646d5a..0646d5a 100644
--- a/Resources/DefaultContent/Libraries/Container/tuple.lua
+++ b/Resources/DefaultContent/Libraries/containers/tuple.lua
diff --git a/Resources/DefaultContent/Libraries/Container/vector.lua b/Resources/DefaultContent/Libraries/containers/vector.lua
index 0b349ce..0b349ce 100644
--- a/Resources/DefaultContent/Libraries/Container/vector.lua
+++ b/Resources/DefaultContent/Libraries/containers/vector.lua
diff --git a/Resources/Scripts/EditorApplication.lua b/Resources/Scripts/EditorApplication.lua
index 305ee87..89efb0d 100644
--- a/Resources/Scripts/EditorApplication.lua
+++ b/Resources/Scripts/EditorApplication.lua
@@ -10,14 +10,14 @@ if app == nil then
 	Debug.LogError("app is nil")
 end 
 
-local mainWindow = GUI.ContainnerWindow.New({400, 400, 800, 500}, GUI.EShowMode.MainWindow, {100, 100}, {700, 700}) 
+local mainWindow = GUI.ContainerWindow.New({400, 400, 800, 500}, GUI.EShowMode.MainWindow, {100, 100}, {700, 700}) 
 mainWindow:SetTitle("GameLab")
 mainWindow:SetIcon("./Icon/GameLab.ico")
 
 app:SetMainWindow(mainWindow)
 
 local guiWindow = GUI.GUIWindow.New() 
-guiWindow:SetContainnerWindow(mainWindow)
+guiWindow:SetContainerWindow(mainWindow)
 guiWindow:SetPosition({0,0, 500, 400})