X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/da1ed74c85f53a75a193c7dcbd2013aa266a222c..6d62b2e2b1d3360461ed3d28e6a2be1474e99ae4:/interface/wx/socket.h

diff --git a/interface/wx/socket.h b/interface/wx/socket.h
index 0a4f3bc93a..621df49adf 100644
--- a/interface/wx/socket.h
+++ b/interface/wx/socket.h
@@ -70,12 +70,12 @@ public:
 
         @return @true on success, @false if something goes wrong (invalid @a service).
     */
-    bool Service(unsigned short service);
+    bool Service(unsigned short service) = 0;
 
     /**
         Returns the current service.
     */
-    unsigned short Service();
+    unsigned short Service() const = 0;
 };
 
 
@@ -257,12 +257,12 @@ public:
 
         @return @true on success, @false if something goes wrong (invalid @a service).
     */
-    virtual bool Service(unsigned short service);
+    virtual bool Service(unsigned short service) = 0;
 
     /**
         Returns the current service.
     */
-    virtual unsigned short Service();
+    virtual unsigned short Service() const = 0;
 };
 
 
@@ -712,6 +712,13 @@ public:
     */
     bool GetPeer(wxSockAddress& addr) const;
 
+    /**
+        Return the socket timeout in seconds.
+
+        The timeout can be set using SetTimeout() and is 10 minutes by default.
+     */
+    long GetTimeout() const;
+
     /**
         Returns @true if the socket is connected.
     */
@@ -1196,6 +1203,8 @@ public:
 /**
     @class wxDatagramSocket
 
+    @todo docme
+
     @library{wxnet}
     @category{net}
 */
@@ -1205,37 +1214,19 @@ public:
     /**
         Constructor.
 
+        @param addr
+            The socket address.
         @param flags
-            Socket flags (See wxSocketBase::SetFlags())
+            Socket flags (See wxSocketBase::SetFlags()).
     */
-    wxDatagramSocket(wxSocketFlags flags = wxSOCKET_NONE);
+    wxDatagramSocket(const wxSockAddress& addr,
+                     wxSocketFlags flags = wxSOCKET_NONE);
 
     /**
         Destructor. Please see wxSocketBase::Destroy().
     */
     virtual ~wxDatagramSocket();
 
-    /**
-        This function reads a buffer of @a nbytes bytes from the socket.
-        Use wxSocketBase::LastCount() to verify the number of bytes actually read.
-        Use wxSocketBase::Error() to determine if the operation succeeded.
-
-        @param address
-            Any address - will be overwritten with the address of the peer that sent
-            that data.
-        @param buffer
-            Buffer where to put read data.
-        @param nbytes
-            Number of bytes.
-
-        @return Returns a reference to the current object, and the address of
-                the peer that sent the data on address param.
-
-        @see wxSocketBase::LastError(), wxSocketBase::SetFlags()
-    */
-    wxDatagramSocket ReceiveFrom(wxSockAddress& address,
-                                 void* buffer, wxUint32 nbytes);
-
     /**
         This function writes a buffer of @a nbytes bytes to the socket.
         Use wxSocketBase::LastCount() to verify the number of bytes actually wrote.
@@ -1252,7 +1243,7 @@ public:
 
         @see wxSocketBase::LastError(), wxSocketBase::SetFlags()
     */
-    wxDatagramSocket SendTo(const wxSockAddress& address,
-                            const void* buffer, wxUint32 nbytes);
+    wxDatagramSocket& SendTo(const wxSockAddress& address,
+                             const void* buffer, wxUint32 nbytes);
 };