use an enum to make it easier to document the values

[wxWidgets.git] / interface / socket.h

diff --git a/interface/socket.h b/interface/socket.h
index d57b844f1fb06098e82d654a0cf7038a6adda270..32d3083e761f493b3d0c133c9a4a0b2350b48415 100644 (file)
--- a/interface/socket.h
+++ b/interface/socket.h
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        socket.h
 /////////////////////////////////////////////////////////////////////////////
 // Name:        socket.h

-// Purpose:     documentation for wxIPV4address class
+// Purpose:     interface of wxIPV4address

 // Author:      wxWidgets team
 // RCS-ID:      $Id$
 // Licence:     wxWindows license
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
 // Licence:     wxWindows license


@@ -23,7 +23,7 @@ public:
         as this correctly handles multi-homed hosts and avoids other small
         problems. Internally, this is the same as setting the IP address
         to @b INADDR_ANY.
         as this correctly handles multi-homed hosts and avoids other small
         problems. Internally, this is the same as setting the IP address
         to @b INADDR_ANY.

-        
+

         @returns Returns @true on success, @false if something went wrong.
     */
     bool AnyAddress();
         @returns Returns @true on success, @false if something went wrong.
     */
     bool AnyAddress();


@@ -60,6 +60,7 @@ public:
 };
 
 
 };
 
 

+

 /**
     @class wxSocketServer
     @wxheader{socket.h}
 /**
     @class wxSocketServer
     @wxheader{socket.h}


@@ -68,9 +69,8 @@ public:
     @library{wxnet}
     @category{net}
 
     @library{wxnet}
     @category{net}
 

-    @seealso
-    wxSocketServer::WaitForAccept, wxSocketBase::SetNotify, wxSocketBase::Notify,
-    wxSocketServer::AcceptWith
+    @see wxSocketServer::WaitForAccept, wxSocketBase::SetNotify,
+    wxSocketBase::Notify, wxSocketServer::AcceptWith

 */
 class wxSocketServer : public wxSocketBase
 {
 */
 class wxSocketServer : public wxSocketBase
 {


@@ -79,12 +79,11 @@ public:
         Constructs a new server and tries to bind to the specified @e address.
         Before trying to accept new connections, test whether it succeeded with
         @ref wxSocketBase::isok wxSocketBase:IsOk.
         Constructs a new server and tries to bind to the specified @e address.
         Before trying to accept new connections, test whether it succeeded with
         @ref wxSocketBase::isok wxSocketBase:IsOk.

-        
+

         @param address
         @param address

-        Specifies the local address for the server (e.g. port number).
-        
+            Specifies the local address for the server (e.g. port number).

         @param flags
         @param flags

-        Socket flags (See wxSocketBase::SetFlags)
+            Socket flags (See wxSocketBase::SetFlags)

     */
     wxSocketServer(const wxSockAddress& address,
                    wxSocketFlags flags = wxSOCKET_NONE);
     */
     wxSocketServer(const wxSockAddress& address,
                    wxSocketFlags flags = wxSOCKET_NONE);


@@ -98,60 +97,58 @@ public:
         Accepts an incoming connection request, and creates a new
         wxSocketBase object which represents
         the server-side of the connection.
         Accepts an incoming connection request, and creates a new
         wxSocketBase object which represents
         the server-side of the connection.

-        
-        If @e wait is @true and there are no pending connections to be
+        If @a wait is @true and there are no pending connections to be

         accepted, it will wait for the next incoming connection to
         arrive. @b Warning: This will block the GUI.
         accepted, it will wait for the next incoming connection to
         arrive. @b Warning: This will block the GUI.

-        
-        If @e wait is @false, it will try to accept a pending connection
+        If @a wait is @false, it will try to accept a pending connection

         if there is one, but it will always return immediately without blocking
         the GUI. If you want to use Accept in this way, you can either check for
         incoming connections with WaitForAccept()
         or catch @b wxSOCKET_CONNECTION events, then call Accept once you know
         that there is an incoming connection waiting to be accepted.
         if there is one, but it will always return immediately without blocking
         the GUI. If you want to use Accept in this way, you can either check for
         incoming connections with WaitForAccept()
         or catch @b wxSOCKET_CONNECTION events, then call Accept once you know
         that there is an incoming connection waiting to be accepted.

-        
+

         @returns Returns an opened socket connection, or @NULL if an error
         @returns Returns an opened socket connection, or @NULL if an error

-                   occurred or if the wait parameter was @false and there
-                   were no pending connections.
-        
-        @sa WaitForAccept(), wxSocketBase::SetNotify,
-              wxSocketBase::Notify, AcceptWith()
+                 occurred or if the wait parameter was @false and there
+                 were no pending connections.
+
+        @see WaitForAccept(), wxSocketBase::SetNotify,
+             wxSocketBase::Notify, AcceptWith()

     */
     */

-    wxSocketBase * Accept(bool wait = @true);
+    wxSocketBase* Accept(bool wait = true);

 
     /**
         Accept an incoming connection using the specified socket object.
 
     /**
         Accept an incoming connection using the specified socket object.

-        
+

         @param socket
         @param socket

-        Socket to be initialized
-        
+            Socket to be initialized
+

         @returns Returns @true on success, or @false if an error occurred or if the
         @returns Returns @true on success, or @false if an error occurred or if the

-                   wait parameter was @false and there were no pending
-                   connections.
+                 wait parameter was @false and there were no pending
+                 connections.

     */
     */

-    bool AcceptWith(wxSocketBase& socket, bool wait = @true);
+    bool AcceptWith(wxSocketBase& socket, bool wait = true);

 
     /**
         This function waits for an incoming connection. Use it if you want to call
         Accept() or AcceptWith()
         with @e wait set to @false, to detect when an incoming connection is waiting
         to be accepted.
 
     /**
         This function waits for an incoming connection. Use it if you want to call
         Accept() or AcceptWith()
         with @e wait set to @false, to detect when an incoming connection is waiting
         to be accepted.

-        
+

         @param seconds
         @param seconds

-        Number of seconds to wait.
-        If -1, it will wait for the default timeout,
-        as set with SetTimeout.
-        
+            Number of seconds to wait.
+            If -1, it will wait for the default timeout,
+            as set with SetTimeout.

         @param millisecond
         @param millisecond

-        Number of milliseconds to wait.
-        
+            Number of milliseconds to wait.
+

         @returns Returns @true if an incoming connection arrived, @false if the
         @returns Returns @true if an incoming connection arrived, @false if the

-                   timeout elapsed.
+                 timeout elapsed.

     */
     bool WaitForAccept(long seconds = -1, long millisecond = 0);
 };
 
 
     */
     bool WaitForAccept(long seconds = -1, long millisecond = 0);
 };
 
 

+

 /**
     @class wxIPaddress
     @wxheader{socket.h}
 /**
     @class wxIPaddress
     @wxheader{socket.h}


@@ -170,11 +167,9 @@ public:
     /**
         Internally, this is the same as setting the IP address
         to @b INADDR_ANY.
     /**
         Internally, this is the same as setting the IP address
         to @b INADDR_ANY.

-        

         On IPV4 implementations, 0.0.0.0
         On IPV4 implementations, 0.0.0.0

-        

         On IPV6 implementations, ::
         On IPV6 implementations, ::

-        
+

         @returns Returns @true on success, @false if something went wrong.
     */
     virtual bool AnyAddress();
         @returns Returns @true on success, @false if something went wrong.
     */
     virtual bool AnyAddress();


@@ -182,9 +177,8 @@ public:
     /**
         Internally, this is the same as setting the IP address
         to @b INADDR_BROADCAST.
     /**
         Internally, this is the same as setting the IP address
         to @b INADDR_BROADCAST.

-        

         On IPV4 implementations, 255.255.255.255
         On IPV4 implementations, 255.255.255.255

-        
+

         @returns Returns @true on success, @false if something went wrong.
     */
     virtual bool BroadcastAddress();
         @returns Returns @true on success, @false if something went wrong.
     */
     virtual bool BroadcastAddress();


@@ -209,11 +203,9 @@ public:
 
     /**
         Set address to localhost.
 
     /**
         Set address to localhost.

-        

         On IPV4 implementations, 127.0.0.1
         On IPV4 implementations, 127.0.0.1

-        

         On IPV6 implementations, ::1
         On IPV6 implementations, ::1

-        
+

         @returns Returns @true on success, @false if something went wrong.
     */
     virtual bool LocalHost();
         @returns Returns @true on success, @false if something went wrong.
     */
     virtual bool LocalHost();


@@ -229,6 +221,7 @@ public:
 };
 
 
 };
 
 

+

 /**
     @class wxSocketClient
     @wxheader{socket.h}
 /**
     @class wxSocketClient
     @wxheader{socket.h}


@@ -237,17 +230,17 @@ public:
     @library{wxnet}
     @category{net}
 
     @library{wxnet}
     @category{net}
 

-    @seealso
-    wxSocketClient::WaitOnConnect, wxSocketBase::SetNotify, wxSocketBase::Notify
+    @see wxSocketClient::WaitOnConnect, wxSocketBase::SetNotify,
+    wxSocketBase::Notify

 */
 class wxSocketClient : public wxSocketBase
 {
 public:
     /**
         Constructor.
 */
 class wxSocketClient : public wxSocketBase
 {
 public:
     /**
         Constructor.

-        
+

         @param flags
         @param flags

-        Socket flags (See wxSocketBase::SetFlags)
+            Socket flags (See wxSocketBase::SetFlags)

     */
     wxSocketClient(wxSocketFlags flags = wxSOCKET_NONE);
 
     */
     wxSocketClient(wxSocketFlags flags = wxSOCKET_NONE);
 


@@ -259,63 +252,58 @@ public:
     //@{
     /**
         Connects to a server using the specified address.
     //@{
     /**
         Connects to a server using the specified address.

-        
-        If @e wait is @true, Connect will wait until the connection
+        If @a wait is @true, Connect will wait until the connection

         completes. @b Warning: This will block the GUI.
         completes. @b Warning: This will block the GUI.

-        
-        If @e wait is @false, Connect will try to establish the connection and
+        If @a wait is @false, Connect will try to establish the connection and

         return immediately, without blocking the GUI. When used this way, even if
         Connect returns @false, the connection request can be completed later.
         To detect this, use WaitOnConnect(),
         or catch @b wxSOCKET_CONNECTION events (for successful establishment)
         and @b wxSOCKET_LOST events (for connection failure).
         return immediately, without blocking the GUI. When used this way, even if
         Connect returns @false, the connection request can be completed later.
         To detect this, use WaitOnConnect(),
         or catch @b wxSOCKET_CONNECTION events (for successful establishment)
         and @b wxSOCKET_LOST events (for connection failure).

-        
+

         @param address
         @param address

-        Address of the server.
-        
+            Address of the server.

         @param local
         @param local

-        Bind to the specified local address and port before connecting.
-        The local address and port can also be set using SetLocal,
-        and then using the 2-parameter Connect method.
-        
+            Bind to the specified local address and port before connecting.
+            The local address and port can also be set using SetLocal,
+            and then using the 2-parameter Connect method.

         @param wait
         @param wait

-        If @true, waits for the connection to complete.
-        
+            If @true, waits for the connection to complete.
+

         @returns Returns @true if the connection is established and no error
         @returns Returns @true if the connection is established and no error

-                   occurs.
-        
-        @sa WaitOnConnect(), wxSocketBase::SetNotify,
-              wxSocketBase::Notify
+                 occurs.
+
+        @see WaitOnConnect(), wxSocketBase::SetNotify,
+             wxSocketBase::Notify

     */
     */

-    bool Connect(wxSockAddress& address, bool wait = @true);
+    bool Connect(wxSockAddress& address, bool wait = true);

     bool Connect(wxSockAddress& address, wxSockAddress& local,
     bool Connect(wxSockAddress& address, wxSockAddress& local,

-                 bool wait = @true);
+                 bool wait = true);

     //@}
 
     /**
         Wait until a connection request completes, or until the specified timeout
         elapses. Use this function after issuing a call
         to Connect() with @e wait set to @false.
     //@}
 
     /**
         Wait until a connection request completes, or until the specified timeout
         elapses. Use this function after issuing a call
         to Connect() with @e wait set to @false.

-        
+

         @param seconds
         @param seconds

-        Number of seconds to wait.
-        If -1, it will wait for the default timeout,
-        as set with SetTimeout.
-        
+            Number of seconds to wait.
+            If -1, it will wait for the default timeout,
+            as set with SetTimeout.

         @param millisecond
         @param millisecond

-        Number of milliseconds to wait.
-        
+            Number of milliseconds to wait.
+

         @returns WaitOnConnect returns @true if the connection request completes.
         @returns WaitOnConnect returns @true if the connection request completes.

-                   This does not necessarily mean that the connection
-                   was successfully established; it might also happen
-                   that the connection was refused by the peer. Use
-                   IsConnected to distinguish between these two
-                   situations.
+                 This does not necessarily mean that the connection was
+                 successfully established; it might also happen that the
+                 connection was refused by the peer. Use  IsConnected to
+                 distinguish between these two situations.

     */
     bool WaitOnConnect(long seconds = -1, long milliseconds = 0);
 };
 
 
     */
     bool WaitOnConnect(long seconds = -1, long milliseconds = 0);
 };
 
 

+

 /**
     @class wxSockAddress
     @wxheader{socket.h}
 /**
     @class wxSockAddress
     @wxheader{socket.h}


@@ -325,8 +313,7 @@ public:
     @library{wxbase}
     @category{FIXME}
 
     @library{wxbase}
     @category{FIXME}
 

-    @seealso
-    wxSocketBase, wxIPaddress, wxIPV4address
+    @see wxSocketBase, wxIPaddress, wxIPV4address

 */
 class wxSockAddress : public wxObject
 {
 */
 class wxSockAddress : public wxObject
 {


@@ -353,6 +340,7 @@ public:
 };
 
 
 };
 
 

+

 /**
     @class wxSocketEvent
     @wxheader{socket.h}
 /**
     @class wxSocketEvent
     @wxheader{socket.h}


@@ -362,8 +350,7 @@ public:
     @library{wxnet}
     @category{net}
 
     @library{wxnet}
     @category{net}
 

-    @seealso
-    wxSocketBase, wxSocketClient, wxSocketServer
+    @see wxSocketBase, wxSocketClient, wxSocketServer

 */
 class wxSocketEvent : public wxEvent
 {
 */
 class wxSocketEvent : public wxEvent
 {


@@ -377,21 +364,22 @@ public:
         Gets the client data of the socket which generated this event, as
         set with wxSocketBase::SetClientData.
     */
         Gets the client data of the socket which generated this event, as
         set with wxSocketBase::SetClientData.
     */

-    void * GetClientData();
+    void* GetClientData();

 
     /**
         Returns the socket object to which this event refers to. This makes
         it possible to use the same event handler for different sockets.
     */
 
     /**
         Returns the socket object to which this event refers to. This makes
         it possible to use the same event handler for different sockets.
     */

-    wxSocketBase * GetSocket();
+    wxSocketBase* GetSocket() const;

 
     /**
         Returns the socket event type.
     */
 
     /**
         Returns the socket event type.
     */

-    wxSocketNotify GetSocketEvent();
+    wxSocketNotify GetSocketEvent() const;

 };
 
 
 };
 
 

+

 /**
     @class wxSocketBase
     @wxheader{socket.h}
 /**
     @class wxSocketBase
     @wxheader{socket.h}


@@ -411,8 +399,7 @@ public:
     @library{wxnet}
     @category{net}
 
     @library{wxnet}
     @category{net}
 

-    @seealso
-    wxSocketEvent, wxSocketClient, wxSocketServer, @ref overview_samplesockets
+    @see wxSocketEvent, wxSocketClient, wxSocketServer, @ref overview_samplesockets

     "Sockets sample"
 */
 class wxSocketBase : public wxObject
     "Sockets sample"
 */
 class wxSocketBase : public wxObject


@@ -434,48 +421,43 @@ public:
 
     /**
         Functions that perform basic IO functionality.
 
     /**
         Functions that perform basic IO functionality.

-        

         Close()
         Close()

-        
+

         Discard()
         Discard()

-        
+

         Peek()
         Peek()

-        
+

         Read()
         Read()

-        
+

         ReadMsg()
         ReadMsg()

-        
+

         Unread()
         Unread()

-        
+

         Write()
         Write()

-        
+

         WriteMsg()
         WriteMsg()

-        

         Functions that perform a timed wait on a certain IO condition.
         Functions that perform a timed wait on a certain IO condition.

-        

         InterruptWait()
         InterruptWait()

-        
+

         Wait()
         Wait()

-        
+

         WaitForLost()
         WaitForLost()

-        
+

         WaitForRead()
         WaitForRead()

-        
+

         WaitForWrite()
         WaitForWrite()

+

         and also:
         and also:

-        

         wxSocketServer::WaitForAccept
         wxSocketServer::WaitForAccept

-        
+

         wxSocketClient::WaitOnConnect
         wxSocketClient::WaitOnConnect

-        

         Functions that allow applications to customize socket IO as needed.
         Functions that allow applications to customize socket IO as needed.

-        

         GetFlags()
         GetFlags()

-        
+

         SetFlags()
         SetFlags()

-        
+

         SetTimeout()
         SetTimeout()

-        
+

         SetLocal()
     */
 
         SetLocal()
     */
 


@@ -492,9 +474,9 @@ public:
 
     /**
         @ref construct() wxSocketBase
 
     /**
         @ref construct() wxSocketBase

-        
+

         @ref destruct() ~wxSocketBase
         @ref destruct() ~wxSocketBase

-        
+

         Destroy()
     */
 
         Destroy()
     */
 


@@ -506,9 +488,8 @@ public:
         the wxSocket to a list of object to be deleted on idle time, after all
         events have been processed. For the same reason, you should avoid creating
         socket objects in the stack.
         the wxSocket to a list of object to be deleted on idle time, after all
         events have been processed. For the same reason, you should avoid creating
         socket objects in the stack.

-        

         Destroy calls Close() automatically.
         Destroy calls Close() automatically.

-        
+

         @returns Always @true.
     */
     bool Destroy();
         @returns Always @true.
     */
     bool Destroy();


@@ -516,61 +497,57 @@ public:
     /**
         This function simply deletes all bytes in the incoming queue. This function
         always returns immediately and its operation is not affected by IO flags.
     /**
         This function simply deletes all bytes in the incoming queue. This function
         always returns immediately and its operation is not affected by IO flags.

-        

         Use LastCount() to verify the number of bytes actually discarded.
         Use LastCount() to verify the number of bytes actually discarded.

-        

         If you use Error(), it will always return @false.
     */
     wxSocketBase Discard();
 
     /**
         Returns @true if an error occurred in the last IO operation.
         If you use Error(), it will always return @false.
     */
     wxSocketBase Discard();
 
     /**
         Returns @true if an error occurred in the last IO operation.

-        

         Use this function to check for an error condition after one of the
         following calls: Discard, Peek, Read, ReadMsg, Unread, Write, WriteMsg.
     */
         Use this function to check for an error condition after one of the
         following calls: Discard, Peek, Read, ReadMsg, Unread, Write, WriteMsg.
     */

-    bool Error();
+    bool Error() const;

 
     /**
         Returns a pointer of the client data for this socket, as set with
         SetClientData()
     */
 
     /**
         Returns a pointer of the client data for this socket, as set with
         SetClientData()
     */

-    void * GetClientData();
+    void* GetClientData() const;

 
     /**
         Returns current IO flags, as set with SetFlags()
     */
 
     /**
         Returns current IO flags, as set with SetFlags()
     */

-    wxSocketFlags GetFlags();
+    wxSocketFlags GetFlags() const;

 
     /**
         This function returns the local address field of the socket. The local
         address field contains the complete local address of the socket (local
         address, local port, ...).
 
     /**
         This function returns the local address field of the socket. The local
         address field contains the complete local address of the socket (local
         address, local port, ...).

-        
+

         @returns @true if no error happened, @false otherwise.
     */
         @returns @true if no error happened, @false otherwise.
     */

-    bool GetLocal(wxSockAddress& addr);
+    bool GetLocal(wxSockAddress& addr) const;

 
     /**
         This function returns the peer address field of the socket. The peer
         address field contains the complete peer host address of the socket
         (address, port, ...).
 
     /**
         This function returns the peer address field of the socket. The peer
         address field contains the complete peer host address of the socket
         (address, port, ...).

-        
+

         @returns @true if no error happened, @false otherwise.
     */
         @returns @true if no error happened, @false otherwise.
     */

-    bool GetPeer(wxSockAddress& addr);
+    bool GetPeer(wxSockAddress& addr) const;

 
     /**
         Functions that allow applications to receive socket events.
 
     /**
         Functions that allow applications to receive socket events.

-        

         Notify()
         Notify()

-        
+

         SetNotify()
         SetNotify()

-        
+

         GetClientData()
         GetClientData()

-        
+

         SetClientData()
         SetClientData()

-        
+

         SetEventHandler()
     */
 
         SetEventHandler()
     */
 


@@ -583,7 +560,6 @@ public:
         some exception or abnormal problem. InterruptWait is automatically called
         when you Close() a socket (and thus also upon
         socket destruction), so you don't need to use it in these cases.
         some exception or abnormal problem. InterruptWait is automatically called
         when you Close() a socket (and thus also upon
         socket destruction), so you don't need to use it in these cases.

-        

         Wait(),
         wxSocketServer::WaitForAccept,
         WaitForLost(),
         Wait(),
         wxSocketServer::WaitForAccept,
         WaitForLost(),


@@ -596,7 +572,7 @@ public:
     /**
         Returns @true if the socket is connected.
     */
     /**
         Returns @true if the socket is connected.
     */

-    bool IsConnected();
+    bool IsConnected() const;

 
     /**
         This function waits until the socket is readable. This might mean that
 
     /**
         This function waits until the socket is readable. This might mean that


@@ -605,32 +581,30 @@ public:
         immediately without blocking (unless the @b wxSOCKET_WAITALL flag
         is set, in which case the operation might still block).
     */
         immediately without blocking (unless the @b wxSOCKET_WAITALL flag
         is set, in which case the operation might still block).
     */

-    bool IsData();
+    bool IsData() const;

 
     /**
         Returns @true if the socket is not connected.
     */
 
     /**
         Returns @true if the socket is not connected.
     */

-    bool IsDisconnected();
+    bool IsDisconnected() const;

 
     /**
         Returns @true if the socket is initialized and ready and @false in other
         cases.
     */
 
     /**
         Returns @true if the socket is initialized and ready and @false in other
         cases.
     */

-#define bool IsOk()     /* implementation is private */
+    bool IsOk() const;

 
     /**
         Returns the number of bytes read or written by the last IO call.
 
     /**
         Returns the number of bytes read or written by the last IO call.

-        

         Use this function to get the number of bytes actually transferred
         after using one of the following IO calls: Discard, Peek, Read,
         ReadMsg, Unread, Write, WriteMsg.
     */
         Use this function to get the number of bytes actually transferred
         after using one of the following IO calls: Discard, Peek, Read,
         ReadMsg, Unread, Write, WriteMsg.
     */

-    wxUint32 LastCount();
+    wxUint32 LastCount() const;

 
     /**
         Returns the last wxSocket error. See @ref overview_wxsocketbase "wxSocket
         errors".
 
     /**
         Returns the last wxSocket error. See @ref overview_wxsocketbase "wxSocket
         errors".

-        

         Please note that this function merely returns the last error code,
         but it should not be used to determine if an error has occurred (this
         is because successful operations do not change the LastError value).
         Please note that this function merely returns the last error code,
         but it should not be used to determine if an error has occurred (this
         is because successful operations do not change the LastError value).


@@ -638,88 +612,78 @@ public:
         if the last IO call failed. If this returns @true, use LastError
         to discover the cause of the error.
     */
         if the last IO call failed. If this returns @true, use LastError
         to discover the cause of the error.
     */

-    wxSocketError LastError();
+    wxSocketError LastError() const;

 
     /**
 
     /**

-        According to the @e notify value, this function enables
-        or disables socket events. If @e notify is @true, the events
+        According to the @a notify value, this function enables
+        or disables socket events. If @a notify is @true, the events

         configured with SetNotify() will
         configured with SetNotify() will

-        be sent to the application. If @e notify is @false; no events
+        be sent to the application. If @a notify is @false; no events

         will be sent.
     */
     void Notify(bool notify);
 
     /**
         will be sent.
     */
     void Notify(bool notify);
 
     /**

-        This function peeks a buffer of @e nbytes bytes from the socket.
+        This function peeks a buffer of @a nbytes bytes from the socket.

         Peeking a buffer doesn't delete it from the socket input queue.
         Peeking a buffer doesn't delete it from the socket input queue.

-        

         Use LastCount() to verify the number of bytes actually peeked.
         Use LastCount() to verify the number of bytes actually peeked.

-        

         Use Error() to determine if the operation succeeded.
         Use Error() to determine if the operation succeeded.

-        
+

         @param buffer
         @param buffer

-        Buffer where to put peeked data.
-        
+            Buffer where to put peeked data.

         @param nbytes
         @param nbytes

-        Number of bytes.
-        
+            Number of bytes.
+

         @returns Returns a reference to the current object.
         @returns Returns a reference to the current object.

-        
-        @sa Error(), LastError(), LastCount(),
-              SetFlags()
+
+        @see Error(), LastError(), LastCount(),
+             SetFlags()

     */
     */

-    wxSocketBase Peek(void * buffer, wxUint32 nbytes);
+    wxSocketBase Peek(void* buffer, wxUint32 nbytes);

 
     /**
 
     /**

-        This function reads a buffer of @e nbytes bytes from the socket.
-        
+        This function reads a buffer of @a nbytes bytes from the socket.

         Use LastCount() to verify the number of bytes actually read.
         Use LastCount() to verify the number of bytes actually read.

-        

         Use Error() to determine if the operation succeeded.
         Use Error() to determine if the operation succeeded.

-        
+

         @param buffer
         @param buffer

-        Buffer where to put read data.
-        
+            Buffer where to put read data.

         @param nbytes
         @param nbytes

-        Number of bytes.
-        
+            Number of bytes.
+

         @returns Returns a reference to the current object.
         @returns Returns a reference to the current object.

-        
-        @sa Error(), LastError(), LastCount(),
-              SetFlags()
+
+        @see Error(), LastError(), LastCount(),
+             SetFlags()

     */
     */

-    wxSocketBase Read(void * buffer, wxUint32 nbytes);
+    wxSocketBase Read(void* buffer, wxUint32 nbytes);

 
     /**
         This function reads a buffer sent by WriteMsg()
         on a socket. If the buffer passed to the function isn't big enough, the
         remaining bytes will be discarded. This function always waits for the
         buffer to be entirely filled, unless an error occurs.
 
     /**
         This function reads a buffer sent by WriteMsg()
         on a socket. If the buffer passed to the function isn't big enough, the
         remaining bytes will be discarded. This function always waits for the
         buffer to be entirely filled, unless an error occurs.

-        

         Use LastCount() to verify the number of bytes actually read.
         Use LastCount() to verify the number of bytes actually read.

-        

         Use Error() to determine if the operation succeeded.
         Use Error() to determine if the operation succeeded.

-        
+

         @param buffer
         @param buffer

-        Buffer where to put read data.
-        
+            Buffer where to put read data.

         @param nbytes
         @param nbytes

-        Size of the buffer.
-        
+            Size of the buffer.
+

         @returns Returns a reference to the current object.
         @returns Returns a reference to the current object.

-        
-        @sa Error(), LastError(), LastCount(),
-              SetFlags(), WriteMsg()
+
+        @see Error(), LastError(), LastCount(),
+             SetFlags(), WriteMsg()

     */
     */

-    wxSocketBase ReadMsg(void * buffer, wxUint32 nbytes);
+    wxSocketBase ReadMsg(void* buffer, wxUint32 nbytes);

 
     /**
         This function restores the previous state of the socket, as saved
         with SaveState()
 
     /**
         This function restores the previous state of the socket, as saved
         with SaveState()

-        

         Calls to SaveState and RestoreState can be nested.
         Calls to SaveState and RestoreState can be nested.

-        
-        @sa SaveState()
+
+        @see SaveState()

     */
     void RestoreState();
 
     */
     void RestoreState();
 


@@ -729,10 +693,9 @@ public:
         event mask, as set with SetNotify() and
         Notify(), user data, as set with
         SetClientData().
         event mask, as set with SetNotify() and
         Notify(), user data, as set with
         SetClientData().

-        

         Calls to SaveState and RestoreState can be nested.
         Calls to SaveState and RestoreState can be nested.

-        
-        @sa RestoreState()
+
+        @see RestoreState()

     */
     void SaveState();
 
     */
     void SaveState();
 


@@ -741,75 +704,64 @@ public:
         contain a pointer to this data, which can be retrieved with
         the wxSocketEvent::GetClientData function.
     */
         contain a pointer to this data, which can be retrieved with
         the wxSocketEvent::GetClientData function.
     */

-    void SetClientData(void * data);
+    void SetClientData(void* data);

 
     /**
         Sets an event handler to be called when a socket event occurs. The
         handler will be called for those events for which notification is
         enabled with SetNotify() and
         Notify().
 
     /**
         Sets an event handler to be called when a socket event occurs. The
         handler will be called for those events for which notification is
         enabled with SetNotify() and
         Notify().

-        
+

         @param handler
         @param handler

-        Specifies the event handler you want to use.
-        
+            Specifies the event handler you want to use.

         @param id
         @param id

-        The id of socket event.
-        
-        @sa SetNotify(), Notify(), wxSocketEvent, wxEvtHandler
+            The id of socket event.
+
+        @see SetNotify(), Notify(), wxSocketEvent, wxEvtHandler

     */
     void SetEventHandler(wxEvtHandler& handler, int id = -1);
 
     /**
         Use SetFlags to customize IO operation for this socket.
     */
     void SetEventHandler(wxEvtHandler& handler, int id = -1);
 
     /**
         Use SetFlags to customize IO operation for this socket.

-        The @e flags parameter may be a combination of flags ORed together.
+        The @a flags parameter may be a combination of flags ORed together.

         The following flags can be used:
         The following flags can be used:

-        
-        
+

         @b wxSOCKET_NONE
         @b wxSOCKET_NONE

-        
-        
+

         Normal functionality.
         Normal functionality.

-        
+

         @b wxSOCKET_NOWAIT
         @b wxSOCKET_NOWAIT

-        
-        
+

         Read/write as much data as possible and return immediately.
         Read/write as much data as possible and return immediately.

-        
+

         @b wxSOCKET_WAITALL
         @b wxSOCKET_WAITALL

-        
-        
+

         Wait for all required data to be read/written unless an error occurs.
         Wait for all required data to be read/written unless an error occurs.

-        
+

         @b wxSOCKET_BLOCK
         @b wxSOCKET_BLOCK

-        
-        
+

         Block the GUI (do not yield) while reading/writing data.
         Block the GUI (do not yield) while reading/writing data.

-        
+

         @b wxSOCKET_REUSEADDR
         @b wxSOCKET_REUSEADDR

-        
-        
+

         Allows the use of an in-use port (wxServerSocket only)
         Allows the use of an in-use port (wxServerSocket only)

-        
+

         @b wxSOCKET_BROADCAST
         @b wxSOCKET_BROADCAST

-        
-        
+

         Switches the socket to broadcast mode
         Switches the socket to broadcast mode

-        
+

         @b wxSOCKET_NOBIND
         @b wxSOCKET_NOBIND

-        
-        
+

         Stops the socket from being bound to a specific adapter (normally used in
         conjunction with @b wxSOCKET_BROADCAST)
         Stops the socket from being bound to a specific adapter (normally used in
         conjunction with @b wxSOCKET_BROADCAST)

-        
+

         A brief overview on how to use these flags follows.
         A brief overview on how to use these flags follows.

-        

         If no flag is specified (this is the same as @b wxSOCKET_NONE),
         IO calls will return after some data has been read or written, even
         when the transfer might not be complete. This is the same as issuing
         exactly one blocking low-level call to recv() or send(). Note
         that @e blocking here refers to when the function returns, not
         to whether the GUI blocks during this time.
         If no flag is specified (this is the same as @b wxSOCKET_NONE),
         IO calls will return after some data has been read or written, even
         when the transfer might not be complete. This is the same as issuing
         exactly one blocking low-level call to recv() or send(). Note
         that @e blocking here refers to when the function returns, not
         to whether the GUI blocks during this time.

-        

         If @b wxSOCKET_NOWAIT is specified, IO calls will return immediately.
         Read operations will retrieve only available data. Write operations will
         write as much data as possible, depending on how much space is available
         If @b wxSOCKET_NOWAIT is specified, IO calls will return immediately.
         Read operations will retrieve only available data. Write operations will
         write as much data as possible, depending on how much space is available


@@ -817,7 +769,6 @@ public:
         low-level call to recv() or send(). Note that @e nonblocking here
         refers to when the function returns, not to whether the GUI blocks during
         this time.
         low-level call to recv() or send(). Note that @e nonblocking here
         refers to when the function returns, not to whether the GUI blocks during
         this time.

-        

         If @b wxSOCKET_WAITALL is specified, IO calls won't return until ALL
         the data has been read or written (or until an error occurs), blocking if
         necessary, and issuing several low level calls if necessary. This is the
         If @b wxSOCKET_WAITALL is specified, IO calls won't return until ALL
         the data has been read or written (or until an error occurs), blocking if
         necessary, and issuing several low level calls if necessary. This is the


@@ -825,13 +776,11 @@ public:
         recv() or send() as needed so as to transfer all the data. Note
         that @e blocking here refers to when the function returns, not
         to whether the GUI blocks during this time.
         recv() or send() as needed so as to transfer all the data. Note
         that @e blocking here refers to when the function returns, not
         to whether the GUI blocks during this time.

-        

         The @b wxSOCKET_BLOCK flag controls whether the GUI blocks during
         IO operations. If this flag is specified, the socket will not yield
         during IO calls, so the GUI will remain blocked until the operation
         completes. If it is not used, then the application must take extra
         care to avoid unwanted reentrance.
         The @b wxSOCKET_BLOCK flag controls whether the GUI blocks during
         IO operations. If this flag is specified, the socket will not yield
         during IO calls, so the GUI will remain blocked until the operation
         completes. If it is not used, then the application must take extra
         care to avoid unwanted reentrance.

-        

         The @b wxSOCKET_REUSEADDR flag controls the use of the SO_REUSEADDR standard
         setsockopt() flag. This flag allows the socket to bind to a port that is
         already in use.
         The @b wxSOCKET_REUSEADDR flag controls the use of the SO_REUSEADDR standard
         setsockopt() flag. This flag allows the socket to bind to a port that is
         already in use.


@@ -848,25 +797,18 @@ public:
         use of wxSOCKET_REUSEADDR implies SO_REUSEPORT in addition to SO_REUSEADDR to
         be consistent
         with Windows.
         use of wxSOCKET_REUSEADDR implies SO_REUSEPORT in addition to SO_REUSEADDR to
         be consistent
         with Windows.

-        

         The @b wxSOCKET_BROADCAST flag controls the use of the SO_BROADCAST standard
         setsockopt() flag. This flag allows the socket to use the broadcast address,
         and is generally
         used in conjunction with @b wxSOCKET_NOBIND and wxIPaddress::BroadcastAddress.
         The @b wxSOCKET_BROADCAST flag controls the use of the SO_BROADCAST standard
         setsockopt() flag. This flag allows the socket to use the broadcast address,
         and is generally
         used in conjunction with @b wxSOCKET_NOBIND and wxIPaddress::BroadcastAddress.

-        

         So:
         So:

-        

         @b wxSOCKET_NONE will try to read at least SOME data, no matter how much.
         @b wxSOCKET_NONE will try to read at least SOME data, no matter how much.

-        

         @b wxSOCKET_NOWAIT will always return immediately, even if it cannot
         read or write ANY data.
         @b wxSOCKET_NOWAIT will always return immediately, even if it cannot
         read or write ANY data.

-        

         @b wxSOCKET_WAITALL will only return when it has read or written ALL
         the data.
         @b wxSOCKET_WAITALL will only return when it has read or written ALL
         the data.

-        

         @b wxSOCKET_BLOCK has nothing to do with the previous flags and
         it controls whether the GUI blocks.
         @b wxSOCKET_BLOCK has nothing to do with the previous flags and
         it controls whether the GUI blocks.

-        

         @b wxSOCKET_REUSEADDR controls special platform-specific behavior for
         reusing local addresses/ports.
     */
         @b wxSOCKET_REUSEADDR controls special platform-specific behavior for
         reusing local addresses/ports.
     */


@@ -882,34 +824,29 @@ public:
 
     /**
         SetNotify specifies which socket events are to be sent to the event handler.
 
     /**
         SetNotify specifies which socket events are to be sent to the event handler.

-        The @e flags parameter may be combination of flags ORed together. The
+        The @a flags parameter may be combination of flags ORed together. The

         following flags can be used:
         following flags can be used:

-        
-        
+

         @b wxSOCKET_INPUT_FLAG
         @b wxSOCKET_INPUT_FLAG

-        
-        
+

         to receive wxSOCKET_INPUT
         to receive wxSOCKET_INPUT

-        
+

         @b wxSOCKET_OUTPUT_FLAG
         @b wxSOCKET_OUTPUT_FLAG

-        
-        
+

         to receive wxSOCKET_OUTPUT
         to receive wxSOCKET_OUTPUT

-        
+

         @b wxSOCKET_CONNECTION_FLAG
         @b wxSOCKET_CONNECTION_FLAG

-        
-        
+

         to receive wxSOCKET_CONNECTION
         to receive wxSOCKET_CONNECTION

-        
+

         @b wxSOCKET_LOST_FLAG
         @b wxSOCKET_LOST_FLAG

-        
-        
+

         to receive wxSOCKET_LOST
         to receive wxSOCKET_LOST

-        
+

         For example:
         For example:

+

         In this example, the user will be notified about incoming socket data and
         whenever the connection is closed.
         In this example, the user will be notified about incoming socket data and
         whenever the connection is closed.

-        

         For more information on socket events see @ref overview_wxsocketbase "wxSocket
         events".
     */
         For more information on socket events see @ref overview_wxsocketbase "wxSocket
         events".
     */


@@ -925,26 +862,25 @@ public:
 
     /**
         Functions to retrieve current state and miscellaneous info.
 
     /**
         Functions to retrieve current state and miscellaneous info.

-        

         Error()
         Error()

-        
+

         GetLocal()
         GetLocal()

-        
+

         GetPeer()
         IsConnected()
         GetPeer()
         IsConnected()

-        
+

         IsData()
         IsData()

-        
+

         IsDisconnected()
         IsDisconnected()

-        
+

         LastCount()
         LastCount()

-        
+

         LastError()
         LastError()

-        
+

         IsOk()
         IsOk()

-        
+

         SaveState()
         SaveState()

-        
+

         RestoreState()
     */
 
         RestoreState()
     */
 


@@ -952,71 +888,64 @@ public:
     /**
         This function unreads a buffer. That is, the data in the buffer is put back
         in the incoming queue. This function is not affected by wxSocket flags.
     /**
         This function unreads a buffer. That is, the data in the buffer is put back
         in the incoming queue. This function is not affected by wxSocket flags.

-        

         If you use LastCount(), it will always return @e nbytes.
         If you use LastCount(), it will always return @e nbytes.

-        

         If you use Error(), it will always return @false.
         If you use Error(), it will always return @false.

-        
+

         @param buffer
         @param buffer

-        Buffer to be unread.
-        
+            Buffer to be unread.

         @param nbytes
         @param nbytes

-        Number of bytes.
-        
+            Number of bytes.
+

         @returns Returns a reference to the current object.
         @returns Returns a reference to the current object.

-        
-        @sa Error(), LastCount(), LastError()
+
+        @see Error(), LastCount(), LastError()

     */
     */

-    wxSocketBase Unread(const void * buffer, wxUint32 nbytes);
+    wxSocketBase Unread(const void* buffer, wxUint32 nbytes);

 
     /**
         This function waits until any of the following conditions is @true:
 
     /**
         This function waits until any of the following conditions is @true:

-        
-        
+

          The socket becomes readable.
          The socket becomes writable.
          An ongoing connection request has completed (wxSocketClient only)
          An incoming connection request has arrived (wxSocketServer only)
          The connection has been closed.
          The socket becomes readable.
          The socket becomes writable.
          An ongoing connection request has completed (wxSocketClient only)
          An incoming connection request has arrived (wxSocketServer only)
          The connection has been closed.

-        

         Note that it is recommended to use the individual Wait functions
         to wait for the required condition, instead of this one.
         Note that it is recommended to use the individual Wait functions
         to wait for the required condition, instead of this one.

-        
+

         @param seconds
         @param seconds

-        Number of seconds to wait.
-        If -1, it will wait for the default timeout,
-        as set with SetTimeout.
-        
+            Number of seconds to wait.
+            If -1, it will wait for the default timeout,
+            as set with SetTimeout.

         @param millisecond
         @param millisecond

-        Number of milliseconds to wait.
-        
+            Number of milliseconds to wait.
+

         @returns Returns @true when any of the above conditions is satisfied,
         @returns Returns @true when any of the above conditions is satisfied,

-                   @false if the timeout was reached.
-        
-        @sa InterruptWait(), wxSocketServer::WaitForAccept,
-              WaitForLost(), WaitForRead(),
-              WaitForWrite(), wxSocketClient::WaitOnConnect
+                 @false if the timeout was reached.
+
+        @see InterruptWait(), wxSocketServer::WaitForAccept,
+             WaitForLost(), WaitForRead(),
+             WaitForWrite(), wxSocketClient::WaitOnConnect

     */
     bool Wait(long seconds = -1, long millisecond = 0);
 
     /**
         This function waits until the connection is lost. This may happen if
         the peer gracefully closes the connection or if the connection breaks.
     */
     bool Wait(long seconds = -1, long millisecond = 0);
 
     /**
         This function waits until the connection is lost. This may happen if
         the peer gracefully closes the connection or if the connection breaks.

-        
+

         @param seconds
         @param seconds

-        Number of seconds to wait.
-        If -1, it will wait for the default timeout,
-        as set with SetTimeout.
-        
+            Number of seconds to wait.
+            If -1, it will wait for the default timeout,
+            as set with SetTimeout.

         @param millisecond
         @param millisecond

-        Number of milliseconds to wait.
-        
+            Number of milliseconds to wait.
+

         @returns Returns @true if the connection was lost, @false if the timeout
         @returns Returns @true if the connection was lost, @false if the timeout

-                   was reached.
-        
-        @sa InterruptWait(), Wait()
+                 was reached.
+
+        @see InterruptWait(), Wait()

     */
     */

-    bool Wait(long seconds = -1, long millisecond = 0);
+    bool WaitForLost(long seconds = -1, long millisecond = 0);

 
     /**
         This function waits until the socket is readable. This might mean that
 
     /**
         This function waits until the socket is readable. This might mean that


@@ -1024,18 +953,17 @@ public:
         the connection has been closed, so that a read operation will complete
         immediately without blocking (unless the @b wxSOCKET_WAITALL flag
         is set, in which case the operation might still block).
         the connection has been closed, so that a read operation will complete
         immediately without blocking (unless the @b wxSOCKET_WAITALL flag
         is set, in which case the operation might still block).

-        
+

         @param seconds
         @param seconds

-        Number of seconds to wait.
-        If -1, it will wait for the default timeout,
-        as set with SetTimeout.
-        
+            Number of seconds to wait.
+            If -1, it will wait for the default timeout,
+            as set with SetTimeout.

         @param millisecond
         @param millisecond

-        Number of milliseconds to wait.
-        
+            Number of milliseconds to wait.
+

         @returns Returns @true if the socket becomes readable, @false on timeout.
         @returns Returns @true if the socket becomes readable, @false on timeout.

-        
-        @sa InterruptWait(), Wait()
+
+        @see InterruptWait(), Wait()

     */
     bool WaitForRead(long seconds = -1, long millisecond = 0);
 
     */
     bool WaitForRead(long seconds = -1, long millisecond = 0);
 


@@ -1045,64 +973,58 @@ public:
         connection has been closed, so that a write operation is guaranteed to
         complete immediately (unless the @b wxSOCKET_WAITALL flag is set,
         in which case the operation might still block).
         connection has been closed, so that a write operation is guaranteed to
         complete immediately (unless the @b wxSOCKET_WAITALL flag is set,
         in which case the operation might still block).

-        
+

         @param seconds
         @param seconds

-        Number of seconds to wait.
-        If -1, it will wait for the default timeout,
-        as set with SetTimeout.
-        
+            Number of seconds to wait.
+            If -1, it will wait for the default timeout,
+            as set with SetTimeout.

         @param millisecond
         @param millisecond

-        Number of milliseconds to wait.
-        
+            Number of milliseconds to wait.
+

         @returns Returns @true if the socket becomes writable, @false on timeout.
         @returns Returns @true if the socket becomes writable, @false on timeout.

-        
-        @sa InterruptWait(), Wait()
+
+        @see InterruptWait(), Wait()

     */
     bool WaitForWrite(long seconds = -1, long millisecond = 0);
 
     /**
     */
     bool WaitForWrite(long seconds = -1, long millisecond = 0);
 
     /**

-        This function writes a buffer of @e nbytes bytes to the socket.
-        
+        This function writes a buffer of @a nbytes bytes to the socket.

         Use LastCount() to verify the number of bytes actually written.
         Use LastCount() to verify the number of bytes actually written.

-        

         Use Error() to determine if the operation succeeded.
         Use Error() to determine if the operation succeeded.

-        
+

         @param buffer
         @param buffer

-        Buffer with the data to be sent.
-        
+            Buffer with the data to be sent.

         @param nbytes
         @param nbytes

-        Number of bytes.
-        
+            Number of bytes.
+

         @returns Returns a reference to the current object.
         @returns Returns a reference to the current object.

-        
-        @sa Error(), LastError(), LastCount(),
-              SetFlags()
+
+        @see Error(), LastError(), LastCount(),
+             SetFlags()

     */
     */

-    wxSocketBase Write(const void * buffer, wxUint32 nbytes);
+    wxSocketBase Write(const void* buffer, wxUint32 nbytes);

 
     /**
 
     /**

-        This function writes a buffer of @e nbytes bytes from the socket, but it
+        This function writes a buffer of @a nbytes bytes from the socket, but it

         writes a short header before so that ReadMsg()
         knows how much data should it actually read. So, a buffer sent with WriteMsg
         @b must be read with ReadMsg. This function always waits for the entire
         buffer to be sent, unless an error occurs.
         writes a short header before so that ReadMsg()
         knows how much data should it actually read. So, a buffer sent with WriteMsg
         @b must be read with ReadMsg. This function always waits for the entire
         buffer to be sent, unless an error occurs.

-        

         Use LastCount() to verify the number of bytes actually written.
         Use LastCount() to verify the number of bytes actually written.

-        

         Use Error() to determine if the operation succeeded.
         Use Error() to determine if the operation succeeded.

-        
+

         @param buffer
         @param buffer

-        Buffer with the data to be sent.
-        
+            Buffer with the data to be sent.

         @param nbytes
         @param nbytes

-        Number of bytes to send.
-        
+            Number of bytes to send.
+

         @returns Returns a reference to the current object.
     */
         @returns Returns a reference to the current object.
     */

-    wxSocketBase WriteMsg(const void * buffer, wxUint32 nbytes);
+    wxSocketBase WriteMsg(const void* buffer, wxUint32 nbytes);

 };
 
 
 };
 
 

+

 /**
     @class wxDatagramSocket
     @wxheader{socket.h}
 /**
     @class wxDatagramSocket
     @wxheader{socket.h}


@@ -1111,8 +1033,7 @@ public:
     @library{wxnet}
     @category{FIXME}
 
     @library{wxnet}
     @category{FIXME}
 

-    @seealso
-    wxSocketBase::Error, wxSocketBase::LastError, wxSocketBase::LastCount,
+    @see wxSocketBase::Error, wxSocketBase::LastError, wxSocketBase::LastCount,

     wxSocketBase::SetFlags,
 */
 class wxDatagramSocket : public wxSocketBase
     wxSocketBase::SetFlags,
 */
 class wxDatagramSocket : public wxSocketBase


@@ -1120,9 +1041,9 @@ class wxDatagramSocket : public wxSocketBase
 public:
     /**
         Constructor.
 public:
     /**
         Constructor.

-        
+

         @param flags
         @param flags

-        Socket flags (See wxSocketBase::SetFlags)
+            Socket flags (See wxSocketBase::SetFlags)

     */
     wxDatagramSocket(wxSocketFlags flags = wxSOCKET_NONE);
 
     */
     wxDatagramSocket(wxSocketFlags flags = wxSOCKET_NONE);
 


@@ -1132,51 +1053,44 @@ public:
     ~wxDatagramSocket();
 
     /**
     ~wxDatagramSocket();
 
     /**

-        This function reads a buffer of @e nbytes bytes from the socket.
-        
+        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::LastCount to verify the number of bytes actually read.

-        

         Use wxSocketBase::Error to determine if the operation succeeded.
         Use wxSocketBase::Error to determine if the operation succeeded.

-        
+

         @param address
         @param address

-        Any address - will be overwritten with the address of the peer that sent that
-        data.
-        
+            Any address - will be overwritten with the address of the peer that sent
+        that data.

         @param buffer
         @param buffer

-        Buffer where to put read data.
-        
+            Buffer where to put read data.

         @param nbytes
         @param nbytes

-        Number of bytes.
-        
+            Number of bytes.
+

         @returns Returns a reference to the current object, and the address of
         @returns Returns a reference to the current object, and the address of

-                   the peer that sent the data on address param.
-        
-        @sa wxSocketBase::Error, wxSocketBase::LastError, wxSocketBase::LastCount,
-              wxSocketBase::SetFlags,
+                 the peer that sent the data on address param.
+
+        @see wxSocketBase::Error, wxSocketBase::LastError, wxSocketBase::LastCount,
+             wxSocketBase::SetFlags,

     */
     wxDatagramSocket ReceiveFrom(wxSockAddress& address,
     */
     wxDatagramSocket ReceiveFrom(wxSockAddress& address,

-                                 void * buffer,
+                                 void* buffer,

                                  wxUint32 nbytes);
 
     /**
                                  wxUint32 nbytes);
 
     /**

-        This function writes a buffer of @e nbytes bytes to the socket.
-        
+        This function writes a buffer of @a nbytes bytes to the socket.

         Use wxSocketBase::LastCount to verify the number of bytes actually wrote.
         Use wxSocketBase::LastCount to verify the number of bytes actually wrote.

-        

         Use wxSocketBase::Error to determine if the operation succeeded.
         Use wxSocketBase::Error to determine if the operation succeeded.

-        
+

         @param address
         @param address

-        The address of the destination peer for this data.
-        
+            The address of the destination peer for this data.

         @param buffer
         @param buffer

-        Buffer where read data is.
-        
+            Buffer where read data is.

         @param nbytes
         @param nbytes

-        Number of bytes.
-        
+            Number of bytes.
+

         @returns Returns a reference to the current object.
     */
     wxDatagramSocket SendTo(const wxSockAddress& address,
         @returns Returns a reference to the current object.
     */
     wxDatagramSocket SendTo(const wxSockAddress& address,

-                            const void * buffer,
+                            const void* buffer,

                             wxUint32 nbytes);
 };
                             wxUint32 nbytes);
 };

+