Menu
▾
▴
[Wxlua-commit] wxLua/modules/wxluasocket/src wxluasocket.cpp, 1.27, 1.28 wxluasocket_bind.cpp, 1.20, 1.21
|
From: John L. <jr...@us...> - 2007-06-14 01:23:24
|
Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv14159/wxLua/modules/wxluasocket/src Modified Files: wxluasocket.cpp wxluasocket_bind.cpp Log Message: Changed the Delete() function from the %delete tag for classes to just delete() to avoid any future name clashes since delete() is never allowed to be a function name in C++. Moved the wxStyledTextCtrl class and it's 1268 defines into the wxstc table. Moved wxLuaObject, wxLuaDebugger (and friends) into the wxlua table and added more functions for inspecting userdata and the bindings. Fix mismatches between the bindings base classes and what they really are. Index: wxluasocket_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxluasocket_bind.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** wxluasocket_bind.cpp 12 Jun 2007 05:03:17 -0000 1.20 --- wxluasocket_bind.cpp 14 Jun 2007 01:23:20 -0000 1.21 *************** *** 95,98 **** --- 95,112 ---- // --------------------------------------------------------------------------- + // %override wxLua_function_LuaStackDialog + // %function void LuaStackDialog() + static int LUACALL wxLua_function_LuaStackDialog(lua_State *L) + { + // call StackDialog + + wxLuaStackDialog stackDialog(wxLuaState(L), NULL); + stackDialog.ShowModal(); + + return 0; + } + + static wxLuaBindCFunc s_wxluafunc_wxLua_function_LuaStackDialog[1] = {{ wxLua_function_LuaStackDialog, WXLUAMETHOD_CFUNCTION, 0, 0, s_wxluaargArray_None }}; + // --------------------------------------------------------------------------- // wxLuaGetFunctionList_wxluasocket() is called to register global functions *************** *** 103,106 **** --- 117,121 ---- static wxLuaBindMethod functionList[] = { + { "LuaStackDialog", WXLUAMETHOD_CFUNCTION, s_wxluafunc_wxLua_function_LuaStackDialog, 1, NULL }, { 0, 0, 0, 0 }, *************** *** 149,153 **** { m_bindingName = wxT("wxluasocket"); ! m_nameSpace = wxT("wx"); m_classArray = wxLuaGetClassList_wxluasocket(m_classCount); m_defineArray = wxLuaGetDefineList_wxluasocket(m_defineCount); --- 164,168 ---- { m_bindingName = wxT("wxluasocket"); ! m_nameSpace = wxT("wxlua"); m_classArray = wxLuaGetClassList_wxluasocket(m_classCount); m_defineArray = wxLuaGetDefineList_wxluasocket(m_defineCount); Index: wxluasocket.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxluasocket.cpp,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** wxluasocket.cpp 13 Jun 2007 00:09:04 -0000 1.27 --- wxluasocket.cpp 14 Jun 2007 01:23:20 -0000 1.28 *************** *** 103,122 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_Delete[] = { &s_wxluatag_wxLuaDebuggerServer, NULL }; - static int LUACALL wxLua_wxLuaDebuggerServer_Delete(lua_State *L); - static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_Delete[1] = {{ wxLua_wxLuaDebuggerServer_Delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_Delete }}; - static int LUACALL wxLua_wxLuaDebuggerServer_Delete(lua_State *L) - { - wxLuaState wxlState(L); - wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); - // if removed from tracked mem list, reset the tag so that gc() is not called on this object. - if ((self != NULL) && wxlState.RemoveTrackedObject(self)) - { - lua_pushnil(L); - lua_setmetatable(L, -2); - } - return 0; - } - static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_DisplayStackDialog[] = { &s_wxluatag_wxLuaDebuggerServer, &s_wxluatag_wxWindow, &s_wxluaarg_Number, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_DisplayStackDialog(lua_State *L); --- 103,106 ---- *************** *** 398,401 **** --- 382,401 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_delete[] = { &s_wxluatag_wxLuaDebuggerServer, NULL }; + static int LUACALL wxLua_wxLuaDebuggerServer_delete(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerServer_delete[1] = {{ wxLua_wxLuaDebuggerServer_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_delete }}; + static int LUACALL wxLua_wxLuaDebuggerServer_delete(lua_State *L) + { + wxLuaState wxlState(L); + wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); + // if removed from tracked mem list, reset the tag so that gc() is not called on this object. + if ((self != NULL) && wxlState.RemoveTrackedObject(self)) + { + lua_pushnil(L); + lua_setmetatable(L, -2); + } + return 0; + } + static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_constructor[] = { &s_wxluaarg_Number, NULL }; static int LUACALL wxLua_wxLuaDebuggerServer_constructor(lua_State *L); *************** *** 427,431 **** { "ClearAllBreakPoints", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxLuaDebuggerServer_ClearAllBreakPoints, 1, NULL }, { "Continue", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxLuaDebuggerServer_Continue, 1, NULL }, - { "Delete", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, s_wxluafunc_wxLua_wxLuaDebuggerServer_Delete, 1, NULL }, { "DisplayStackDialog", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxLuaDebuggerServer_DisplayStackDialog, 1, NULL }, { "EvaluateExpr", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxLuaDebuggerServer_EvaluateExpr, 1, NULL }, --- 427,430 ---- *************** *** 443,446 **** --- 442,446 ---- { "StepOver", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxLuaDebuggerServer_StepOver, 1, NULL }, { "StopServer", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxLuaDebuggerServer_StopServer, 1, NULL }, + { "delete", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, s_wxluafunc_wxLua_wxLuaDebuggerServer_delete, 1, NULL }, { "wxLuaDebuggerServer", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxLuaDebuggerServer_constructor, 1, NULL }, { 0, 0, 0, 0 }, *************** *** 457,476 **** int s_wxluatag_wxLuaDebuggerEvent = -1; - static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerEvent_Delete[] = { &s_wxluatag_wxLuaDebuggerEvent, NULL }; - static int LUACALL wxLua_wxLuaDebuggerEvent_Delete(lua_State *L); - static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerEvent_Delete[1] = {{ wxLua_wxLuaDebuggerEvent_Delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerEvent_Delete }}; - static int LUACALL wxLua_wxLuaDebuggerEvent_Delete(lua_State *L) - { - wxLuaState wxlState(L); - wxLuaDebuggerEvent * self = (wxLuaDebuggerEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerEvent); - // if removed from tracked mem list, reset the tag so that gc() is not called on this object. - if ((self != NULL) && wxlState.RemoveTrackedObject(self)) - { - lua_pushnil(L); - lua_setmetatable(L, -2); - } - return 0; - } - static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerEvent_GetFileName[] = { &s_wxluatag_wxLuaDebuggerEvent, NULL }; static int LUACALL wxLua_wxLuaDebuggerEvent_GetFileName(lua_State *L); --- 457,460 ---- *************** *** 545,557 **** } // Map Lua Class Methods to C Binding Functions wxLuaBindMethod wxLuaDebuggerEvent_methods[] = { - { "Delete", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, s_wxluafunc_wxLua_wxLuaDebuggerEvent_Delete, 1, NULL }, { "GetFileName", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxLuaDebuggerEvent_GetFileName, 1, NULL }, { "GetLineNumber", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxLuaDebuggerEvent_GetLineNumber, 1, NULL }, { "GetMessage", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxLuaDebuggerEvent_GetMessage, 1, NULL }, { "GetReference", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxLuaDebuggerEvent_GetReference, 1, NULL }, { 0, 0, 0, 0 }, }; --- 529,557 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerEvent_delete[] = { &s_wxluatag_wxLuaDebuggerEvent, NULL }; + static int LUACALL wxLua_wxLuaDebuggerEvent_delete(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxLuaDebuggerEvent_delete[1] = {{ wxLua_wxLuaDebuggerEvent_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerEvent_delete }}; + static int LUACALL wxLua_wxLuaDebuggerEvent_delete(lua_State *L) + { + wxLuaState wxlState(L); + wxLuaDebuggerEvent * self = (wxLuaDebuggerEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerEvent); + // if removed from tracked mem list, reset the tag so that gc() is not called on this object. + if ((self != NULL) && wxlState.RemoveTrackedObject(self)) + { + lua_pushnil(L); + lua_setmetatable(L, -2); + } + return 0; + } + // Map Lua Class Methods to C Binding Functions wxLuaBindMethod wxLuaDebuggerEvent_methods[] = { { "GetFileName", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxLuaDebuggerEvent_GetFileName, 1, NULL }, { "GetLineNumber", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxLuaDebuggerEvent_GetLineNumber, 1, NULL }, { "GetMessage", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxLuaDebuggerEvent_GetMessage, 1, NULL }, { "GetReference", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxLuaDebuggerEvent_GetReference, 1, NULL }, + { "delete", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, s_wxluafunc_wxLua_wxLuaDebuggerEvent_delete, 1, NULL }, { 0, 0, 0, 0 }, }; |
