Changeset 74 for UI/ui_lua.cpp

Timestamp:

11/01/09 12:32:25 (4 years ago)

Author:

knowknowledge

Message:

Added Button Callbacks.
Buttons can take either Lua code or C++ function pointers.
From the Lua Console (`), use the command 'menu()' to see an example.

File:

• UI/ui_lua.cpp (modified) (2 diffs)

UI/ui_lua.cpp

@@ -71 +71 @@
 int UI_Lua::newButton(lua_State *luaVM){
         int n = lua_gettop(luaVM);  // Number of arguments
-        if (n != 6)
-                return luaL_error(luaVM, "Got %d arguments expected 5 (class, x, y, w, h, caption)", n);
+        if ( (n != 6) && (n != 7) )
+                return luaL_error(luaVM, "Got %d arguments expected 6 or 7 (class, x, y, w, h, caption [Lua_code])", n);
 
         double x = luaL_checknumber (luaVM, 2);
@@ -79 +79 @@
         double h = luaL_checknumber (luaVM, 5);
         string caption = luaL_checkstring (luaVM, 6);
+        string code = "";
+        if(n==7) code = luaL_checkstring (luaVM, 7);
 
         // Allocate memory for a pointer to object
         Button **button= (Button**)lua_newuserdata(luaVM, sizeof(Button*));
-        *button = new Button(x,y,w,h,caption);
+        *button = new Button(x,y,w,h,caption,code);
 
         // Note: We're not putting this button anywhere!