From: John L. <jr...@us...> - 2007-06-11 03:58:19
|
Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv19140/wxLua/modules/wxluasocket/include Modified Files: wxldserv.h Log Message: Remove wxArrayString_FromLuaTable and wxArrayInt_FromLuaTable binding tag since we convert from wxArrayInt/String automatically Fix listctrl sorting Fix validator code using wxLuaObject Rename wxLuaState::LuaCall to LuaPCall since that what it calls Lots more cleanup and shuffling of code to more appropriate places Index: wxldserv.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/wxldserv.h,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** wxldserv.h 24 May 2007 00:59:47 -0000 1.35 --- wxldserv.h 11 Jun 2007 03:58:10 -0000 1.36 *************** *** 49,55 **** wxLUASOCKET_DEBUGGEE_EVENT_TABLE_ENUM, wxLUASOCKET_DEBUGGEE_EVENT_EVALUATE_EXPR, - wxLUASOCKET_DEBUGGEE_EVENT_BREAKPOINT_ADDED, - wxLUASOCKET_DEBUGGEE_EVENT_BREAKPOINT_REMOVED, }; --- 49,54 ---- wxLUASOCKET_DEBUGGEE_EVENT_TABLE_ENUM, wxLUASOCKET_DEBUGGEE_EVENT_EVALUATE_EXPR, + wxLUASOCKET_DEBUGGEE_EVENT__COUNT }; *************** *** 438,445 **** DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUGGER_EVALUATE_EXPR, 2518) ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUGGER_STARTDEBUGGER, 2519) ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUGGER_STOPDEBUGGER, 2520) ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUGGER_BREAKPOINT_ADDED, 2521) ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUGGER_BREAKPOINT_REMOVED, 2522) END_DECLARE_EVENT_TYPES() --- 437,442 ---- DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUGGER_EVALUATE_EXPR, 2518) ! //DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUGGER_STARTDEBUGGER, 2519) ! //DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUGGER_STOPDEBUGGER, 2520) END_DECLARE_EVENT_TYPES() *************** *** 448,451 **** --- 445,449 ---- #define EVT_WXLUA_DEBUGGER_DEBUGGEE_CONNECTED(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUGGER_DEBUGGEE_CONNECTED, id, -1, wxLuaDebuggerEventHandler(fn), (wxObject *) NULL), + #define EVT_WXLUA_DEBUGGER_DEBUGGEE_DISCONNECTED(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUGGER_DEBUGGEE_DISCONNECTED, id, -1, wxLuaDebuggerEventHandler(fn), (wxObject *) NULL), #define EVT_WXLUA_DEBUGGER_BREAK(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUGGER_BREAK, id, -1, wxLuaDebuggerEventHandler(fn), (wxObject *) NULL), #define EVT_WXLUA_DEBUGGER_PRINT(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUGGER_PRINT, id, -1, wxLuaDebuggerEventHandler(fn), (wxObject *) NULL), *************** *** 456,463 **** #define EVT_WXLUA_DEBUGGER_TABLE_ENUM(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUGGER_TABLE_ENUM, id, -1, wxLuaDebuggerEventHandler(fn), (wxObject *) NULL), #define EVT_WXLUA_DEBUGGER_EVALUATE_EXPR(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUGGER_EVALUATE_EXPR, id, -1, wxLuaDebuggerEventHandler(fn), (wxObject *) NULL), ! #define EVT_WXLUA_DEBUGGER_STARTDEBUGGER(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUGGER_STARTDEBUGGER, id, -1, wxLuaDebuggerEventHandler(fn), (wxObject *) NULL), ! #define EVT_WXLUA_DEBUGGER_STOPDEBUGGER(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUGGER_STOPDEBUGGER, id, -1, wxLuaDebuggerEventHandler(fn), (wxObject *) NULL), ! #define EVT_WXLUA_DEBUGGER_BREAKPOINT_ADDED(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUGGER_BREAKPOINT_ADDED, id, -1, wxLuaDebuggerEventHandler(fn), (wxObject *) NULL), ! #define EVT_WXLUA_DEBUGGER_BREAKPOINT_REMOVED(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUGGER_BREAKPOINT_REMOVED, id, -1, wxLuaDebuggerEventHandler(fn), (wxObject *) NULL), #endif // WX_LUA_DEBUG_SERVER_H --- 454,459 ---- #define EVT_WXLUA_DEBUGGER_TABLE_ENUM(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUGGER_TABLE_ENUM, id, -1, wxLuaDebuggerEventHandler(fn), (wxObject *) NULL), #define EVT_WXLUA_DEBUGGER_EVALUATE_EXPR(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUGGER_EVALUATE_EXPR, id, -1, wxLuaDebuggerEventHandler(fn), (wxObject *) NULL), ! //#define EVT_WXLUA_DEBUGGER_STARTDEBUGGER(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUGGER_STARTDEBUGGER, id, -1, wxLuaDebuggerEventHandler(fn), (wxObject *) NULL), ! //#define EVT_WXLUA_DEBUGGER_STOPDEBUGGER(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUGGER_STOPDEBUGGER, id, -1, wxLuaDebuggerEventHandler(fn), (wxObject *) NULL), #endif // WX_LUA_DEBUG_SERVER_H |