removed extern from inline function declarations

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

diff --git a/include/wx/sckipc.h b/include/wx/sckipc.h
index 586b0d06effcf7df94aa475690151552378d1a86..c88d5fd19c669da1b9a5f04edaf11de37b8bc877 100644 (file)
--- a/include/wx/sckipc.h
+++ b/include/wx/sckipc.h
@@ -1,23 +1,28 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        sckipc.h
 /////////////////////////////////////////////////////////////////////////////
 // Name:        sckipc.h

-// Purpose:     Interprocess communication
-// Author:      Julian Smart/Guilhem Lavaux (big rewrite)
-// Modified by: Guilhem Lavaux 1997
+// Purpose:     Interprocess communication implementation (wxSocket version)
+// Author:      Julian Smart
+// Modified by: Guilhem Lavaux (big rewrite) May 1997, 1998
+//              Guillermo Rodriguez (updated for wxSocket v2) Jan 2000

 // Created:     1993
 // RCS-ID:      $Id$
 // Created:     1993
 // RCS-ID:      $Id$

-// Copyright:   (c) 1993 Julian Smart
-//              (c) 1997, 1998 Guilhem Lavaux
+// Copyright:   (c) Julian Smart 1993
+//              (c) Guilhem Lavaux 1997, 1998
+//              (c) 2000 Guillermo Rodriguez <guille@iies.es>

 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////

+

 #ifndef _WX_SCKIPC_H
 #define _WX_SCKIPC_H
 
 #ifdef __GNUG__
 #ifndef _WX_SCKIPC_H
 #define _WX_SCKIPC_H
 
 #ifdef __GNUG__

-#pragma interface
+#pragma interface "sckipc.h"

 #endif
 
 #include "wx/defs.h"
 #endif
 
 #include "wx/defs.h"

-#include "wx/setup.h"
+
+#if wxUSE_SOCKETS
+

 #include "wx/ipcbase.h"
 #include "wx/socket.h"
 #include "wx/sckstrm.h"
 #include "wx/ipcbase.h"
 #include "wx/socket.h"
 #include "wx/sckstrm.h"


@@ -47,56 +52,56 @@
  *
  */
 
  *
  */
 

-class wxTCPServer;
-class wxTCPClient;
-class wxTCPConnection: public wxConnectionBase
+class WXDLLEXPORT wxTCPServer;
+class WXDLLEXPORT wxTCPClient;
+
+class WXDLLEXPORT wxTCPConnection: public wxConnectionBase

 {
   DECLARE_DYNAMIC_CLASS(wxTCPConnection)
 {
   DECLARE_DYNAMIC_CLASS(wxTCPConnection)

-
-protected:
-  wxSocketBase *m_sock;
-  wxSocketStream *m_sockstrm;
-  wxDataInputStream *m_codeci;
-  wxDataOutputStream *m_codeco;
-  wxString m_topic;
-
-  friend class wxTCPServer;
-  friend class wxTCPClient;
-  friend void Client_OnRequest(wxSocketBase&,
-                              wxSocketNotify, char *);
-  friend void Server_OnRequest(wxSocketServer&,
-                              wxSocketNotify, char *);

 public:
 public:

-

   wxTCPConnection(char *buffer, int size);
   wxTCPConnection();
   virtual ~wxTCPConnection();
 
   // Calls that CLIENT can make
   wxTCPConnection(char *buffer, int size);
   wxTCPConnection();
   virtual ~wxTCPConnection();
 
   // Calls that CLIENT can make

-  bool Execute(wxChar *data, int size = -1,
-               wxIPCFormat format = wxIPC_TEXT);
-  char *Request(const wxString& item, int *size = NULL,
-                wxIPCFormat format = wxIPC_TEXT);
-  bool Poke(const wxString& item, wxChar *data, int size = -1,
-            wxIPCFormat format = wxIPC_TEXT);
-  bool StartAdvise(const wxString& item);
-  bool StopAdvise(const wxString& item);
+  virtual bool Execute(const wxChar *data, int size = -1, wxIPCFormat format = wxIPC_TEXT);
+  virtual char *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);

 
   // Calls that SERVER can make
 
   // Calls that SERVER can make

-  bool Advise(const wxString& item, wxChar *data, int size = -1,
-              wxIPCFormat format = wxIPC_TEXT);
+  virtual bool Advise(const wxString& item, wxChar *data, int size = -1, wxIPCFormat format = wxIPC_TEXT);

 
   // Calls that both can make
 
   // Calls that both can make

-  bool Disconnect();
+  virtual bool Disconnect(void);

 
 

-  // Called when we lost the peer.
-  bool OnDisconnect() { return TRUE; }
+  // Default behaviour is to delete connection and return TRUE
+  virtual bool OnDisconnect(void) { delete this; return TRUE; }

 
   // To enable the compressor
   void Compress(bool on);
 
   // To enable the compressor
   void Compress(bool on);

+
+protected:
+  wxSocketBase *m_sock;
+  wxSocketStream *m_sockstrm;
+  wxDataInputStream *m_codeci;
+  wxDataOutputStream *m_codeco;
+  wxString m_topic;
+
+  friend class wxTCPServer;
+  friend class wxTCPClient;
+  friend void Client_OnRequest(wxSocketBase&,
+                               wxSocketNotify, char *);
+  friend void Server_OnRequest(wxSocketServer&,
+                               wxSocketNotify, char *);
+

 private:
 private:

-  // to prevent virtual function hiding warnings
-  virtual bool Execute(const wxString& str) { return(wxConnectionBase::Execute(str)); };
+  //
+  // We're hiding an Execute method in ConnectionBase
+  //s
+  virtual bool Execute(const wxString& str)
+  { return Execute(str, -1, wxIPC_TEXT); }

 };
 
 class wxTCPServer: public wxServerBase
 };
 
 class wxTCPServer: public wxServerBase


@@ -123,8 +128,8 @@ public:
   virtual ~wxTCPClient();
 
   virtual bool ValidHost(const wxString& host);
   virtual ~wxTCPClient();
 
   virtual bool ValidHost(const wxString& host);

-    // Call this to make a connection.
-    // Returns NULL if cannot.
+  // Call this to make a connection.
+  // Returns NULL if cannot.

   virtual wxConnectionBase *MakeConnection(const wxString& host,
                                            const wxString& server,
                                            const wxString& topic);
   virtual wxConnectionBase *MakeConnection(const wxString& host,
                                            const wxString& server,
                                            const wxString& topic);


@@ -133,4 +138,6 @@ public:
   virtual wxConnectionBase *OnMakeConnection();
 };
 
   virtual wxConnectionBase *OnMakeConnection();
 };
 

+#endif // wxUSE_SOCKETS
+

 #endif // ipcsock.h
 #endif // ipcsock.h