Thread: [Wxlua-commit] wxLua/modules/wxluasocket/src wxldserv.cpp, 1.40, 1.41 wxldtarg.cpp, 1.35, 1.36 wxls

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-cvs9.sourceforge.net:/tmp/cvs-serv5256/wxLua/modules/wxluasocket/src

Modified Files:
	wxldserv.cpp wxldtarg.cpp wxlsock.cpp 
Log Message:
Make the stack dialog listctrl a little nicer with bold fonts
clean up variable names


Index: wxldtarg.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxldtarg.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** wxldtarg.cpp	19 May 2007 17:14:13 -0000	1.35
--- wxldtarg.cpp	23 May 2007 02:48:31 -0000	1.36
***************
*** 44,50 ****
  wxLuaDebugTarget::wxLuaDebugTarget(const wxLuaState& wxlState,
                                     const wxString &serverName,
!                                    int             portNumber) :
      m_wxlState(wxlState),
!     m_portNumber(portNumber),
      m_serverName(serverName),
      m_debugCondition(m_debugMutex),
--- 44,50 ----
  wxLuaDebugTarget::wxLuaDebugTarget(const wxLuaState& wxlState,
                                     const wxString &serverName,
!                                    int             port_number) :
      m_wxlState(wxlState),
!     m_port_number(port_number),
      m_serverName(serverName),
      m_debugCondition(m_debugMutex),
***************
*** 172,176 ****
      bool fThreadRunning = false;
  
!     if (m_clientSocket.Connect(m_serverName, m_portNumber))
      {
          m_fConnected   = true;
--- 172,176 ----
      bool fThreadRunning = false;
  
!     if (m_clientSocket.Connect(m_serverName, m_port_number))
      {
          m_fConnected   = true;

Index: wxldserv.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxldserv.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** wxldserv.cpp	22 May 2007 03:27:54 -0000	1.40
--- wxldserv.cpp	23 May 2007 02:48:31 -0000	1.41
***************
*** 49,58 ****
  wxLuaDebuggerEvent::wxLuaDebuggerEvent(const wxLuaDebuggerEvent& event)
  				   :wxEvent(event),
!                     m_lineNumber(event.m_lineNumber),
                      m_fileName(event.m_fileName),
                      m_strMessage(event.m_strMessage),
!                     m_fHasMessage(event.m_fHasMessage),
!                     m_nReference(event.m_nReference),
!                     m_fEnabledFlag(event.m_fEnabledFlag)
  {
      SetDebugData(event.GetReference(), event.GetDebugData().Copy());
--- 49,58 ----
  wxLuaDebuggerEvent::wxLuaDebuggerEvent(const wxLuaDebuggerEvent& event)
  				   :wxEvent(event),
!                     m_line_number(event.m_line_number),
                      m_fileName(event.m_fileName),
                      m_strMessage(event.m_strMessage),
!                     m_has_message(event.m_has_message),
!                     m_lua_ref(event.m_lua_ref),
!                     m_enabled_flag(event.m_enabled_flag)
  {
      SetDebugData(event.GetReference(), event.GetDebugData().Copy());
***************
*** 61,72 ****
  wxLuaDebuggerEvent::wxLuaDebuggerEvent(wxEventType eventType,
                                         wxObject* eventObject,
!                                        int lineNumber,
!                                        const wxString &file, bool enabledFlag)
                     :wxEvent(0, eventType),
!                     m_lineNumber(lineNumber),
                      m_fileName(file),
!                     m_fHasMessage(false),
!                     m_nReference(-1),
!                     m_fEnabledFlag(enabledFlag)
  {
      SetEventObject(eventObject);
--- 61,72 ----
  wxLuaDebuggerEvent::wxLuaDebuggerEvent(wxEventType eventType,
                                         wxObject* eventObject,
!                                        int line_number,
!                                        const wxString &file, bool enabled_flag)
                     :wxEvent(0, eventType),
!                     m_line_number(line_number),
                      m_fileName(file),
!                     m_has_message(false),
!                     m_lua_ref(-1),
!                     m_enabled_flag(enabled_flag)
  {
      SetEventObject(eventObject);
***************
*** 76,85 ****
  {
      m_strMessage  = message;
!     m_fHasMessage = true;
  }
  
  void wxLuaDebuggerEvent::SetDebugData(long nReference, const wxLuaDebugData& debugData)
  {
!     m_nReference = nReference;
      m_debugData  = debugData;
  }
--- 76,85 ----
  {
      m_strMessage  = message;
!     m_has_message = true;
  }
  
  void wxLuaDebuggerEvent::SetDebugData(long nReference, const wxLuaDebugData& debugData)
  {
!     m_lua_ref    = nReference;
      m_debugData  = debugData;
  }
***************
*** 703,707 ****
                        m_serverSocket(NULL), m_acceptedSocket(NULL),
                        m_pThread(NULL),
!                       m_fShutdown(false)
  {
  }
--- 703,707 ----
                        m_serverSocket(NULL), m_acceptedSocket(NULL),
                        m_pThread(NULL),
!                       m_shutdown(false)
  {
  }
***************
*** 716,720 ****
      wxCHECK_MSG(m_serverSocket == NULL, false, wxT("Debugger server socket already created"));
  
!     m_fShutdown = false;
      m_serverSocket = new wxLuaCSocket();
      m_serverSocket->m_name = wxString::Format(wxT("wxLuaDebuggerCServer::m_serverSocket (%ld)"), (long)wxGetProcessId());
--- 716,720 ----
      wxCHECK_MSG(m_serverSocket == NULL, false, wxT("Debugger server socket already created"));
  
!     m_shutdown = false;
      m_serverSocket = new wxLuaCSocket();
      m_serverSocket->m_name = wxString::Format(wxT("wxLuaDebuggerCServer::m_serverSocket (%ld)"), (long)wxGetProcessId());
***************
*** 724,728 ****
          wxCHECK_MSG(m_pThread == NULL, false, wxT("Debugger server thread already created"));
  
!         if (!m_fShutdown)
          {
              m_pThread = new wxLuaDebuggerCServer::LuaThread(this);
--- 724,728 ----
          wxCHECK_MSG(m_pThread == NULL, false, wxT("Debugger server thread already created"));
  
!         if (!m_shutdown)
          {
              m_pThread = new wxLuaDebuggerCServer::LuaThread(this);
***************
*** 741,745 ****
          delete m_serverSocket;
          m_serverSocket = NULL;
!         m_fShutdown = true;
      }
  
--- 741,745 ----
          delete m_serverSocket;
          m_serverSocket = NULL;
!         m_shutdown = true;
      }
  
***************
*** 752,756 ****
      wxCHECK_MSG(m_pThread, false, wxT("Debugger server thread not running"));
  
!     if (!m_fShutdown)
          return wxLuaDebuggerBase::StartClient();
  
--- 752,756 ----
      wxCHECK_MSG(m_pThread, false, wxT("Debugger server thread not running"));
  
!     if (!m_shutdown)
          return wxLuaDebuggerBase::StartClient();
  
***************
*** 763,767 ****
  
      // Set the shutdown flag
!     m_fShutdown = true;
  
      // close the session socket, but first NULL it so we won't try to use it
--- 763,767 ----
  
      // Set the shutdown flag
!     m_shutdown = true;
  
      // close the session socket, but first NULL it so we won't try to use it
***************
*** 793,797 ****
          // 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.
--- 793,797 ----
          // 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_shutdown flag will be set
          // so the thread will not loop and instead will just destroy the
          // session socket object and return.
***************
*** 851,855 ****
  
          // Enter the debug loop
!         while (!m_pThread->TestDestroy() && !m_fShutdown && m_acceptedSocket)
          {
              debug_event = wxLUASOCKET_DEBUGGEE_EVENT_EXIT;
--- 851,855 ----
  
          // Enter the debug loop
!         while (!m_pThread->TestDestroy() && !m_shutdown && m_acceptedSocket)
          {
              debug_event = wxLUASOCKET_DEBUGGEE_EVENT_EXIT;
***************
*** 860,864 ****
                  if ((m_acceptedSocket == NULL) || !m_acceptedSocket->ReadCmd(debug_event))
                  {
!                     m_fShutdown = true;
                      break;
                  }
--- 860,864 ----
                  if ((m_acceptedSocket == NULL) || !m_acceptedSocket->ReadCmd(debug_event))
                  {
!                     m_shutdown = true;
                      break;
                  }
***************
*** 871,875 ****
                  if (debug_event == wxLUASOCKET_DEBUGGEE_EVENT_EXIT)
                  {
!                     m_fShutdown = true;
                      break;
                  }
--- 871,875 ----
                  if (debug_event == wxLUASOCKET_DEBUGGEE_EVENT_EXIT)
                  {
!                     m_shutdown = true;
                      break;
                  }

Index: wxlsock.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxlsock.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** wxlsock.cpp	21 May 2007 01:08:00 -0000	1.26
--- wxlsock.cpp	23 May 2007 02:48:31 -0000	1.27
***************
*** 245,249 ****
      // [wxInt32 debug data item count] then for each item
      //   [wxInt32 item data length]
!     //   [{wxInt32 GetReference}{wxInt32 GetIndex}{wxInt32 IsExpanded}
      //    {char GetName \0}{char GetType \0}{char GetValue \0}{char GetSource \0}]
  
--- 245,249 ----
      // [wxInt32 debug data item count] then for each item
      //   [wxInt32 item data length]
!     //   [{wxInt32 GetReference}{wxInt32 GetIndex}{wxInt32 GetExpanded}
      //    {char GetName \0}{char GetType \0}{char GetValue \0}{char GetSource \0}]
  
***************
*** 284,288 ****
          pMemory += sizeof(wxInt32);
  
!         *(wxInt32 *) pMemory = (wxInt32)(item->IsExpanded() ? 1 : 0);
          pMemory += sizeof(wxInt32);
  
--- 284,288 ----
          pMemory += sizeof(wxInt32);
  
!         *(wxInt32 *) pMemory = (wxInt32)(item->GetExpanded() ? 1 : 0);
          pMemory += sizeof(wxInt32);

Thread: [Wxlua-commit] wxLua/modules/wxluasocket/src wxldserv.cpp, 1.40, 1.41 wxldtarg.cpp, 1.35, 1.36 wxls

wxlua-commit