Menu
▾
▴
[Wxlua-commit] wxLua/modules/wxluasocket/include dservice.h, 1.21, 1.22 wxldserv.h, 1.29, 1.30 wxldtarg.h, 1.21, 1.22 wxlsock.h, 1.20, 1.21
|
From: John L. <jr...@us...> - 2007-05-19 02:05:52
|
Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv11964/wxLua/modules/wxluasocket/include Modified Files: dservice.h wxldserv.h wxldtarg.h wxlsock.h Log Message: Make wxProcess Kill and Exists functions %staticonly Remove all exception code from wxLuaSocket code (debugger code) Rename wxLuaSocket to wxLuaCSocket and move wxLuaDebuggerSocket to wxLuawxSocket we have two options C or wx sockets now... both work in 2.8 GTK2 Lots of reorganization in server and socket code Update the editor.wx.lua for new code and only Delete() the debugger server in EVT_IDLE to give it a chance to exit gracefully Index: wxldserv.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/wxldserv.h,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** wxldserv.h 13 Dec 2006 06:57:50 -0000 1.29 --- wxldserv.h 19 May 2007 02:05:47 -0000 1.30 *************** *** 92,96 **** // socket connection to the debuggee using the wxLuaDebuggerBase. // Note: The wxLuaState of the wxLuaStackDialog is not used in this case ! // since it 'exists' in the debuggee process. // ---------------------------------------------------------------------------- --- 92,96 ---- // socket connection to the debuggee using the wxLuaDebuggerBase. // Note: The wxLuaState of the wxLuaStackDialog is not used in this case ! // since it 'exists' in the independent debuggee process. // ---------------------------------------------------------------------------- *************** *** 156,159 **** --- 156,168 ---- virtual ~wxLuaDebuggerBase(); + // Start the debugger server to listen for a debuggee. After creation + // you must call StartServer to actually start the server. returns success + virtual bool StartServer() = 0; + // Stop the debugger server, returns success + virtual bool StopServer() = 0; + // Start a debuggee client to be debugged by this, returns success + // By default it starts a new wxLuaDebuggerProcess + virtual long StartClient(); + // These functions all send socket commands wxLUASOCKET_DEBUGGER_CMD_XXX // and the appropriate data to the debuggee. *************** *** 188,192 **** // wxEVT_WXLUA_DEBUGGER_DEBUGGEE_DISCONNECTED event with a socket error msg virtual bool CheckSocketConnected(bool send_event = true, const wxString& msg = wxEmptyString); ! // Check if the input is true (eg. return of a socket read) and if not send a // wxEVT_WXLUA_DEBUGGER_DEBUGGEE_DISCONNECTED with a read error msg virtual bool CheckSocketRead(bool read_ok, const wxString& msg = wxEmptyString); --- 197,201 ---- // wxEVT_WXLUA_DEBUGGER_DEBUGGEE_DISCONNECTED event with a socket error msg virtual bool CheckSocketConnected(bool send_event = true, const wxString& msg = wxEmptyString); ! // Check if the input is true (ie. return of a socket read) and if not send a // wxEVT_WXLUA_DEBUGGER_DEBUGGEE_DISCONNECTED with a read error msg virtual bool CheckSocketRead(bool read_ok, const wxString& msg = wxEmptyString); *************** *** 195,198 **** --- 204,210 ---- virtual bool CheckSocketWrite(bool write_ok, const wxString& msg = wxEmptyString); + // Get the socket error message or "" + virtual wxString GetSocketErrorMsg() = 0; + // Send the event to this wxEvtHandler virtual void SendEvent(wxEvent& event) { AddPendingEvent(event); } *************** *** 254,294 **** // ---------------------------------------------------------------------------- ! // 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 port_number); ! virtual ~wxLuaDebuggerServer(); // Start the debugger server to listen for a debuggee. After creation // you must call StartServer to actually start the server. returns success ! bool StartServer(); // Stop the debugger server, returns success ! bool StopServer(); // Start a debuggee client to be debugged by this, returns process ID // is > 0 on success. ! long StartClient(); virtual wxLuaSocketBase* GetSocketBase() { return m_acceptedSocket; } // The thread function for the running LuaThread, only to be called by the // thread. --- 266,310 ---- // ---------------------------------------------------------------------------- ! // wxLuaDebuggerCServer - a socket server for a lua program to communicate with a ! // wxLuaDebugTarget run in C++. // ---------------------------------------------------------------------------- ! class WXDLLIMPEXP_WXLUASOCKET wxLuaDebuggerCServer : public wxLuaDebuggerBase { protected: // ---------------------------------------------------------------------------- ! // wxLuaDebuggerCServer::LuaThread - a wxThread for the wxLuaDebuggerCServer // ---------------------------------------------------------------------------- class LuaThread : public wxThread { public: ! LuaThread(wxLuaDebuggerCServer *pServer) : wxThread(wxTHREAD_JOINABLE), ! m_pServer(pServer) {} protected: virtual void *Entry(); // thread execution starts here virtual void OnExit(); // called when the thread exits ! wxLuaDebuggerCServer *m_pServer; }; public: ! wxLuaDebuggerCServer(int port_number); ! virtual ~wxLuaDebuggerCServer(); // Start the debugger server to listen for a debuggee. After creation // you must call StartServer to actually start the server. returns success ! virtual bool StartServer(); // Stop the debugger server, returns success ! virtual bool StopServer(); // Start a debuggee client to be debugged by this, returns process ID // is > 0 on success. ! virtual long StartClient(); virtual wxLuaSocketBase* GetSocketBase() { return m_acceptedSocket; } + virtual wxString GetSocketErrorMsg(); + + // implementation + // The thread function for the running LuaThread, only to be called by the // thread. *************** *** 296,311 **** protected: - bool StartServerThread(); bool WaitForConnect(int timeOut); wxLuaSocket *m_serverSocket; wxLuaSocket *m_acceptedSocket; ! wxLuaDebuggerServer::LuaThread *m_pThread; bool m_fShutdown; private: ! DECLARE_ABSTRACT_CLASS(wxLuaDebuggerServer) }; #else // !WXLUASOCKET_USE_C_SOCKET --- 312,328 ---- protected: bool WaitForConnect(int timeOut); wxLuaSocket *m_serverSocket; wxLuaSocket *m_acceptedSocket; ! wxLuaDebuggerCServer::LuaThread *m_pThread; bool m_fShutdown; private: ! DECLARE_ABSTRACT_CLASS(wxLuaDebuggerCServer) }; + typedef wxLuaDebuggerCServer wxLuaDebuggerServer; + #else // !WXLUASOCKET_USE_C_SOCKET *************** *** 314,319 **** // wxLuaDebugTarget run in C++. // ---------------------------------------------------------------------------- - class WXDLLIMPEXP_WXLUASOCKET wxLuaDebugSocket; - #include "wxluasocket/include/dservice.h" class WXDLLIMPEXP_WXLUASOCKET wxLuaDebuggerwxSocketServer : public wxLuaDebuggerBase --- 331,334 ---- *************** *** 325,336 **** // Start the debugger server to listen for a debuggee. After creation // you must call StartServer to actually start the server. returns success ! bool StartServer(); // Stop the debugger server, returns success ! bool StopServer(); // Start a debuggee client to be debugged by this, returns success ! long StartClient(); virtual wxLuaSocketBase* GetSocketBase() { return m_acceptedSocket; } virtual void SendEvent(wxEvent& event) { ProcessEvent(event); } --- 340,355 ---- // Start the debugger server to listen for a debuggee. After creation // you must call StartServer to actually start the server. returns success ! virtual bool StartServer(); // Stop the debugger server, returns success ! virtual bool StopServer(); // Start a debuggee client to be debugged by this, returns success ! virtual long StartClient(); virtual wxLuaSocketBase* GetSocketBase() { return m_acceptedSocket; } + virtual wxString GetSocketErrorMsg(); + + // implementation + virtual void SendEvent(wxEvent& event) { ProcessEvent(event); } *************** *** 339,344 **** protected: ! wxSocketServer *m_serverSocket; ! wxLuaDebugSocket *m_acceptedSocket; private: --- 358,363 ---- protected: ! wxSocketServer *m_serverSocket; ! wxLuawxSocket *m_acceptedSocket; private: *************** *** 369,377 **** void SetDebugData(long nReference, const wxLuaDebugData& pDebugData = wxLuaDebugData()); ! int GetLineNumber() const { return m_lineNumber;} ! wxString GetFileName() const { return m_fileName; } ! wxString GetMessage() const { return m_strMessage; } // check HasMessage ! bool HasMessage() const { return m_fHasMessage; } ! long GetReference() const { return m_nReference; } // lua reference wxLuaDebugData GetDebugData() const { return m_debugData; } bool GetEnabledFlag() const { return m_fEnabledFlag; } --- 388,396 ---- void SetDebugData(long nReference, const wxLuaDebugData& pDebugData = wxLuaDebugData()); ! int GetLineNumber() const { return m_lineNumber;} ! wxString GetFileName() const { return m_fileName; } ! wxString GetMessage() const { return m_strMessage; } // check HasMessage ! bool HasMessage() const { return m_fHasMessage; } ! long GetReference() const { return m_nReference; } // lua reference wxLuaDebugData GetDebugData() const { return m_debugData; } bool GetEnabledFlag() const { return m_fEnabledFlag; } Index: wxlsock.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/wxlsock.h,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** wxlsock.h 12 Dec 2006 01:23:40 -0000 1.20 --- wxlsock.h 19 May 2007 02:05:47 -0000 1.21 *************** *** 1,4 **** ///////////////////////////////////////////////////////////////////////////// ! // Name: wxLuaSocket.h // Purpose: wxLua Socket interfaces // Author: J. Winwood --- 1,4 ---- ///////////////////////////////////////////////////////////////////////////// ! // Name: wxlsock.h // Purpose: wxLua Socket interfaces // Author: J. Winwood *************** *** 46,52 **** // ---------------------------------------------------------------------------- // wxLuaSocketBase - a base class for different socket implementations ! // The derived socket class must override virtual int Read(...) and ! // virtual int Write(...) which all the other ReadXXX and WriteXXX functions ! // of this class use. // ---------------------------------------------------------------------------- --- 46,54 ---- // ---------------------------------------------------------------------------- // wxLuaSocketBase - a base class for different socket implementations ! // ! // The derived socket class must override ! // virtual int Read(...) all ReadXXX functions use this ! // virtual int Write(...) all WriteXXX functions use this ! // virtual bool IsConnected() // ---------------------------------------------------------------------------- *************** *** 54,58 **** { public: ! wxLuaSocketBase() {} virtual ~wxLuaSocketBase() {} --- 56,60 ---- { public: ! wxLuaSocketBase() : m_port_number(-1) {} virtual ~wxLuaSocketBase() {} *************** *** 77,80 **** --- 79,83 ---- // Write data to the socket, calls virtual void Write(...) + // returns success bool WriteCmd(char value); bool WriteInt32(wxInt32 value); *************** *** 83,87 **** bool WriteDebugData(const wxLuaDebugData& debugData); ! wxString m_name; // a readable name for the socket, for debugging private: --- 86,102 ---- bool WriteDebugData(const wxLuaDebugData& debugData); ! // Concat the error message array together and optionally clear the message ! virtual wxString GetErrorMsg(bool clear_msg); ! // Add a message to the internal error message and then append any ! // additional from GetLastErrorMsg() to it. ! void AddErrorMessage(const wxString& msg); ! // Get the last/current error message as a string ! virtual wxString GetLastErrorMsg() const = 0; ! ! // implementation ! ! wxString m_name; // human readable name for the socket, for debugging ! wxString m_errorMsg; // human readable error message ! int m_port_number; // The port that's used, else -1 private: *************** *** 90,98 **** // ---------------------------------------------------------------------------- ! // wxLuaSocket - a c socket implementation // ---------------------------------------------------------------------------- - class WXDLLIMPEXP_WXLUASOCKET wxLuaSocket : public wxLuaSocketBase - { #ifdef WIN32 typedef SOCKET socket_type; --- 105,111 ---- // ---------------------------------------------------------------------------- ! // wxLuaCSocket - a C socket implementation for both client and server // ---------------------------------------------------------------------------- #ifdef WIN32 typedef SOCKET socket_type; *************** *** 101,118 **** #endif ! // proxy class for accept ! class wxLuaAcceptedSocket ! { ! public: ! wxLuaAcceptedSocket(socket_type socket, sockaddr_in address) ! : m_sock(socket), m_addr(address) {} ! ! private: ! socket_type m_sock; ! sockaddr_in m_addr; ! ! friend class wxLuaSocket; ! }; ! public: --- 114,119 ---- #endif ! class WXDLLIMPEXP_WXLUASOCKET wxLuaCSocket : public wxLuaSocketBase ! { public: *************** *** 125,143 **** }; ! wxLuaSocket(); // Socket constructor from an accepted socket ! wxLuaSocket(const wxLuaAcceptedSocket &acceptedSocket); ! virtual ~wxLuaSocket(); // Create a listening socket, using the specified port number // server: bind and listen for client connections ! void Listen(u_short port, int backLog = 100); // Accept a connection, returning an accepted socket. ! // server: accept a connection from a client ! wxLuaAcceptedSocket Accept(); // Connect to a given host and port number // client: connect a client to a server ! void Connect(const wxString &address, u_short port); // Get the socket state SocketState GetState() const { return m_sockstate; } --- 126,144 ---- }; ! wxLuaCSocket(); // Socket constructor from an accepted socket ! wxLuaCSocket(socket_type socket, sockaddr_in address); ! virtual ~wxLuaCSocket(); // Create a listening socket, using the specified port number // server: bind and listen for client connections ! bool Listen(u_short port, int backLog = 100); // Accept a connection, returning an accepted socket. ! // server: block until accepting a connection from a client ! wxLuaCSocket* Accept(); // Connect to a given host and port number // client: connect a client to a server ! bool Connect(const wxString &address, u_short port); // Get the socket state SocketState GetState() const { return m_sockstate; } *************** *** 145,157 **** int GetSocket() const { return m_sock; } ! // Is the socket connected ! virtual bool IsConnected() ! { ! return ((m_sockstate == SOCKET_CONNECTED) || ! (m_sockstate == SOCKET_ACCEPTED)); ! } ! // Test if the socket is readable ! bool IsReadable() const { return ((m_sockstate == SOCKET_CONNECTED) || --- 146,162 ---- int GetSocket() const { return m_sock; } ! // Get the address of the opened socket ! wxString GetAddress(); ! // Get the port number of the opened socket ! int GetPort(); ! // Shutdown the socket in an orderly fashion, ::shutdown(sock, how) ! // returns true on success ! bool Shutdown(int how = SD_BOTH); ! // Close the open socket, returns true on success ! bool Close(); ! // Is the socket connected? ! // Overridden from wxLuaSocketBase ! virtual bool IsConnected() { return ((m_sockstate == SOCKET_CONNECTED) || *************** *** 159,180 **** } - // Get the address of the socket - wxString GetAddress() const; - // Get the port number of the socket - int GetPort() const; // Read the whole buffer of byte size length into buffer from the socket virtual int Read(char *buffer, wxUint32 length); // Write the whole buffer of byte size length to the socket virtual int Write(const char *buffer, wxUint32 length); ! // Shutdown the socket in an orderly fashion, ::shutdown(sock, how) ! // returns true on success, if false then check errno ! bool Shutdown(int how = SD_BOTH); ! // Close the open socket, returns true on success ! bool Close(); protected: // Prevent copying and assignment of this class ! wxLuaSocket(const wxLuaSocket&); ! wxLuaSocket& operator=(const wxLuaSocket&); socket_type m_sock; --- 164,182 ---- } // Read the whole buffer of byte size length into buffer from the socket + // Overridden from wxLuaSocketBase virtual int Read(char *buffer, wxUint32 length); // Write the whole buffer of byte size length to the socket + // Overridden from wxLuaSocketBase virtual int Write(const char *buffer, wxUint32 length); ! ! // Get the last/current error message using the system error ! // either errno in Unix or WSAGetLastError in MSW, doesn't clear error ! virtual wxString GetLastErrorMsg() const; protected: // Prevent copying and assignment of this class ! wxLuaCSocket(const wxLuaCSocket&); ! wxLuaCSocket& operator=(const wxLuaCSocket&); socket_type m_sock; *************** *** 183,231 **** private: ! DECLARE_ABSTRACT_CLASS(wxLuaSocket); }; // ---------------------------------------------------------------------------- ! // wxLuaSocketException // ---------------------------------------------------------------------------- ! class WXDLLIMPEXP_WXLUASOCKET wxLuaSocketException { public: ! enum SocketErrorCode ! { ! SOCKET_NOT_CLOSED, ! SOCKET_NOT_CONNECTED, ! SOCKET_NOT_LISTENING, ! SOCKET_INVALID_SOCKET, ! SOCKET_ADDRESS_NOT_RESOLVED, ! SOCKET_INCOMPATIBLE_TYPE, ! SOCKET_SET_BLOCKING_FAILED, ! SOCKET_ACCEPT_FAILED, ! SOCKET_CONNECT_FAILED, ! SOCKET_BIND_FAILED, ! SOCKET_LISTEN_FAILED, ! SOCKET_SEND_FAILED, ! SOCKET_RECEIVE_FAILED, ! SOCKET_CLOSE_FAILED ! }; ! // constructors ! wxLuaSocketException(SocketErrorCode code, const wxString& msg); ! wxLuaSocketException(const wxLuaSocketException &e) ! : m_code(e.m_code), m_msg(e.m_msg), m_errnum(e.m_errnum) {} ! SocketErrorCode GetCode() const { return m_code; } ! int errnum() const { return m_errnum; } ! wxString description() const { return m_description; } ! private: ! wxLuaSocketException& operator=(const wxLuaSocketException& e); ! SocketErrorCode m_code; ! wxString m_msg; ! int m_errnum; ! wxString m_description; }; #endif // WX_LUA_SOCKET_H_ --- 185,235 ---- private: ! DECLARE_ABSTRACT_CLASS(wxLuaCSocket); }; // ---------------------------------------------------------------------------- ! // wxLuawxSocket - Handles Debugger/Debuggee IO // ---------------------------------------------------------------------------- + #include "wx/socket.h" ! class WXDLLIMPEXP_WXLUASOCKET wxLuawxSocket : public wxLuaSocketBase { public: ! wxLuawxSocket() : m_socket(NULL) {} ! wxLuawxSocket(wxSocketBase* sock) : m_socket(sock) {} ! virtual ~wxLuawxSocket() { Destroy(); } ! // Safely close and destroy the socket ! bool Destroy(); ! // Get/Set the socket, if you set a new socket you must delete the ! // previous one first ! wxSocketBase* GetSocket() const { return m_socket; } ! void SetSocket(wxSocketBase* sock) { m_socket = sock; } ! // Socket Error from wxSocketBase ! bool Error() { return !m_socket || m_socket->Error(); } ! // Is Socket Connected, from wxSocketBase ! bool WaitForRead(long seconds = 0, long milliseconds = 300) { return m_socket && m_socket->WaitForRead(seconds, milliseconds); } ! // Is Socket Connected, from wxSocketBase ! virtual bool IsConnected() { return m_socket && m_socket->IsConnected(); } ! ! // Read the whole buffer of size length into buffer buffer from the socket ! virtual int Read(char *buffer, wxUint32 length); ! // Write the whole buffer of size length to the socket ! virtual int Write(const char *buffer, wxUint32 length); ! ! virtual wxString GetLastErrorMsg() const; ! ! protected: ! wxSocketBase* m_socket; }; + // ---------------------------------------------------------------------------- + // wxLuaSocket - Choose the socket we want to use + // ---------------------------------------------------------------------------- + + typedef wxLuaCSocket wxLuaSocket; + #endif // WX_LUA_SOCKET_H_ Index: wxldtarg.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/wxldtarg.h,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** wxldtarg.h 12 Dec 2006 01:23:40 -0000 1.21 --- wxldtarg.h 19 May 2007 02:05:47 -0000 1.22 *************** *** 49,53 **** void ThreadFunction(); ! int HandleDebuggerCmd(int cmd); void DisplayError(const wxString& errorMsg) { NotifyError(errorMsg); } --- 49,53 ---- void ThreadFunction(); ! bool HandleDebuggerCmd(int cmd); void DisplayError(const wxString& errorMsg) { NotifyError(errorMsg); } Index: dservice.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/dservice.h,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** dservice.h 12 Dec 2006 01:23:40 -0000 1.21 --- dservice.h 19 May 2007 02:05:47 -0000 1.22 *************** *** 34,38 **** #include "wx/dynarray.h" - #include "wx/socket.h" #include "wx/filename.h" --- 34,37 ---- *************** *** 49,91 **** class WXDLLIMPEXP_WXLUASOCKET wxLuaDebuggee; - // ---------------------------------------------------------------------------- - // wxLuaDebugSocket - Handles Debugger/Debuggee IO - // ---------------------------------------------------------------------------- - - class WXDLLIMPEXP_WXLUASOCKET wxLuaDebugSocket : public wxLuaSocketBase - { - public: - wxLuaDebugSocket() : m_socket(NULL) {} - wxLuaDebugSocket(wxSocketBase* sock) : m_socket(sock) {} - - virtual ~wxLuaDebugSocket() { Destroy(); } - - // Safely close and destroy the socket - bool Destroy(); - - // Get/Set the socket, if you set a new socket you must delete the - // previous one first - wxSocketBase* GetSocket() const { return m_socket; } - void SetSocket(wxSocketBase* sock) { m_socket = sock; } - // Socket Error from wxSocketBase - bool Error() { return !m_socket || m_socket->Error(); } - // Is Socket Connected, from wxSocketBase - virtual bool IsConnected() { return m_socket && m_socket->IsConnected(); } - // Is Socket Connected, from wxSocketBase - bool WaitForRead(long seconds = 0, long milliseconds = 300) { return m_socket && m_socket->WaitForRead(seconds, milliseconds); } - - // Read the whole buffer of size length into buffer buffer from the socket - virtual int Read(char *buffer, wxUint32 length); - // Write the whole buffer of size length to the socket - virtual int Write(const char *buffer, wxUint32 length); - - protected: - wxSocketBase* m_socket; - }; - - WX_DECLARE_USER_EXPORTED_LIST(wxLuaDebugSocket, wxLuaDebugSocketList, WXDLLIMPEXP_WXLUASOCKET); - #include "wxluasocket/include/wxldserv.h" // ---------------------------------------------------------------------------- // wxLuaBreakPoint - Project BreakPoint - a filename/line pair --- 48,55 ---- class WXDLLIMPEXP_WXLUASOCKET wxLuaDebuggee; #include "wxluasocket/include/wxldserv.h" + WX_DECLARE_USER_EXPORTED_LIST(wxLuawxSocket, wxLuawxSocketList, WXDLLIMPEXP_WXLUASOCKET); + // ---------------------------------------------------------------------------- // wxLuaBreakPoint - Project BreakPoint - a filename/line pair *************** *** 149,153 **** void InteruptWait(); ! void NotifyBreakPoints(wxLuaDebugSocket* debugSocket = NULL); protected: --- 113,117 ---- void InteruptWait(); ! void NotifyBreakPoints(wxLuawxSocket* debugSocket = NULL); protected: *************** *** 242,247 **** bool NotifyTableEnumeration(long itemNode, const wxLuaDebugData& debugData); bool NotifyEvaluateExpr(int exprRef, const wxString &strResult); ! bool NotifyBreakpointAdded(wxLuaBreakPoint& breakPoint, wxLuaDebugSocket* debugSocket = NULL); ! bool NotifyBreakpointRemoved(wxLuaBreakPoint& breakPoint, wxLuaDebugSocket* debugSocket = NULL); wxLuaDebuggee* GetActiveDebuggee(); --- 206,211 ---- bool NotifyTableEnumeration(long itemNode, const wxLuaDebugData& debugData); bool NotifyEvaluateExpr(int exprRef, const wxString &strResult); ! bool NotifyBreakpointAdded(wxLuaBreakPoint& breakPoint, wxLuawxSocket* debugSocket = NULL); ! bool NotifyBreakpointRemoved(wxLuaBreakPoint& breakPoint, wxLuawxSocket* debugSocket = NULL); wxLuaDebuggee* GetActiveDebuggee(); *************** *** 253,257 **** void OnSocketEvent(wxSocketEvent& event); ! wxLuaDebugSocket* GetDebugSocket(wxSocketBase* sock); private: --- 217,221 ---- void OnSocketEvent(wxSocketEvent& event); ! wxLuawxSocket* GetDebugSocket(wxSocketBase* sock); private: *************** *** 261,265 **** // Debuggers connected to Service mutable wxCriticalSection m_debuggerSocketListCriticalSection; ! wxLuaDebugSocketList m_debuggerSocketList; // Lua Interpreters Hooked by Service --- 225,229 ---- // Debuggers connected to Service mutable wxCriticalSection m_debuggerSocketListCriticalSection; ! wxLuawxSocketList m_debuggerSocketList; // Lua Interpreters Hooked by Service *************** *** 295,299 **** private: mutable wxCriticalSection m_debuggerSocketCriticalSection; ! wxLuaDebugSocket* m_debuggerSocket; DECLARE_EVENT_TABLE() --- 259,263 ---- private: mutable wxCriticalSection m_debuggerSocketCriticalSection; ! wxLuawxSocket* m_debuggerSocket; DECLARE_EVENT_TABLE() |
