O_BINARY added to wxFile::Create

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

diff --git a/src/common/sckipc.cpp b/src/common/sckipc.cpp
index 5528d2eca3e5b10b37bb701d2547fcde38f44c8d..b9e286ffbfbb4303041776f5fdf64451c2811d53 100644 (file)
--- a/src/common/sckipc.cpp
+++ b/src/common/sckipc.cpp
@@ -35,11 +35,9 @@
 #pragma hdrstop
 #endif
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxTCPServer, wxServerBase)
 IMPLEMENT_DYNAMIC_CLASS(wxTCPClient, wxClientBase)
 IMPLEMENT_DYNAMIC_CLASS(wxTCPConnection, wxConnectionBase)
-#endif
 
 // It seems to be already defined somewhere in the Xt includes.
 #ifndef __XT__
@@ -60,22 +58,22 @@ enum {
 #endif
 
 void Server_OnRequest(wxSocketServer& server,
-                     wxSocketBase::wxRequestEvent evt,
+                     wxSocketNotify evt,
                      char *cdata);
 void Client_OnRequest(wxSocketBase& sock,
-                     wxSocketBase::wxRequestEvent evt,
+                     wxSocketNotify evt,
                      char *cdata);
 
 // ---------------------------------------------------------------------------
 // wxTCPClient
 // ---------------------------------------------------------------------------
 
-wxTCPClient::wxTCPClient (void)
+wxTCPClient::wxTCPClient ()
   : wxClientBase()
 {
 }
 
-wxTCPClient::~wxTCPClient (void)
+wxTCPClient::~wxTCPClient ()
 {
 }
 
@@ -91,13 +89,12 @@ wxConnectionBase *wxTCPClient::MakeConnection (const wxString& host,
                                                const wxString& topic)
 {
   wxIPV4address addr;
-  wxSocketHandler *hsock = &wxSocketHandler::Master();
-  wxSocketClient *client = hsock->CreateClient();
+  wxSocketClient *client = new wxSocketClient();
   wxSocketStream *stream = new wxSocketStream(*client);
   wxDataInputStream data_is(*stream);
   wxDataOutputStream data_os(*stream);
   
-  client->SetNotify(wxSocketBase::REQ_READ | wxSocketBase::REQ_LOST);
+  client->SetNotify(wxSOCKET_INPUT_FLAG | wxSOCKET_LOST_FLAG);
   addr.Service(server_name);
   addr.Hostname(host);
 
@@ -136,7 +133,6 @@ wxConnectionBase *wxTCPClient::MakeConnection (const wxString& host,
     delete client;
     return NULL;
   }
-  return NULL;
 }
 
 wxConnectionBase *wxTCPClient::OnMakeConnection()
@@ -148,7 +144,7 @@ wxConnectionBase *wxTCPClient::OnMakeConnection()
 // wxTCPServer
 // ---------------------------------------------------------------------------
 
-wxTCPServer::wxTCPServer (void)
+wxTCPServer::wxTCPServer ()
   : wxServerBase()
 {
 }
@@ -156,22 +152,21 @@ wxTCPServer::wxTCPServer (void)
 bool wxTCPServer::Create(const wxString& server_name)
 {
   wxIPV4address addr;
-  wxSocketHandler *hsock = &wxSocketHandler::Master();
   wxSocketServer *server;
 
   addr.Service(server_name);
 
   // Create a socket listening on specified port
-  server = hsock->CreateServer(addr);
+  server = new wxSocketServer(addr);
   server->Callback((wxSocketBase::wxSockCbk)Server_OnRequest);
-  server->SetNotify(wxSocketBase::REQ_ACCEPT);
+  server->SetNotify(wxSOCKET_CONNECTION_FLAG);
 
   server->CallbackData((char *)this);
 
   return TRUE;
 }
 
-wxTCPServer::~wxTCPServer(void)
+wxTCPServer::~wxTCPServer()
 {
 }
 
@@ -184,17 +179,17 @@ wxConnectionBase *wxTCPServer::OnAcceptConnection( const wxString& WXUNUSED(topi
 // wxTCPConnection
 // ---------------------------------------------------------------------------
 
-wxTCPConnection::wxTCPConnection (void)
+wxTCPConnection::wxTCPConnection ()
   : 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);
@@ -208,7 +203,7 @@ void wxTCPConnection::Compress(bool WXUNUSED(on))
 }
 
 // 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);
@@ -217,7 +212,7 @@ bool wxTCPConnection::Disconnect (void)
   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;
@@ -229,7 +224,7 @@ bool wxTCPConnection::Execute (wxChar *data, int size, wxIPCFormat format)
     m_codeco->WriteString(data);
   else {
     m_codeco->Write32(size);
-    m_codeco->Write(data, size);
+    m_sockstrm->Write(data, size);
   }
 
   return TRUE;
@@ -256,7 +251,7 @@ char *wxTCPConnection::Request (const wxString& item, int *size, wxIPCFormat for
 
     s = m_codeci->Read32();
     data = new char[s];
-    m_codeci->Read(data, s);
+    m_sockstrm->Read(data, s);
 
     if (size)
       *size = s;
@@ -276,7 +271,7 @@ bool wxTCPConnection::Poke (const wxString& item, wxChar *data, int size, wxIPCF
     m_codeco->WriteString(data);
   else {
     m_codeco->Write32(size);
-    m_codeco->Write(data, size);
+    m_sockstrm->Write(data, size);
   }
 
   return TRUE;
@@ -332,24 +327,25 @@ bool wxTCPConnection::Advise (const wxString& item,
     m_codeco->WriteString(data);
   else {
     m_codeco->Write32(size);
-    m_codeco->Write(data, size);
+    m_sockstrm->Write(data, size);
   }
 
   return TRUE;
 }
 
-void Client_OnRequest(wxSocketBase& sock, wxSocketBase::wxRequestEvent evt,
+void Client_OnRequest(wxSocketBase& sock, wxSocketNotify evt,
                      char *cdata)
 {
   int msg = 0;
   wxTCPConnection *connection = (wxTCPConnection *)cdata;
   wxDataInputStream *codeci;
   wxDataOutputStream *codeco; 
+  wxSocketStream *sockstrm;
   wxString topic_name = connection->m_topic;
   wxString item;
 
   // The socket handler signals us that we lost the connection: destroy all.
-  if (evt == wxSocketBase::EVT_LOST) {
+  if (evt == wxSOCKET_LOST) {
     sock.Close();
     connection->OnDisconnect();
     return;
@@ -358,6 +354,7 @@ void Client_OnRequest(wxSocketBase& sock, wxSocketBase::wxRequestEvent evt,
   // Receive message number.
   codeci = connection->m_codeci;
   codeco = connection->m_codeco;
+  sockstrm = connection->m_sockstrm;
   msg = codeci->Read8();
 
   switch (msg) {
@@ -369,7 +366,7 @@ void Client_OnRequest(wxSocketBase& sock, wxSocketBase::wxRequestEvent evt,
     format = (wxIPCFormat)codeci->Read8();
     size = codeci->Read32();
     data = new char[size];
-    codeci->Read(data, size);
+    sockstrm->Read(data, size);
 
     connection->OnExecute (topic_name, data, size, format);
 
@@ -385,7 +382,7 @@ void Client_OnRequest(wxSocketBase& sock, wxSocketBase::wxRequestEvent evt,
     format = (wxIPCFormat)codeci->Read8();
     size = codeci->Read32();
     data = new char[size];
-    codeci->Read(data, size);
+    sockstrm->Read(data, size);
     
     connection->OnAdvise (topic_name, item, data, size, format);
 
@@ -423,7 +420,7 @@ void Client_OnRequest(wxSocketBase& sock, wxSocketBase::wxRequestEvent evt,
     format = (wxIPCFormat)codeci->Read8();
     size = codeci->Read32();
     data = new wxChar[size];
-    codeci->Read(data, size);
+    sockstrm->Read(data, size);
     
     connection->OnPoke (topic_name, item, data, size, format);
 
@@ -444,7 +441,7 @@ void Client_OnRequest(wxSocketBase& sock, wxSocketBase::wxRequestEvent evt,
       codeco->Write8(IPC_REQUEST_REPLY);
       if (user_size != -1) {
         codeco->Write32(user_size);
-        codeco->Write(user_data, user_size);
+        sockstrm->Write(user_data, user_size);
       } else
         codeco->WriteString(user_data);
     } else
@@ -464,20 +461,20 @@ void Client_OnRequest(wxSocketBase& sock, wxSocketBase::wxRequestEvent evt,
 }
 
 void Server_OnRequest(wxSocketServer& server,
-                     wxSocketBase::wxRequestEvent evt, char *cdata)
+                     wxSocketNotify evt, char *cdata)
 {
   wxTCPServer *ipcserv = (wxTCPServer *)cdata;
   wxSocketStream *stream;
   wxDataInputStream *codeci;
   wxDataOutputStream *codeco;
 
-  if (evt != wxSocketBase::EVT_ACCEPT)
+  if (evt != wxSOCKET_CONNECTION)
     return;
 
   /* Accept the connection, getting a new socket */
   wxSocketBase *sock = server.Accept();
   sock->Notify(FALSE);
-  sock->SetNotify(wxSocketBase::REQ_READ | wxSocketBase::REQ_LOST);
+  sock->SetNotify(wxSOCKET_INPUT_FLAG | wxSOCKET_LOST_FLAG);
 
   stream = new wxSocketStream(*sock);
   codeci = new wxDataInputStream(*stream);