Applied patch for wxComboBox and wxListBox to

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

diff --git a/include/wx/sckipc.h b/include/wx/sckipc.h
index 939283e94040a8f6af7c118e00e02228579f203d..743da0ab9f03e0f8268422f80b55a6ea651d3a99 100644 (file)
--- a/include/wx/sckipc.h
+++ b/include/wx/sckipc.h
@@ -4,6 +4,7 @@
 // Author:      Julian Smart
 // Modified by: Guilhem Lavaux (big rewrite) May 1997, 1998
 //              Guillermo Rodriguez (updated for wxSocket v2) Jan 2000
 // Author:      Julian Smart
 // Modified by: Guilhem Lavaux (big rewrite) May 1997, 1998
 //              Guillermo Rodriguez (updated for wxSocket v2) Jan 2000

+//                                  (callbacks deprecated)    Mar 2000

 // Created:     1993
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart 1993
 // Created:     1993
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart 1993


@@ -20,7 +21,9 @@
 #endif
 
 #include "wx/defs.h"
 #endif
 
 #include "wx/defs.h"

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

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


@@ -56,6 +59,7 @@ class WXDLLEXPORT wxTCPClient;
 class WXDLLEXPORT wxTCPConnection: public wxConnectionBase
 {
   DECLARE_DYNAMIC_CLASS(wxTCPConnection)
 class WXDLLEXPORT wxTCPConnection: public wxConnectionBase
 {
   DECLARE_DYNAMIC_CLASS(wxTCPConnection)

+

 public:
   wxTCPConnection(char *buffer, int size);
   wxTCPConnection();
 public:
   wxTCPConnection(char *buffer, int size);
   wxTCPConnection();


@@ -63,7 +67,6 @@ public:
 
   // Calls that CLIENT can make
   virtual bool Execute(const wxChar *data, int size = -1, wxIPCFormat format = wxIPC_TEXT);
 
   // Calls that CLIENT can make
   virtual bool Execute(const wxChar *data, int size = -1, wxIPCFormat format = wxIPC_TEXT);

-  virtual bool Execute(const wxString& str) { return Execute(str, -1, 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 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);


@@ -75,45 +78,30 @@ public:
   // Calls that both can make
   virtual bool Disconnect(void);
 
   // Calls that both can make
   virtual bool Disconnect(void);
 

-  // Callbacks to SERVER - override at will
-  virtual bool OnExecute(const wxString& topic, char *data, int size, wxIPCFormat format)
-    { return wxConnectionBase::OnExecute(topic, data, size, format); };
-  virtual char *OnRequest(const wxString& topic, const wxString& item, int *size, wxIPCFormat format)
-    { return wxConnectionBase::OnRequest(topic, item, size, format); };
-  virtual bool OnPoke(const wxString& topic, const wxString& item, char *data, int size, wxIPCFormat format)
-    { return wxConnectionBase::OnPoke(topic, item, data, size, format); };
-  virtual bool OnStartAdvise(const wxString& topic, const wxString& item)
-    { return wxConnectionBase::OnStartAdvise(topic, item); };
-  virtual bool OnStopAdvise(const wxString& topic, const wxString& item)
-    { return wxConnectionBase::OnStopAdvise(topic, item); };
-
-  // Callbacks to CLIENT - override at will
-  virtual bool OnAdvise(const wxString& topic, const wxString& item, char *data, int size, wxIPCFormat format)
-    { return wxConnectionBase::OnAdvise(topic, item, data, size, format); };
-
-  // Callbacks to BOTH
-
+  // Callbacks to BOTH - override at will

   // Default behaviour is to delete connection and return TRUE
   virtual bool OnDisconnect(void) { delete this; return TRUE; }
 
   // Default behaviour is to delete connection and return TRUE
   virtual bool OnDisconnect(void) { delete this; return TRUE; }
 

-  // To enable the compressor
+  // To enable the compressor (NOTE: not implemented!)

   void Compress(bool on);
 
 protected:
   void Compress(bool on);
 
 protected:

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

   wxDataOutputStream *m_codeco;
   wxDataOutputStream *m_codeco;

-  wxString m_topic;
+  wxString            m_topic;

 
   friend class wxTCPServer;
   friend class wxTCPClient;
 
   friend class wxTCPServer;
   friend class wxTCPClient;

-  friend void Client_OnRequest(wxSocketBase&,
-                               wxSocketNotify, char *);
-  friend void Server_OnRequest(wxSocketServer&,
-                               wxSocketNotify, char *);
+  friend class wxTCPEventHandler;

 
 private:
 
 private:

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

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


@@ -126,9 +114,14 @@ public:
   wxTCPServer();
   virtual ~wxTCPServer();
 
   wxTCPServer();
   virtual ~wxTCPServer();
 

-  // Returns FALSE if can't create server (e.g. port number is already in use)
-  virtual bool Create(const wxString& server_name);
+  // Returns FALSE on error (e.g. port number is already in use)
+  virtual bool Create(const wxString& serverName);
+
+  // Callbacks to SERVER - override at will

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

+
+protected:
+  wxSocketServer *m_server;

 };
 
 class wxTCPClient: public wxClientBase
 };
 
 class wxTCPClient: public wxClientBase


@@ -140,14 +133,16 @@ 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);
 

-  // Tailor this to return own connection.
+  // Callbacks to CLIENT - override at will

   virtual wxConnectionBase *OnMakeConnection();
 };
 
   virtual wxConnectionBase *OnMakeConnection();
 };
 

-#endif // ipcsock.h
+#endif // wxUSE_SOCKETS && wxUSE_IPC
+
+#endif // _WX_SCKIPC_H