diff options
Diffstat (limited to '')
-rw-r--r-- | src/GuiLua/GuiLua.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/GuiLua/GuiLua.c b/src/GuiLua/GuiLua.c index fe398c8..2bdba70 100644 --- a/src/GuiLua/GuiLua.c +++ b/src/GuiLua/GuiLua.c | |||
@@ -344,9 +344,9 @@ printf("**********************require GuiLua\n"); | |||
344 | // The skang module should have been loaded by now, so we can just grab it out of package.loaded[]. | 344 | // The skang module should have been loaded by now, so we can just grab it out of package.loaded[]. |
345 | lua_getglobal(L, "package"); | 345 | lua_getglobal(L, "package"); |
346 | lua_getfield(L, lua_gettop(L), "loaded"); | 346 | lua_getfield(L, lua_gettop(L), "loaded"); |
347 | lua_remove(L, -2); // Removes "package" | 347 | lua_remove(L, -2); // Removes "package" |
348 | lua_getfield(L, lua_gettop(L), SKANG); | 348 | lua_getfield(L, lua_gettop(L), SKANG); |
349 | lua_remove(L, -2); // Removes "loaded" | 349 | lua_remove(L, -2); // Removes "loaded" |
350 | lua_setfield(L, LUA_REGISTRYINDEX, SKANG); | 350 | lua_setfield(L, LUA_REGISTRYINDEX, SKANG); |
351 | lua_getfield(L, LUA_REGISTRYINDEX, SKANG); // Puts the skang table back on the stack. | 351 | lua_getfield(L, LUA_REGISTRYINDEX, SKANG); // Puts the skang table back on the stack. |
352 | skang = lua_gettop(L); | 352 | skang = lua_gettop(L); |
@@ -358,7 +358,7 @@ printf("**********************require GuiLua\n"); | |||
358 | PD("GuiLua 2"); | 358 | PD("GuiLua 2"); |
359 | // TODO - This one crashes sometimes. Figure out why later. | 359 | // TODO - This one crashes sometimes. Figure out why later. |
360 | // push_lua(L, "@ ( { = $ $ & $ } )", skang, THINGASM, skang, "widget", "Create a widget.", widget, "userdata,string,string,number,number,number,number"); | 360 | // push_lua(L, "@ ( { = $ $ & $ } )", skang, THINGASM, skang, "widget", "Create a widget.", widget, "userdata,string,string,number,number,number,number"); |
361 | push_lua(L, "@ ( = $ $ & )", skang, THINGASM, skang, "widget", "Create a widget.", widget, 0); | 361 | push_lua(L, "@ ( = $ $ & )", skang, THINGASM, skang, "widget", "Create a widget.", widget, 0); |
362 | PD("GuiLua 3"); | 362 | PD("GuiLua 3"); |
363 | push_lua(L, "@ ( = $ $ & )", skang, THINGASM, skang, "action", "Add an action to a widget.", action, 0); | 363 | push_lua(L, "@ ( = $ $ & )", skang, THINGASM, skang, "action", "Add an action to a widget.", action, 0); |
364 | push_lua(L, "@ ( = $ $ & )", skang, THINGASM, skang, "Colour", "Change widget colours.", colour, 0); | 364 | push_lua(L, "@ ( = $ $ & )", skang, THINGASM, skang, "Colour", "Change widget colours.", colour, 0); |
@@ -410,7 +410,6 @@ GuiLua *GuiLuaDo(int argc, char **argv, winFang *parent) | |||
410 | lua_call(L, 1, 1); | 410 | lua_call(L, 1, 1); |
411 | lua_setfield(L, LUA_GLOBALSINDEX, SKANG); | 411 | lua_setfield(L, LUA_GLOBALSINDEX, SKANG); |
412 | 412 | ||
413 | |||
414 | if (!parent) | 413 | if (!parent) |
415 | { | 414 | { |
416 | // Run the main loop via a Lua call. | 415 | // Run the main loop via a Lua call. |