Menu
▾
▴
[Wxlua-commit] wxLua/modules/wxluasocket/include wxldserv.h, 1.13, 1.14 wxldtarg.h, 1.15, 1.16 wxlhandl.h, 1.8, 1.9 wxlsock.h, 1.11, 1.12 wxluasocket_bind.h, 1.5, 1.6
|
From: John L. <jr...@us...> - 2006-09-15 00:11:02
|
Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv23109/wxLua/modules/wxluasocket/include Modified Files: wxldserv.h wxldtarg.h wxlhandl.h wxlsock.h wxluasocket_bind.h Log Message: rename EVT_WXLUA_DEBUG_XXX to EVT_WXLUA_DEBUGGER since that's what they apply to rename wxEVT_WXLUA_DEBUG_XXX to wxEVT_WXLUA_DEBUGGER_XXX wxLuaDebugEvent renamed to wxLuaDebuggerEvent rename wxLUASOCKET_DEBUG_EVENT_XXX to wxLUASOCKET_DEBUGGEE_EVENT_XXX rename wxLUASOCKET_DEBUG_CMD_XXX to wxLUASOCKET_DEBUGGER_CMD_XXX make all wxLuaSocketBase::ReadXXX functions return bool for success checking rename wxLuaDebugServer to wxLuaDebuggerServer Index: wxlhandl.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/wxlhandl.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** wxlhandl.h 7 Sep 2006 04:20:54 -0000 1.8 --- wxlhandl.h 15 Sep 2006 00:10:56 -0000 1.9 *************** *** 19,23 **** #include "wxluasocket/include/wxluasocketdefs.h" ! class WXDLLIMPEXP_WXLUASOCKET wxLuaDebugEvent; class WXDLLIMPEXP_WXLUADEBUG wxLuaStackDialog; --- 19,23 ---- #include "wxluasocket/include/wxluasocketdefs.h" ! class WXDLLIMPEXP_WXLUASOCKET wxLuaDebuggerEvent; class WXDLLIMPEXP_WXLUADEBUG wxLuaStackDialog; Index: wxlsock.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/wxlsock.h,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** wxlsock.h 13 Sep 2006 04:13:47 -0000 1.11 --- wxlsock.h 15 Sep 2006 00:10:56 -0000 1.12 *************** *** 62,71 **** // Read data from the socket, calls virtual int Read(...) ! unsigned char ReadByte(); ! wxInt32 ReadInt32(); ! wxUint32 ReadUInt32(); ! long ReadLong(); ! wxString ReadString(); ! wxLuaDebugData ReadDebugData(); // Write data to the socket, calls virtual void Write(...) --- 62,71 ---- // Read data from the socket, calls virtual int Read(...) ! bool ReadByte(unsigned char& value); ! bool ReadInt32(wxInt32& value); ! bool ReadUInt32(wxUint32& value); ! bool ReadLong(long& value); ! bool ReadString(wxString& value); ! bool ReadDebugData(wxLuaDebugData& data); // Write data to the socket, calls virtual void Write(...) Index: wxluasocket_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/wxluasocket_bind.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** wxluasocket_bind.h 7 Sep 2006 22:42:19 -0000 1.5 --- wxluasocket_bind.h 15 Sep 2006 00:10:56 -0000 1.6 *************** *** 57,62 **** // ---------------------------------------------------------------------------- ! extern WXDLLIMPEXP_DATA_WXLUASOCKET(int) s_wxluatag_wxLuaDebugEvent; ! extern WXDLLIMPEXP_DATA_WXLUASOCKET(int) s_wxluatag_wxLuaDebugServer; --- 57,62 ---- // ---------------------------------------------------------------------------- ! extern WXDLLIMPEXP_DATA_WXLUASOCKET(int) s_wxluatag_wxLuaDebuggerEvent; ! extern WXDLLIMPEXP_DATA_WXLUASOCKET(int) s_wxluatag_wxLuaDebuggerServer; *************** *** 66,73 **** // ---------------------------------------------------------------------------- ! extern WXDLLIMPEXP_WXLUASOCKET WXLUAMETHOD* wxLuaDebugEvent_methods; ! extern WXDLLIMPEXP_DATA_WXLUASOCKET(int) wxLuaDebugEvent_methodCount; ! extern WXDLLIMPEXP_WXLUASOCKET WXLUAMETHOD* wxLuaDebugServer_methods; ! extern WXDLLIMPEXP_DATA_WXLUASOCKET(int) wxLuaDebugServer_methodCount; --- 66,73 ---- // ---------------------------------------------------------------------------- ! extern WXDLLIMPEXP_WXLUASOCKET WXLUAMETHOD* wxLuaDebuggerEvent_methods; ! extern WXDLLIMPEXP_DATA_WXLUASOCKET(int) wxLuaDebuggerEvent_methodCount; ! extern WXDLLIMPEXP_WXLUASOCKET WXLUAMETHOD* wxLuaDebuggerServer_methods; ! extern WXDLLIMPEXP_DATA_WXLUASOCKET(int) wxLuaDebuggerServer_methodCount; Index: wxldtarg.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/wxldtarg.h,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** wxldtarg.h 13 Sep 2006 04:13:47 -0000 1.15 --- wxldtarg.h 15 Sep 2006 00:10:56 -0000 1.16 *************** *** 21,25 **** // ---------------------------------------------------------------------------- ! // wxLuaDebugTarget - a C++ socket target that the wxLuaDebugServer run in lua // communicates with. Handles the Debugger/Debuggee IO // ---------------------------------------------------------------------------- --- 21,25 ---- // ---------------------------------------------------------------------------- ! // wxLuaDebugTarget - a C++ socket target that the wxLuaDebuggerServer run in lua // communicates with. Handles the Debugger/Debuggee IO // ---------------------------------------------------------------------------- Index: wxldserv.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/wxldserv.h,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** wxldserv.h 13 Sep 2006 04:13:47 -0000 1.13 --- wxldserv.h 15 Sep 2006 00:10:56 -0000 1.14 *************** *** 19,82 **** #include "wxluasocket/include/wxlsock.h" ! class WXDLLIMPEXP_WXLUASOCKET wxLuaDebugServer; ! class WXDLLIMPEXP_WXLUASOCKET wxLuaDebugEvent; class WXDLLIMPEXP_WXLUADEBUG wxLuaStackDialog; // ---------------------------------------------------------------------------- ! // wxLuaScoketDebugEvents_Type // ---------------------------------------------------------------------------- ! enum wxLuaScoketDebugEvents_Type { ! wxLUASOCKET_DEBUG_EVENT_NONE = 0, - wxLUASOCKET_DEBUG_EVENT_BREAK, - wxLUASOCKET_DEBUG_EVENT_PRINT, - wxLUASOCKET_DEBUG_EVENT_ERROR, - wxLUASOCKET_DEBUG_EVENT_EXIT, - wxLUASOCKET_DEBUG_EVENT_STACK_ENUM, - wxLUASOCKET_DEBUG_EVENT_STACK_ENTRY_ENUM, - wxLUASOCKET_DEBUG_EVENT_TABLE_ENUM, - wxLUASOCKET_DEBUG_EVENT_EVALUATE_EXPR, - wxLUASOCKET_DEBUG_EVENT_BREAKPOINT_ADDED, - wxLUASOCKET_DEBUG_EVENT_BREAKPOINT_REMOVED }; // ---------------------------------------------------------------------------- ! // wxLuaSocketDebugCommands_Type // ---------------------------------------------------------------------------- ! enum wxLuaSocketDebugCommands_Type { ! wxLUASOCKET_DEBUG_CMD_NONE = 0, ! wxLUASOCKET_DEBUG_CMD_ADD_BREAKPOINT = 100, ! wxLUASOCKET_DEBUG_CMD_REMOVE_BREAKPOINT, ! wxLUASOCKET_DEBUG_CMD_CLEAR_ALL_BREAKPOINTS, ! wxLUASOCKET_DEBUG_CMD_RUN_BUFFER, ! wxLUASOCKET_DEBUG_CMD_DEBUG_STEP, ! wxLUASOCKET_DEBUG_CMD_DEBUG_STEPOVER, ! wxLUASOCKET_DEBUG_CMD_DEBUG_STEPOUT, ! wxLUASOCKET_DEBUG_CMD_DEBUG_CONTINUE, ! wxLUASOCKET_DEBUG_CMD_DEBUG_BREAK, ! wxLUASOCKET_DEBUG_CMD_ENUMERATE_STACK, ! wxLUASOCKET_DEBUG_CMD_ENUMERATE_STACK_ENTRY, ! wxLUASOCKET_DEBUG_CMD_ENUMERATE_TABLE_REF, ! wxLUASOCKET_DEBUG_CMD_EVALUATE_EXPR, ! wxLUASOCKET_DEBUG_CMD_RESET, ! wxLUASOCKET_DEBUG_CMD_CLEAR_DEBUG_REFERENCES, ! wxLUASOCKET_DEBUG_CMD_DISABLE_BREAKPOINT, ! wxLUASOCKET_DEBUG_CMD_ENABLE_BREAKPOINT }; // ---------------------------------------------------------------------------- ! // wxLuaDebugServerInterface - a wxLuaInterface for the wxLuaDebugServer // ---------------------------------------------------------------------------- ! class WXDLLIMPEXP_WXLUASOCKET wxLuaDebugServerInterface : public wxLuaInterface { public: ! wxLuaDebugServerInterface(wxLuaDebugServer* server); ! virtual ~wxLuaDebugServerInterface(); virtual wxLuaDebugData EnumerateStack(); --- 19,83 ---- #include "wxluasocket/include/wxlsock.h" ! class WXDLLIMPEXP_WXLUASOCKET wxLuaDebuggerServer; ! class WXDLLIMPEXP_WXLUASOCKET wxLuaDebuggerEvent; class WXDLLIMPEXP_WXLUADEBUG wxLuaStackDialog; // ---------------------------------------------------------------------------- ! // wxLuaSocketDebuggeeEvents_Type - socket events sent from debuggee to debugger // ---------------------------------------------------------------------------- ! enum wxLuaSocketDebuggeeEvents_Type { ! wxLUASOCKET_DEBUGGEE_EVENT_NONE = 0, // a socket error probably ! ! wxLUASOCKET_DEBUGGEE_EVENT_BREAK, ! wxLUASOCKET_DEBUGGEE_EVENT_PRINT, ! wxLUASOCKET_DEBUGGEE_EVENT_ERROR, ! wxLUASOCKET_DEBUGGEE_EVENT_EXIT, ! wxLUASOCKET_DEBUGGEE_EVENT_STACK_ENUM, ! wxLUASOCKET_DEBUGGEE_EVENT_STACK_ENTRY_ENUM, ! wxLUASOCKET_DEBUGGEE_EVENT_TABLE_ENUM, ! wxLUASOCKET_DEBUGGEE_EVENT_EVALUATE_EXPR, ! wxLUASOCKET_DEBUGGEE_EVENT_BREAKPOINT_ADDED, ! wxLUASOCKET_DEBUGGEE_EVENT_BREAKPOINT_REMOVED, }; // ---------------------------------------------------------------------------- ! // wxLuaSocketDebuggerCommands_Type - socket commands sent from debugger to debuggee // ---------------------------------------------------------------------------- ! enum wxLuaSocketDebuggerCommands_Type { ! wxLUASOCKET_DEBUGGER_CMD_NONE = 0, // a socket error probably ! wxLUASOCKET_DEBUGGER_CMD_ADD_BREAKPOINT = 100, ! wxLUASOCKET_DEBUGGER_CMD_REMOVE_BREAKPOINT, ! wxLUASOCKET_DEBUGGER_CMD_CLEAR_ALL_BREAKPOINTS, ! wxLUASOCKET_DEBUGGER_CMD_RUN_BUFFER, ! wxLUASOCKET_DEBUGGER_CMD_DEBUG_STEP, ! wxLUASOCKET_DEBUGGER_CMD_DEBUG_STEPOVER, ! wxLUASOCKET_DEBUGGER_CMD_DEBUG_STEPOUT, ! wxLUASOCKET_DEBUGGER_CMD_DEBUG_CONTINUE, ! wxLUASOCKET_DEBUGGER_CMD_DEBUG_BREAK, ! wxLUASOCKET_DEBUGGER_CMD_ENUMERATE_STACK, ! wxLUASOCKET_DEBUGGER_CMD_ENUMERATE_STACK_ENTRY, ! wxLUASOCKET_DEBUGGER_CMD_ENUMERATE_TABLE_REF, ! wxLUASOCKET_DEBUGGER_CMD_EVALUATE_EXPR, ! wxLUASOCKET_DEBUGGER_CMD_RESET, ! wxLUASOCKET_DEBUGGER_CMD_CLEAR_DEBUG_REFERENCES, ! wxLUASOCKET_DEBUGGER_CMD_DISABLE_BREAKPOINT, ! wxLUASOCKET_DEBUGGER_CMD_ENABLE_BREAKPOINT }; // ---------------------------------------------------------------------------- ! // wxLuaDebuggerServerInterface - a wxLuaInterface for the wxLuaDebuggerServer // ---------------------------------------------------------------------------- ! class WXDLLIMPEXP_WXLUASOCKET wxLuaDebuggerServerInterface : public wxLuaInterface { public: ! wxLuaDebuggerServerInterface(wxLuaDebuggerServer* server); ! virtual ~wxLuaDebuggerServerInterface(); virtual wxLuaDebugData EnumerateStack(); *************** *** 88,92 **** private: ! wxLuaDebugServer* m_pServer; }; --- 89,93 ---- private: ! wxLuaDebuggerServer* m_pServer; }; *************** *** 123,127 **** virtual void NotifyError(const wxString &msg); ! virtual int HandleDebugEvent(wxLuaScoketDebugEvents_Type event_type); virtual wxLuaSocketBase* GetSocketBase() { return NULL; } --- 124,128 ---- virtual void NotifyError(const wxString &msg); ! virtual int HandleDebugEvent(wxLuaSocketDebuggeeEvents_Type event_type); virtual wxLuaSocketBase* GetSocketBase() { return NULL; } *************** *** 132,160 **** // ---------------------------------------------------------------------------- ! // wxLuaDebugServer - a socket server for a lua program to communicate with a // wxLuaDebugTarget run in C++. // ---------------------------------------------------------------------------- ! class WXDLLIMPEXP_WXLUASOCKET wxLuaDebugServer : public wxLuaDebuggerBase { protected: // ---------------------------------------------------------------------------- ! // wxLuaDebugServer::LuaThread - a wxThread for the wxLuaDebugServer // ---------------------------------------------------------------------------- class LuaThread : public wxThread { public: ! LuaThread(wxLuaDebugServer *pServer) : wxThread(wxTHREAD_JOINABLE), ! m_pServer(pServer) {} protected: virtual void *Entry(); // thread execution starts here virtual void OnExit() {} // called when the thread exits ! wxLuaDebugServer *m_pServer; }; public: ! wxLuaDebugServer(int portNumber); ! virtual ~wxLuaDebugServer(); // Set the program and network name to start the wxLua target with --- 133,161 ---- // ---------------------------------------------------------------------------- ! // wxLuaDebuggerServer - a socket server for a lua program to communicate with a // wxLuaDebugTarget run in C++. // ---------------------------------------------------------------------------- ! class WXDLLIMPEXP_WXLUASOCKET wxLuaDebuggerServer : public wxLuaDebuggerBase { protected: // ---------------------------------------------------------------------------- ! // wxLuaDebuggerServer::LuaThread - a wxThread for the wxLuaDebuggerServer // ---------------------------------------------------------------------------- class LuaThread : public wxThread { public: ! LuaThread(wxLuaDebuggerServer *pServer) : wxThread(wxTHREAD_JOINABLE), ! m_pServer(pServer) {} protected: virtual void *Entry(); // thread execution starts here virtual void OnExit() {} // called when the thread exits ! wxLuaDebuggerServer *m_pServer; }; public: ! wxLuaDebuggerServer(int portNumber); ! virtual ~wxLuaDebuggerServer(); // Set the program and network name to start the wxLua target with *************** *** 182,186 **** int m_portNumber; wxProcess *m_pProcess; ! wxLuaDebugServer::LuaThread *m_pThread; wxLuaStackDialog *m_pStackDialog; bool m_fShutdown; --- 183,187 ---- int m_portNumber; wxProcess *m_pProcess; ! wxLuaDebuggerServer::LuaThread *m_pThread; wxLuaStackDialog *m_pStackDialog; bool m_fShutdown; *************** *** 190,210 **** private: ! DECLARE_ABSTRACT_CLASS(wxLuaDebugServer) }; // ---------------------------------------------------------------------------- ! // wxLuaDebugEvent // ---------------------------------------------------------------------------- ! class WXDLLIMPEXP_WXLUASOCKET wxLuaDebugEvent : public wxEvent { public: ! wxLuaDebugEvent(const wxLuaDebugEvent& event); ! wxLuaDebugEvent(int eventType = wxEVT_NULL, ! int lineNumber = 0, ! const wxString &fileName = wxEmptyString, ! bool enabledFlag = false); ! virtual ~wxLuaDebugEvent(); void SetMessage(const wxString &message); --- 191,211 ---- private: ! DECLARE_ABSTRACT_CLASS(wxLuaDebuggerServer) }; // ---------------------------------------------------------------------------- ! // wxLuaDebuggerEvent // ---------------------------------------------------------------------------- ! class WXDLLIMPEXP_WXLUASOCKET wxLuaDebuggerEvent : public wxEvent { public: ! wxLuaDebuggerEvent(const wxLuaDebuggerEvent& event); ! wxLuaDebuggerEvent(wxEventType eventType = wxEVT_NULL, ! int lineNumber = 0, ! const wxString &fileName = wxEmptyString, ! bool enabledFlag = false); ! virtual ~wxLuaDebuggerEvent(); void SetMessage(const wxString &message); *************** *** 214,223 **** wxString GetFileName() const { return m_fileName; } wxString GetMessage() const { return m_strMessage; } ! int GetReference() const { return m_nReference; } bool GetEnabledFlag() const { return m_fEnabledFlag; } wxLuaDebugData GetDebugData() const { return m_debugData; } protected: ! virtual wxEvent* Clone() const { return new wxLuaDebugEvent(*this); } int m_lineNumber; --- 215,224 ---- wxString GetFileName() const { return m_fileName; } wxString GetMessage() const { return m_strMessage; } ! long GetReference() const { return m_nReference; } bool GetEnabledFlag() const { return m_fEnabledFlag; } wxLuaDebugData GetDebugData() const { return m_debugData; } protected: ! virtual wxEvent* Clone() const { return new wxLuaDebuggerEvent(*this); } int m_lineNumber; *************** *** 230,270 **** private: ! DECLARE_DYNAMIC_CLASS(wxLuaDebugEvent) }; ! typedef void (wxEvtHandler::*wxLuaDebugEventFunction)(wxLuaDebugEvent&); BEGIN_DECLARE_EVENT_TYPES() ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUG_CLIENT_CONNECTED, 2510) ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUG_BREAK, 2511) ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUG_PRINT, 2512) ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUG_ERROR, 2513) ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUG_EXIT, 2514) ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUG_STACK_ENUM, 2515) ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUG_STACK_ENTRY_ENUM, 2516) ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUG_TABLE_ENUM, 2517) ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUG_EVALUATE_EXPR, 2518) ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUG_STARTDEBUGGER, 2519) ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUG_STOPDEBUGGER, 2520) ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUG_BREAKPOINT_ADDED, 2521) ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUG_BREAKPOINT_REMOVED, 2522) END_DECLARE_EVENT_TYPES() ! #define wxLuaDebugEventHandler(func) \ ! (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxLuaDebugEventFunction, &func) ! #define EVT_WXLUA_DEBUG_CLIENT_CONNECTED(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUG_CLIENT_CONNECTED, id, -1, wxLuaDebugEventHandler(fn), (wxObject *) NULL), ! #define EVT_WXLUA_DEBUG_BREAK(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUG_BREAK, id, -1, wxLuaDebugEventHandler(fn), (wxObject *) NULL), ! #define EVT_WXLUA_DEBUG_PRINT(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUG_PRINT, id, -1, wxLuaDebugEventHandler(fn), (wxObject *) NULL), ! #define EVT_WXLUA_DEBUG_ERROR(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUG_ERROR, id, -1, wxLuaDebugEventHandler(fn), (wxObject *) NULL), ! #define EVT_WXLUA_DEBUG_EXIT(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUG_EXIT, id, -1, wxLuaDebugEventHandler(fn), (wxObject *) NULL), ! #define EVT_WXLUA_DEBUG_STACK_ENUM(fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUG_STACK_ENUM, -1, -1, wxLuaDebugEventHandler(fn), (wxObject *) NULL), ! #define EVT_WXLUA_DEBUG_STACK_ENTRY_ENUM(fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUG_STACK_ENTRY_ENUM, -1, -1, wxLuaDebugEventHandler(fn), (wxObject *) NULL), ! #define EVT_WXLUA_DEBUG_TABLE_ENUM(fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUG_TABLE_ENUM, -1, -1, wxLuaDebugEventHandler(fn), (wxObject *) NULL), ! #define EVT_WXLUA_DEBUG_EVALUATE_EXPR(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUG_EVALUATE_EXPR, id, -1, wxLuaDebugEventHandler(fn), (wxObject *) NULL), ! #define EVT_WXLUA_DEBUG_STARTDEBUGGER(fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUG_STARTDEBUGGER, -1, -1, wxLuaDebugEventHandler(fn), (wxObject *) NULL), ! #define EVT_WXLUA_DEBUG_STOPDEBUGGER(fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUG_STOPDEBUGGER, -1, -1, wxLuaDebugEventHandler(fn), (wxObject *) NULL), ! #define EVT_WXLUA_DEBUG_BREAKPOINT_ADDED(fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUG_BREAKPOINT_ADDED, -1, -1, wxLuaDebugEventHandler(fn), (wxObject *) NULL), ! #define EVT_WXLUA_DEBUG_BREAKPOINT_REMOVED(fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUG_BREAKPOINT_REMOVED, -1, -1, wxLuaDebugEventHandler(fn), (wxObject *) NULL), #endif // WX_LUA_DEBUG_SERVER_H --- 231,271 ---- private: ! DECLARE_DYNAMIC_CLASS(wxLuaDebuggerEvent) }; ! typedef void (wxEvtHandler::*wxLuaDebuggerEventFunction)(wxLuaDebuggerEvent&); BEGIN_DECLARE_EVENT_TYPES() ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUGGER_CLIENT_CONNECTED, 2510) ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUGGER_BREAK, 2511) ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUGGER_PRINT, 2512) ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUGGER_ERROR, 2513) ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUGGER_EXIT, 2514) ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUGGER_STACK_ENUM, 2515) ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUGGER_STACK_ENTRY_ENUM, 2516) ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUGGER_TABLE_ENUM, 2517) ! 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() ! #define wxLuaDebuggerEventHandler(func) \ ! (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxLuaDebuggerEventFunction, &func) ! #define EVT_WXLUA_DEBUGGER_CLIENT_CONNECTED(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUGGER_CLIENT_CONNECTED, 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), ! #define EVT_WXLUA_DEBUGGER_ERROR(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUGGER_ERROR, id, -1, wxLuaDebuggerEventHandler(fn), (wxObject *) NULL), ! #define EVT_WXLUA_DEBUGGER_EXIT(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUGGER_EXIT, id, -1, wxLuaDebuggerEventHandler(fn), (wxObject *) NULL), ! #define EVT_WXLUA_DEBUGGER_STACK_ENUM(fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUGGER_STACK_ENUM, -1, -1, wxLuaDebuggerEventHandler(fn), (wxObject *) NULL), ! #define EVT_WXLUA_DEBUGGER_STACK_ENTRY_ENUM(fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUGGER_STACK_ENTRY_ENUM, -1, -1, wxLuaDebuggerEventHandler(fn), (wxObject *) NULL), ! #define EVT_WXLUA_DEBUGGER_TABLE_ENUM(fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUGGER_TABLE_ENUM, -1, -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(fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUGGER_STARTDEBUGGER, -1, -1, wxLuaDebuggerEventHandler(fn), (wxObject *) NULL), ! #define EVT_WXLUA_DEBUGGER_STOPDEBUGGER(fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUGGER_STOPDEBUGGER, -1, -1, wxLuaDebuggerEventHandler(fn), (wxObject *) NULL), ! #define EVT_WXLUA_DEBUGGER_BREAKPOINT_ADDED(fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUGGER_BREAKPOINT_ADDED, -1, -1, wxLuaDebuggerEventHandler(fn), (wxObject *) NULL), ! #define EVT_WXLUA_DEBUGGER_BREAKPOINT_REMOVED(fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUGGER_BREAKPOINT_REMOVED, -1, -1, wxLuaDebuggerEventHandler(fn), (wxObject *) NULL), #endif // WX_LUA_DEBUG_SERVER_H |
