Prototypes for some _internal_ functions had to be changed (API remains the same)

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

diff --git a/include/wx/socket.h b/include/wx/socket.h
index da40262dc9522a32d38f1254e1d27af6e41b258b..22f5d74bfd0e728b541ea1afb6776bcef7000203 100644 (file)
--- a/include/wx/socket.h
+++ b/include/wx/socket.h
@@ -1,7 +1,7 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        socket.h
 // Purpose:     Socket handling classes
 /////////////////////////////////////////////////////////////////////////////
 // Name:        socket.h
 // Purpose:     Socket handling classes

-// Author:      Guilhem Lavaux
+// Authors:     Guilhem Lavaux, Guillermo Rodriguez Garcia

 // Modified by:
 // Created:     April 1997
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     April 1997
 // RCS-ID:      $Id$


@@ -82,13 +82,13 @@ public:
   // Type of request
 
   enum wxSockType { SOCK_CLIENT, SOCK_SERVER, SOCK_INTERNAL, SOCK_UNINIT };
   // 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
 
 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
                      
   wxUint32 m_lcount;                   // Last IO request size
   unsigned long m_timeout;             // IO timeout value
                      


@@ -167,7 +167,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
+  // Method called when something happens in the socket

   void SetNotify(wxSocketEventFlags flags);
   virtual void OnRequest(wxSocketNotify req_evt);
 
   void SetNotify(wxSocketEventFlags flags);
   virtual void OnRequest(wxSocketNotify req_evt);
 


@@ -201,11 +201,11 @@ public:
 protected:
 #endif
 
 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);
 
   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);
 
   // Pushback library
   wxUint32 GetPushback(char *buffer, wxUint32 size, bool peek);