column autosizing added

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

diff --git a/include/wx/sckipc.h b/include/wx/sckipc.h
index 939283e94040a8f6af7c118e00e02228579f203d..c88d5fd19c669da1b9a5f04edaf11de37b8bc877 100644 (file)
--- a/include/wx/sckipc.h
+++ b/include/wx/sckipc.h
@@ -20,7 +20,9 @@
 #endif
 
 #include "wx/defs.h"
-#include "wx/setup.h"
+
+#if wxUSE_SOCKETS
+
 #include "wx/ipcbase.h"
 #include "wx/socket.h"
 #include "wx/sckstrm.h"
@@ -63,7 +65,6 @@ public:
 
   // 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);
@@ -75,24 +76,6 @@ public:
   // 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
-
   // Default behaviour is to delete connection and return TRUE
   virtual bool OnDisconnect(void) { delete this; return TRUE; }
 
@@ -114,6 +97,11 @@ protected:
                                wxSocketNotify, char *);
 
 private:
+  //
+  // 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
@@ -150,4 +138,6 @@ public:
   virtual wxConnectionBase *OnMakeConnection();
 };
 
+#endif // wxUSE_SOCKETS
+
 #endif // ipcsock.h