From: John L. <jr...@us...> - 2007-01-21 23:13:12
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv17508/wxLua/modules/wxbind/src Modified Files: print.cpp wxlprint.cpp Log Message: fix wxPrintout::OnBeginDocument binding to not directly call wxPrintout::OnBeginDocument but just OnBeginDocument on the object on the stack, allows base_OnBeginDocument to work properly Add better descriptions to functions in wxlstate.h GetLuaNULL() -> GetLuaNULLTag() GetLuaWinDestroyTable() -> GetLuaWinDestroyTableTag() wxLua_lua_isenumerationtype does not take nil as a valid enum anymore Add wxLuaDebugDataItem::ToString for debugging Index: wxlprint.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxlprint.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** wxlprint.cpp 13 Dec 2006 06:57:50 -0000 1.12 --- wxlprint.cpp 21 Jan 2007 23:13:07 -0000 1.13 *************** *** 116,120 **** m_wxlState.LuaCall(3, false); - fResult = m_wxlState.GetBooleanType(-1); m_wxlState.lua_Pop(1); --- 116,119 ---- Index: print.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/print.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** print.cpp 17 Dec 2006 07:47:16 -0000 1.20 --- print.cpp 21 Jan 2007 23:13:07 -0000 1.21 *************** *** 200,205 **** static wxLuaArgTag s_wxluatagArray_wxLua_wxPrintout_OnBeginDocument[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, 0 }; ! // %override wxLua_wxPrintout_OnBeginDocument ! // bool OnBeginDocument(int startPage, int endPage); static int LUACALL wxLua_wxPrintout_OnBeginDocument(lua_State *L) { --- 200,204 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxPrintout_OnBeginDocument[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, 0 }; ! // bool OnBeginDocument(int startPage, int endPage) static int LUACALL wxLua_wxPrintout_OnBeginDocument(lua_State *L) { *************** *** 208,220 **** // int endPage int endPage = (int)wxlState.GetNumberType(3); ! // int startPagest int startPage = (int)wxlState.GetNumberType(2); // get this ! wxPrintout *self = (wxPrintout *)wxlState.GetUserDataType(1, s_wxluatag_wxPrintout); // call OnBeginDocument ! returns = self->wxPrintout::OnBeginDocument(startPage, endPage); ! // push the result number lua_pushboolean(L, returns); ! // return the number of parameters return 1; } --- 207,219 ---- // int endPage int endPage = (int)wxlState.GetNumberType(3); ! // int startPage int startPage = (int)wxlState.GetNumberType(2); // get this ! wxPrintout * self = (wxPrintout *)wxlState.GetUserDataType(1, s_wxluatag_wxPrintout); // call OnBeginDocument ! returns = self->OnBeginDocument(startPage, endPage); ! // push the result flag lua_pushboolean(L, returns); ! return 1; } |