Now works when derived from wxTextCtrlBase, using wxScrollHelper.

[wxWidgets.git] / src / mac / classic / gsocket.c

diff --git a/src/mac/classic/gsocket.c b/src/mac/classic/gsocket.c
index 9e3ba3079a4c3e75ef5dc34ed064c596d7ef37a8..6b81b9a9a26decef1b92042425652486dc4d5383 100644 (file)
--- a/src/mac/classic/gsocket.c
+++ b/src/mac/classic/gsocket.c
@@ -524,7 +524,7 @@ GSocketError GSocket_SetServer(GSocket *sck)
   if ((bind(sck->m_endpoint, sck->m_local->m_addr, sck->m_local->m_len) != 0) ||
       (getsockname(sck->m_endpoint,
                    sck->m_local->m_addr,
   if ((bind(sck->m_endpoint, sck->m_local->m_addr, sck->m_local->m_len) != 0) ||
       (getsockname(sck->m_endpoint,
                    sck->m_local->m_addr,

-                   (SOCKLEN_T *) &sck->m_local->m_len) != 0) ||
+                   (WX_SOCKLEN_T *) &sck->m_local->m_len) != 0) ||

       (listen(sck->m_endpoint, 5) != 0))
   {
     close(sck->m_endpoint);
       (listen(sck->m_endpoint, 5) != 0))
   {
     close(sck->m_endpoint);


@@ -583,7 +583,7 @@ GSocket *GSocket_WaitConnection(GSocket *socket)
 
 // TODO
 #if 0
 
 // TODO
 #if 0

-  connection->m_endpoint = accept(socket->m_endpoint, &from, (SOCKLEN_T *) &fromlen);
+  connection->m_endpoint = accept(socket->m_endpoint, &from, (WX_SOCKLEN_T *) &fromlen);

 #endif
 
   if (connection->m_endpoint == kOTInvalidEndpointRef )
 #endif
 
   if (connection->m_endpoint == kOTInvalidEndpointRef )


@@ -689,7 +689,7 @@ GSocketError GSocket_SetNonOriented(GSocket *sck)
   if ((bind(sck->m_endpoint, sck->m_local->m_addr, sck->m_local->m_len) != 0) ||
       (getsockname(sck->m_endpoint,
                    sck->m_local->m_addr,
   if ((bind(sck->m_endpoint, sck->m_local->m_addr, sck->m_local->m_len) != 0) ||
       (getsockname(sck->m_endpoint,
                    sck->m_local->m_addr,

-                   (SOCKLEN_T *) &sck->m_local->m_len) != 0))
+                   (WX_SOCKLEN_T *) &sck->m_local->m_len) != 0))

   {
     close(sck->m_endpoint);
     sck->m_endpoint    = -1;
   {
     close(sck->m_endpoint);
     sck->m_endpoint    = -1;


@@ -706,7 +706,7 @@ GSocketError GSocket_SetNonOriented(GSocket *sck)
  *  For stream (connection oriented) sockets, GSocket_Connect() tries
  *  to establish a client connection to a server using the peer address
  *  as established with GSocket_SetPeer(). Returns GSOCK_NOERROR if the
  *  For stream (connection oriented) sockets, GSocket_Connect() tries
  *  to establish a client connection to a server using the peer address
  *  as established with GSocket_SetPeer(). Returns GSOCK_NOERROR if the

- *  connection has been succesfully established, or one of the error
+ *  connection has been successfully established, or one of the error

  *  codes listed below. Note that for nonblocking sockets, a return
  *  value of GSOCK_WOULDBLOCK doesn't mean a failure. The connection
  *  request can be completed later; you should use GSocket_Select()
  *  codes listed below. Note that for nonblocking sockets, a return
  *  value of GSOCK_WOULDBLOCK doesn't mean a failure. The connection
  *  request can be completed later; you should use GSocket_Select()


@@ -806,7 +806,7 @@ GSocketError GSocket_Connect(GSocket *sck, GSocketStream stream)
       {
 /*
         int error;
       {
 /*
         int error;

-        SOCKLEN_T len = sizeof(error);
+        WX_SOCKLEN_T len = sizeof(error);

 
         getsockopt(sck->m_endpoint, SOL_SOCKET, SO_ERROR, (void*) &error, &len);
 
 
         getsockopt(sck->m_endpoint, SOL_SOCKET, SO_ERROR, (void*) &error, &len);
 


@@ -984,7 +984,7 @@ void GSocket_SetTimeout(GSocket *socket, unsigned long millisec)
 }
 
 /* GSocket_GetError:
 }
 
 /* GSocket_GetError:

- *  Returns the last error occured for this socket. Note that successful
+ *  Returns the last error which occurred for this socket. Note that successful

  *  operations do not clear this back to GSOCK_NOERROR, so use it only
  *  after an error.
  */
  *  operations do not clear this back to GSOCK_NOERROR, so use it only
  *  after an error.
  */


@@ -1009,7 +1009,7 @@ GSocketError GSocket_GetError(GSocket *socket)
  *   assume that it can write since the first OUTPUT event, and no more
  *   OUTPUT events will be generated unless an error occurs.
  * GSOCK_CONNECTION:
  *   assume that it can write since the first OUTPUT event, and no more
  *   OUTPUT events will be generated unless an error occurs.
  * GSOCK_CONNECTION:

- *   Connection succesfully established, for client sockets, or incoming
+ *   Connection successfully established, for client sockets, or incoming

  *   client connection, for server sockets. Wait for this event (also watch
  *   out for GSOCK_LOST) after you issue a nonblocking GSocket_Connect() call.
  * GSOCK_LOST:
  *   client connection, for server sockets. Wait for this event (also watch
  *   out for GSOCK_LOST) after you issue a nonblocking GSocket_Connect() call.
  * GSOCK_LOST:


@@ -1104,12 +1104,12 @@ int _GSocket_Recv_Dgram(GSocket *socket, char *buffer, int size)
   int ret = -1;
 #if 0
   struct sockaddr from;
   int ret = -1;
 #if 0
   struct sockaddr from;

-  SOCKLEN_T fromlen = sizeof(from);
+  WX_SOCKLEN_T fromlen = sizeof(from);

   GSocketError err;
 
   fromlen = sizeof(from);
 
   GSocketError err;
 
   fromlen = sizeof(from);
 

-  ret = recvfrom(socket->m_endpoint, buffer, size, 0, &from, (SOCKLEN_T *) &fromlen);
+  ret = recvfrom(socket->m_endpoint, buffer, size, 0, &from, (WX_SOCKLEN_T *) &fromlen);

 
   if (ret == -1)
     return -1;
 
   if (ret == -1)
     return -1;


@@ -1534,7 +1534,7 @@ GSocketError _GSocket_Output_Timeout(GSocket *socket)
  *   assume that it can write since the first OUTPUT event, and no more
  *   OUTPUT events will be generated unless an error occurs.
  * GSOCK_CONNECTION:
  *   assume that it can write since the first OUTPUT event, and no more
  *   OUTPUT events will be generated unless an error occurs.
  * GSOCK_CONNECTION:

- *   Connection succesfully established, for client sockets, or incoming
+ *   Connection successfully established, for client sockets, or incoming

  *   client connection, for server sockets. Wait for this event (also watch
  *   out for GSOCK_LOST) after you issue a nonblocking GSocket_Connect() call.
  * GSOCK_LOST:
  *   client connection, for server sockets. Wait for this event (also watch
  *   out for GSOCK_LOST) after you issue a nonblocking GSocket_Connect() call.
  * GSOCK_LOST: