Mingw32/gcc-2.95 change

[wxWidgets.git] / include / wx / socket.h

diff --git a/include/wx/socket.h b/include/wx/socket.h
index 77a04e2f24addaa8e2bfe7bca61f543a9142fcaf..22f5d74bfd0e728b541ea1afb6776bcef7000203 100644 (file)
--- a/include/wx/socket.h
+++ b/include/wx/socket.h
@@ -1,7 +1,7 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        socket.h
 // Purpose:     Socket handling classes
-// Author:      Guilhem Lavaux
+// Authors:     Guilhem Lavaux, Guillermo Rodriguez Garcia
 // Modified by:
 // Created:     April 1997
 // RCS-ID:      $Id$
@@ -48,7 +48,7 @@ enum {
   wxSOCKET_INPUT_FLAG = GSOCK_INPUT_FLAG,
   wxSOCKET_OUTPUT_FLAG = GSOCK_OUTPUT_FLAG,
   wxSOCKET_CONNECTION_FLAG = GSOCK_CONNECTION_FLAG,
-  wxSOCKET_LOST_FLAG = GSOCK_LOST_FLAG,
+  wxSOCKET_LOST_FLAG = GSOCK_LOST_FLAG
 };
 
 typedef GSocketEventFlags wxSocketEventFlags;
@@ -82,36 +82,37 @@ public:
   // Type of request
 
   enum wxSockType { SOCK_CLIENT, SOCK_SERVER, SOCK_INTERNAL, SOCK_UNINIT };
-  typedef void (*wxSockCbk)(wxSocketBase& sock,wxSocketNotify evt,char *cdata);
+  typedef void (*wxSockCbk)(wxSocketBase& sock, wxSocketNotify evt, char *cdata);
 
 protected:
   GSocket *m_socket;                   // wxSocket socket
   wxSockFlags m_flags;                 // wxSocket flags
   wxSockType m_type;                   // wxSocket type
-  wxSocketEventFlags m_neededreq;      // Specify which requet signals we need
+  wxSocketEventFlags m_neededreq;   // Which events we are interested in
   wxUint32 m_lcount;                   // Last IO request size
   unsigned long m_timeout;             // IO timeout value
-
-  char *m_unread;                      // Pushback buffer
+                     
+  char *m_unread;               // Pushback buffer
   wxUint32 m_unrd_size;                        // Pushback buffer size
   wxUint32 m_unrd_cur;                 // Pushback pointer
 
-  wxSockCbk m_cbk;                     // C callback
-  char *m_cdata;                       // C callback data
+  wxSockCbk m_cbk;              // C callback
+  char *m_cdata;                // C callback data
 
-  bool m_connected;                    // Connected ?
+  bool m_connected;             // Connected ?
+  bool m_establishing;          // Pending connections?
   bool m_notify_state;                 // Notify state
-  int m_id;                            // Socket id (for event handler)
+  int m_id;                     // Socket id (for event handler)
 
   // Defering variables
   enum {
     DEFER_READ, DEFER_WRITE, NO_DEFER
   } m_defering;                         // Defering state
   char *m_defer_buffer;                 // Defering target buffer
-  wxUint32 m_defer_nbytes;                // Defering buffer size
-  wxTimer *m_defer_timer;              // Timer for defering mode
+  wxUint32 m_defer_nbytes;              // Defering buffer size
+  wxTimer *m_defer_timer;               // Timer for defering mode
 
-  wxList m_states;                     // Stack of states
+  wxList m_states;                      // Stack of states
 
 public:
   wxSocketBase();
@@ -127,7 +128,7 @@ public:
   wxSocketBase& WriteMsg(const char *buffer, wxUint32 nbytes);
   void Discard();
 
-  // Try not to use this two methods (they sould be protected)
+  // Try not to use these two methods (they sould be protected)
   void CreatePushbackAfter(const char *buffer, wxUint32 size);
   void CreatePushbackBefore(const char *buffer, wxUint32 size);
 
@@ -148,8 +149,8 @@ public:
   void SetTimeout(unsigned long sec);
 
   // seconds = -1 means infinite wait
-  // seconds = 0 means no wait
-  // seconds > 0 means specified wait
+  // seconds, milliseconds = 0 means no wait
+  // seconds, milliseconds > 0 means specified wait
   bool Wait(long seconds = -1, long milliseconds = 0);
   bool WaitForRead(long seconds = -1, long milliseconds = 0);
   bool WaitForWrite(long seconds = -1, long milliseconds = 0);
@@ -166,7 +167,7 @@ public:
   // Setup event handler
   void SetEventHandler(wxEvtHandler& evt_hdlr, int id = -1);
 
-  // Method called when it happens something on the socket
+  // Method called when something happens in the socket
   void SetNotify(wxSocketEventFlags flags);
   virtual void OnRequest(wxSocketNotify req_evt);
 
@@ -200,11 +201,11 @@ public:
 protected:
 #endif
 
-  bool _Wait(long seconds, long milliseconds, int type);
+  bool _Wait(long seconds, long milliseconds, wxSocketEventFlags flags);
 
   int DeferRead(char *buffer, wxUint32 nbytes);
   int DeferWrite(const char *buffer, wxUint32 nbytes);
-  void DoDefer(wxSocketNotify evt);
+  void DoDefer();
 
   // Pushback library
   wxUint32 GetPushback(char *buffer, wxUint32 size, bool peek);
@@ -221,8 +222,10 @@ public:
 
   wxSocketServer(wxSockAddress& addr_man, wxSockFlags flags = wxSocketBase::NONE);
 
-  wxSocketBase* Accept();
-  bool AcceptWith(wxSocketBase& sock);
+  wxSocketBase* Accept(bool wait = TRUE);
+  bool AcceptWith(wxSocketBase& sock, bool wait = TRUE);
+
+  bool WaitOnAccept(long seconds = -1, long milliseconds = 0);
 };
 
 ////////////////////////////////////////////////////////////////////////