Update of /cvsroot/wxlua/wxLua/modules/wxlua/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18351/wxLua/modules/wxlua/src
Modified Files:
internal.cpp interp.cpp
Log Message:
the wxLua app now runs
add back wxExecute and add wxProcess
add bin2c.lua to generate editor.h for wxlua app
Index: interp.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/interp.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** interp.cpp 23 Aug 2005 21:27:18 -0000 1.5
--- interp.cpp 19 Nov 2005 07:08:39 -0000 1.6
***************
*** 702,706 ****
m_is_running = TRUE;
! //int ret_val = luaL_loadbuffer(m_lua_State, wx2lua(script), script.Len(), "=hello");
int ret_val = lua_dobuffer(m_lua_State, (const char*)buf, size, wx2lua(name));
m_is_running = FALSE;
--- 702,706 ----
m_is_running = TRUE;
! //int ret_val = luaL_loadbuffer(m_lua_State, (const char*)buf, size, wx2lua(name));
int ret_val = lua_dobuffer(m_lua_State, (const char*)buf, size, wx2lua(name));
m_is_running = FALSE;
Index: internal.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/internal.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** internal.cpp 17 Nov 2005 05:51:20 -0000 1.4
--- internal.cpp 19 Nov 2005 07:08:39 -0000 1.5
***************
*** 57,62 ****
#include "wxlua/include/interp.h"
- //#include "wxlua/include/htmlwin.h"
- //#include "wxlua/include/library.h"
// lua registry table
--- 57,60 ----
***************
*** 199,202 ****
--- 197,202 ----
*pClass->class_tag = iTag;
+ //wxPrintf(wxT("RegisterGenClasses %d '%s'\n"), iTag, lua2wx(pClass->name).c_str());
+
for (unsigned iFunction = 0; iFunction < funcCount; iFunction++)
{
***************
*** 1394,1398 ****
error:
! terror(L, wx2lua(wxString::Format(_("wxLua: Unexpected user defined data type for parameter %d."), iParam)));
return NULL;
}
--- 1394,1398 ----
error:
! terror(L, wx2lua(wxString::Format(_("wxLua: Unexpected user defined data type %d for parameter %d."), iParamTag, iParam)));
return NULL;
}
|