Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/include
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv23774/wxLua/modules/wxluasocket/include
Modified Files:
wxldserv.h wxlsock.h
Log Message:
add GetEventTypeName(int) to bindings to lookup event name string
use sizers in stack dialog
simplify the stackdialog by unifying all treectrl item adding
better comments in headers
Index: wxldserv.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/wxldserv.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** wxldserv.h 29 Sep 2006 22:22:06 -0000 1.17
--- wxldserv.h 2 Oct 2006 21:19:24 -0000 1.18
***************
*** 19,22 ****
--- 19,23 ----
#include "wxluasocket/include/wxlsock.h"
+ class WXDLLIMPEXP_WXLUASOCKET wxLuaDebuggerBase;
class WXDLLIMPEXP_WXLUASOCKET wxLuaDebuggerServer;
class WXDLLIMPEXP_WXLUASOCKET wxLuaDebuggerEvent;
***************
*** 25,29 ****
// ----------------------------------------------------------------------------
// wxLuaSocketDebuggeeEvents_Type - These are socket events sent from debuggee
! // to debugger to notify the debugger that action has been taken.
// ----------------------------------------------------------------------------
--- 26,33 ----
// ----------------------------------------------------------------------------
// wxLuaSocketDebuggeeEvents_Type - These are socket events sent from debuggee
! // to debugger to notify the debugger that action has been taken which was
! // probably a result of a previously received
! // wxLuaSocketDebuggerCommands_Type.
! // These socket events should be sent with wxLuaSocketBase::Read/WriteCmd()
// ----------------------------------------------------------------------------
***************
*** 49,52 ****
--- 53,57 ----
// debugger to debuggee to direct the debuggee to take action, which will
// then return with a wxLuaSocketDebuggeeEvents_Type when done.
+ // These socket commands should be sent with wxLuaSocketBase::Read/WriteCmd()
// ----------------------------------------------------------------------------
***************
*** 76,79 ****
--- 81,88 ----
// ----------------------------------------------------------------------------
// wxLuaDebuggerServerInterface - a wxLuaInterface for the wxLuaDebuggerServer
+ // If you want to show a wxLuaStackDialog for a program being debugged,
+ // create this interface and the wxLuaStackDialog in the wxLuaDebuggerServer
+ // debugger process and then this will act as a middle man to get the
+ // wxLuaDebugData from the socket connection which may be delayed.
// ----------------------------------------------------------------------------
***************
*** 81,87 ****
{
public:
! wxLuaDebuggerServerInterface(wxLuaDebuggerServer* server);
virtual ~wxLuaDebuggerServerInterface();
virtual wxLuaDebugData EnumerateStack();
virtual wxLuaDebugData EnumerateStackEntry(int nEntry);
--- 90,99 ----
{
public:
! wxLuaDebuggerServerInterface(wxLuaDebuggerBase* debugger);
virtual ~wxLuaDebuggerServerInterface();
+ // instruct the wxLuaDebuggerServer to send cmds to the debuggee which
+ // responds to the debugger with events and the required data, see
+ // wxLuaDebuggerBase::OnDebugStackEnum, OnDebugStackEntryEnum, OnDebugTableEnum
virtual wxLuaDebugData EnumerateStack();
virtual wxLuaDebugData EnumerateStackEntry(int nEntry);
***************
*** 89,96 ****
virtual wxLuaDebugData GetGlobalData();
! virtual bool IsDebugServer() const { return true; }
private:
! wxLuaDebuggerServer* m_pServer;
};
--- 101,108 ----
virtual wxLuaDebugData GetGlobalData();
! virtual bool IsDebugger() const { return true; }
private:
! wxLuaDebuggerBase* m_luaDebugger;
};
Index: wxlsock.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/wxlsock.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** wxlsock.h 29 Sep 2006 22:22:06 -0000 1.16
--- wxlsock.h 2 Oct 2006 21:19:24 -0000 1.17
***************
*** 161,171 ****
}
- // Test if the socket is writeable
- bool IsWritable() const
- {
- return ((m_sockstate != SOCKET_CONNECTED) ||
- (m_sockstate == SOCKET_WRITE_BLOCKED));
- }
-
// Get the address of the socket
wxString GetAddress() const;
--- 161,164 ----
***************
*** 182,186 ****
bool Close();
! private:
// Prevent copying and assignment of this class
wxLuaSocket(const wxLuaSocket&);
--- 175,179 ----
bool Close();
! protected:
// Prevent copying and assignment of this class
wxLuaSocket(const wxLuaSocket&);
***************
*** 191,194 ****
--- 184,188 ----
SocketState m_sockstate;
+ private:
DECLARE_ABSTRACT_CLASS(wxLuaSocket);
};
|
