From 10ec31b6acf3b2b3f7c865dc8f25156f19a14551 Mon Sep 17 00:00:00 2001
From: Nick Gasson <nick@nickg.me.uk>
Date: Tue, 8 Jun 2010 19:21:22 +0100
Subject: [PATCH] Flesh out Lua UI demo a little bit

---
 scripts/uidemo.lua | 14 +++++++++++++-
 src/LuaWrap.cpp    |  2 +-
 src/UIDemo.cpp     |  5 ++++-
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/scripts/uidemo.lua b/scripts/uidemo.lua
index c8abd5f..22924f2 100644
--- a/scripts/uidemo.lua
+++ b/scripts/uidemo.lua
@@ -1 +1,13 @@
-debug("Lua UI demo!")
\ No newline at end of file
+debug("Lua UI demo!")
+
+function btn2Click(btn)
+   debug("yahyahyah :D")
+end
+
+function layoutLoaded(layout)
+   layout:get("/wnd/btn2"):connect(
+      gui.Widget.SIG_CLICK,
+      btn2Click)
+end
+
+addHook("layoutLoaded", layoutLoaded)
diff --git a/src/LuaWrap.cpp b/src/LuaWrap.cpp
index 078c9f8..e4836ec 100644
--- a/src/LuaWrap.cpp
+++ b/src/LuaWrap.cpp
@@ -82,7 +82,7 @@ void LuaWrap::pcall()
    switch (result) {
    case LUA_ERRRUN:
    case LUA_ERRERR:
-      error() << "Lua: " << lua_tolstring(luaVM, -1, NULL);
+      error() << lua_tolstring(luaVM, -1, NULL);
       lua_pop(luaVM, 1);
       break;
    case LUA_ERRMEM:
diff --git a/src/UIDemo.cpp b/src/UIDemo.cpp
index b52494f..a2040b9 100644
--- a/src/UIDemo.cpp
+++ b/src/UIDemo.cpp
@@ -55,7 +55,10 @@ UIDemo::UIDemo()
     layout->get("/wnd1/btn1").connect(gui::Widget::SIG_CLICK,
 	bind(&UIDemo::btn1Click, this, _1));
 
-    getLua()->loadFile("scripts/uidemo.lua");
+    ILuaPtr lua = getLua();
+    lua->makeHook("layoutLoaded");    
+    lua->loadFile("scripts/uidemo.lua");
+    lua->runHook("layoutLoaded");
 }
 
 void UIDemo::btn1Click(gui::Widget& w)
-- 
2.39.2