*** empty log message ***

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3191 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/sckaddr.h b/include/wx/sckaddr.h
index 1ea7a599dd91e3b2838718a475cd9302c5e7f521..7a7612731da21fd64d5b0442a6de34f716a24eb1 100644 (file)
--- a/include/wx/sckaddr.h
+++ b/include/wx/sckaddr.h
@@ -21,7 +21,7 @@
 #if wxUSE_SOCKETS
 
 #include "wx/string.h"
 #if wxUSE_SOCKETS
 
 #include "wx/string.h"

-#include "gsocket.h"
+#include "wx/gsocket.h"

 
 
 class WXDLLEXPORT wxSockAddress : public wxObject {
 
 
 class WXDLLEXPORT wxSockAddress : public wxObject {


@@ -109,6 +109,6 @@ public:
 
 #endif
   // wxUSE_SOCKETS
 
 #endif
   // wxUSE_SOCKETS

-  
+

 #endif
   // _WX_NETWORK_ADDRESS_H
 #endif
   // _WX_NETWORK_ADDRESS_H

diff --git a/include/wx/socket.h b/include/wx/socket.h
index 1b23f7c07581bf8000c6eef0141e68bd8140788e..a8797de0549ee68c00dd57131416bf84d0adc07f 100644 (file)
--- a/include/wx/socket.h
+++ b/include/wx/socket.h
@@ -31,7 +31,7 @@
 #endif
 
 #include "wx/sckaddr.h"
 #endif
 
 #include "wx/sckaddr.h"

-#include "gsocket.h"
+#include "wx/gsocket.h"

 
 class WXDLLEXPORT wxSocketEvent;
 class WXDLLEXPORT wxSocketBase : public wxEvtHandler
 
 class WXDLLEXPORT wxSocketEvent;
 class WXDLLEXPORT wxSocketBase : public wxEvtHandler


@@ -43,7 +43,7 @@ public:
   typedef int wxSockFlags;
   // Type of request
 
   typedef int wxSockFlags;
   // Type of request
 

-  enum wxSockType { SOCK_CLIENT, SOCK_SERVER, SOCK_INTERNAL, SOCK_UNINIT }; 
+  enum wxSockType { SOCK_CLIENT, SOCK_SERVER, SOCK_INTERNAL, SOCK_UNINIT };

   typedef void (*wxSockCbk)(wxSocketBase& sock,GSocketEvent evt,char *cdata);
 
 protected:
   typedef void (*wxSockCbk)(wxSocketBase& sock,GSocketEvent evt,char *cdata);
 
 protected:


@@ -72,7 +72,7 @@ protected:
   size_t m_defer_nbytes;                // Defering buffer size
 
   wxList m_states;                     // Stack of states
   size_t m_defer_nbytes;                // Defering buffer size
 
   wxList m_states;                     // Stack of states

-  
+

 public:
   wxSocketBase();
   virtual ~wxSocketBase();
 public:
   wxSocketBase();
   virtual ~wxSocketBase();


@@ -102,7 +102,7 @@ public:
   inline size_t LastCount() const { return m_lcount; }
   inline GSocketError LastError() const { return GSocket_GetError(m_socket); }
   inline wxSockType GetType() const { return m_type; }
   inline size_t LastCount() const { return m_lcount; }
   inline GSocketError LastError() const { return GSocket_GetError(m_socket); }
   inline wxSockType GetType() const { return m_type; }

-  
+

   void SetFlags(wxSockFlags _flags);
   wxSockFlags GetFlags() const;
   inline void SetTimeout(unsigned long sec) { m_timeout = sec; }
   void SetFlags(wxSockFlags _flags);
   wxSockFlags GetFlags() const;
   inline void SetTimeout(unsigned long sec) { m_timeout = sec; }


@@ -114,7 +114,7 @@ public:
   bool WaitForRead(long seconds = -1, long microseconds = 0);
   bool WaitForWrite(long seconds = -1, long microseconds = 0);
   bool WaitForLost(long seconds = -1, long microseconds = 0);
   bool WaitForRead(long seconds = -1, long microseconds = 0);
   bool WaitForWrite(long seconds = -1, long microseconds = 0);
   bool WaitForLost(long seconds = -1, long microseconds = 0);

-  
+

   // Save the current state of Socket
   void SaveState();
   void RestoreState();
   // Save the current state of Socket
   void SaveState();
   void RestoreState();


@@ -125,7 +125,7 @@ public:
 
   // Setup event handler
   void SetEventHandler(wxEvtHandler& evt_hdlr, int id = -1);
 
   // Setup event handler
   void SetEventHandler(wxEvtHandler& evt_hdlr, int id = -1);

-  
+

   // Method called when it happens something on the socket
   void SetNotify(GSocketEventFlags flags);
   virtual void OnRequest(GSocketEvent req_evt);
   // Method called when it happens something on the socket
   void SetNotify(GSocketEventFlags flags);
   virtual void OnRequest(GSocketEvent req_evt);


@@ -159,13 +159,13 @@ public:
 #ifdef __SALFORDC__
 protected:
 #endif
 #ifdef __SALFORDC__
 protected:
 #endif

-  
+

   bool _Wait(long seconds, long microseconds, int type);
 
   int DeferRead(char *buffer, size_t nbytes);
   int DeferWrite(const char *buffer, size_t nbytes);
   void DoDefer(GSocketEvent evt);
   bool _Wait(long seconds, long microseconds, int type);
 
   int DeferRead(char *buffer, size_t nbytes);
   int DeferWrite(const char *buffer, size_t nbytes);
   void DoDefer(GSocketEvent evt);

-  
+

   // Pushback library
   size_t GetPushback(char *buffer, size_t size, bool peek);
 };
   // Pushback library
   size_t GetPushback(char *buffer, size_t size, bool peek);
 };