1. undid my wrong fix to wxWindowBase::Centre

[wxWidgets.git] / src / common / sckipc.cpp

diff --git a/src/common/sckipc.cpp b/src/common/sckipc.cpp
index 27dae77d322c6cab2f0dde33a4ee443b21e579dd..9034bc595b019c4b539ffa0403dfd3ae43d2faa5 100644 (file)
--- a/src/common/sckipc.cpp
+++ b/src/common/sckipc.cpp
@@ -60,22 +60,22 @@ enum {
 #endif
 
 void Server_OnRequest(wxSocketServer& server,
 #endif
 
 void Server_OnRequest(wxSocketServer& server,

-                     GSocketEvent evt,
+                     wxSocketNotify evt,

                      char *cdata);
 void Client_OnRequest(wxSocketBase& sock,
                      char *cdata);
 void Client_OnRequest(wxSocketBase& sock,

-                     GSocketEvent evt,
+                     wxSocketNotify evt,

                      char *cdata);
 
 // ---------------------------------------------------------------------------
 // wxTCPClient
 // ---------------------------------------------------------------------------
 
                      char *cdata);
 
 // ---------------------------------------------------------------------------
 // wxTCPClient
 // ---------------------------------------------------------------------------
 

-wxTCPClient::wxTCPClient (void)
+wxTCPClient::wxTCPClient ()

   : wxClientBase()
 {
 }
 
   : wxClientBase()
 {
 }
 

-wxTCPClient::~wxTCPClient (void)
+wxTCPClient::~wxTCPClient ()

 {
 }
 
 {
 }
 


@@ -96,7 +96,7 @@ wxConnectionBase *wxTCPClient::MakeConnection (const wxString& host,
   wxDataInputStream data_is(*stream);
   wxDataOutputStream data_os(*stream);
   
   wxDataInputStream data_is(*stream);
   wxDataOutputStream data_os(*stream);
   

-  client->SetNotify(GSOCK_INPUT_FLAG | GSOCK_LOST_FLAG);
+  client->SetNotify(wxSOCKET_INPUT_FLAG | wxSOCKET_LOST_FLAG);

   addr.Service(server_name);
   addr.Hostname(host);
 
   addr.Service(server_name);
   addr.Hostname(host);
 


@@ -147,7 +147,7 @@ wxConnectionBase *wxTCPClient::OnMakeConnection()
 // wxTCPServer
 // ---------------------------------------------------------------------------
 
 // wxTCPServer
 // ---------------------------------------------------------------------------
 

-wxTCPServer::wxTCPServer (void)
+wxTCPServer::wxTCPServer ()

   : wxServerBase()
 {
 }
   : wxServerBase()
 {
 }


@@ -162,14 +162,14 @@ bool wxTCPServer::Create(const wxString& server_name)
   // Create a socket listening on specified port
   server = new wxSocketServer(addr);
   server->Callback((wxSocketBase::wxSockCbk)Server_OnRequest);
   // Create a socket listening on specified port
   server = new wxSocketServer(addr);
   server->Callback((wxSocketBase::wxSockCbk)Server_OnRequest);

-  server->SetNotify(GSOCK_CONNECTION_FLAG);
+  server->SetNotify(wxSOCKET_CONNECTION_FLAG);

 
   server->CallbackData((char *)this);
 
   return TRUE;
 }
 
 
   server->CallbackData((char *)this);
 
   return TRUE;
 }
 

-wxTCPServer::~wxTCPServer(void)
+wxTCPServer::~wxTCPServer()

 {
 }
 
 {
 }
 


@@ -182,17 +182,17 @@ wxConnectionBase *wxTCPServer::OnAcceptConnection( const wxString& WXUNUSED(topi
 // wxTCPConnection
 // ---------------------------------------------------------------------------
 
 // wxTCPConnection
 // ---------------------------------------------------------------------------
 

-wxTCPConnection::wxTCPConnection (void)
+wxTCPConnection::wxTCPConnection ()

   : wxConnectionBase(),
     m_sock(NULL), m_sockstrm(NULL), m_codeci(NULL), m_codeco(NULL)
 {
 }
 
   : wxConnectionBase(),
     m_sock(NULL), m_sockstrm(NULL), m_codeci(NULL), m_codeco(NULL)
 {
 }
 

-wxTCPConnection::wxTCPConnection(char *buffer, int size)
+wxTCPConnection::wxTCPConnection(char * WXUNUSED(buffer), int WXUNUSED(size))

 {
 }
 
 {
 }
 

-wxTCPConnection::~wxTCPConnection (void)
+wxTCPConnection::~wxTCPConnection ()

 {
   wxDELETE(m_sock);
   wxDELETE(m_codeci);
 {
   wxDELETE(m_sock);
   wxDELETE(m_codeci);


@@ -206,7 +206,7 @@ void wxTCPConnection::Compress(bool WXUNUSED(on))
 }
 
 // Calls that CLIENT can make.
 }
 
 // Calls that CLIENT can make.

-bool wxTCPConnection::Disconnect (void)
+bool wxTCPConnection::Disconnect ()

 {
   // Send the the disconnect message to the peer.
   m_codeco->Write8(IPC_DISCONNECT);
 {
   // Send the the disconnect message to the peer.
   m_codeco->Write8(IPC_DISCONNECT);


@@ -215,7 +215,7 @@ bool wxTCPConnection::Disconnect (void)
   return TRUE;
 }
 
   return TRUE;
 }
 

-bool wxTCPConnection::Execute (wxChar *data, int size, wxIPCFormat format)
+bool wxTCPConnection::Execute (const wxChar *data, int size, wxIPCFormat format)

 {
   if (!m_sock->IsConnected())
     return FALSE;
 {
   if (!m_sock->IsConnected())
     return FALSE;


@@ -336,7 +336,7 @@ bool wxTCPConnection::Advise (const wxString& item,
   return TRUE;
 }
 
   return TRUE;
 }
 

-void Client_OnRequest(wxSocketBase& sock, GSocketEvent evt,
+void Client_OnRequest(wxSocketBase& sock, wxSocketNotify evt,

                      char *cdata)
 {
   int msg = 0;
                      char *cdata)
 {
   int msg = 0;


@@ -348,7 +348,7 @@ void Client_OnRequest(wxSocketBase& sock, GSocketEvent evt,
   wxString item;
 
   // The socket handler signals us that we lost the connection: destroy all.
   wxString item;
 
   // The socket handler signals us that we lost the connection: destroy all.

-  if (evt == GSOCK_LOST) {
+  if (evt == wxSOCKET_LOST) {

     sock.Close();
     connection->OnDisconnect();
     return;
     sock.Close();
     connection->OnDisconnect();
     return;


@@ -464,20 +464,20 @@ void Client_OnRequest(wxSocketBase& sock, GSocketEvent evt,
 }
 
 void Server_OnRequest(wxSocketServer& server,
 }
 
 void Server_OnRequest(wxSocketServer& server,

-                     GSocketEvent evt, char *cdata)
+                     wxSocketNotify evt, char *cdata)

 {
   wxTCPServer *ipcserv = (wxTCPServer *)cdata;
   wxSocketStream *stream;
   wxDataInputStream *codeci;
   wxDataOutputStream *codeco;
 
 {
   wxTCPServer *ipcserv = (wxTCPServer *)cdata;
   wxSocketStream *stream;
   wxDataInputStream *codeci;
   wxDataOutputStream *codeco;
 

-  if (evt != GSOCK_CONNECTION)
+  if (evt != wxSOCKET_CONNECTION)

     return;
 
   /* Accept the connection, getting a new socket */
   wxSocketBase *sock = server.Accept();
   sock->Notify(FALSE);
     return;
 
   /* Accept the connection, getting a new socket */
   wxSocketBase *sock = server.Accept();
   sock->Notify(FALSE);

-  sock->SetNotify(GSOCK_INPUT_FLAG | GSOCK_LOST_FLAG);
+  sock->SetNotify(wxSOCKET_INPUT_FLAG | wxSOCKET_LOST_FLAG);

 
   stream = new wxSocketStream(*sock);
   codeci = new wxDataInputStream(*stream);
 
   stream = new wxSocketStream(*sock);
   codeci = new wxDataInputStream(*stream);