From: John L. <jr...@us...> - 2007-05-21 01:08:33
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv14147/wxLua/modules/wxbind/src Modified Files: wxlhtmlwin.cpp wxlprint.cpp Log Message: Remove all code in dservice as it wasn't used Removed m_pDerivedList and put derived lua functions into the lua registry index A little more cleanup in the socket and editor.wx.lua code. Index: wxlprint.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxlprint.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** wxlprint.cpp 23 Mar 2007 04:27:23 -0000 1.15 --- wxlprint.cpp 21 May 2007 01:07:59 -0000 1.16 *************** *** 53,57 **** if (m_wxlState.Ok() && !m_wxlState.GetCallBaseClassFunction() && ! m_wxlState.HasDerivedMethod(this, "GetPageInfo")) { int nOldTop = m_wxlState.lua_GetTop(); --- 53,57 ---- if (m_wxlState.Ok() && !m_wxlState.GetCallBaseClassFunction() && ! m_wxlState.HasDerivedMethod(this, "GetPageInfo", true)) { int nOldTop = m_wxlState.lua_GetTop(); *************** *** 83,87 **** if (m_wxlState.Ok() && !m_wxlState.GetCallBaseClassFunction() && ! m_wxlState.HasDerivedMethod(this, "HasPage")) { int nOldTop = m_wxlState.lua_GetTop(); --- 83,87 ---- if (m_wxlState.Ok() && !m_wxlState.GetCallBaseClassFunction() && ! m_wxlState.HasDerivedMethod(this, "HasPage", true)) { int nOldTop = m_wxlState.lua_GetTop(); *************** *** 133,137 **** if (m_wxlState.Ok() && !m_wxlState.GetCallBaseClassFunction() && ! m_wxlState.HasDerivedMethod(this, "OnBeginDocument")) { int nOldTop = m_wxlState.lua_GetTop(); --- 133,137 ---- if (m_wxlState.Ok() && !m_wxlState.GetCallBaseClassFunction() && ! m_wxlState.HasDerivedMethod(this, "OnBeginDocument", true)) { int nOldTop = m_wxlState.lua_GetTop(); *************** *** 163,167 **** // NOTE: The wxLua program MUST call the base class, see printing.wx.lua if (m_wxlState.Ok() && !m_wxlState.GetCallBaseClassFunction() && ! m_wxlState.HasDerivedMethod(this, "OnEndDocument")) { int nOldTop = m_wxlState.lua_GetTop(); --- 163,167 ---- // NOTE: The wxLua program MUST call the base class, see printing.wx.lua if (m_wxlState.Ok() && !m_wxlState.GetCallBaseClassFunction() && ! m_wxlState.HasDerivedMethod(this, "OnEndDocument", true)) { int nOldTop = m_wxlState.lua_GetTop(); *************** *** 179,183 **** { if (m_wxlState.Ok() && !m_wxlState.GetCallBaseClassFunction() && ! m_wxlState.HasDerivedMethod(this, "OnBeginPrinting")) { int nOldTop = m_wxlState.lua_GetTop(); --- 179,183 ---- { if (m_wxlState.Ok() && !m_wxlState.GetCallBaseClassFunction() && ! m_wxlState.HasDerivedMethod(this, "OnBeginPrinting", true)) { int nOldTop = m_wxlState.lua_GetTop(); *************** *** 195,199 **** { if (m_wxlState.Ok() && !m_wxlState.GetCallBaseClassFunction() && ! m_wxlState.HasDerivedMethod(this, "OnEndPrinting")) { int nOldTop = m_wxlState.lua_GetTop(); --- 195,199 ---- { if (m_wxlState.Ok() && !m_wxlState.GetCallBaseClassFunction() && ! m_wxlState.HasDerivedMethod(this, "OnEndPrinting", true)) { int nOldTop = m_wxlState.lua_GetTop(); *************** *** 211,215 **** { if (m_wxlState.Ok() && !m_wxlState.GetCallBaseClassFunction() && ! m_wxlState.HasDerivedMethod(this, "OnPreparePrinting")) { int nOldTop = m_wxlState.lua_GetTop(); --- 211,215 ---- { if (m_wxlState.Ok() && !m_wxlState.GetCallBaseClassFunction() && ! m_wxlState.HasDerivedMethod(this, "OnPreparePrinting", true)) { int nOldTop = m_wxlState.lua_GetTop(); *************** *** 229,233 **** if (m_wxlState.Ok() && !m_wxlState.GetCallBaseClassFunction() && ! m_wxlState.HasDerivedMethod(this, "OnPrintPage")) { int nOldTop = m_wxlState.lua_GetTop(); --- 229,233 ---- if (m_wxlState.Ok() && !m_wxlState.GetCallBaseClassFunction() && ! m_wxlState.HasDerivedMethod(this, "OnPrintPage", true)) { int nOldTop = m_wxlState.lua_GetTop(); Index: wxlhtmlwin.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxlhtmlwin.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** wxlhtmlwin.cpp 22 Feb 2007 05:40:53 -0000 1.14 --- wxlhtmlwin.cpp 21 May 2007 01:07:59 -0000 1.15 *************** *** 60,64 **** if (m_wxlState.Ok() && !m_wxlState.GetCallBaseClassFunction() && ! m_wxlState.HasDerivedMethod(this, "OnCellClicked")) { lua_State *L = m_wxlState.GetLuaState(); --- 60,64 ---- if (m_wxlState.Ok() && !m_wxlState.GetCallBaseClassFunction() && ! m_wxlState.HasDerivedMethod(this, "OnCellClicked", true)) { lua_State *L = m_wxlState.GetLuaState(); *************** *** 100,104 **** { if (m_wxlState.Ok() && !m_wxlState.GetCallBaseClassFunction() && ! m_wxlState.HasDerivedMethod(this, "OnCellMouseHover")) { lua_State *L = m_wxlState.GetLuaState(); --- 100,104 ---- { if (m_wxlState.Ok() && !m_wxlState.GetCallBaseClassFunction() && ! m_wxlState.HasDerivedMethod(this, "OnCellMouseHover", true)) { lua_State *L = m_wxlState.GetLuaState(); *************** *** 121,125 **** { if (m_wxlState.Ok() && !m_wxlState.GetCallBaseClassFunction() && ! m_wxlState.HasDerivedMethod(this, "OnLinkClicked")) { lua_State *L = m_wxlState.GetLuaState(); --- 121,125 ---- { if (m_wxlState.Ok() && !m_wxlState.GetCallBaseClassFunction() && ! m_wxlState.HasDerivedMethod(this, "OnLinkClicked", true)) { lua_State *L = m_wxlState.GetLuaState(); *************** *** 140,144 **** { if (m_wxlState.Ok() && !m_wxlState.GetCallBaseClassFunction() && ! m_wxlState.HasDerivedMethod(this, "OnSetTitle")) { lua_State *L = m_wxlState.GetLuaState(); --- 140,144 ---- { if (m_wxlState.Ok() && !m_wxlState.GetCallBaseClassFunction() && ! m_wxlState.HasDerivedMethod(this, "OnSetTitle", true)) { lua_State *L = m_wxlState.GetLuaState(); |