[Wxlua-commit] wxLua/modules/wxluasocket/src dserver.cpp,1.2,1.3 dtarget.cpp,1.2,1.3

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

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

Modified Files:
	dserver.cpp dtarget.cpp 
Log Message:
update for wx26/27
Add bindings for builtin (global) functions
Handle %if statements for enums


Index: dtarget.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/dtarget.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** dtarget.cpp	7 Jun 2005 04:17:41 -0000	1.2
--- dtarget.cpp	17 Nov 2005 05:51:21 -0000	1.3
***************
*** 24,27 ****
--- 24,31 ----
  #include "wxluasocket/include/dtarget.h"
  
+ #if !wxCHECK_VERSION(2, 6, 0)
+     #define wxMilliSleep wxUsleep
+ #endif // !wxCHECK_VERSION(2, 6, 0)
+ 
  static const char *debugName = "__wxLuaDebug__";
  static const int  connectTimeout = 200;            // 20 seconds
***************
*** 83,87 ****
              break;
  
!         wxUsleep(100);
      }
      return m_fConnected;
--- 87,91 ----
              break;
  
!         wxMilliSleep(100);
      }
      return m_fConnected;
***************
*** 145,149 ****
      {
          m_clientSocket.Shutdown(SD_BOTH);
!         wxUsleep(100);
          m_clientSocket.Close();
      }
--- 149,153 ----
      {
          m_clientSocket.Shutdown(SD_BOTH);
!         wxMilliSleep(100);
          m_clientSocket.Close();
      }
***************
*** 280,283 ****
--- 284,291 ----
                      }
                      break;
+                 case CMD_DISABLE_BREAKPOINT: 
+                     break;
+                 case CMD_ENABLE_BREAKPOINT: 
+                     break;
              }
          }

Index: dserver.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/dserver.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** dserver.cpp	7 Jun 2005 04:17:41 -0000	1.2
--- dserver.cpp	17 Nov 2005 05:51:21 -0000	1.3
***************
*** 28,33 ****
  
  #if wxCHECK_VERSION(2, 3, 0)
! #include "wxluadebug/include/staktree.h"
! #endif
  
  wxString g_strProgramName;
--- 28,37 ----
  
  #if wxCHECK_VERSION(2, 3, 0)
!     #include "wxluadebug/include/staktree.h"
! #endif // wxCHECK_VERSION(2, 3, 0)
! 
! #if !wxCHECK_VERSION(2, 6, 0)
!     #define wxMilliSleep wxUsleep
! #endif // !wxCHECK_VERSION(2, 6, 0)
  
  wxString g_strProgramName;
***************
*** 122,126 ****
          }
  
!         wxUsleep(100);
  
          wxLuaSocket *acceptedSocket = m_acceptedSocket;
--- 126,130 ----
          }
  
!         wxMilliSleep(100);
  
          wxLuaSocket *acceptedSocket = m_acceptedSocket;
***************
*** 152,156 ****
              closeSocket.Shutdown(SD_BOTH);
  
!             wxUsleep(100);
  
              wxLuaSocket *serverSocket = m_serverSocket;
--- 156,160 ----
              closeSocket.Shutdown(SD_BOTH);
  
!             wxMilliSleep(100);
  
              wxLuaSocket *serverSocket = m_serverSocket;
***************
*** 512,516 ****
  
  #if wxCHECK_VERSION(2, 3, 3)
!             wxUsleep(500);  // why ??
  #endif
  
--- 516,520 ----
  
  #if wxCHECK_VERSION(2, 3, 3)
!             wxMilliSleep(500);  // why ??
  #endif