X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/75ed1d15d0d866cac78f7c0da176db8dd5288bc8..7f42cff13eaba35dda3527b2ca658dd00b9e7a46:/src/common/sckipc.cpp?ds=sidebyside

diff --git a/src/common/sckipc.cpp b/src/common/sckipc.cpp
index 718211b7dc..59511a065b 100644
--- a/src/common/sckipc.cpp
+++ b/src/common/sckipc.cpp
@@ -188,6 +188,10 @@ wxTCPConnection::wxTCPConnection (void)
 {
 }
 
+wxTCPConnection::wxTCPConnection(char *buffer, int size)
+{
+}
+
 wxTCPConnection::~wxTCPConnection (void)
 {
   wxDELETE(m_sock);
@@ -211,7 +215,7 @@ bool wxTCPConnection::Disconnect (void)
   return TRUE;
 }
 
-bool wxTCPConnection::Execute (char *data, int size, wxDataFormat format)
+bool wxTCPConnection::Execute (char *data, int size, wxIPCFormat format)
 {
   if (!m_sock->IsConnected())
     return FALSE;
@@ -229,7 +233,7 @@ bool wxTCPConnection::Execute (char *data, int size, wxDataFormat format)
   return TRUE;
 }
 
-char *wxTCPConnection::Request (const wxString& item, int *size, wxDataFormat format)
+char *wxTCPConnection::Request (const wxString& item, int *size, wxIPCFormat format)
 {
   if (!m_sock->IsConnected())
     return NULL;
@@ -258,7 +262,7 @@ char *wxTCPConnection::Request (const wxString& item, int *size, wxDataFormat fo
   }
 }
 
-bool wxTCPConnection::Poke (const wxString& item, char *data, int size, wxDataFormat format)
+bool wxTCPConnection::Poke (const wxString& item, char *data, int size, wxIPCFormat format)
 {
   if (!m_sock->IsConnected())
     return FALSE;
@@ -314,7 +318,7 @@ bool wxTCPConnection::StopAdvise (const wxString& item)
 
 // Calls that SERVER can make
 bool wxTCPConnection::Advise (const wxString& item,
-                              char *data, int size, wxDataFormat format)
+                              char *data, int size, wxIPCFormat format)
 {
   if (!m_sock->IsConnected())
     return FALSE;
@@ -358,9 +362,9 @@ void Client_OnRequest(wxSocketBase& sock, wxSocketBase::wxRequestEvent evt,
   case IPC_EXECUTE: {
     char *data;
     size_t size; 
-    wxDataFormat format;
+    wxIPCFormat format;
     
-    format = (wxDataFormat)codeci->Read8();
+    format = (wxIPCFormat)codeci->Read8();
     size = codeci->Read32();
     data = new char[size];
     codeci->Read(data, size);
@@ -373,10 +377,10 @@ void Client_OnRequest(wxSocketBase& sock, wxSocketBase::wxRequestEvent evt,
   case IPC_ADVISE: {
     char *data;
     size_t size;
-    wxDataFormat format;
+    wxIPCFormat format;
 
     item = codeci->ReadString();
-    format = (wxDataFormat)codeci->Read8();
+    format = (wxIPCFormat)codeci->Read8();
     size = codeci->Read32();
     data = new char[size];
     codeci->Read(data, size);
@@ -409,12 +413,12 @@ void Client_OnRequest(wxSocketBase& sock, wxSocketBase::wxRequestEvent evt,
     break;
   }
   case IPC_POKE: {
-    wxDataFormat format;
+    wxIPCFormat format;
     size_t size;
     char *data;
 
     item = codeci->ReadString();
-    format = (wxDataFormat)codeci->Read8();
+    format = (wxIPCFormat)codeci->Read8();
     size = codeci->Read32();
     data = new char[size];
     codeci->Read(data, size);
@@ -426,10 +430,10 @@ void Client_OnRequest(wxSocketBase& sock, wxSocketBase::wxRequestEvent evt,
     break;
   }
   case IPC_REQUEST: {
-    wxDataFormat format;
+    wxIPCFormat format;
 
     item = codeci->ReadString();
-    format = (wxDataFormat)codeci->Read8();
+    format = (wxIPCFormat)codeci->Read8();
 
     int user_size = -1;
     char *user_data = connection->OnRequest (topic_name, item, &user_size, format);