wxlua-commit

[John L. <jr...@us...>]

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

Modified Files:
	wxldserv.cpp wxlsock.cpp 
Log Message:
Remove wxArrayString_FromLuaTable and wxArrayInt_FromLuaTable binding tag since we
  convert from wxArrayInt/String automatically
Fix listctrl sorting
Fix validator code using wxLuaObject
Rename wxLuaState::LuaCall to LuaPCall since that what it calls
Lots more cleanup and shuffling of code to more appropriate places


Index: wxldserv.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxldserv.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** wxldserv.cpp	6 Jun 2007 23:43:17 -0000	1.43
--- wxldserv.cpp	11 Jun 2007 03:58:10 -0000	1.44
***************
*** 40,47 ****
  DEFINE_EVENT_TYPE(wxEVT_WXLUA_DEBUGGER_TABLE_ENUM)
  DEFINE_EVENT_TYPE(wxEVT_WXLUA_DEBUGGER_EVALUATE_EXPR)
! DEFINE_EVENT_TYPE(wxEVT_WXLUA_DEBUGGER_STARTDEBUGGER)
! DEFINE_EVENT_TYPE(wxEVT_WXLUA_DEBUGGER_STOPDEBUGGER)
! DEFINE_EVENT_TYPE(wxEVT_WXLUA_DEBUGGER_BREAKPOINT_ADDED)
! DEFINE_EVENT_TYPE(wxEVT_WXLUA_DEBUGGER_BREAKPOINT_REMOVED)
  
  IMPLEMENT_DYNAMIC_CLASS(wxLuaDebuggerEvent, wxEvent)
--- 40,45 ----
  DEFINE_EVENT_TYPE(wxEVT_WXLUA_DEBUGGER_TABLE_ENUM)
  DEFINE_EVENT_TYPE(wxEVT_WXLUA_DEBUGGER_EVALUATE_EXPR)
! //DEFINE_EVENT_TYPE(wxEVT_WXLUA_DEBUGGER_STARTDEBUGGER)
! //DEFINE_EVENT_TYPE(wxEVT_WXLUA_DEBUGGER_STOPDEBUGGER)
  
  IMPLEMENT_DYNAMIC_CLASS(wxLuaDebuggerEvent, wxEvent)
***************
*** 501,540 ****
              break;
          }
-         case wxLUASOCKET_DEBUGGEE_EVENT_BREAKPOINT_ADDED:
-         {
-             wxString fileName;
-             wxInt32 line = 0;
-             wxInt32 enabled = 0;
- 
-             if (CheckSocketRead(
-                 GetSocketBase()->ReadString(fileName) &&
-                 GetSocketBase()->ReadInt32(line) &&
-                 GetSocketBase()->ReadInt32(enabled),
-                 wxT("Debugger wxLUASOCKET_DEBUGGEE_EVENT_BREAKPOINT_ADDED")))
-             {
-                 wxLuaDebuggerEvent debugEvent(wxEVT_WXLUA_DEBUGGER_BREAKPOINT_ADDED, this, line, fileName, enabled ? true : false);
-                 SendEvent(debugEvent);
-             }
-             else return -1;
- 
-             break;
-         }
-         case wxLUASOCKET_DEBUGGEE_EVENT_BREAKPOINT_REMOVED:
-         {
-             wxString fileName;
-             wxInt32 line = 0;
- 
-             if (CheckSocketRead(
-                 GetSocketBase()->ReadString(fileName) &&
-                 GetSocketBase()->ReadInt32(line),
-                 wxT("Debugger wxLUASOCKET_DEBUGGEE_EVENT_BREAKPOINT_REMOVED")))
-             {
-                 wxLuaDebuggerEvent debugEvent(wxEVT_WXLUA_DEBUGGER_BREAKPOINT_REMOVED, this, line, fileName);
-                 SendEvent(debugEvent);
-             }
-             else return -1;
- 
-             break;
-         }
          default : return -1; // don't know this event?
      }
--- 499,502 ----
***************
*** 779,783 ****
  
      if (acceptedSocket != NULL)
!     {      
          if (!acceptedSocket->Shutdown(SD_BOTH))
          {
--- 741,745 ----
  
      if (acceptedSocket != NULL)
!     {
          if (!acceptedSocket->Shutdown(SD_BOTH))
          {

Index: wxlsock.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxlsock.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** wxlsock.cpp	31 May 2007 17:18:55 -0000	1.28
--- wxlsock.cpp	11 Jun 2007 03:58:10 -0000	1.29
***************
*** 43,48 ****
          "wxLUASOCKET_DEBUGGEE_EVENT_TABLE_ENUM",
          "wxLUASOCKET_DEBUGGEE_EVENT_EVALUATE_EXPR",
-         "wxLUASOCKET_DEBUGGEE_EVENT_BREAKPOINT_ADDED",
-         "wxLUASOCKET_DEBUGGEE_EVENT_BREAKPOINT_REMOVED"
      };
  
--- 43,46 ----
***************
*** 72,76 ****
          if (val <= 0) return wxString::Format(wxT("INVALID SOCKET CMD/EVENT (%d), SOCKET ERROR?"), val);
  
!         if ((val >= wxLUASOCKET_DEBUGGEE_EVENT_BREAK) && (val <= wxLUASOCKET_DEBUGGEE_EVENT_BREAKPOINT_REMOVED))
              return lua2wx(s_wxlsocket_event[val]);
  
--- 70,74 ----
          if (val <= 0) return wxString::Format(wxT("INVALID SOCKET CMD/EVENT (%d), SOCKET ERROR?"), val);
  
!         if ((val >= wxLUASOCKET_DEBUGGEE_EVENT_BREAK) && (val <= wxLUASOCKET_DEBUGGEE_EVENT__COUNT))
              return lua2wx(s_wxlsocket_event[val]);