Menu
▾
▴
[Wxlua-commit] wxLua/modules/wxluasocket/src wxldtarg.cpp, 1.36, 1.37 wxlsock.cpp, 1.27, 1.28 wxluasocket.cpp, 1.20, 1.21 wxluasocket_bind.cpp, 1.15, 1.16
|
From: John L. <jr...@us...> - 2007-05-31 17:18:59
|
Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv14219/wxLua/modules/wxluasocket/src Modified Files: wxldtarg.cpp wxlsock.cpp wxluasocket.cpp wxluasocket_bind.cpp Log Message: Huge changes, overloaded functions by default replace wx.wxNull with wx.NULL change WXLUA_VERSION and others with wxLUA_VERSION class member enums are part of class table static class member functions are part of class table %properties are generated on the fly ... and more, see docs/changelog.txt Index: wxldtarg.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxldtarg.cpp,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** wxldtarg.cpp 23 May 2007 02:48:31 -0000 1.36 --- wxldtarg.cpp 31 May 2007 17:18:55 -0000 1.37 *************** *** 215,218 **** --- 215,219 ---- ret = AddBreakPoint(fileName, lineNumber); } + break; } case wxLUASOCKET_DEBUGGER_CMD_REMOVE_BREAKPOINT: Index: wxluasocket_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxluasocket_bind.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** wxluasocket_bind.cpp 19 Mar 2007 03:47:21 -0000 1.15 --- wxluasocket_bind.cpp 31 May 2007 17:18:55 -0000 1.16 *************** *** 104,108 **** { ! { LuaGlobal, 0, 0, 0, 0, s_wxluaargArray_None }, }; count = (sizeof(functionList)/sizeof(functionList[0])) - 1; --- 104,108 ---- { ! { WXLUAMETHOD_CFUNCTION, 0, 0, 0 }, }; count = (sizeof(functionList)/sizeof(functionList[0])) - 1; *************** *** 120,125 **** static WXLUACLASS classList[] = { ! { "wxLuaDebuggerEvent", wxLuaDebuggerEvent_methods, wxLuaDebuggerEvent_methodCount, CLASSINFO(wxLuaDebuggerEvent), &s_wxluatag_wxLuaDebuggerEvent, "wxEvent", NULL }, ! { "wxLuaDebuggerServer", wxLuaDebuggerServer_methods, wxLuaDebuggerServer_methodCount, CLASSINFO(wxLuaDebuggerServer), &s_wxluatag_wxLuaDebuggerServer, "wxEvtHandler", NULL }, { 0, 0, 0, 0, 0, 0, 0 }, --- 120,125 ---- static WXLUACLASS classList[] = { ! { "wxLuaDebuggerEvent", wxLuaDebuggerEvent_methods, wxLuaDebuggerEvent_methodCount, CLASSINFO(wxLuaDebuggerEvent), &s_wxluatag_wxLuaDebuggerEvent, "wxEvent", NULL ,wxLuaDebuggerEvent_enums, wxLuaDebuggerEvent_enumCount, }, ! { "wxLuaDebuggerServer", wxLuaDebuggerServer_methods, wxLuaDebuggerServer_methodCount, CLASSINFO(wxLuaDebuggerServer), &s_wxluatag_wxLuaDebuggerServer, "wxEvtHandler", NULL ,wxLuaDebuggerServer_enums, wxLuaDebuggerServer_enumCount, }, { 0, 0, 0, 0, 0, 0, 0 }, Index: wxluasocket.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxluasocket.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** wxluasocket.cpp 19 Mar 2007 03:47:21 -0000 1.20 --- wxluasocket.cpp 31 May 2007 17:18:55 -0000 1.21 *************** *** 28,31 **** --- 28,34 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_AddBreakPoint[] = { &s_wxluaarg_String, &s_wxluaarg_Number, 0 }; + static int LUACALL wxLua_wxLuaDebuggerServer_AddBreakPoint(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_AddBreakPoint[1] = {{ wxLua_wxLuaDebuggerServer_AddBreakPoint, 2, 2, s_wxluatagArray_wxLua_wxLuaDebuggerServer_AddBreakPoint }}; + // bool AddBreakPoint(const wxString &fileName, int lineNumber) static int LUACALL wxLua_wxLuaDebuggerServer_AddBreakPoint(lua_State *L) *************** *** 34,38 **** bool returns; // int lineNumber ! int lineNumber = (int)wxlState.GetNumberType(3); // const wxString fileName const wxString fileName = wxlState.GetwxStringType(2); --- 37,41 ---- bool returns; // int lineNumber ! int lineNumber = (int)wxlua_getnumbertype(L, 3); // const wxString fileName const wxString fileName = wxlState.GetwxStringType(2); *************** *** 47,50 **** --- 50,56 ---- } + static int LUACALL wxLua_wxLuaDebuggerServer_Break(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_Break[1] = {{ wxLua_wxLuaDebuggerServer_Break, 0, 0, s_wxluaargArray_None }}; + // bool Break() static int LUACALL wxLua_wxLuaDebuggerServer_Break(lua_State *L) *************** *** 62,65 **** --- 68,74 ---- } + static int LUACALL wxLua_wxLuaDebuggerServer_ClearAllBreakPoints(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_ClearAllBreakPoints[1] = {{ wxLua_wxLuaDebuggerServer_ClearAllBreakPoints, 0, 0, s_wxluaargArray_None }}; + // bool ClearAllBreakPoints() static int LUACALL wxLua_wxLuaDebuggerServer_ClearAllBreakPoints(lua_State *L) *************** *** 77,80 **** --- 86,92 ---- } + static int LUACALL wxLua_wxLuaDebuggerServer_Continue(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_Continue[1] = {{ wxLua_wxLuaDebuggerServer_Continue, 0, 0, s_wxluaargArray_None }}; + // bool Continue() static int LUACALL wxLua_wxLuaDebuggerServer_Continue(lua_State *L) *************** *** 92,95 **** --- 104,110 ---- } + static int LUACALL wxLua_wxLuaDebuggerServer_Delete(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_Delete[1] = {{ wxLua_wxLuaDebuggerServer_Delete, 0, 0, s_wxluaargArray_None }}; + static int LUACALL wxLua_wxLuaDebuggerServer_Delete(lua_State *L) { *************** *** 106,109 **** --- 121,127 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_DisplayStackDialog[] = { &s_wxluatag_wxWindow, &s_wxluaarg_Number, 0 }; + static int LUACALL wxLua_wxLuaDebuggerServer_DisplayStackDialog(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_DisplayStackDialog[1] = {{ wxLua_wxLuaDebuggerServer_DisplayStackDialog, 1, 2, s_wxluatagArray_wxLua_wxLuaDebuggerServer_DisplayStackDialog }}; + // void DisplayStackDialog(wxWindow *pParent, wxWindowID id = wxID_ANY) static int LUACALL wxLua_wxLuaDebuggerServer_DisplayStackDialog(lua_State *L) *************** *** 113,117 **** int argCount = lua_gettop(L); // wxWindowID id = wxID_ANY ! wxWindowID id = (argCount >= 3 ? (wxWindowID)wxlState.GetNumberType(3) : wxID_ANY); // wxWindow pParent wxWindow * pParent = (wxWindow *)wxlState.GetUserDataType(2, s_wxluatag_wxWindow); --- 131,135 ---- int argCount = lua_gettop(L); // wxWindowID id = wxID_ANY ! wxWindowID id = (argCount >= 3 ? (wxWindowID)wxlua_getnumbertype(L, 3) : wxID_ANY); // wxWindow pParent wxWindow * pParent = (wxWindow *)wxlState.GetUserDataType(2, s_wxluatag_wxWindow); *************** *** 125,128 **** --- 143,149 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_EvaluateExpr[] = { &s_wxluaarg_Number, &s_wxluaarg_String, 0 }; + static int LUACALL wxLua_wxLuaDebuggerServer_EvaluateExpr(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_EvaluateExpr[1] = {{ wxLua_wxLuaDebuggerServer_EvaluateExpr, 2, 2, s_wxluatagArray_wxLua_wxLuaDebuggerServer_EvaluateExpr }}; + // bool EvaluateExpr(int exprRef, const wxString &expr) static int LUACALL wxLua_wxLuaDebuggerServer_EvaluateExpr(lua_State *L) *************** *** 133,137 **** const wxString expr = wxlState.GetwxStringType(3); // int exprRef ! int exprRef = (int)wxlState.GetNumberType(2); // get this wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); --- 154,158 ---- const wxString expr = wxlState.GetwxStringType(3); // int exprRef ! int exprRef = (int)wxlua_getnumbertype(L, 2); // get this wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); *************** *** 144,147 **** --- 165,171 ---- } + static int LUACALL wxLua_wxLuaDebuggerServer_GetDebuggeeProcessId(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_GetDebuggeeProcessId[1] = {{ wxLua_wxLuaDebuggerServer_GetDebuggeeProcessId, 0, 0, s_wxluaargArray_None }}; + // long GetDebuggeeProcessId() const static int LUACALL wxLua_wxLuaDebuggerServer_GetDebuggeeProcessId(lua_State *L) *************** *** 159,162 **** --- 183,189 ---- } + static int LUACALL wxLua_wxLuaDebuggerServer_GetNetworkName(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_GetNetworkName[1] = {{ wxLua_wxLuaDebuggerServer_GetNetworkName, 0, 0, s_wxluaargArray_None }}; + // static wxString GetNetworkName() static int LUACALL wxLua_wxLuaDebuggerServer_GetNetworkName(lua_State *L) *************** *** 172,175 **** --- 199,205 ---- } + static int LUACALL wxLua_wxLuaDebuggerServer_GetProgramName(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_GetProgramName[1] = {{ wxLua_wxLuaDebuggerServer_GetProgramName, 0, 0, s_wxluaargArray_None }}; + // static wxString GetProgramName() static int LUACALL wxLua_wxLuaDebuggerServer_GetProgramName(lua_State *L) *************** *** 185,188 **** --- 215,221 ---- } + static int LUACALL wxLua_wxLuaDebuggerServer_KillDebuggee(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_KillDebuggee[1] = {{ wxLua_wxLuaDebuggerServer_KillDebuggee, 0, 0, s_wxluaargArray_None }}; + // bool KillDebuggee() static int LUACALL wxLua_wxLuaDebuggerServer_KillDebuggee(lua_State *L) *************** *** 201,204 **** --- 234,240 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_RemoveBreakPoint[] = { &s_wxluaarg_String, &s_wxluaarg_Number, 0 }; + static int LUACALL wxLua_wxLuaDebuggerServer_RemoveBreakPoint(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_RemoveBreakPoint[1] = {{ wxLua_wxLuaDebuggerServer_RemoveBreakPoint, 2, 2, s_wxluatagArray_wxLua_wxLuaDebuggerServer_RemoveBreakPoint }}; + // bool RemoveBreakPoint(const wxString &fileName, int lineNumber) static int LUACALL wxLua_wxLuaDebuggerServer_RemoveBreakPoint(lua_State *L) *************** *** 207,211 **** bool returns; // int lineNumber ! int lineNumber = (int)wxlState.GetNumberType(3); // const wxString fileName const wxString fileName = wxlState.GetwxStringType(2); --- 243,247 ---- bool returns; // int lineNumber ! int lineNumber = (int)wxlua_getnumbertype(L, 3); // const wxString fileName const wxString fileName = wxlState.GetwxStringType(2); *************** *** 220,223 **** --- 256,262 ---- } + static int LUACALL wxLua_wxLuaDebuggerServer_Reset(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_Reset[1] = {{ wxLua_wxLuaDebuggerServer_Reset, 0, 0, s_wxluaargArray_None }}; + // bool Reset() static int LUACALL wxLua_wxLuaDebuggerServer_Reset(lua_State *L) *************** *** 236,239 **** --- 275,281 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_Run[] = { &s_wxluaarg_String, &s_wxluaarg_String, 0 }; + static int LUACALL wxLua_wxLuaDebuggerServer_Run(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_Run[1] = {{ wxLua_wxLuaDebuggerServer_Run, 2, 2, s_wxluatagArray_wxLua_wxLuaDebuggerServer_Run }}; + // bool Run(const wxString &file, const wxString &fileName) static int LUACALL wxLua_wxLuaDebuggerServer_Run(lua_State *L) *************** *** 255,258 **** --- 297,303 ---- } + static int LUACALL wxLua_wxLuaDebuggerServer_StartClient(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_StartClient[1] = {{ wxLua_wxLuaDebuggerServer_StartClient, 0, 0, s_wxluaargArray_None }}; + // long StartClient() static int LUACALL wxLua_wxLuaDebuggerServer_StartClient(lua_State *L) *************** *** 270,273 **** --- 315,321 ---- } + static int LUACALL wxLua_wxLuaDebuggerServer_StartServer(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_StartServer[1] = {{ wxLua_wxLuaDebuggerServer_StartServer, 0, 0, s_wxluaargArray_None }}; + // bool StartServer() static int LUACALL wxLua_wxLuaDebuggerServer_StartServer(lua_State *L) *************** *** 285,288 **** --- 333,339 ---- } + static int LUACALL wxLua_wxLuaDebuggerServer_Step(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_Step[1] = {{ wxLua_wxLuaDebuggerServer_Step, 0, 0, s_wxluaargArray_None }}; + // bool Step() static int LUACALL wxLua_wxLuaDebuggerServer_Step(lua_State *L) *************** *** 300,303 **** --- 351,357 ---- } + static int LUACALL wxLua_wxLuaDebuggerServer_StepOut(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_StepOut[1] = {{ wxLua_wxLuaDebuggerServer_StepOut, 0, 0, s_wxluaargArray_None }}; + // bool StepOut() static int LUACALL wxLua_wxLuaDebuggerServer_StepOut(lua_State *L) *************** *** 315,318 **** --- 369,375 ---- } + static int LUACALL wxLua_wxLuaDebuggerServer_StepOver(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_StepOver[1] = {{ wxLua_wxLuaDebuggerServer_StepOver, 0, 0, s_wxluaargArray_None }}; + // bool StepOver() static int LUACALL wxLua_wxLuaDebuggerServer_StepOver(lua_State *L) *************** *** 330,333 **** --- 387,393 ---- } + static int LUACALL wxLua_wxLuaDebuggerServer_StopServer(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_StopServer[1] = {{ wxLua_wxLuaDebuggerServer_StopServer, 0, 0, s_wxluaargArray_None }}; + // bool StopServer() static int LUACALL wxLua_wxLuaDebuggerServer_StopServer(lua_State *L) *************** *** 346,356 **** static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_constructor[] = { &s_wxluaarg_Number, 0 }; // wxLuaDebuggerServer(int portNumber) static int LUACALL wxLua_wxLuaDebuggerServer_constructor(lua_State *L) { wxLuaState wxlState(L); wxLuaDebuggerServer *returns; // int portNumber ! int portNumber = (int)wxlState.GetNumberType(1); // call constructor returns = new wxLuaDebuggerServer(portNumber); --- 406,420 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_constructor[] = { &s_wxluaarg_Number, 0 }; + static int LUACALL wxLua_wxLuaDebuggerServer_constructor(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_constructor[1] = {{ wxLua_wxLuaDebuggerServer_constructor, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_constructor }}; + // wxLuaDebuggerServer(int portNumber) static int LUACALL wxLua_wxLuaDebuggerServer_constructor(lua_State *L) { + wxlua_removetableforcall(L); wxLuaState wxlState(L); wxLuaDebuggerServer *returns; // int portNumber ! int portNumber = (int)wxlua_getnumbertype(L, 1); // call constructor returns = new wxLuaDebuggerServer(portNumber); *************** *** 367,396 **** // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxLuaDebuggerServer_methods[] = { ! { LuaMethod, "AddBreakPoint", wxLua_wxLuaDebuggerServer_AddBreakPoint, 2, 2, s_wxluatagArray_wxLua_wxLuaDebuggerServer_AddBreakPoint }, ! { LuaMethod, "Break", wxLua_wxLuaDebuggerServer_Break, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "ClearAllBreakPoints", wxLua_wxLuaDebuggerServer_ClearAllBreakPoints, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "Continue", wxLua_wxLuaDebuggerServer_Continue, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "Delete", wxLua_wxLuaDebuggerServer_Delete, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "DisplayStackDialog", wxLua_wxLuaDebuggerServer_DisplayStackDialog, 2, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_DisplayStackDialog }, ! { LuaMethod, "EvaluateExpr", wxLua_wxLuaDebuggerServer_EvaluateExpr, 2, 2, s_wxluatagArray_wxLua_wxLuaDebuggerServer_EvaluateExpr }, ! { LuaMethod, "GetDebuggeeProcessId", wxLua_wxLuaDebuggerServer_GetDebuggeeProcessId, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "GetNetworkName", wxLua_wxLuaDebuggerServer_GetNetworkName, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "GetProgramName", wxLua_wxLuaDebuggerServer_GetProgramName, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "KillDebuggee", wxLua_wxLuaDebuggerServer_KillDebuggee, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "RemoveBreakPoint", wxLua_wxLuaDebuggerServer_RemoveBreakPoint, 2, 2, s_wxluatagArray_wxLua_wxLuaDebuggerServer_RemoveBreakPoint }, ! { LuaMethod, "Reset", wxLua_wxLuaDebuggerServer_Reset, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "Run", wxLua_wxLuaDebuggerServer_Run, 2, 2, s_wxluatagArray_wxLua_wxLuaDebuggerServer_Run }, ! { LuaMethod, "StartClient", wxLua_wxLuaDebuggerServer_StartClient, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "StartServer", wxLua_wxLuaDebuggerServer_StartServer, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "Step", wxLua_wxLuaDebuggerServer_Step, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "StepOut", wxLua_wxLuaDebuggerServer_StepOut, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "StepOver", wxLua_wxLuaDebuggerServer_StepOver, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "StopServer", wxLua_wxLuaDebuggerServer_StopServer, 0, 0, s_wxluaargArray_None }, ! { LuaConstructor, "wxLuaDebuggerServer", wxLua_wxLuaDebuggerServer_constructor, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_constructor }, ! { LuaMethod, 0, 0, 0, 0 }, }; int wxLuaDebuggerServer_methodCount = sizeof(wxLuaDebuggerServer_methods)/sizeof(wxLuaDebuggerServer_methods[0]) - 1; // --------------------------------------------------------------------------- // Bind class wxLuaDebuggerEvent --- 431,467 ---- // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxLuaDebuggerServer_methods[] = { ! { WXLUAMETHOD_METHOD, "AddBreakPoint", s_wxluafunc_wxLua_wxLuaDebuggerServer_AddBreakPoint, 1 }, ! { WXLUAMETHOD_METHOD, "Break", s_wxluafunc_wxLua_wxLuaDebuggerServer_Break, 1 }, ! { WXLUAMETHOD_METHOD, "ClearAllBreakPoints", s_wxluafunc_wxLua_wxLuaDebuggerServer_ClearAllBreakPoints, 1 }, ! { WXLUAMETHOD_METHOD, "Continue", s_wxluafunc_wxLua_wxLuaDebuggerServer_Continue, 1 }, ! { WXLUAMETHOD_METHOD, "Delete", s_wxluafunc_wxLua_wxLuaDebuggerServer_Delete }, ! { WXLUAMETHOD_METHOD, "DisplayStackDialog", s_wxluafunc_wxLua_wxLuaDebuggerServer_DisplayStackDialog, 1 }, ! { WXLUAMETHOD_METHOD, "EvaluateExpr", s_wxluafunc_wxLua_wxLuaDebuggerServer_EvaluateExpr, 1 }, ! { WXLUAMETHOD_METHOD, "GetDebuggeeProcessId", s_wxluafunc_wxLua_wxLuaDebuggerServer_GetDebuggeeProcessId, 1 }, ! { WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, "GetNetworkName", s_wxluafunc_wxLua_wxLuaDebuggerServer_GetNetworkName, 1 }, ! { WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, "GetProgramName", s_wxluafunc_wxLua_wxLuaDebuggerServer_GetProgramName, 1 }, ! { WXLUAMETHOD_METHOD, "KillDebuggee", s_wxluafunc_wxLua_wxLuaDebuggerServer_KillDebuggee, 1 }, ! { WXLUAMETHOD_METHOD, "RemoveBreakPoint", s_wxluafunc_wxLua_wxLuaDebuggerServer_RemoveBreakPoint, 1 }, ! { WXLUAMETHOD_METHOD, "Reset", s_wxluafunc_wxLua_wxLuaDebuggerServer_Reset, 1 }, ! { WXLUAMETHOD_METHOD, "Run", s_wxluafunc_wxLua_wxLuaDebuggerServer_Run, 1 }, ! { WXLUAMETHOD_METHOD, "StartClient", s_wxluafunc_wxLua_wxLuaDebuggerServer_StartClient, 1 }, ! { WXLUAMETHOD_METHOD, "StartServer", s_wxluafunc_wxLua_wxLuaDebuggerServer_StartServer, 1 }, ! { WXLUAMETHOD_METHOD, "Step", s_wxluafunc_wxLua_wxLuaDebuggerServer_Step, 1 }, ! { WXLUAMETHOD_METHOD, "StepOut", s_wxluafunc_wxLua_wxLuaDebuggerServer_StepOut, 1 }, ! { WXLUAMETHOD_METHOD, "StepOver", s_wxluafunc_wxLua_wxLuaDebuggerServer_StepOver, 1 }, ! { WXLUAMETHOD_METHOD, "StopServer", s_wxluafunc_wxLua_wxLuaDebuggerServer_StopServer, 1 }, ! { WXLUAMETHOD_CONSTRUCTOR, "wxLuaDebuggerServer", s_wxluafunc_wxLua_wxLuaDebuggerServer_constructor, 1 }, ! { WXLUAMETHOD_METHOD, 0, 0, 0 }, }; int wxLuaDebuggerServer_methodCount = sizeof(wxLuaDebuggerServer_methods)/sizeof(wxLuaDebuggerServer_methods[0]) - 1; + + WXLUADEFINE wxLuaDebuggerServer_enums[] = { + { NULL, 0, }, + }; + + int wxLuaDebuggerServer_enumCount = sizeof(wxLuaDebuggerServer_enums)/sizeof(wxLuaDebuggerServer_enums[0]) - 1; + // --------------------------------------------------------------------------- // Bind class wxLuaDebuggerEvent *************** *** 400,403 **** --- 471,477 ---- int s_wxluatag_wxLuaDebuggerEvent = -1; + static int LUACALL wxLua_wxLuaDebuggerEvent_Delete(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerEvent_Delete[1] = {{ wxLua_wxLuaDebuggerEvent_Delete, 0, 0, s_wxluaargArray_None }}; + static int LUACALL wxLua_wxLuaDebuggerEvent_Delete(lua_State *L) { *************** *** 413,416 **** --- 487,493 ---- } + static int LUACALL wxLua_wxLuaDebuggerEvent_GetFileName(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerEvent_GetFileName[1] = {{ wxLua_wxLuaDebuggerEvent_GetFileName, 0, 0, s_wxluaargArray_None }}; + // wxString GetFileName() const static int LUACALL wxLua_wxLuaDebuggerEvent_GetFileName(lua_State *L) *************** *** 428,431 **** --- 505,511 ---- } + static int LUACALL wxLua_wxLuaDebuggerEvent_GetLineNumber(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerEvent_GetLineNumber[1] = {{ wxLua_wxLuaDebuggerEvent_GetLineNumber, 0, 0, s_wxluaargArray_None }}; + // int GetLineNumber() const static int LUACALL wxLua_wxLuaDebuggerEvent_GetLineNumber(lua_State *L) *************** *** 443,446 **** --- 523,529 ---- } + static int LUACALL wxLua_wxLuaDebuggerEvent_GetMessage(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerEvent_GetMessage[1] = {{ wxLua_wxLuaDebuggerEvent_GetMessage, 0, 0, s_wxluaargArray_None }}; + // wxString GetMessage() const static int LUACALL wxLua_wxLuaDebuggerEvent_GetMessage(lua_State *L) *************** *** 458,461 **** --- 541,547 ---- } + static int LUACALL wxLua_wxLuaDebuggerEvent_GetReference(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerEvent_GetReference[1] = {{ wxLua_wxLuaDebuggerEvent_GetReference, 0, 0, s_wxluaargArray_None }}; + // int GetReference() const static int LUACALL wxLua_wxLuaDebuggerEvent_GetReference(lua_State *L) *************** *** 477,488 **** // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxLuaDebuggerEvent_methods[] = { ! { LuaMethod, "Delete", wxLua_wxLuaDebuggerEvent_Delete, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "GetFileName", wxLua_wxLuaDebuggerEvent_GetFileName, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "GetLineNumber", wxLua_wxLuaDebuggerEvent_GetLineNumber, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "GetMessage", wxLua_wxLuaDebuggerEvent_GetMessage, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "GetReference", wxLua_wxLuaDebuggerEvent_GetReference, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, 0, 0, 0, 0 }, }; int wxLuaDebuggerEvent_methodCount = sizeof(wxLuaDebuggerEvent_methods)/sizeof(wxLuaDebuggerEvent_methods[0]) - 1; --- 563,581 ---- // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxLuaDebuggerEvent_methods[] = { ! { WXLUAMETHOD_METHOD, "Delete", s_wxluafunc_wxLua_wxLuaDebuggerEvent_Delete }, ! { WXLUAMETHOD_METHOD, "GetFileName", s_wxluafunc_wxLua_wxLuaDebuggerEvent_GetFileName, 1 }, ! { WXLUAMETHOD_METHOD, "GetLineNumber", s_wxluafunc_wxLua_wxLuaDebuggerEvent_GetLineNumber, 1 }, ! { WXLUAMETHOD_METHOD, "GetMessage", s_wxluafunc_wxLua_wxLuaDebuggerEvent_GetMessage, 1 }, ! { WXLUAMETHOD_METHOD, "GetReference", s_wxluafunc_wxLua_wxLuaDebuggerEvent_GetReference, 1 }, ! { WXLUAMETHOD_METHOD, 0, 0, 0 }, }; int wxLuaDebuggerEvent_methodCount = sizeof(wxLuaDebuggerEvent_methods)/sizeof(wxLuaDebuggerEvent_methods[0]) - 1; + + WXLUADEFINE wxLuaDebuggerEvent_enums[] = { + { NULL, 0, }, + }; + + int wxLuaDebuggerEvent_enumCount = sizeof(wxLuaDebuggerEvent_enums)/sizeof(wxLuaDebuggerEvent_enums[0]) - 1; + Index: wxlsock.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxlsock.cpp,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** wxlsock.cpp 23 May 2007 02:48:31 -0000 1.27 --- wxlsock.cpp 31 May 2007 17:18:55 -0000 1.28 *************** *** 181,185 **** pMemory += sizeof(wxInt32); ! bool fExpanded = (0 != (*(wxInt32 *) pMemory)); pMemory += sizeof(wxInt32); --- 181,185 ---- pMemory += sizeof(wxInt32); ! wxInt32 flag = *(wxInt32 *) pMemory; pMemory += sizeof(wxInt32); *************** *** 192,202 **** const char *pSourcePtr = pMemory; ! wxLuaDebugDataItem *pItem = new wxLuaDebugDataItem(lua2wx(pNamePtr), ! lua2wx(pTypePtr), ! lua2wx(pValuePtr), ! lua2wx(pSourcePtr), ! nReference, ! nIndex, ! fExpanded); debugData.Add(pItem); --- 192,202 ---- const char *pSourcePtr = pMemory; ! wxLuaDebugItem *pItem = new wxLuaDebugItem(lua2wx(pNamePtr), ! lua2wx(pTypePtr), ! lua2wx(pValuePtr), ! lua2wx(pSourcePtr), ! nReference, ! nIndex, ! flag); debugData.Add(pItem); *************** *** 245,249 **** // [wxInt32 debug data item count] then for each item // [wxInt32 item data length] ! // [{wxInt32 GetReference}{wxInt32 GetIndex}{wxInt32 GetExpanded} // {char GetName \0}{char GetType \0}{char GetValue \0}{char GetSource \0}] --- 245,249 ---- // [wxInt32 debug data item count] then for each item // [wxInt32 item data length] ! // [{wxInt32 GetReference}{wxInt32 GetIndex}{wxInt32 GetFlag} // {char GetName \0}{char GetType \0}{char GetValue \0}{char GetSource \0}] *************** *** 257,261 **** for (idx = 0; ok && (idx < idxMax); ++idx) { ! const wxLuaDebugDataItem *item = debugData.Item(idx); wxLuaCharBuffer nameBuffer(item->GetName()); --- 257,261 ---- for (idx = 0; ok && (idx < idxMax); ++idx) { ! const wxLuaDebugItem *item = debugData.Item(idx); wxLuaCharBuffer nameBuffer(item->GetName()); *************** *** 284,288 **** pMemory += sizeof(wxInt32); ! *(wxInt32 *) pMemory = (wxInt32)(item->GetExpanded() ? 1 : 0); pMemory += sizeof(wxInt32); --- 284,288 ---- pMemory += sizeof(wxInt32); ! *(wxInt32 *) pMemory = (wxInt32)item->GetFlag(); pMemory += sizeof(wxInt32); |
