Thread: [Wxlua-commit] wxLua/modules/wxluasocket/src dservice.cpp,1.4,1.5 wxldbgio.cpp,1.2,1.3 wxldserv.cpp,

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32720/wxLua/modules/wxluasocket/src

Modified Files:
	dservice.cpp wxldbgio.cpp wxldserv.cpp wxldtarg.cpp 
	wxlsock.cpp 
Log Message:
wxEVT_DEBUG_XXX -> wxEVT_WXLUA_DEBUG_XXX and export them for DLL
reorder libs for linking in wxluaedit
TRUE/FALSE -> true/false
EVENT_DEBUG_XXX and CMD_XXX -> wxLUA_EVENT_DEBUG_XXX wxLUA_CMD_XXX

Index: wxldtarg.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxldtarg.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** wxldtarg.cpp	30 Nov 2005 04:46:17 -0000	1.3
--- wxldtarg.cpp	1 Dec 2005 04:17:29 -0000	1.4
***************
*** 101,107 ****
      m_pThread = new LuaThread(this);
      // Start the thread
!     if (m_pThread != NULL                        &&
!         m_pThread->Create() == wxTHREAD_NO_ERROR &&
!         m_pThread->Run()    == wxTHREAD_NO_ERROR)
      {
          // Wait for the connection to the server to complete
--- 101,107 ----
      m_pThread = new LuaThread(this);
      // Start the thread
!     if ((m_pThread != NULL)                        &&
!         (m_pThread->Create() == wxTHREAD_NO_ERROR) &&
!         (m_pThread->Run()    == wxTHREAD_NO_ERROR))
      {
          // Wait for the connection to the server to complete
***************
*** 118,123 ****
              m_fErrorsSeen = false;

!             size_t idx;
!             for (idx = 0; idx < m_bufferList.Count(); ++idx)
              {
                  int rc = LUA_ERRERR;
--- 118,123 ----
              m_fErrorsSeen = false;

!             size_t idx, count = m_bufferList.Count();
!             for (idx = 0; idx < count; ++idx)
              {
                  int rc = LUA_ERRERR;
***************
*** 193,197 ****
              switch(debugCommand)
              {
!                 case CMD_ADD_BREAKPOINT:
                      {
                          wxString fileName   = ReadString(&m_clientSocket);
--- 193,197 ----
              switch(debugCommand)
              {
!                 case wxLUA_CMD_ADD_BREAKPOINT:
                      {
                          wxString fileName   = ReadString(&m_clientSocket);
***************
*** 202,206 ****
                      break;

!                 case CMD_REMOVE_BREAKPOINT:
                      {
                          wxString fileName   = ReadString(&m_clientSocket);
--- 202,206 ----
                      break;

!                 case wxLUA_CMD_REMOVE_BREAKPOINT:
                      {
                          wxString fileName   = ReadString(&m_clientSocket);
***************
*** 211,219 ****
                      break;

!                 case CMD_CLEAR_ALL_BREAKPOINTS:
                      ClearAllBreakPoints();
                      break;

!                 case CMD_RUN_BUFFER:
                      {
                          wxString fileName = ReadString(&m_clientSocket);
--- 211,219 ----
                      break;

!                 case wxLUA_CMD_CLEAR_ALL_BREAKPOINTS:
                      ClearAllBreakPoints();
                      break;

!                 case wxLUA_CMD_RUN_BUFFER:
                      {
                          wxString fileName = ReadString(&m_clientSocket);
***************
*** 224,252 ****
                      break;

!                 case CMD_DEBUG_STEP:
                      Step();
                      break;

!                 case CMD_DEBUG_STEPOVER:
                      StepOver();
                      break;

!                 case CMD_DEBUG_STEPOUT:
                      StepOut();
                      break;

!                 case CMD_DEBUG_CONTINUE:
                      Continue();
                      break;

!                 case CMD_DEBUG_BREAK:
                      Break();
                      break;

!                 case CMD_ENUMERATE_STACK:
                      EnumerateStack();
                      break;

!                 case CMD_ENUMERATE_STACK_ENTRY:
                      {
                          int stackRef = ReadInt(&m_clientSocket);
--- 224,252 ----
                      break;

!                 case wxLUA_CMD_DEBUG_STEP:
                      Step();
                      break;

!                 case wxLUA_CMD_DEBUG_STEPOVER:
                      StepOver();
                      break;

!                 case wxLUA_CMD_DEBUG_STEPOUT:
                      StepOut();
                      break;

!                 case wxLUA_CMD_DEBUG_CONTINUE:
                      Continue();
                      break;

!                 case wxLUA_CMD_DEBUG_BREAK:
                      Break();
                      break;

!                 case wxLUA_CMD_ENUMERATE_STACK:
                      EnumerateStack();
                      break;

!                 case wxLUA_CMD_ENUMERATE_STACK_ENTRY:
                      {
                          int stackRef = ReadInt(&m_clientSocket);
***************
*** 255,259 ****
                      break;

!                 case CMD_ENUMERATE_TABLE_REF:
                      {
                          int tableRef  = ReadInt(&m_clientSocket);
--- 255,259 ----
                      break;

!                 case wxLUA_CMD_ENUMERATE_TABLE_REF:
                      {
                          int tableRef  = ReadInt(&m_clientSocket);
***************
*** 264,272 ****
                      break;

!                 case CMD_RESET:
                      Reset();
                      break;

!                 case CMD_EVALUATE_EXPR:
                      {
                          int exprRef       = ReadInt(&m_clientSocket);
--- 264,272 ----
                      break;

!                 case wxLUA_CMD_RESET:
                      Reset();
                      break;

!                 case wxLUA_CMD_EVALUATE_EXPR:
                      {
                          int exprRef       = ReadInt(&m_clientSocket);
***************
*** 276,280 ****
                      break;

!                 case CMD_CLEAR_DEBUG_REFERENCES:
                      {
                          size_t idx, idxMax = m_references.GetCount();
--- 276,280 ----
                      break;

!                 case wxLUA_CMD_CLEAR_DEBUG_REFERENCES:
                      {
                          size_t idx, idxMax = m_references.GetCount();
***************
*** 286,292 ****
                      }
                      break;
!                 case CMD_DISABLE_BREAKPOINT:
                      break;
!                 case CMD_ENABLE_BREAKPOINT:
                      break;
              }
--- 286,293 ----
                      }
                      break;
! 
!                 case wxLUA_CMD_DISABLE_BREAKPOINT:
                      break;
!                 case wxLUA_CMD_ENABLE_BREAKPOINT:
                      break;
              }
***************
*** 332,337 ****
  bool wxLuaDebugTarget::Run(const wxString &fileName, const wxString &buffer)
  {
!     wxLuaBuffer *pBuffer = new wxLuaBuffer(fileName,
!                                            buffer);
      if (pBuffer != NULL)
      {
--- 333,338 ----
  bool wxLuaDebugTarget::Run(const wxString &fileName, const wxString &buffer)
  {
!     wxLuaBuffer *pBuffer = new wxLuaBuffer(fileName, buffer);
! 
      if (pBuffer != NULL)
      {
***************
*** 345,353 ****
  {
      m_nextOperation = DEBUG_STEP;
      if (!m_fRunning)
          m_runCondition.Signal();
!     else
!     if (m_fStopped)
          m_debugCondition.Signal();
      return true;
  }
--- 346,355 ----
  {
      m_nextOperation = DEBUG_STEP;
+ 
      if (!m_fRunning)
          m_runCondition.Signal();
!     else if (m_fStopped)
          m_debugCondition.Signal();
+ 
      return true;
  }
***************
*** 357,365 ****
      m_nFramesUntilBreak = 0;
      m_nextOperation = DEBUG_STEPOVER;
      if (!m_fRunning)
          m_runCondition.Signal();
!     else
!     if (m_fStopped)
          m_debugCondition.Signal();
      return true;
  }
--- 359,368 ----
      m_nFramesUntilBreak = 0;
      m_nextOperation = DEBUG_STEPOVER;
+ 
      if (!m_fRunning)
          m_runCondition.Signal();
!     else if (m_fStopped)
          m_debugCondition.Signal();
+ 
      return true;
  }
***************
*** 369,377 ****
      m_nFramesUntilBreak = 1;
      m_nextOperation = DEBUG_STEPOVER;
      if (!m_fRunning)
          m_runCondition.Signal();
!     else
!     if (m_fStopped)
          m_debugCondition.Signal();
      return true;
  }
--- 372,381 ----
      m_nFramesUntilBreak = 1;
      m_nextOperation = DEBUG_STEPOVER;
+ 
      if (!m_fRunning)
          m_runCondition.Signal();
!     else if (m_fStopped)
          m_debugCondition.Signal();
+ 
      return true;
  }
***************
*** 380,388 ****
  {
      m_nextOperation = DEBUG_GO;
      if (!m_fRunning)
          m_runCondition.Signal();
!     else
!     if (m_fStopped)
          m_debugCondition.Signal();
      return true;
  }
--- 384,393 ----
  {
      m_nextOperation = DEBUG_GO;
+ 
      if (!m_fRunning)
          m_runCondition.Signal();
!     else if (m_fStopped)
          m_debugCondition.Signal();
+ 
      return true;
  }
***************
*** 390,394 ****
  bool wxLuaDebugTarget::Break()
  {
!     m_forceBreak = TRUE;
      return true;
  }
--- 395,399 ----
  bool wxLuaDebugTarget::Break()
  {
!     m_forceBreak = true;
      return true;
  }
***************
*** 396,406 ****
  bool wxLuaDebugTarget::Reset()
  {
!     m_forceBreak     = TRUE;
!     m_resetRequested = TRUE;
      if (!m_fRunning)
          m_runCondition.Signal();
!     else
!     if (m_fStopped)
          m_debugCondition.Signal();
      return true;
  }
--- 401,412 ----
  bool wxLuaDebugTarget::Reset()
  {
!     m_forceBreak     = true;
!     m_resetRequested = true;
! 
      if (!m_fRunning)
          m_runCondition.Signal();
!     else if (m_fStopped)
          m_debugCondition.Signal();
+ 
      return true;
  }
***************
*** 426,430 ****
                  // skip stack frames that do not have line number
                  int  currentLine = luaDebug.currentline;
!                 if (!fFirst || currentLine != -1)
                  {
                      if (currentLine == -1)
--- 432,436 ----
                  // skip stack frames that do not have line number
                  int  currentLine = luaDebug.currentline;
!                 if (!fFirst || (currentLine != -1))
                  {
                      if (currentLine == -1)
***************
*** 898,905 ****
  wxString wxLuaDebugTarget::MakeBoolean(int num)
  {
!     if (num)
!         return wxT("True");
! 
!     return wxT("False");
  }

--- 904,908 ----
  wxString wxLuaDebugTarget::MakeBoolean(int num)
  {
!     return num != 0 ? wxT("True") : wxT("False");
  }

***************
*** 908,912 ****
      if (WaitForConnect())
      {
!         WriteByte(&m_clientSocket, EVENT_DEBUG_BREAK);
          WriteString(&m_clientSocket, fileName);
          WriteInt(&m_clientSocket, lineNumber);
--- 911,915 ----
      if (WaitForConnect())
      {
!         WriteByte(&m_clientSocket, wxLUA_EVENT_DEBUG_BREAK);
          WriteString(&m_clientSocket, fileName);
          WriteInt(&m_clientSocket, lineNumber);
***************
*** 920,924 ****
      if (WaitForConnect())
      {
!         WriteByte(&m_clientSocket, EVENT_DEBUG_ERROR);
          WriteString(&m_clientSocket, errorMsg);
          return true;
--- 923,927 ----
      if (WaitForConnect())
      {
!         WriteByte(&m_clientSocket, wxLUA_EVENT_DEBUG_ERROR);
          WriteString(&m_clientSocket, errorMsg);
          return true;
***************
*** 931,935 ****
      if (WaitForConnect())
      {
!         WriteByte(&m_clientSocket, EVENT_DEBUG_ERROR);
          WriteString(&m_clientSocket, errorMsg);
          return true;
--- 934,938 ----
      if (WaitForConnect())
      {
!         WriteByte(&m_clientSocket, wxLUA_EVENT_DEBUG_ERROR);
          WriteString(&m_clientSocket, errorMsg);
          return true;
***************
*** 946,950 ****
      if (WaitForConnect())
      {
!         WriteByte(&m_clientSocket, EVENT_DEBUG_EXIT);
          return true;
      }
--- 949,953 ----
      if (WaitForConnect())
      {
!         WriteByte(&m_clientSocket, wxLUA_EVENT_DEBUG_EXIT);
          return true;
      }
***************
*** 956,960 ****
      if (WaitForConnect())
      {
!         WriteByte(&m_clientSocket, EVENT_DEBUG_STACK_ENUM);
          WriteDebugData(&m_clientSocket, pDebugData);
          return true;
--- 959,963 ----
      if (WaitForConnect())
      {
!         WriteByte(&m_clientSocket, wxLUA_EVENT_DEBUG_STACK_ENUM);
          WriteDebugData(&m_clientSocket, pDebugData);
          return true;
***************
*** 964,973 ****
  }

! bool wxLuaDebugTarget::NotifyStackEntryEnumeration(int          entryRef,
                                                     wxLuaDebugData *pDebugData)
  {
      if (WaitForConnect())
      {
!         WriteByte(&m_clientSocket, EVENT_DEBUG_STACK_ENTRY_ENUM);
          WriteInt(&m_clientSocket, entryRef);
          WriteDebugData(&m_clientSocket, pDebugData);
--- 967,976 ----
  }

! bool wxLuaDebugTarget::NotifyStackEntryEnumeration(int             entryRef,
                                                     wxLuaDebugData *pDebugData)
  {
      if (WaitForConnect())
      {
!         WriteByte(&m_clientSocket, wxLUA_EVENT_DEBUG_STACK_ENTRY_ENUM);
          WriteInt(&m_clientSocket, entryRef);
          WriteDebugData(&m_clientSocket, pDebugData);
***************
*** 978,987 ****
  }

! bool wxLuaDebugTarget::NotifyTableEnumeration(int          itemNode,
                                                wxLuaDebugData *pDebugData)
  {
      if (WaitForConnect())
      {
!         WriteByte(&m_clientSocket, EVENT_DEBUG_TABLE_ENUM);
          WriteInt(&m_clientSocket, itemNode);
          WriteDebugData(&m_clientSocket, pDebugData);
--- 981,990 ----
  }

! bool wxLuaDebugTarget::NotifyTableEnumeration(int             itemNode,
                                                wxLuaDebugData *pDebugData)
  {
      if (WaitForConnect())
      {
!         WriteByte(&m_clientSocket, wxLUA_EVENT_DEBUG_TABLE_ENUM);
          WriteInt(&m_clientSocket, itemNode);
          WriteDebugData(&m_clientSocket, pDebugData);
***************
*** 992,1001 ****
  }

! bool wxLuaDebugTarget::NotifyEvaluateExpr(int                exprRef,
                                            const wxString &strResult)
  {
      if (WaitForConnect())
      {
!         WriteByte(&m_clientSocket, EVENT_DEBUG_EVALUATE_EXPR);
          WriteInt(&m_clientSocket, exprRef);
          WriteString(&m_clientSocket, strResult);
--- 995,1004 ----
  }

! bool wxLuaDebugTarget::NotifyEvaluateExpr(int             exprRef,
                                            const wxString &strResult)
  {
      if (WaitForConnect())
      {
!         WriteByte(&m_clientSocket, wxLUA_EVENT_DEBUG_EVALUATE_EXPR);
          WriteInt(&m_clientSocket, exprRef);
          WriteString(&m_clientSocket, strResult);
***************
*** 1037,1041 ****
              m_nFramesUntilBreak++;
          else
!         if (event == LUA_HOOKRET || event == LUA_HOOKTAILRET) // return
          {
              if (m_nFramesUntilBreak > 0)
--- 1040,1044 ----
              m_nFramesUntilBreak++;
          else
!         if ((event == LUA_HOOKRET) || (event == LUA_HOOKTAILRET)) // return
          {
              if (m_nFramesUntilBreak > 0)
***************
*** 1118,1122 ****
  }

! int LUACALL wxLuaDebugTarget::LuaPrint (lua_State *L)
  {
      int         idx;
--- 1121,1125 ----
  }

! int LUACALL wxLuaDebugTarget::LuaPrint(lua_State *L)
  {
      int         idx;

Index: wxldbgio.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxldbgio.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** wxldbgio.cpp	25 Nov 2005 19:45:37 -0000	1.2
--- wxldbgio.cpp	1 Dec 2005 04:17:29 -0000	1.3
***************
*** 23,28 ****

  #include "wxluasocket/include/wxldbgio.h"
  #include "wxluasocket/include/wxlsock.h"
- #include "wxlua/include/internal.h"
  #include "wxluadebug/include/wxldebug.h"

--- 23,28 ----

  #include "wxluasocket/include/wxldbgio.h"
+ #include "wxlua/include/wxlstate.h"
  #include "wxluasocket/include/wxlsock.h"
  #include "wxluadebug/include/wxldebug.h"

***************
*** 102,106 ****
      try
      {
!         size_t idx, idxMax;
          pSocket->Read((char *) &idxMax, sizeof(idxMax));

--- 102,106 ----
      try
      {
!         size_t idx, idxMax = 0;
          pSocket->Read((char *) &idxMax, sizeof(idxMax));

***************
*** 248,252 ****
  bool wxLuaDebugIO::WriteString(wxLuaSocket *pSocket, const wxString &value)
  {
!     bool result = FALSE;
      try
      {
--- 248,252 ----
  bool wxLuaDebugIO::WriteString(wxLuaSocket *pSocket, const wxString &value)
  {
!     bool result = false;
      try
      {
***************
*** 258,262 ****
              pSocket->Write(buf.GetData(), buflen);
          }
!         result = TRUE;
      }
      catch(wxLuaSocketException & /*e*/)
--- 258,262 ----
              pSocket->Write(buf.GetData(), buflen);
          }
!         result = true;
      }
      catch(wxLuaSocketException & /*e*/)

Index: dservice.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/dservice.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** dservice.cpp	26 Nov 2005 03:15:20 -0000	1.4
--- dservice.cpp	1 Dec 2005 04:17:29 -0000	1.5
***************
*** 374,378 ****
          m_serverSocket->SetNotify(wxSOCKET_CONNECTION_FLAG);
          m_serverSocket->SetFlags(wxSOCKET_BLOCK);
!         m_serverSocket->Notify(TRUE);
      }

--- 374,378 ----
          m_serverSocket->SetNotify(wxSOCKET_CONNECTION_FLAG);
          m_serverSocket->SetFlags(wxSOCKET_BLOCK);
!         m_serverSocket->Notify(true);
      }

***************
*** 396,400 ****
      {
          wxLuaDebugSocket* debugSocket;
!         wxSocketBase *sock = m_serverSocket->Accept(FALSE);
          if (!sock)
          {
--- 396,400 ----
      {
          wxLuaDebugSocket* debugSocket;
!         wxSocketBase *sock = m_serverSocket->Accept(false);
          if (!sock)
          {
***************
*** 417,421 ****
          sock->SetEventHandler(*this, SOCKET_ID);
          sock->SetNotify(wxSOCKET_INPUT_FLAG | wxSOCKET_LOST_FLAG);
!         sock->Notify(TRUE);

          // Notify Connected Debugger of Existing BreakPoints
--- 417,421 ----
          sock->SetEventHandler(*this, SOCKET_ID);
          sock->SetNotify(wxSOCKET_INPUT_FLAG | wxSOCKET_LOST_FLAG);
!         sock->Notify(true);

          // Notify Connected Debugger of Existing BreakPoints
***************
*** 454,458 ****
              switch(debugCommand)
              {
!             case CMD_ADD_BREAKPOINT:
                  {
                      wxString fileName   = debugSocket->ReadString();
--- 454,458 ----
              switch(debugCommand)
              {
!             case wxLUA_CMD_ADD_BREAKPOINT:
                  {
                      wxString fileName   = debugSocket->ReadString();
***************
*** 463,467 ****
                  break;

!             case CMD_REMOVE_BREAKPOINT:
                  {
                      wxString fileName   = debugSocket->ReadString();
--- 463,467 ----
                  break;

!             case wxLUA_CMD_REMOVE_BREAKPOINT:
                  {
                      wxString fileName   = debugSocket->ReadString();
***************
*** 472,476 ****
                  break;

!             case CMD_DISABLE_BREAKPOINT:
                  {
                      wxString fileName   = debugSocket->ReadString();
--- 472,476 ----
                  break;

!             case wxLUA_CMD_DISABLE_BREAKPOINT:
                  {
                      wxString fileName   = debugSocket->ReadString();
***************
*** 482,486 ****

!             case CMD_ENABLE_BREAKPOINT:
                  {
                      wxString fileName   = debugSocket->ReadString();
--- 482,486 ----

!             case wxLUA_CMD_ENABLE_BREAKPOINT:
                  {
                      wxString fileName   = debugSocket->ReadString();
***************
*** 491,523 ****
                  break;

!             case CMD_CLEAR_ALL_BREAKPOINTS:
                  debuggee->ClearAllBreakPoints();
                  break;

!             case CMD_DEBUG_STEP:
                  debuggee->Step();
                  break;

!             case CMD_DEBUG_STEPOVER:
                  debuggee->StepOver();
                  break;

!             case CMD_DEBUG_STEPOUT:
                  debuggee->StepOut();
                  break;

!             case CMD_DEBUG_CONTINUE:
                  debuggee->Continue();
                  break;

!             case CMD_DEBUG_BREAK:
                  debuggee->Break();
                  break;

!             case CMD_ENUMERATE_STACK:
                  debuggee->EnumerateStack();
                  break;

!             case CMD_ENUMERATE_STACK_ENTRY:
                  {
                      int stackRef = debugSocket->ReadInt();
--- 491,523 ----
                  break;

!             case wxLUA_CMD_CLEAR_ALL_BREAKPOINTS:
                  debuggee->ClearAllBreakPoints();
                  break;

!             case wxLUA_CMD_DEBUG_STEP:
                  debuggee->Step();
                  break;

!             case wxLUA_CMD_DEBUG_STEPOVER:
                  debuggee->StepOver();
                  break;

!             case wxLUA_CMD_DEBUG_STEPOUT:
                  debuggee->StepOut();
                  break;

!             case wxLUA_CMD_DEBUG_CONTINUE:
                  debuggee->Continue();
                  break;

!             case wxLUA_CMD_DEBUG_BREAK:
                  debuggee->Break();
                  break;

!             case wxLUA_CMD_ENUMERATE_STACK:
                  debuggee->EnumerateStack();
                  break;

!             case wxLUA_CMD_ENUMERATE_STACK_ENTRY:
                  {
                      int stackRef = debugSocket->ReadInt();
***************
*** 526,530 ****
                  break;

!             case CMD_ENUMERATE_TABLE_REF:
                  {
                      int tableRef  = debugSocket->ReadInt();
--- 526,530 ----
                  break;

!             case wxLUA_CMD_ENUMERATE_TABLE_REF:
                  {
                      int tableRef  = debugSocket->ReadInt();
***************
*** 535,543 ****
                  break;

!             case CMD_RESET:
                  debuggee->Reset();
                  break;

!             case CMD_EVALUATE_EXPR:
                  {
                      int      exprRef  = debugSocket->ReadInt();
--- 535,543 ----
                  break;

!             case wxLUA_CMD_RESET:
                  debuggee->Reset();
                  break;

!             case wxLUA_CMD_EVALUATE_EXPR:
                  {
                      int      exprRef  = debugSocket->ReadInt();
***************
*** 547,556 ****
                  break;

!             case CMD_CLEAR_DEBUG_REFERENCES:
                  {
                      debuggee->ClearReferences();
                  }
                  break;
!             case CMD_RUN_BUFFER: break; // FIXME - not impemented
              }
          }
--- 547,556 ----
                  break;

!             case wxLUA_CMD_CLEAR_DEBUG_REFERENCES:
                  {
                      debuggee->ClearReferences();
                  }
                  break;
!             case wxLUA_CMD_RUN_BUFFER: break; // FIXME - not impemented
              }
          }
***************
*** 594,598 ****
                  debuggee->Continue();

!             wxLuaDebugEvent debugEvent(wxEVT_DEBUG_STOPDEBUGGER);
              wxLuaHandler::GetHandler().ProcessEvent(debugEvent);
          }
--- 594,598 ----
                  debuggee->Continue();

!             wxLuaDebugEvent debugEvent(wxEVT_WXLUA_DEBUG_STOPDEBUGGER);
              wxLuaHandler::GetHandler().ProcessEvent(debugEvent);
          }
***************
*** 656,660 ****
      if (!IsDebugger())
      {
!         wxLuaDebugEvent debugEvent(wxEVT_DEBUG_STARTDEBUGGER);

          // started debug process
--- 656,660 ----
      if (!IsDebugger())
      {
!         wxLuaDebugEvent debugEvent(wxEVT_WXLUA_DEBUG_STARTDEBUGGER);

          // started debug process
***************
*** 673,677 ****
      for (size_t i = 0; i < m_debuggerSocketList.GetCount(); i++)
      {
!         m_debuggerSocketList[i]->WriteByte(EVENT_DEBUG_BREAK);
  #if wxCHECK_VERSION(2,3,0)
          m_debuggerSocketList[i]->WriteString(fileName.GetFullPath());
--- 673,677 ----
      for (size_t i = 0; i < m_debuggerSocketList.GetCount(); i++)
      {
!         m_debuggerSocketList[i]->WriteByte(wxLUA_EVENT_DEBUG_BREAK);
  #if wxCHECK_VERSION(2,3,0)
          m_debuggerSocketList[i]->WriteString(fileName.GetFullPath());
***************
*** 697,701 ****
      for (size_t i = 0; i < m_debuggerSocketList.GetCount(); i++)
      {
!         m_debuggerSocketList[i]->WriteByte(EVENT_DEBUG_ERROR);
          m_debuggerSocketList[i]->WriteString(errorMsg);

--- 697,701 ----
      for (size_t i = 0; i < m_debuggerSocketList.GetCount(); i++)
      {
!         m_debuggerSocketList[i]->WriteByte(wxLUA_EVENT_DEBUG_ERROR);
          m_debuggerSocketList[i]->WriteString(errorMsg);

***************
*** 716,720 ****
      for (size_t i = 0; i < m_debuggerSocketList.GetCount(); i++)
      {
!         m_debuggerSocketList[i]->WriteByte(EVENT_DEBUG_ERROR);
          m_debuggerSocketList[i]->WriteString(errorMsg);

--- 716,720 ----
      for (size_t i = 0; i < m_debuggerSocketList.GetCount(); i++)
      {
!         m_debuggerSocketList[i]->WriteByte(wxLUA_EVENT_DEBUG_ERROR);
          m_debuggerSocketList[i]->WriteString(errorMsg);

***************
*** 735,739 ****
      for (size_t i = 0; i < m_debuggerSocketList.GetCount(); i++)
      {
!         m_debuggerSocketList[i]->WriteByte(EVENT_DEBUG_EXIT);

          if (!m_debuggerSocketList[i]->Error())
--- 735,739 ----
      for (size_t i = 0; i < m_debuggerSocketList.GetCount(); i++)
      {
!         m_debuggerSocketList[i]->WriteByte(wxLUA_EVENT_DEBUG_EXIT);

          if (!m_debuggerSocketList[i]->Error())
***************
*** 753,757 ****
      for (size_t i = 0; i < m_debuggerSocketList.GetCount(); i++)
      {
!         m_debuggerSocketList[i]->WriteByte(EVENT_DEBUG_STACK_ENUM);
          m_debuggerSocketList[i]->WriteDebugData(pDebugData);

--- 753,757 ----
      for (size_t i = 0; i < m_debuggerSocketList.GetCount(); i++)
      {
!         m_debuggerSocketList[i]->WriteByte(wxLUA_EVENT_DEBUG_STACK_ENUM);
          m_debuggerSocketList[i]->WriteDebugData(pDebugData);

***************
*** 774,778 ****
      for (size_t i = 0; i < m_debuggerSocketList.GetCount(); i++)
      {
!         m_debuggerSocketList[i]->WriteByte(EVENT_DEBUG_STACK_ENTRY_ENUM);
          m_debuggerSocketList[i]->WriteInt(entryRef);
          m_debuggerSocketList[i]->WriteDebugData(pDebugData);
--- 774,778 ----
      for (size_t i = 0; i < m_debuggerSocketList.GetCount(); i++)
      {
!         m_debuggerSocketList[i]->WriteByte(wxLUA_EVENT_DEBUG_STACK_ENTRY_ENUM);
          m_debuggerSocketList[i]->WriteInt(entryRef);
          m_debuggerSocketList[i]->WriteDebugData(pDebugData);
***************
*** 796,800 ****
      for (size_t i = 0; i < m_debuggerSocketList.GetCount(); i++)
      {
!         m_debuggerSocketList[i]->WriteByte(EVENT_DEBUG_TABLE_ENUM);
          m_debuggerSocketList[i]->WriteInt(itemNode);
          m_debuggerSocketList[i]->WriteDebugData(pDebugData);
--- 796,800 ----
      for (size_t i = 0; i < m_debuggerSocketList.GetCount(); i++)
      {
!         m_debuggerSocketList[i]->WriteByte(wxLUA_EVENT_DEBUG_TABLE_ENUM);
          m_debuggerSocketList[i]->WriteInt(itemNode);
          m_debuggerSocketList[i]->WriteDebugData(pDebugData);
***************
*** 818,822 ****
      for (size_t i = 0; i < m_debuggerSocketList.GetCount(); i++)
      {
!         m_debuggerSocketList[i]->WriteByte(EVENT_DEBUG_EVALUATE_EXPR);
          m_debuggerSocketList[i]->WriteInt(exprRef);
          m_debuggerSocketList[i]->WriteString(strResult);
--- 818,822 ----
      for (size_t i = 0; i < m_debuggerSocketList.GetCount(); i++)
      {
!         m_debuggerSocketList[i]->WriteByte(wxLUA_EVENT_DEBUG_EVALUATE_EXPR);
          m_debuggerSocketList[i]->WriteInt(exprRef);
          m_debuggerSocketList[i]->WriteString(strResult);
***************
*** 840,844 ****
          if (!debugSocket || debugSocket == m_debuggerSocketList[i])
          {
!             m_debuggerSocketList[i]->WriteByte(EVENT_DEBUG_BREAKPOINT_ADDED);
  #if wxCHECK_VERSION(2,3,0)
              m_debuggerSocketList[i]->WriteString(breakPoint.GetFileName().GetFullPath());
--- 840,844 ----
          if (!debugSocket || debugSocket == m_debuggerSocketList[i])
          {
!             m_debuggerSocketList[i]->WriteByte(wxLUA_EVENT_DEBUG_BREAKPOINT_ADDED);
  #if wxCHECK_VERSION(2,3,0)
              m_debuggerSocketList[i]->WriteString(breakPoint.GetFileName().GetFullPath());
***************
*** 868,872 ****
          if (!debugSocket || debugSocket == m_debuggerSocketList[i])
          {
!             m_debuggerSocketList[i]->WriteByte(EVENT_DEBUG_BREAKPOINT_REMOVED);
  #if wxCHECK_VERSION(2,3,0)
              m_debuggerSocketList[i]->WriteString(breakPoint.GetFileName().GetFullPath());
--- 868,872 ----
          if (!debugSocket || debugSocket == m_debuggerSocketList[i])
          {
!             m_debuggerSocketList[i]->WriteByte(wxLUA_EVENT_DEBUG_BREAKPOINT_REMOVED);
  #if wxCHECK_VERSION(2,3,0)
              m_debuggerSocketList[i]->WriteString(breakPoint.GetFileName().GetFullPath());
***************
*** 932,936 ****
                      wxSOCKET_INPUT_FLAG |
                      wxSOCKET_LOST_FLAG);
!     sock->Notify(TRUE);

      if (!sock->Connect(addr, true))
--- 932,936 ----
                      wxSOCKET_INPUT_FLAG |
                      wxSOCKET_LOST_FLAG);
!     sock->Notify(true);

      if (!sock->Connect(addr, true))
***************
*** 979,988 ****
          switch((wxLuaDebugEvents_Type) debuggeeEvent)
          {
!         case EVENT_DEBUG_BREAK:
              {
                  wxString fileName   = m_debuggerSocket->ReadString();
                  int      lineNumber = m_debuggerSocket->ReadInt();

!                 wxLuaDebugEvent debugEvent(wxEVT_DEBUG_BREAK, lineNumber, fileName);

                  wxLuaHandler::GetHandler().AddPendingEvent(debugEvent);
--- 979,988 ----
          switch((wxLuaDebugEvents_Type) debuggeeEvent)
          {
!         case wxLUA_EVENT_DEBUG_BREAK:
              {
                  wxString fileName   = m_debuggerSocket->ReadString();
                  int      lineNumber = m_debuggerSocket->ReadInt();

!                 wxLuaDebugEvent debugEvent(wxEVT_WXLUA_DEBUG_BREAK, lineNumber, fileName);

                  wxLuaHandler::GetHandler().AddPendingEvent(debugEvent);
***************
*** 990,998 ****
              break;

!         case EVENT_DEBUG_PRINT:
              {
                  wxString strMessage = m_debuggerSocket->ReadString();

!                 wxLuaDebugEvent debugEvent(wxEVT_DEBUG_PRINT);
                  debugEvent.SetMessage(strMessage);

--- 990,998 ----
              break;

!         case wxLUA_EVENT_DEBUG_PRINT:
              {
                  wxString strMessage = m_debuggerSocket->ReadString();

!                 wxLuaDebugEvent debugEvent(wxEVT_WXLUA_DEBUG_PRINT);
                  debugEvent.SetMessage(strMessage);

***************
*** 1001,1009 ****
              break;

!         case EVENT_DEBUG_ERROR:
              {
                  wxString strMessage = m_debuggerSocket->ReadString();

!                 wxLuaDebugEvent debugEvent(wxEVT_DEBUG_ERROR);
                  debugEvent.SetMessage(strMessage);

--- 1001,1009 ----
              break;

!         case wxLUA_EVENT_DEBUG_ERROR:
              {
                  wxString strMessage = m_debuggerSocket->ReadString();

!                 wxLuaDebugEvent debugEvent(wxEVT_WXLUA_DEBUG_ERROR);
                  debugEvent.SetMessage(strMessage);

***************
*** 1012,1025 ****
              break;

!         case EVENT_DEBUG_EXIT:
              {
!                 wxLuaDebugEvent debugEvent(wxEVT_DEBUG_EXIT);
                  wxLuaHandler::GetHandler().AddPendingEvent(debugEvent);
              }
              break;

!         case EVENT_DEBUG_STACK_ENUM:
              {
!                 wxLuaDebugEvent  debugEvent(wxEVT_DEBUG_STACK_ENUM);
                  wxLuaDebugData     *pDebugData = m_debuggerSocket->ReadDebugData();
                  if (pDebugData != NULL)
--- 1012,1025 ----
              break;

!         case wxLUA_EVENT_DEBUG_EXIT:
              {
!                 wxLuaDebugEvent debugEvent(wxEVT_WXLUA_DEBUG_EXIT);
                  wxLuaHandler::GetHandler().AddPendingEvent(debugEvent);
              }
              break;

!         case wxLUA_EVENT_DEBUG_STACK_ENUM:
              {
!                 wxLuaDebugEvent  debugEvent(wxEVT_WXLUA_DEBUG_STACK_ENUM);
                  wxLuaDebugData     *pDebugData = m_debuggerSocket->ReadDebugData();
                  if (pDebugData != NULL)
***************
*** 1030,1036 ****
              break;

!         case EVENT_DEBUG_STACK_ENTRY_ENUM:
              {
!                 wxLuaDebugEvent  debugEvent(wxEVT_DEBUG_STACK_ENTRY_ENUM);
                  int              stackRef   = m_debuggerSocket->ReadInt();
                  wxLuaDebugData     *pDebugData = m_debuggerSocket->ReadDebugData();
--- 1030,1036 ----
              break;

!         case wxLUA_EVENT_DEBUG_STACK_ENTRY_ENUM:
              {
!                 wxLuaDebugEvent  debugEvent(wxEVT_WXLUA_DEBUG_STACK_ENTRY_ENUM);
                  int              stackRef   = m_debuggerSocket->ReadInt();
                  wxLuaDebugData     *pDebugData = m_debuggerSocket->ReadDebugData();
***************
*** 1042,1048 ****
              break;

!         case EVENT_DEBUG_TABLE_ENUM:
              {
!                 wxLuaDebugEvent  debugEvent(wxEVT_DEBUG_TABLE_ENUM);
                  int              itemNode   = m_debuggerSocket->ReadInt();
                  wxLuaDebugData     *pDebugData = m_debuggerSocket->ReadDebugData();
--- 1042,1048 ----
              break;

!         case wxLUA_EVENT_DEBUG_TABLE_ENUM:
              {
!                 wxLuaDebugEvent  debugEvent(wxEVT_WXLUA_DEBUG_TABLE_ENUM);
                  int              itemNode   = m_debuggerSocket->ReadInt();
                  wxLuaDebugData     *pDebugData = m_debuggerSocket->ReadDebugData();
***************
*** 1054,1060 ****
              break;

!         case EVENT_DEBUG_EVALUATE_EXPR:
              {
!                 wxLuaDebugEvent  debugEvent(wxEVT_DEBUG_EVALUATE_EXPR);
                  int              exprRef   = m_debuggerSocket->ReadInt();
                  wxString         strResult = m_debuggerSocket->ReadString();
--- 1054,1060 ----
              break;

!         case wxLUA_EVENT_DEBUG_EVALUATE_EXPR:
              {
!                 wxLuaDebugEvent  debugEvent(wxEVT_WXLUA_DEBUG_EVALUATE_EXPR);
                  int              exprRef   = m_debuggerSocket->ReadInt();
                  wxString         strResult = m_debuggerSocket->ReadString();
***************
*** 1067,1071 ****
              break;

!         case EVENT_DEBUG_BREAKPOINT_ADDED:
              {
                  wxString         fileName = m_debuggerSocket->ReadString();
--- 1067,1071 ----
              break;

!         case wxLUA_EVENT_DEBUG_BREAKPOINT_ADDED:
              {
                  wxString         fileName = m_debuggerSocket->ReadString();
***************
*** 1073,1087 ****
                  bool             enabled = m_debuggerSocket->ReadInt() ? true : false;

!                 wxLuaDebugEvent  debugEvent(wxEVT_DEBUG_BREAKPOINT_ADDED, line, fileName, enabled);
                  wxLuaHandler::GetHandler().AddPendingEvent(debugEvent);
              }
              break;

!         case EVENT_DEBUG_BREAKPOINT_REMOVED:
              {
                  wxString         fileName = m_debuggerSocket->ReadString();
                  int              line = m_debuggerSocket->ReadInt();

!                 wxLuaDebugEvent  debugEvent(wxEVT_DEBUG_BREAKPOINT_REMOVED, line, fileName);
                  wxLuaHandler::GetHandler().AddPendingEvent(debugEvent);
              }
--- 1073,1087 ----
                  bool             enabled = m_debuggerSocket->ReadInt() ? true : false;

!                 wxLuaDebugEvent  debugEvent(wxEVT_WXLUA_DEBUG_BREAKPOINT_ADDED, line, fileName, enabled);
                  wxLuaHandler::GetHandler().AddPendingEvent(debugEvent);
              }
              break;

!         case wxLUA_EVENT_DEBUG_BREAKPOINT_REMOVED:
              {
                  wxString         fileName = m_debuggerSocket->ReadString();
                  int              line = m_debuggerSocket->ReadInt();

!                 wxLuaDebugEvent  debugEvent(wxEVT_WXLUA_DEBUG_BREAKPOINT_REMOVED, line, fileName);
                  wxLuaHandler::GetHandler().AddPendingEvent(debugEvent);
              }
***************
*** 1116,1120 ****
          return false;

!     return (m_debuggerSocket->WriteByte(CMD_ADD_BREAKPOINT) &&
              m_debuggerSocket->WriteString(fileName)         &&
              m_debuggerSocket->WriteInt(lineNumber));
--- 1116,1120 ----
          return false;

!     return (m_debuggerSocket->WriteByte(wxLUA_CMD_ADD_BREAKPOINT) &&
              m_debuggerSocket->WriteString(fileName)         &&
              m_debuggerSocket->WriteInt(lineNumber));
***************
*** 1126,1130 ****
          return false;

!     return (m_debuggerSocket->WriteByte(CMD_REMOVE_BREAKPOINT) &&
              m_debuggerSocket->WriteString(fileName)            &&
              m_debuggerSocket->WriteInt(lineNumber));
--- 1126,1130 ----
          return false;

!     return (m_debuggerSocket->WriteByte(wxLUA_CMD_REMOVE_BREAKPOINT) &&
              m_debuggerSocket->WriteString(fileName)            &&
              m_debuggerSocket->WriteInt(lineNumber));
***************
*** 1136,1140 ****
          return false;

!     return (m_debuggerSocket->WriteByte(CMD_DISABLE_BREAKPOINT) &&
              m_debuggerSocket->WriteString(fileName)         &&
              m_debuggerSocket->WriteInt(lineNumber));
--- 1136,1140 ----
          return false;

!     return (m_debuggerSocket->WriteByte(wxLUA_CMD_DISABLE_BREAKPOINT) &&
              m_debuggerSocket->WriteString(fileName)         &&
              m_debuggerSocket->WriteInt(lineNumber));
***************
*** 1146,1150 ****
          return false;

!     return (m_debuggerSocket->WriteByte(CMD_ENABLE_BREAKPOINT) &&
              m_debuggerSocket->WriteString(fileName)         &&
              m_debuggerSocket->WriteInt(lineNumber));
--- 1146,1150 ----
          return false;

!     return (m_debuggerSocket->WriteByte(wxLUA_CMD_ENABLE_BREAKPOINT) &&
              m_debuggerSocket->WriteString(fileName)         &&
              m_debuggerSocket->WriteInt(lineNumber));
***************
*** 1156,1160 ****
          return false;

!     return (m_debuggerSocket->WriteByte(CMD_CLEAR_ALL_BREAKPOINTS));
  }

--- 1156,1160 ----
          return false;

!     return (m_debuggerSocket->WriteByte(wxLUA_CMD_CLEAR_ALL_BREAKPOINTS));
  }

***************
*** 1164,1168 ****
          return false;

!     return m_debuggerSocket->WriteByte(CMD_DEBUG_STEP);
  }

--- 1164,1168 ----
          return false;

!     return m_debuggerSocket->WriteByte(wxLUA_CMD_DEBUG_STEP);
  }

***************
*** 1172,1176 ****
          return false;

!     return m_debuggerSocket->WriteByte(CMD_DEBUG_STEPOVER);
  }

--- 1172,1176 ----
          return false;

!     return m_debuggerSocket->WriteByte(wxLUA_CMD_DEBUG_STEPOVER);
  }

***************
*** 1180,1184 ****
          return false;

!     return m_debuggerSocket->WriteByte(CMD_DEBUG_STEPOUT);
  }

--- 1180,1184 ----
          return false;

!     return m_debuggerSocket->WriteByte(wxLUA_CMD_DEBUG_STEPOUT);
  }

***************
*** 1188,1192 ****
          return false;

!     return m_debuggerSocket->WriteByte(CMD_DEBUG_CONTINUE);
  }

--- 1188,1192 ----
          return false;

!     return m_debuggerSocket->WriteByte(wxLUA_CMD_DEBUG_CONTINUE);
  }

***************
*** 1196,1200 ****
          return false;

!     return m_debuggerSocket->WriteByte(CMD_DEBUG_BREAK);
  }

--- 1196,1200 ----
          return false;

!     return m_debuggerSocket->WriteByte(wxLUA_CMD_DEBUG_BREAK);
  }

***************
*** 1204,1208 ****
          return false;

!     return m_debuggerSocket->WriteByte(CMD_ENUMERATE_STACK);
  }

--- 1204,1208 ----
          return false;

!     return m_debuggerSocket->WriteByte(wxLUA_CMD_ENUMERATE_STACK);
  }

***************
*** 1212,1216 ****
          return false;

!     return m_debuggerSocket->WriteByte(CMD_RESET);
  }

--- 1212,1216 ----
          return false;

!     return m_debuggerSocket->WriteByte(wxLUA_CMD_RESET);
  }

***************
*** 1220,1224 ****
          return false;

!     return (m_debuggerSocket->WriteByte(CMD_ENUMERATE_STACK_ENTRY) &&
              m_debuggerSocket->WriteInt(stackEntry));
  }
--- 1220,1224 ----
          return false;

!     return (m_debuggerSocket->WriteByte(wxLUA_CMD_ENUMERATE_STACK_ENTRY) &&
              m_debuggerSocket->WriteInt(stackEntry));
  }
***************
*** 1229,1233 ****
          return false;

!     return (m_debuggerSocket->WriteByte(CMD_ENUMERATE_TABLE_REF) &&
              m_debuggerSocket->WriteInt(tableRef)                 &&
              m_debuggerSocket->WriteInt(nIndex)                   &&
--- 1229,1233 ----
          return false;

!     return (m_debuggerSocket->WriteByte(wxLUA_CMD_ENUMERATE_TABLE_REF) &&
              m_debuggerSocket->WriteInt(tableRef)                 &&
              m_debuggerSocket->WriteInt(nIndex)                   &&
***************
*** 1240,1249 ****
          return false;

!     return (m_debuggerSocket->WriteByte(CMD_CLEAR_DEBUG_REFERENCES));
  }

  void wxLuaDebugger::NotifyError(const wxString &msg)
  {
!     wxLuaDebugEvent debugEvent(wxEVT_DEBUG_ERROR);

      debugEvent.SetMessage(msg);
--- 1240,1249 ----
          return false;

!     return (m_debuggerSocket->WriteByte(wxLUA_CMD_CLEAR_DEBUG_REFERENCES));
  }

  void wxLuaDebugger::NotifyError(const wxString &msg)
  {
!     wxLuaDebugEvent debugEvent(wxEVT_WXLUA_DEBUG_ERROR);

      debugEvent.SetMessage(msg);
***************
*** 1467,1473 ****
          // Notify Debuggee
  #if wxCHECK_VERSION(2,3,0)
!         wxLuaDebugEvent  debugEvent(wxEVT_DEBUG_BREAKPOINT_ADDED, lineNumber, fileName.GetFullPath());
  #else
!         wxLuaDebugEvent  debugEvent(wxEVT_DEBUG_BREAKPOINT_ADDED, lineNumber, fileName);
  #endif

--- 1467,1473 ----
          // Notify Debuggee
  #if wxCHECK_VERSION(2,3,0)
!         wxLuaDebugEvent  debugEvent(wxEVT_WXLUA_DEBUG_BREAKPOINT_ADDED, lineNumber, fileName.GetFullPath());
  #else
!         wxLuaDebugEvent  debugEvent(wxEVT_WXLUA_DEBUG_BREAKPOINT_ADDED, lineNumber, fileName);
  #endif

***************
*** 1494,1500 ****
          // Notify Debuggee
  #if wxCHECK_VERSION(2,3,0)
!         wxLuaDebugEvent  debugEvent(wxEVT_DEBUG_BREAKPOINT_REMOVED, lineNumber, fileName.GetFullPath());
  #else
!         wxLuaDebugEvent  debugEvent(wxEVT_DEBUG_BREAKPOINT_REMOVED, lineNumber, fileName);
  #endif
          wxLuaHandler::GetHandler().AddPendingEvent(debugEvent);
--- 1494,1500 ----
          // Notify Debuggee
  #if wxCHECK_VERSION(2,3,0)
!         wxLuaDebugEvent  debugEvent(wxEVT_WXLUA_DEBUG_BREAKPOINT_REMOVED, lineNumber, fileName.GetFullPath());
  #else
!         wxLuaDebugEvent  debugEvent(wxEVT_WXLUA_DEBUG_BREAKPOINT_REMOVED, lineNumber, fileName);
  #endif
          wxLuaHandler::GetHandler().AddPendingEvent(debugEvent);
***************
*** 1569,1579 ****
  void wxLuaDebuggee::Break()
  {
!     m_forceBreak = TRUE;
  }

  void wxLuaDebuggee::Reset()
  {
!     m_forceBreak     = TRUE;
!     m_resetRequested = TRUE;
      if (m_InDebugHook)
          InteruptWait();
--- 1569,1579 ----
  void wxLuaDebuggee::Break()
  {
!     m_forceBreak = true;
  }

  void wxLuaDebuggee::Reset()
  {
!     m_forceBreak     = true;
!     m_resetRequested = true;
      if (m_InDebugHook)
          InteruptWait();

Index: wxldserv.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxldserv.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** wxldserv.cpp	29 Nov 2005 05:45:10 -0000	1.3
--- wxldserv.cpp	1 Dec 2005 04:17:29 -0000	1.4
***************
*** 90,94 ****
  #endif
                                              m_portNumber);
!         m_processID = wxExecute(command, FALSE, m_pProcess);
          return (m_processID != -1);
      }
--- 90,94 ----
  #endif
                                              m_portNumber);
!         m_processID = wxExecute(command, false, m_pProcess);
          return (m_processID != -1);
      }
***************
*** 196,200 ****
          try
          {
!             if (WriteByte(m_acceptedSocket, CMD_ADD_BREAKPOINT) &&
                  WriteString(m_acceptedSocket, fileName)         &&
                  WriteInt(m_acceptedSocket, lineNumber))
--- 196,200 ----
          try
          {
!             if (WriteByte(m_acceptedSocket, wxLUA_CMD_ADD_BREAKPOINT) &&
                  WriteString(m_acceptedSocket, fileName)         &&
                  WriteInt(m_acceptedSocket, lineNumber))
***************
*** 216,220 ****
          try
          {
!             if (WriteByte(m_acceptedSocket, CMD_REMOVE_BREAKPOINT) &&
                  WriteString(m_acceptedSocket, fileName)            &&
                  WriteInt(m_acceptedSocket, lineNumber))
--- 216,220 ----
          try
          {
!             if (WriteByte(m_acceptedSocket, wxLUA_CMD_REMOVE_BREAKPOINT) &&
                  WriteString(m_acceptedSocket, fileName)            &&
                  WriteInt(m_acceptedSocket, lineNumber))
***************
*** 236,240 ****
          try
          {
!             if (WriteByte(m_acceptedSocket, CMD_CLEAR_ALL_BREAKPOINTS))
                  return true;
          }
--- 236,240 ----
          try
          {
!             if (WriteByte(m_acceptedSocket, wxLUA_CMD_CLEAR_ALL_BREAKPOINTS))
                  return true;
          }
***************
*** 248,252 ****
  void wxLuaDebugServer::NotifyError(const wxString &msg)
  {
!     wxLuaDebugEvent debugEvent(wxEVT_DEBUG_ERROR);

      debugEvent.SetMessage(msg);
--- 248,252 ----
  void wxLuaDebugServer::NotifyError(const wxString &msg)
  {
!     wxLuaDebugEvent debugEvent(wxEVT_WXLUA_DEBUG_ERROR);

      debugEvent.SetMessage(msg);
***************
*** 321,325 ****
          try
          {
!             if (WriteByte(m_acceptedSocket, CMD_RUN_BUFFER) &&
                  WriteString(m_acceptedSocket, fileName) &&
                  WriteString(m_acceptedSocket, buffer))
--- 321,325 ----
          try
          {
!             if (WriteByte(m_acceptedSocket, wxLUA_CMD_RUN_BUFFER) &&
                  WriteString(m_acceptedSocket, fileName) &&
                  WriteString(m_acceptedSocket, buffer))
***************
*** 341,345 ****
          try
          {
!             return WriteByte(m_acceptedSocket, CMD_DEBUG_STEP);
          }
          catch(wxLuaSocketException & /*e*/)
--- 341,345 ----
          try
          {
!             return WriteByte(m_acceptedSocket, wxLUA_CMD_DEBUG_STEP);
          }
          catch(wxLuaSocketException & /*e*/)
***************
*** 356,360 ****
          try
          {
!             return WriteByte(m_acceptedSocket, CMD_DEBUG_STEPOVER);
          }
          catch(wxLuaSocketException & /*e*/)
--- 356,360 ----
          try
          {
!             return WriteByte(m_acceptedSocket, wxLUA_CMD_DEBUG_STEPOVER);
          }
          catch(wxLuaSocketException & /*e*/)
***************
*** 371,375 ****
          try
          {
!             return WriteByte(m_acceptedSocket, CMD_DEBUG_STEPOUT);
          }
          catch(wxLuaSocketException & /*e*/)
--- 371,375 ----
          try
          {
!             return WriteByte(m_acceptedSocket, wxLUA_CMD_DEBUG_STEPOUT);
          }
          catch(wxLuaSocketException & /*e*/)
***************
*** 386,390 ****
          try
          {
!             return WriteByte(m_acceptedSocket, CMD_DEBUG_CONTINUE);
          }
          catch(wxLuaSocketException & /*e*/)
--- 386,390 ----
          try
          {
!             return WriteByte(m_acceptedSocket, wxLUA_CMD_DEBUG_CONTINUE);
          }
          catch(wxLuaSocketException & /*e*/)
***************
*** 401,405 ****
          try
          {
!             return WriteByte(m_acceptedSocket, CMD_DEBUG_BREAK);
          }
          catch(wxLuaSocketException & /*e*/)
--- 401,405 ----
          try
          {
!             return WriteByte(m_acceptedSocket, wxLUA_CMD_DEBUG_BREAK);
          }
          catch(wxLuaSocketException & /*e*/)
***************
*** 416,420 ****
          try
          {
!             return WriteByte(m_acceptedSocket, CMD_ENUMERATE_STACK);
          }
          catch(wxLuaSocketException & /*e*/)
--- 416,420 ----
          try
          {
!             return WriteByte(m_acceptedSocket, wxLUA_CMD_ENUMERATE_STACK);
          }
          catch(wxLuaSocketException & /*e*/)
***************
*** 431,435 ****
          try
          {
!             return WriteByte(m_acceptedSocket, CMD_RESET);
          }
          catch(wxLuaSocketException & /*e*/)
--- 431,435 ----
          try
          {
!             return WriteByte(m_acceptedSocket, wxLUA_CMD_RESET);
          }
          catch(wxLuaSocketException & /*e*/)
***************
*** 446,450 ****
          try
          {
!             if (WriteByte(m_acceptedSocket, CMD_ENUMERATE_STACK_ENTRY) &&
                  WriteInt(m_acceptedSocket, stackEntry))
              {
--- 446,450 ----
          try
          {
!             if (WriteByte(m_acceptedSocket, wxLUA_CMD_ENUMERATE_STACK_ENTRY) &&
                  WriteInt(m_acceptedSocket, stackEntry))
              {
***************
*** 465,469 ****
          try
          {
!             if (WriteByte(m_acceptedSocket, CMD_ENUMERATE_TABLE_REF) &&
                  WriteInt(m_acceptedSocket, tableRef)                 &&
                  WriteInt(m_acceptedSocket, nIndex)                   &&
--- 465,469 ----
          try
          {
!             if (WriteByte(m_acceptedSocket, wxLUA_CMD_ENUMERATE_TABLE_REF) &&
                  WriteInt(m_acceptedSocket, tableRef)                 &&
                  WriteInt(m_acceptedSocket, nIndex)                   &&
***************
*** 486,490 ****
          try
          {
!             if (WriteByte(m_acceptedSocket, CMD_CLEAR_DEBUG_REFERENCES))
              {
                  return true;
--- 486,490 ----
          try
          {
!             if (WriteByte(m_acceptedSocket, wxLUA_CMD_CLEAR_DEBUG_REFERENCES))
              {
                  return true;
***************
*** 525,529 ****
                  {
                      // Notify that a client has connected and we are ready to debug
!                     wxLuaDebugEvent debugEvent(wxEVT_DEBUG_CLIENT_CONNECTED);

                      wxLuaHandler::GetHandler().AddPendingEvent(debugEvent);
--- 525,529 ----
                  {
                      // Notify that a client has connected and we are ready to debug
!                     wxLuaDebugEvent debugEvent(wxEVT_WXLUA_DEBUG_CLIENT_CONNECTED);

                      wxLuaHandler::GetHandler().AddPendingEvent(debugEvent);
***************
*** 535,544 ****
                          switch((wxLuaDebugEvents_Type) debugEvent)
                          {
!                             case EVENT_DEBUG_BREAK:
                                  {
                                      wxString fileName   = ReadString(m_acceptedSocket);
                                      int      lineNumber = ReadInt(m_acceptedSocket);

!                                     wxLuaDebugEvent debugEvent(wxEVT_DEBUG_BREAK, lineNumber, fileName);

                                      wxLuaHandler::GetHandler().AddPendingEvent(debugEvent);
--- 535,544 ----
                          switch((wxLuaDebugEvents_Type) debugEvent)
                          {
!                             case wxLUA_EVENT_DEBUG_BREAK:
                                  {
                                      wxString fileName   = ReadString(m_acceptedSocket);
                                      int      lineNumber = ReadInt(m_acceptedSocket);

!                                     wxLuaDebugEvent debugEvent(wxEVT_WXLUA_DEBUG_BREAK, lineNumber, fileName);

                                      wxLuaHandler::GetHandler().AddPendingEvent(debugEvent);
***************
*** 546,554 ****
                                  break;

!                             case EVENT_DEBUG_PRINT:
                                  {
                                      wxString strMessage = ReadString(m_acceptedSocket);

!                                     wxLuaDebugEvent debugEvent(wxEVT_DEBUG_PRINT);
                                      debugEvent.SetMessage(strMessage);

--- 546,554 ----
                                  break;

!                             case wxLUA_EVENT_DEBUG_PRINT:
                                  {
                                      wxString strMessage = ReadString(m_acceptedSocket);

!                                     wxLuaDebugEvent debugEvent(wxEVT_WXLUA_DEBUG_PRINT);
                                      debugEvent.SetMessage(strMessage);

***************
*** 557,565 ****
                                  break;

!                             case EVENT_DEBUG_ERROR:
                                  {
                                      wxString strMessage = ReadString(m_acceptedSocket);

!                                     wxLuaDebugEvent debugEvent(wxEVT_DEBUG_ERROR);
                                      debugEvent.SetMessage(strMessage);

--- 557,565 ----
                                  break;

!                             case wxLUA_EVENT_DEBUG_ERROR:
                                  {
                                      wxString strMessage = ReadString(m_acceptedSocket);

!                                     wxLuaDebugEvent debugEvent(wxEVT_WXLUA_DEBUG_ERROR);
                                      debugEvent.SetMessage(strMessage);

***************
*** 568,574 ****
                                  break;

!                             case EVENT_DEBUG_EXIT:
                                  {
!                                     wxLuaDebugEvent debugEvent(wxEVT_DEBUG_EXIT);
                                      wxLuaHandler::GetHandler().AddPendingEvent(debugEvent);
                                      m_fShutdown = true;
--- 568,574 ----
                                  break;

!                             case wxLUA_EVENT_DEBUG_EXIT:
                                  {
!                                     wxLuaDebugEvent debugEvent(wxEVT_WXLUA_DEBUG_EXIT);
                                      wxLuaHandler::GetHandler().AddPendingEvent(debugEvent);
                                      m_fShutdown = true;
***************
*** 576,582 ****
                                  break;

!                             case EVENT_DEBUG_STACK_ENUM:
                                  {
!                                     wxLuaDebugEvent  debugEvent(wxEVT_DEBUG_STACK_ENUM);
                                      wxLuaDebugData     *pDebugData = ReadDebugData(m_acceptedSocket);
                                      if (pDebugData != NULL)
--- 576,582 ----
                                  break;

!                             case wxLUA_EVENT_DEBUG_STACK_ENUM:
                                  {
!                                     wxLuaDebugEvent  debugEvent(wxEVT_WXLUA_DEBUG_STACK_ENUM);
                                      wxLuaDebugData     *pDebugData = ReadDebugData(m_acceptedSocket);
                                      if (pDebugData != NULL)
***************
*** 587,593 ****
                                  break;

!                             case EVENT_DEBUG_STACK_ENTRY_ENUM:
                                  {
!                                     wxLuaDebugEvent  debugEvent(wxEVT_DEBUG_STACK_ENTRY_ENUM);
                                      int              stackRef   = ReadInt(m_acceptedSocket);
                                      wxLuaDebugData  *pDebugData = ReadDebugData(m_acceptedSocket);
--- 587,593 ----
                                  break;

!                             case wxLUA_EVENT_DEBUG_STACK_ENTRY_ENUM:
                                  {
!                                     wxLuaDebugEvent  debugEvent(wxEVT_WXLUA_DEBUG_STACK_ENTRY_ENUM);
                                      int              stackRef   = ReadInt(m_acceptedSocket);
                                      wxLuaDebugData  *pDebugData = ReadDebugData(m_acceptedSocket);
***************
*** 599,605 ****
                                  break;

!                             case EVENT_DEBUG_TABLE_ENUM:
                                  {
!                                     wxLuaDebugEvent  debugEvent(wxEVT_DEBUG_TABLE_ENUM);
                                      int              itemNode   = ReadInt(m_acceptedSocket);
                                      wxLuaDebugData  *pDebugData = ReadDebugData(m_acceptedSocket);
--- 599,605 ----
                                  break;

!                             case wxLUA_EVENT_DEBUG_TABLE_ENUM:
                                  {
!                                     wxLuaDebugEvent  debugEvent(wxEVT_WXLUA_DEBUG_TABLE_ENUM);
                                      int              itemNode   = ReadInt(m_acceptedSocket);
                                      wxLuaDebugData  *pDebugData = ReadDebugData(m_acceptedSocket);
***************
*** 611,617 ****
                                  break;

!                             case EVENT_DEBUG_EVALUATE_EXPR:
                                  {
!                                     wxLuaDebugEvent  debugEvent(wxEVT_DEBUG_EVALUATE_EXPR);
                                      int              exprRef   = ReadInt(m_acceptedSocket);
                                      wxString         strResult = ReadString(m_acceptedSocket);
--- 611,617 ----
                                  break;

!                             case wxLUA_EVENT_DEBUG_EVALUATE_EXPR:
                                  {
!                                     wxLuaDebugEvent  debugEvent(wxEVT_WXLUA_DEBUG_EVALUATE_EXPR);
                                      int              exprRef   = ReadInt(m_acceptedSocket);
                                      wxString         strResult = ReadString(m_acceptedSocket);
***************
*** 623,628 ****
                                  }
                                  break;
!                         case EVENT_DEBUG_BREAKPOINT_ADDED : break;   // FIXME - unused
!                         case EVENT_DEBUG_BREAKPOINT_REMOVED : break; // FIXME - unused

                          }
--- 623,629 ----
                                  }
                                  break;
! 
!                             case wxLUA_EVENT_DEBUG_BREAKPOINT_ADDED : break;   // FIXME - unused
!                             case wxLUA_EVENT_DEBUG_BREAKPOINT_REMOVED : break; // FIXME - unused

                          }
***************
*** 677,681 ****
          try
          {
!             if (WriteByte(m_acceptedSocket, CMD_EVALUATE_EXPR) &&
                  WriteInt(m_acceptedSocket, exprRef)            &&
                  WriteString(m_acceptedSocket, strExpression))
--- 678,682 ----
          try
          {
!             if (WriteByte(m_acceptedSocket, wxLUA_CMD_EVALUATE_EXPR) &&
                  WriteInt(m_acceptedSocket, exprRef)            &&
                  WriteString...

[truncated message content]

Thread: [Wxlua-commit] wxLua/modules/wxluasocket/src dservice.cpp,1.4,1.5 wxldbgio.cpp,1.2,1.3 wxldserv.cpp,

wxlua-commit