*misc

1 files changed, 5 insertions, 5 deletions

diff --git a/Editor/GUI/GUIWindow.cpp b/Editor/GUI/GUIWindow.cpp
index 94dfe33..a4049c8 100644
--- a/Editor/GUI/GUIWindow.cpp
+++ b/Editor/GUI/GUIWindow.cpp
@@ -5,7 +5,7 @@
 #include "Editor/Win/Win.h"
 #include "Runtime/Math/Math.h"
 #include "Runtime/Events/InputEvent.h"
-#include "Runtime/Scripting/ScriptingManager.h"
+#include "Editor/Scripting/EditorScriptingManager.h"
 
 using namespace LuaBind;
 
@@ -262,15 +262,15 @@ void GUIWindow::ProcessEventMessages(UINT message, WPARAM wParam, LPARAM lParam)
 {
     InputEvent ie(message, wParam, lParam, m_Handle);
 
-	SCRIPT_GLOBAL.setCurrentEvent.Invoke(0);
-
     LuaBind::State state = GetVM()->GetCurThread();
 
+    SCRIPT_GLOBAL.setCurrentEvent.AddTable(state, ie);
+    SCRIPT_GLOBAL.setCurrentEvent.Invoke(state, 0);
+
     LuaBind::MemberInvoker invoker = LuaBind::MemberInvoker(state, this);
     invoker.member = m_Script;
-    invoker.method = "OnEvent";
+    invoker.method = "OnGUI";
     invoker.AddMember(m_Script);
-    invoker.AddTable(ie);
     invoker.Invoke(0);
 }