From d35bf6bc49a93bbb02abfbfb61f5d695ab782f94 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Tue, 6 May 2014 18:58:24 +1000
Subject: CloseWindow() now just winFangDel()'s the passed in winFang.

---
 src/GuiLua/GuiLua.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'src/GuiLua/GuiLua.c')

diff --git a/src/GuiLua/GuiLua.c b/src/GuiLua/GuiLua.c
index 643a9d5..fe398c8 100644
--- a/src/GuiLua/GuiLua.c
+++ b/src/GuiLua/GuiLua.c
@@ -299,14 +299,10 @@ static int quit(lua_State *L)
 
 static int closeWindow(lua_State *L)
 {
-  GuiLua *gl;
-
-  lua_getfield(L, LUA_REGISTRYINDEX, glName);
-  gl = lua_touserdata(L, -1);
-  lua_pop(L, 1);
+  winFang *win = NULL;
 
-  if (gl)
-    winFangDel(gl->parent);
+  pull_lua(L, 1, "*window", &win);
+  if (win) winFangDel(win);
 
   return 0;
 }
@@ -368,7 +364,7 @@ PD("GuiLua 3");
   push_lua(L, "@ ( = $ $ & )",			skang, THINGASM, skang, "Colour",	"Change widget colours.",			colour, 0);
   push_lua(L, "@ ( = $ $ & )",			skang, THINGASM, skang, "loopWindow",	"Run our windows main loop.",			loopWindow, 0);
   push_lua(L, "@ ( = $ $ & )",			skang, THINGASM, skang, "quit",		"Quit, exit, remove thyself.",			quit, 0);
-  push_lua(L, "@ ( = $ $ & )",			skang, THINGASM, skang, "closeWindow",	"Closes our window.",				closeWindow, 0);
+  push_lua(L, "@ ( = $ $ & )",			skang, THINGASM, skang, "closeWindow",	"Closes a window.",				closeWindow, 0); // TODO - closeWindow, "userdata");
 
   // A test of the array building stuff.
   push_lua(L, "@ ( { = $ $ % $widget !required } )", skang, THINGASM, skang, "wibble", "It's wibbly!", 1, "'edit', 'The wibblinator:', 1, 1, 10, 50", 1, 0);
-- 
cgit v1.1