Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv31238/wxLua/bindings/wxwidgets
Modified Files:
override.hpp wxlua.i
Log Message:
Index: wxlua.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxlua.i,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** wxlua.i 24 May 2006 04:50:00 -0000 1.16
--- wxlua.i 28 Sep 2006 22:26:03 -0000 1.17
***************
*** 8,11 ****
--- 8,16 ----
// ============================================================================
+ // Compile the luaScript of the given name and return the lua error code, a message
+ // and the line number (or -1) of the error.
+ // %override [int return, lua_string err_msg, int line_number] CompileLuaScript(const wxString& luaScript, const wxString& fileName)
+ %function int CompileLuaScript(const wxString& luaScript, const wxString& fileName)
+
//-----------------------------------------------------------------------------
// wxLuaState
Index: override.hpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/override.hpp,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** override.hpp 2 Aug 2006 04:13:41 -0000 1.52
--- override.hpp 28 Sep 2006 22:26:03 -0000 1.53
***************
*** 4351,4354 ****
--- 4351,4376 ----
// ----------------------------------------------------------------------------
+ %override wxLua_function_CompileLuaScript
+ // %function int CompileLuaScript(const wxString& luaScript, const wxString& fileName)
+ static int LUACALL wxLua_function_CompileLuaScript(lua_State *L)
+ {
+ wxLuaState wxlState(L);
+ int returns;
+ // const wxString fileName
+ const wxString fileName = lua2wx(wxlState.GetStringType(2));
+ // const wxString luaScript
+ const wxString luaScript = lua2wx(wxlState.GetStringType(1));
+ wxString errMsg;
+ int line_num = -1;
+ wxLuaState wxlState2(true); // create a brand new empty lua state to compile in
+ returns = wxlState2.CompileString(luaScript, fileName, &errMsg, &line_num);
+ // push the result number
+ lua_pushnumber(L, returns);
+ lua_pushstring(L, wx2lua(errMsg));
+ lua_pushnumber(L, line_num);
+ return 3;
+ }
+ %end
+
%override wxLua_wxLuaObject_constructor
// wxLuaObject(void *object)
|
