Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/src
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv22903/wxLua/modules/wxluasocket/src
Modified Files:
wxldserv.cpp wxlhandl.cpp
Log Message:
cleanup and formatting in the wxlua editor.wx.lua
move SetStackDialog to the wxLuaHandler so it can be used by other programs more easily
start work on using the socket code in the wxluaeditor
formatting in wxldserv.cpp
Index: wxldserv.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxldserv.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** wxldserv.cpp 6 Sep 2006 22:23:20 -0000 1.16
--- wxldserv.cpp 7 Sep 2006 04:20:54 -0000 1.17
***************
*** 526,530 ****
int wxLuaDebuggerBase::HandleDebugEvent(wxLuaDebugEvents_Type event_type)
{
! switch(event_type)
{
case wxLUA_EVENT_DEBUG_BREAK:
--- 526,532 ----
int wxLuaDebuggerBase::HandleDebugEvent(wxLuaDebugEvents_Type event_type)
{
! wxCHECK_MSG(GetSocketBase(), event_type, wxT("Invalid socket"));
!
! switch (event_type)
{
case wxLUA_EVENT_DEBUG_BREAK:
***************
*** 534,538 ****
wxLuaDebugEvent debugEvent(wxEVT_WXLUA_DEBUG_BREAK, lineNumber, fileName);
-
wxLuaHandler::GetHandler().AddPendingEvent(debugEvent);
break;
--- 536,539 ----
***************
*** 544,548 ****
wxLuaDebugEvent debugEvent(wxEVT_WXLUA_DEBUG_PRINT);
debugEvent.SetMessage(strMessage);
-
wxLuaHandler::GetHandler().AddPendingEvent(debugEvent);
break;
--- 545,548 ----
***************
*** 554,558 ****
wxLuaDebugEvent debugEvent(wxEVT_WXLUA_DEBUG_ERROR);
debugEvent.SetMessage(strMessage);
-
wxLuaHandler::GetHandler().AddPendingEvent(debugEvent);
break;
--- 554,557 ----
***************
*** 566,574 ****
case wxLUA_EVENT_DEBUG_STACK_ENUM:
{
- wxLuaDebugEvent debugEvent(wxEVT_WXLUA_DEBUG_STACK_ENUM);
wxLuaDebugData *pDebugData = GetSocketBase()->ReadDebugData();
if (pDebugData != NULL)
debugEvent.SetDebugData(-1, pDebugData);
-
wxLuaHandler::GetHandler().AddPendingEvent(debugEvent);
break;
--- 565,573 ----
case wxLUA_EVENT_DEBUG_STACK_ENUM:
{
wxLuaDebugData *pDebugData = GetSocketBase()->ReadDebugData();
+
+ wxLuaDebugEvent debugEvent(wxEVT_WXLUA_DEBUG_STACK_ENUM);
if (pDebugData != NULL)
debugEvent.SetDebugData(-1, pDebugData);
wxLuaHandler::GetHandler().AddPendingEvent(debugEvent);
break;
***************
*** 576,585 ****
case wxLUA_EVENT_DEBUG_STACK_ENTRY_ENUM:
{
- wxLuaDebugEvent debugEvent(wxEVT_WXLUA_DEBUG_STACK_ENTRY_ENUM);
int stackRef = GetSocketBase()->ReadInt();
wxLuaDebugData *pDebugData = GetSocketBase()->ReadDebugData();
if (pDebugData != NULL)
debugEvent.SetDebugData(stackRef, pDebugData);
-
wxLuaHandler::GetHandler().AddPendingEvent(debugEvent);
break;
--- 575,584 ----
case wxLUA_EVENT_DEBUG_STACK_ENTRY_ENUM:
{
int stackRef = GetSocketBase()->ReadInt();
wxLuaDebugData *pDebugData = GetSocketBase()->ReadDebugData();
+
+ wxLuaDebugEvent debugEvent(wxEVT_WXLUA_DEBUG_STACK_ENTRY_ENUM);
if (pDebugData != NULL)
debugEvent.SetDebugData(stackRef, pDebugData);
wxLuaHandler::GetHandler().AddPendingEvent(debugEvent);
break;
***************
*** 587,596 ****
case wxLUA_EVENT_DEBUG_TABLE_ENUM:
{
- wxLuaDebugEvent debugEvent(wxEVT_WXLUA_DEBUG_TABLE_ENUM);
long itemNode = GetSocketBase()->ReadLong();
wxLuaDebugData *pDebugData = GetSocketBase()->ReadDebugData();
if (pDebugData != NULL)
debugEvent.SetDebugData(itemNode, pDebugData);
-
wxLuaHandler::GetHandler().AddPendingEvent(debugEvent);
break;
--- 586,595 ----
case wxLUA_EVENT_DEBUG_TABLE_ENUM:
{
long itemNode = GetSocketBase()->ReadLong();
wxLuaDebugData *pDebugData = GetSocketBase()->ReadDebugData();
+
+ wxLuaDebugEvent debugEvent(wxEVT_WXLUA_DEBUG_TABLE_ENUM);
if (pDebugData != NULL)
debugEvent.SetDebugData(itemNode, pDebugData);
wxLuaHandler::GetHandler().AddPendingEvent(debugEvent);
break;
***************
*** 598,608 ****
case wxLUA_EVENT_DEBUG_EVALUATE_EXPR:
{
- wxLuaDebugEvent debugEvent(wxEVT_WXLUA_DEBUG_EVALUATE_EXPR);
int exprRef = GetSocketBase()->ReadInt();
wxString strResult = GetSocketBase()->ReadString();
debugEvent.SetMessage(strResult);
debugEvent.SetDebugData(exprRef);
-
wxLuaHandler::GetHandler().AddPendingEvent(debugEvent);
break;
--- 597,606 ----
case wxLUA_EVENT_DEBUG_EVALUATE_EXPR:
{
int exprRef = GetSocketBase()->ReadInt();
wxString strResult = GetSocketBase()->ReadString();
+ wxLuaDebugEvent debugEvent(wxEVT_WXLUA_DEBUG_EVALUATE_EXPR);
debugEvent.SetMessage(strResult);
debugEvent.SetDebugData(exprRef);
wxLuaHandler::GetHandler().AddPendingEvent(debugEvent);
break;
***************
*** 614,618 ****
bool enabled = GetSocketBase()->ReadInt() ? true : false;
! wxLuaDebugEvent debugEvent(wxEVT_WXLUA_DEBUG_BREAKPOINT_ADDED, line, fileName, enabled);
wxLuaHandler::GetHandler().AddPendingEvent(debugEvent);
break;
--- 612,616 ----
bool enabled = GetSocketBase()->ReadInt() ? true : false;
! wxLuaDebugEvent debugEvent(wxEVT_WXLUA_DEBUG_BREAKPOINT_ADDED, line, fileName, enabled);
wxLuaHandler::GetHandler().AddPendingEvent(debugEvent);
break;
***************
*** 623,627 ****
int line = GetSocketBase()->ReadInt();
! wxLuaDebugEvent debugEvent(wxEVT_WXLUA_DEBUG_BREAKPOINT_REMOVED, line, fileName);
wxLuaHandler::GetHandler().AddPendingEvent(debugEvent);
break;
--- 621,625 ----
int line = GetSocketBase()->ReadInt();
! wxLuaDebugEvent debugEvent(wxEVT_WXLUA_DEBUG_BREAKPOINT_REMOVED, line, fileName);
wxLuaHandler::GetHandler().AddPendingEvent(debugEvent);
break;
***************
*** 629,633 ****
default : break;
}
!
return event_type;
}
--- 627,631 ----
default : break;
}
!
return event_type;
}
***************
*** 733,740 ****
if (m_serverSocket != NULL)
{
! // close the server socket by connecting to the socket, thus
! // completing the 'accept'. If a client has not connected, this
// code will satisfy the accept the m_fShutdown flag will be set
! // so the thread will not loop and instead will just destroy the
// session socket object and return.
try
--- 731,738 ----
if (m_serverSocket != NULL)
{
! // close the server socket by connecting to the socket, thus
! // completing the 'accept'. If a client has not connected, this
// code will satisfy the accept the m_fShutdown flag will be set
! // so the thread will not loop and instead will just destroy the
// session socket object and return.
try
Index: wxlhandl.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxlhandl.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** wxlhandl.cpp 6 Sep 2006 05:33:09 -0000 1.4
--- wxlhandl.cpp 7 Sep 2006 04:20:54 -0000 1.5
***************
*** 32,38 ****
wxLuaHandler* wxLuaHandler::sm_luaHandler = NULL;
! wxLuaHandler::wxLuaHandler()
{
! wxASSERT_MSG(!sm_luaHandler, wxT("There can only be one wxLuaHandler"));
sm_luaHandler = this;
}
--- 32,38 ----
wxLuaHandler* wxLuaHandler::sm_luaHandler = NULL;
! wxLuaHandler::wxLuaHandler() : m_stackDialog(NULL)
{
! wxASSERT_MSG(!sm_luaHandler, wxT("There can only be one wxLuaHandler!"));
sm_luaHandler = this;
}
|
