Define WXBUILDING in Xcode projects.

[wxWidgets.git] / include / wx / sckipc.h

diff --git a/include/wx/sckipc.h b/include/wx/sckipc.h
index 205366d40b4b6ac172ab7267510b16501a592a39..d446cc47009f09cc12d145c8ff257331fbd05c77 100644 (file)
--- a/include/wx/sckipc.h
+++ b/include/wx/sckipc.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        sckipc.h
+// Name:        wx/sckipc.h
 // Purpose:     Interprocess communication implementation (wxSocket version)
 // Author:      Julian Smart
 // Modified by: Guilhem Lavaux (big rewrite) May 1997, 1998
@@ -52,6 +52,8 @@
 class WXDLLIMPEXP_FWD_NET wxTCPServer;
 class WXDLLIMPEXP_FWD_NET wxTCPClient;
 
+class wxIPCSocketStreams;
+
 class WXDLLIMPEXP_NET wxTCPConnection : public wxConnectionBase
 {
 public:
@@ -85,11 +87,19 @@ protected:
                           wxIPCFormat format);
 
 
-    wxSocketBase       *m_sock;
-    wxSocketStream     *m_sockstrm;
-    wxDataInputStream  *m_codeci;
-    wxDataOutputStream *m_codeco;
-    wxString            m_topic;
+    // notice that all the members below are only initialized once the
+    // connection is made, i.e. in MakeConnection() for the client objects and
+    // after OnAcceptConnection() in the server ones
+
+    // the underlying socket (wxSocketClient for IPC client and wxSocketServer
+    // for IPC server)
+    wxSocketBase *m_sock;
+
+    // various streams that we use
+    wxIPCSocketStreams *m_streams;
+
+    // the topic of this connection
+    wxString m_topic;
 
 private:
     // common part of both ctors
@@ -99,7 +109,7 @@ private:
     friend class wxTCPClient;
     friend class wxTCPEventHandler;
 
-    DECLARE_NO_COPY_CLASS(wxTCPConnection)
+    wxDECLARE_NO_COPY_CLASS(wxTCPConnection);
     DECLARE_DYNAMIC_CLASS(wxTCPConnection)
 };
 
@@ -122,7 +132,7 @@ protected:
     wxString m_filename;
 #endif // __UNIX_LIKE__
 
-    DECLARE_NO_COPY_CLASS(wxTCPServer)
+    wxDECLARE_NO_COPY_CLASS(wxTCPServer);
     DECLARE_DYNAMIC_CLASS(wxTCPServer)
 };