Minor corrections to make dist after reports

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

diff --git a/include/wx/sckipc.h b/include/wx/sckipc.h
index 9e5b847389d36ecfa5a7d983a2319a551ab55c47..4d4164cd8c9e2762d1dc3d43c86f4b1dff8aa193 100644 (file)
--- a/include/wx/sckipc.h
+++ b/include/wx/sckipc.h
@@ -16,10 +16,6 @@
 #ifndef _WX_SCKIPC_H
 #define _WX_SCKIPC_H
 
 #ifndef _WX_SCKIPC_H
 #define _WX_SCKIPC_H
 

-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "sckipc.h"
-#endif
-

 #include "wx/defs.h"
 
 #if wxUSE_SOCKETS && wxUSE_IPC
 #include "wx/defs.h"
 
 #if wxUSE_SOCKETS && wxUSE_IPC


@@ -53,39 +49,36 @@
  *
  */
 
  *
  */
 

-class WXDLLEXPORT_BASE wxTCPServer;
-class WXDLLEXPORT_BASE wxTCPClient;
+class WXDLLIMPEXP_FWD_NET wxTCPServer;
+class WXDLLIMPEXP_FWD_NET wxTCPClient;

 
 

-class WXDLLEXPORT_BASE wxTCPConnection: public wxConnectionBase
+class WXDLLIMPEXP_NET wxTCPConnection : public wxConnectionBase

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxTCPConnection)
-

 public:
 public:

-  wxTCPConnection(wxChar *buffer, int size);
+  wxTCPConnection(void *buffer, size_t size);

   wxTCPConnection();
   virtual ~wxTCPConnection();
 
   wxTCPConnection();
   virtual ~wxTCPConnection();
 

-  // Calls that CLIENT can make
-  virtual bool Execute(const wxChar *data, int size = -1, wxIPCFormat format = wxIPC_TEXT);
-  virtual wxChar *Request(const wxString& item, int *size = NULL, wxIPCFormat format = wxIPC_TEXT);
-  virtual bool Poke(const wxString& item, wxChar *data, int size = -1, wxIPCFormat format = wxIPC_TEXT);
-  virtual bool StartAdvise(const wxString& item);
-  virtual bool StopAdvise(const wxString& item);
+  // To enable the compressor (NOTE: not implemented!)
+  void Compress(bool on);

 
 

-  // Calls that SERVER can make
-  virtual bool Advise(const wxString& item, wxChar *data, int size = -1, wxIPCFormat format = wxIPC_TEXT);

 
 

-  // Calls that both can make
+  // implement base class pure virtual methods
+  virtual const void *Request(const wxString& item,
+                              size_t *size = NULL,
+                              wxIPCFormat format = wxIPC_TEXT);
+  virtual bool StartAdvise(const wxString& item);
+  virtual bool StopAdvise(const wxString& item);

   virtual bool Disconnect(void);
 
   virtual bool Disconnect(void);
 

-  // Callbacks to BOTH - override at will
-  // Default behaviour is to delete connection and return TRUE
-  virtual bool OnDisconnect(void) { delete this; return TRUE; }
+protected:
+  virtual bool DoExecute(const void *data, size_t size, wxIPCFormat format);
+  virtual bool DoPoke(const wxString& item, const void *data, size_t size,
+                      wxIPCFormat format);
+  virtual bool DoAdvise(const wxString& item, const void *data, size_t size,
+                        wxIPCFormat format);

 
 

-  // To enable the compressor (NOTE: not implemented!)
-  void Compress(bool on);

 
 

-protected:

   wxSocketBase       *m_sock;
   wxSocketStream     *m_sockstrm;
   wxDataInputStream  *m_codeci;
   wxSocketBase       *m_sock;
   wxSocketStream     *m_sockstrm;
   wxDataInputStream  *m_codeci;


@@ -96,32 +89,23 @@ protected:
   friend class wxTCPClient;
   friend class wxTCPEventHandler;
 
   friend class wxTCPClient;
   friend class wxTCPEventHandler;
 

-private:
-  //
-  // We're hiding an Execute method in ConnectionBase
-  //
-  virtual bool Execute(const wxString& str)
-    { return Execute(str, -1, wxIPC_TEXT); }
-
-    DECLARE_NO_COPY_CLASS(wxTCPConnection)
+  DECLARE_NO_COPY_CLASS(wxTCPConnection)
+  DECLARE_DYNAMIC_CLASS(wxTCPConnection)

 };
 
 };
 

-class wxTCPServer: public wxServerBase
+class WXDLLIMPEXP_NET wxTCPServer : public wxServerBase

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxTCPServer)
-

 public:
 public:

-  wxTCPConnection *topLevelConnection;
-

   wxTCPServer();
   virtual ~wxTCPServer();
 
   wxTCPServer();
   virtual ~wxTCPServer();
 

-  // Returns FALSE on error (e.g. port number is already in use)
+  // Returns false on error (e.g. port number is already in use)

   virtual bool Create(const wxString& serverName);
 
   virtual bool Create(const wxString& serverName);
 

-  // Callbacks to SERVER - override at will

   virtual wxConnectionBase *OnAcceptConnection(const wxString& topic);
 
   virtual wxConnectionBase *OnAcceptConnection(const wxString& topic);
 

+  wxTCPConnection *topLevelConnection;
+

 protected:
   wxSocketServer *m_server;
 
 protected:
   wxSocketServer *m_server;
 


@@ -130,13 +114,12 @@ protected:
   wxString m_filename;
 #endif // __UNIX_LIKE__
 
   wxString m_filename;
 #endif // __UNIX_LIKE__
 

-    DECLARE_NO_COPY_CLASS(wxTCPServer)
+  DECLARE_NO_COPY_CLASS(wxTCPServer)
+  DECLARE_DYNAMIC_CLASS(wxTCPServer)

 };
 
 };
 

-class wxTCPClient: public wxClientBase
+class WXDLLIMPEXP_NET wxTCPClient : public wxClientBase

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxTCPClient)
-

 public:
   wxTCPClient();
   virtual ~wxTCPClient();
 public:
   wxTCPClient();
   virtual ~wxTCPClient();


@@ -150,6 +133,9 @@ public:
 
   // Callbacks to CLIENT - override at will
   virtual wxConnectionBase *OnMakeConnection();
 
   // Callbacks to CLIENT - override at will
   virtual wxConnectionBase *OnMakeConnection();

+
+private:
+  DECLARE_DYNAMIC_CLASS(wxTCPClient)

 };
 
 #endif // wxUSE_SOCKETS && wxUSE_IPC
 };
 
 #endif // wxUSE_SOCKETS && wxUSE_IPC